Revert max span to 12
Improve droppable spaces when dragging
Merge remote branch 'upstream/master'