Refactor table widths