[OE-2684] print layout tweaks based on feedback from Rob & Mel.