Added ToggleButton style, lots of refactoring