Base Page refactor