another Editor Controller and View refactoring