Remove some of the clutter in the forms

This is an extension of https://github.com/dddeastanglia/DDDEastAnglia/pull/70 to remove some of the clutter.