Fix some invalid HTML tag nesting
Fix alignment and mismatched mustache tags
Merge pull request #2055 from reciprocity/minor-fixes

Fix some invalid HTML tag nesting