Fix/table 18n

@donnapep @stulees can you please review this and the other open PR. This will need a rebase before merge. Thanks.