Restructure templates and add in evaluation form