some navigation tweaks