Nav-Bar bug fixes