fixed scroll and playlist delete
resolved merge conflicts