Made important structural changes for navigating pages