[DF-348] UI Editor. DF-655 final fix.