Added new Images, Fixed bug in templates