add images and refine template
Resolve merge conflicts