HTML Fixes found by attempted 8.0 update
merge 8.0 html fixes to 7.2