Cleaned up image templates

Fixed issues with image templates, and added last two images.