Merge pull request #29 from lilkraftwerk/refactoring

Adding style for show trip page
Merge branch 'master' into further-styling