Fix #247 - Replaced plan trip button with swap trips, auto-plan trip