refactor angular code
Merge remote-tracking branch 'upstream/refactor_editorui' into refactor_editorui