3.1 Update html
3.1 html fixes part2 #2323
Merge pull request #2350 from 810/3.1-fix-1

3.1 Update html