done refactoring of page menus, now refactor pages