Add alt attributes for img tags

Also correctly close img tags, with just > instead of />
Resolve merge conflict