Further work on editor (display working)