Navbar, spans and css updates (in prog)