Added ToggleButton and updated button classes