Adds style fixes + button text change
Resolved merging conflict
Merge branch 'master' of github.com:pa7/a-story-about-vienna