some nav fixes