Lots of markup consistency nits.

Logical markup.
11 files changed