final fixes to toggle switch.