Ui editor updates for development qa

Recent fixes for UIEditor.