Rework for the new playlist layout