Moved hardcoded HTML to templates