Some fixes to navbar