Navbar refactor