more page refactoring