massive nav overhaul