more navigation tweaks