Well, started to fix the dnd. Sort of working, but the old widgets are
not