fix batch, layout