Tweak edit form layout, and improve tests.
Merge pull request #19 from alphagov/edit_form_tweaks

Tweak edit form layout, and improve tests.