More improvements to the editor