More fixes to navbar