and unify layout of form view. issue8644 review262131002
issue8252 review257851003
issue4139 review9661002