NORMAL CHANGE: Page Navigator code refactoring