Refactor UI Kit adapter, fixes for batch moves

It works now!