Adding more HTML
More HTML cleanup
more HTML
output improvements