More nav fixes/