UI changes & more function to DnD/Add/Delete