Page refactoring