major page loc refactoring