Moved all inputs onto one HTML form

Did some significant rearranging and a bit of refactoring. Richard you may want to take a look at this because I dont know if it threw off the CSS or not.