Major upgrades to internal pages