Major changes to editor, bringing it in line with designs