Changed images, template bug fixing