Improved UI with drag drop with backend support