Some fixes to the nav bar