Improved drag and drop

Added support to properly enable and disable the draggable without corrupting the state of the GUI