trying some page refactoring