I'm never writing raw HTML again
Fix up even more of the markup