Ui editor - [DF-740] and [DF-769] fixes.