Added content, swapped images, add new template