Improvements to the editor