Improve gallery and lightbox to include image caption