Fix up nesting of html and mustache tags

and add style to make right column titles look a bit better