Small feature refactor for pages