Corrections to has_navigation and navigation_host to use the new NavigationMapper...