refactor added draggable