finished nav fixes