player in drawer
merge
play button drawRect, new scrub color
merge