Fixed issues with the navbar