Navbar & other updates