Third round of figure improvements

Fix figure box width when the caption exceeds image width in index.