Lots of little refactoring
Refactored form toggling