Refactored grid layout (draggable)
Merge branch 'master' of github.com:quedigital/tenth_hcw