Navbar more fixes