Fix numbering and figcaption