Pages refactoring