Much needed change to calculations for column widths