Move HTML to templates