[DF-878] - UI polishment.
Merge remote-tracking branch 'origin/UIEditor' into UIEditor