Changes for checkout page Issues