All: Fix demos markup inconsistencies discovered by cheerio

Closes gh-7212
Fixes gh-7211