Cancelling and ToggleButton fixes