Change names, wrap images in span and fix indentation