Issue fix for customer layout