Improve EditorFrame [dev.]