Player mode gets rid of unnecessary elements
Merge branch 'master' into gh-pages