Started with the new design in Spotify
Merge conflict fixed