refined layout on the screen
Merge branch 'song-player' into bernhard

* song-player:
  refined layout on the screen
Merge branch 'feature/song-player' into develop
Merge branch 'bernhard' into develop

* bernhard: