use spans to fit header/footer rows, add supplier name in stubs