UI and Form work mainly on the Edit page
Merge branch 'vertical'