feature: #25 Better drag and drop handling