Improved HDDraggableButton code