Improvement HtmlDisplay
Restructuring