Updated navbar.  Still needs work