Various amendments to the forms element spacing.
Merge branch 'master' into form-element-styling