Page refactor