Combined controllers; added button styles; added check all / uncheck all buttons; cleaned up some code