Tweaks to the navigation