More Navigator refactoring.
2 files changed