Updated routing logic, map responsiveness