Refactor survey creation forms and controller actions