Improve drag and drop application