add page logic
Merge branch 'dev5' into dev3