Nicole - moved Navbar code to the place it's actually supposed to go, apparently