Continuing pageSettings refactor