ticket:5 fix main page layout
Merge branch 't5_edit_form'