more nav fixes...