Update main tables to be CSS instead of HTML
Update test data