[TIDOC-1272] Updates for new NavigationWindow

This resolves both TIDOC-1272 and TIDOC-1259