I'm writing a document in which the figures have captions. In order to make it easier to immediately discern which caption belongs to which figure, I'd like to have borders surrounding each image and its associated caption. Is there a quick way to achieve this that doesn't involve manually dragging rectangle shapes around the images/captions?