added a condition on @trip
added some more styling