[DF-348] UI Editor. Fix for DF-654 and DF-676.