Drag & Drop as well as sidebar functionality improvements