Final NavBar refactoring