Added some form validation, formatting improvements, and template formatting fixes