Refactor the flow of customizing a trip