Moved HTML to templates