minor navigator refactoring