Some form improvements

Merged username-removed-26331 requested to merge grote/repomaker:form-improvements into master

Forms are still not final. These are just some smaller incremental improvements.