Merge pull request #606 from johnhaddon/dragDropImprovements

Drag drop improvements
Merge pull request #607 from johnhaddon/boxFixes

Box fixes
Added an icon.