Third round of figure improvements

Fix figure box width when the caption exceeds image width in index.
Merge pull request #14 from magnunleno/improve-figures-3

Third round of figure improvements