change view
fix edit layout
Merge branch 'edit-view'