a few navigation tweaks