updated refereneces for images and updated templates correctly