Navbar and tiny fix