Moved TH and TD values to a template