Patient summary and other template tweaks