On Off Button Fixes