Moved more hardcoded HTML to templates