Global nav fixes