new set of changes for nav and pages