basic sane state
reverting some shit
some reordering
fixed the drag and drop bug