Fix a few html correctness issues.

* ampersand escaping
* nesting block elements inside inline elements (CSS seems to work the same)
*