Improvements to Trip map