Navigation behavior overhaul