updated templates and images, fixed map