Removed "reset" button and used "switch" (java 7)