Fix some invalid HTML tag nesting

`states.mustache` still needs some attention. I left two comments on it at 08d631888b607413641cbbd01725e8aa27ab70c4