format edit page
Merge branch 'master' into paginate