and unify layout of form view. issue8644 review262131002
issue6310 review31141002
issue6157 review25971002