finished making the drag and drop robust