Changed list of headers to table