drag n drop changes

-now supports swapping elements without resetting them back to
contiainer
-and dragging individual elements back to container