Navbar and sidemenu related changes