[TIDOC-1272] Updates for new NavigationWindow