Moved more to inner classes in EditorView