Helper Map to format cells for Table, small fixes for Table