Fixed back button
Merge branch 'master' into heroku
changed to original color scheme