Width calculations fixed