Add missing labels for form fields

Otherwise they can't be translated.

Fixes #1003
Docs: Add note regarding documentation style guides
Merge remote-tracking branch 'upstream/master'