Draggable and selectable working better together now