Fixing some issues with Drag and Drop and adding events