Page scaffolding changes