change to the calculation function and addition of a class for columns and padding