Putting images in a container so captions are easier to position

Should have done this from the start
Make caption nicer!