Tweaks to HTML Reporting Framework