Improvements to layout.
Working drag and drop, cleaned up code, improved UI
Refactor
Merge branch 'dev'