Small refactoring of navigation.