Fix HTML rendering, and add table combining symbols and punctuation