More improvements of editor