Added beats picker Relates to #1