refactor editor view
Merge pull request #104 from lodge/refactor_editor_view

refactor editor view