adding images and minor changes to templates/macros