Small fixes for nav bar