Fix selector
Add animation scrubber and speed control