Move HtmlDisplay to separate module