Move the form into a view and use a button