Address fix for GivingDetail and layout change to Batch