nav fixes / cleanup