Nav refactoring.