Trip list single view
TripList fix one item view
Merge confilicts
merge confilictov