Refactoring of Editor View and controller