Fixing animation pile up, adding dragging