Code cleanup
Fix Drag and Drop