nav fix and organization