All images and one or two content tweaks
Merged conflicts