added ToggleButton, CheckButton and remove handler methods