Table width calculations updated