Some navigation tweaks.