Style trip show

* resolved merge conflict
* all specs pass
Please delete this branch after merge.