t651 Update UI and add placeholder for drag and drop
Merge branch 't651' into resolved