Final fixes to toggle switch.