PageView refactoring