Improvements to ToggleSwitch

..plus some style clean up.