clean up Trip view
merge conflicts
changed epoch time to human readable form