Updated Navbar

Names now correct and in order