more nav fixes