Add HTML templates
Switch (back) to default template delimiters
Add comments container to templates
Wrap new comment form in a div
Ummm... too many m's