Some upgrades to the navbar