[DF-348] UI Editor.  Code optimization for previous fixes.