attempt at nav fixes

got a conflict on nav.php trying to figure it out.