Fix some HTML issues in the templates

Just to be safe.

@gradyward please review.