Indent on return. Fix reference cycle. Keep using EditorView