A few changes for master and pages