Refactor the form HTML to match the ui