Navbar and form fixes