Small improvements to templates, updated old inline code to move images to collection