Modifying PageNavigation

Still needs work