Navigation review

Small changes to get the navigation and related capabilities to work within the intended use cases and integration concepts.