Navbar fix + Maps issue fixed