edited some of the templates