DOM nav fixes