Added Layout service provider and HtmlView