final navigation tweaks