Small changes to EditorViewController