Some nav fixes