Refactoring pages