music player components added, merge remaining