Fixed some issues with Toggle Switch including style