Some aesthetic improvements
Functional media player
Some additions
Merge branch 'player' into develop