Base: Fix some buttons not working correctly
Base: Fix some buttons not working correctly

OpenSprinkler/OpenSprinkler-App,PeteBa/OpenSprinkler-App,PeteBa/OpenSprinkler-App,OpenSprinkler/OpenSprinkler-App,OpenSprinkler/OpenSprinkler-App,PeteBa/OpenSprinkler-App