More navigation tweaks