Toggle and Fill

Toggle switch and fill now responding as intended
Also renamed primary folder
Bonus