Cleanup the form layout
Add the switch form type