Added table layout fix