[DF-738] Small ui fix
Merge remote-tracking branch 'origin/UIEditor' into UIEditor