ticket:5 fix test and change view
Merge branch 't5_edit_page'