Navbar refactoring