Add beautiful styling and design bug fixes
Merge branch 'master' of https://github.com/the-ben-waters/pistrion