More UI tweaks, fix drag and drop