misc nav fixes