Draggable/droppable revised