Initial implementation of drag and drop functionality
fix merge issues
Merge branch 'jimmytsao-dnd'