Updated editor and template