Fix nested cancellation + Improvements to the arrival time  UI