Feature/draggable fixes