Make the trip plan name editable.
Merge and fixes