Navbar conflict fix