Fixed an issue in ToggleButton2, added various buttons to the demo for testing.