More nav refactoring