Improved wrapper HTML and template.