Navbar bug fixes