Updated layout for Batch 22 release