Revert "Start creating a more custom form"

This reverts commit 8757b5c695420daa44b279a8ef702883e52d2324.
Update form to create a more custom layout