ticket:5 corrections according to remarks
Merge branch 't5_edit_page'