more UI changes, drag almost works