nav refactoring