Add missing break for push button case and tidy up some formatting.