Fixes #8785 - Html improvements - add thead/tbody, fix formatting