Fix Animation Controls and Battery Saver