and unify layout of form view. issue8644 review262131002
This is easier when searching for lines to add. issue7021 review42961003