Improve design of editor