Encapsulated addMatchToTable as a function

Need to separate headers from flex containers.