Updated form formatting
Merge branch 'layout_v10'