[Modify] rearrange code

- swap unwanted figure and unwanted place when user press cancel after
they have modified some thing in the trip