Fixed bug with persist on closed state. Finished travel edit
Fixed conflict