Minor HTML fix
Minor cleanups
More cleanups
More cleanups
Ensure that output HTML text is properly escaped in the custom tags