Improvements in editor