refactor pages
Refactor_pages
Merge branch 'refactor_pages'