Navbar and Titles fixes