More tweaking of the UI
Fix drag and drop
More tweaking of layout, colors etc.