Some upgrades and fixes to the navbar