Navbar refactor.