Adjust markup to support drag and drop better
Tweaks