Minor edits to EditorController