Remove DragDetector and handle everything in Draggable