I'd forgotten to add check for need for a new batch. Fixes visual anomalies, particularly tab container.