EditorTemplate improvements; editor view models