Ui editor

UI Editor bug fixes. Including DF-636, DF-640, DF-663, DF-765.