Tidy-up form
Merge pull request #19 from djotto/flatten_form

Tidy-up form