Improvements to ToggleSwitch

+ some style clean up.