Fixes to the nav bar