Move more hardcoded HTML to template