More nav tweaks