More nav tweaks...