NavigatorView code cleanup