Further page refactoring