Tweaks to navigation