[OE-2684] updates to print templates based on feedback from Rob & Mel