fixed layout-width for editTrip
Merge commit '69c59895a1af4ab33c22a846cfaeb231f28ed696'