nav refactor