continued work on refactoring page names