Navbar and Logged user fixes