Navbar Changes  and some container changes