Moved more hardcoded HTML to templated