Finished editor refactoring.