Fixed bug in trips controller
Formatted trips better