Some page refactoring