More nav tweaks.