template wizard and researcher view updated