Fixed all data and table headings