NavBar Update

Update to the Navbar to reflect new structure from meeting