nav fixes; cleanup