Clean up, impl battery, settings dismissed change