Made layout for player bar
Merge branch 'master' into musicplayer