Made a lot of improvements to the editor