More top nav fixes