Fix some HTML issues in the templates
Merge pull request #558 from edx/will/fix-html-errors

Fix some HTML issues in the templates