Navbar cleanup