and unify layout of form view. issue8644 review262131002
issue6013 review44181002
issue6734 review41531002