Refactoring to have the form at the bottom of the document