Only draggable items should get a "move" cursor
Enable toggling of drag/expand status with CSS classes
Resolve merge