diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index e4f4711e..26039cc8 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java
index 6e1d0c09..ba334f92 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java
@@ -214,13 +214,14 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
     public void showReceiptData(SendMoneyTransactionCompleteModel recieptData) {
 
         String middlName = recieptData.getRMiddleName() == null || recieptData.getRMiddleName().equalsIgnoreCase(" ") ? "" : recieptData.getRMiddleName() + " ";
-        receiverNameTextView.setText(recieptData.getRFirstName() + " " + middlName + recieptData.getRLastName());
+        String name=recieptData.getRFirstName() + " " + middlName + recieptData.getRLastName();
+        receiverNameTextView.setText(String.format("%s : %s", getString(R.string.to_text), name));
 
         //        receiverNameTextView.setText(recieptData.getRFirstName());
         payoutAmountTextView.setText(recieptData.getPAmount());
-        gmeControlNumberTextView.setText("GME Control No. " + recieptData.getControlNo());
+        gmeControlNumberTextView.setText(String.format("GME Control No. %s", recieptData.getControlNo()));
         transactionDateTextView.setText(recieptData.getTrnDate());
-        receiverTextView.setText(recieptData.getRFirstName() + " " + middlName + recieptData.getRLastName());
+        receiverTextView.setText(name);
         addressTextView.setText(recieptData.getRAddress());
         mobileNumberTextView.setText(recieptData.getRContactNo());
 
@@ -254,7 +255,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
             txt_partner_info.setText(partnerText);
             progressbar_partner_info.setVisibility(View.VISIBLE);
             container_partner_info.setVisibility(View.VISIBLE);
-            Glide.with(img_partner_info.getContext()).asBitmap().load(partnerLogoUrl).diskCacheStrategy(DiskCacheStrategy.NONE).into(new CustomTarget<Bitmap>() {
+            Glide.with(img_partner_info.getContext()).asBitmap().load(partnerLogoUrl).dontTransform().diskCacheStrategy(DiskCacheStrategy.NONE).into(new CustomTarget<Bitmap>() {
                 @Override
                 public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
                     Log.d(TAG, "Resource load success");
diff --git a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
index 2aa30e22..8feb7304 100644
--- a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
+++ b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
@@ -76,7 +76,7 @@
                     android:textSize="@dimen/_12ssp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/transfer_detail"
+                    app:layout_constraintTop_toBottomOf="@+id/transfer_label"
                     app:txtfontName="@string/heavy"
                     tools:text="Some name" />
 
@@ -132,23 +132,6 @@
                     tools:text="1209389128379128" />
 
 
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/transfer_detail"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/_6sdp"
-                    android:layout_marginEnd="@dimen/_6sdp"
-                    android:gravity="center_horizontal"
-                    android:padding="@dimen/_1sdp"
-                    android:paddingStart="@dimen/_4sdp"
-                    android:paddingEnd="@dimen/_4sdp"
-                    android:text="@string/transfer_success_info_text"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/_12ssp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/transfer_label" />
-
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/container_partner_info"
                     android:layout_width="match_parent"
@@ -158,52 +141,18 @@
                     app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintStart_toEndOf="@+id/imageView7"
                     app:layout_constraintTop_toBottomOf="@+id/tv_gme_control_no">
-                    <!--                    >-->
-                    <!--                    <ImageView-->
-                    <!--                        android:layout_marginTop="@dimen/_10sdp"-->
-                    <!--                        android:visibility="gone"-->
-                    <!--                        android:id="@+id/img_partner_info"-->
-                    <!--                        app:layout_constraintStart_toStartOf="parent"-->
-                    <!--                        app:layout_constraintEnd_toEndOf="parent"-->
-                    <!--                        app:layout_constraintTop_toTopOf="parent"-->
-                    <!--                        app:layout_constraintBottom_toTopOf="@+id/txt_partner_info"-->
-                    <!--                        android:layout_width="0dp"-->
-                    <!--                        app:layout_constraintDimensionRatio="H,3:1"-->
-                    <!--                        android:layout_height="0dp"/>-->
-                    <!--                    <ProgressBar-->
-                    <!--                        android:id="@+id/progressbar_partner_info"-->
-                    <!--                        android:layout_width="@dimen/_18sdp"-->
-                    <!--                        android:layout_height="@dimen/_18sdp"-->
-                    <!--                        android:layout_marginBottom="@dimen/_20sdp"-->
-                    <!--                        android:layout_marginTop="@dimen/_20sdp"-->
-                    <!--                        app:layout_constraintStart_toStartOf="parent"-->
-                    <!--                        app:layout_constraintEnd_toEndOf="parent"-->
-                    <!--                        app:layout_constraintTop_toTopOf="parent"-->
-                    <!--                        app:layout_constraintBottom_toBottomOf="parent"/>-->
-
-                    <!--                <ProgressBar-->
-                    <!--                    android:id="@+id/progressbar_partner_info"-->
-                    <!--                    android:layout_width="@dimen/_18sdp"-->
-                    <!--                    android:layout_height="@dimen/_18sdp"-->
-                    <!--                    android:layout_marginTop="@dimen/_20sdp"-->
-                    <!--                    android:layout_marginBottom="@dimen/_20sdp"-->
-                    <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-                    <!--                    app:layout_constraintEnd_toEndOf="parent"-->
-                    <!--                    app:layout_constraintStart_toStartOf="parent"-->
-                    <!--                    app:layout_constraintTop_toTopOf="parent" />-->
 
                     <ImageView
                         android:id="@+id/img_partner_info"
                         android:layout_width="@dimen/_60sdp"
                         android:layout_height="@dimen/_60sdp"
-                        android:layout_marginStart="@dimen/_8sdp"
-                        android:layout_marginTop="@dimen/_10sdp"
-                        android:layout_marginEnd="@dimen/_8sdp"
+                        android:layout_marginStart="@dimen/_25sdp"
                         android:scaleType="fitCenter"
                         android:visibility="visible"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@+id/txt_partner_info"
                         app:layout_constraintHorizontal_bias="0.5"
+                        app:layout_constraintHorizontal_chainStyle="packed"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
@@ -211,20 +160,17 @@
                         android:id="@+id/progressbar_partner_info"
                         android:layout_width="@dimen/_18sdp"
                         android:layout_height="@dimen/_18sdp"
-                        android:layout_marginTop="@dimen/_20sdp"
-                        android:layout_marginBottom="@dimen/_20sdp"
-                        app:layout_constraintBottom_toBottomOf="@+id/img_partner_info"
+                        app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="@+id/img_partner_info"
                         app:layout_constraintStart_toStartOf="@+id/img_partner_info"
-                        app:layout_constraintTop_toTopOf="@+id/img_partner_info" />
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                         android:id="@+id/txt_partner_info"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/_8sdp"
                         android:layout_marginTop="@dimen/_10sdp"
-                        android:layout_marginEnd="@dimen/_8sdp"
+                        android:layout_marginEnd="@dimen/_25sdp"
                         android:gravity="center"
                         android:textColor="@color/white"
                         android:textSize="@dimen/_9ssp"
@@ -242,7 +188,6 @@
                     android:id="@+id/tv_note"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_6sdp"
                     android:gravity="center"
                     android:paddingStart="@dimen/_4sdp"
                     android:paddingTop="@dimen/_2sdp"
@@ -419,7 +364,6 @@
                         android:layout_weight="1"
                         android:ellipsize="end"
                         android:gravity="end"
-                        android:maxLines="2"
                         android:padding="@dimen/_8sdp"
                         android:singleLine="false"
                         android:text=""
@@ -631,7 +575,6 @@
                 </LinearLayout>
             </LinearLayout>
 
-
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                 android:id="@+id/btn_submit"
                 style="@style/gme_button"
diff --git a/app/src/main/res/layout/send_money_header.xml b/app/src/main/res/layout/send_money_header.xml
index cbda7fc0..ac3db1c9 100644
--- a/app/src/main/res/layout/send_money_header.xml
+++ b/app/src/main/res/layout/send_money_header.xml
@@ -36,7 +36,7 @@
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
         android:id="@+id/page1TitleTxtView"
-        android:layout_width="80dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:paddingTop="@dimen/_3sdp"
@@ -66,7 +66,7 @@
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
         android:id="@+id/page2TitleTxtView"
-        android:layout_width="80dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:paddingTop="@dimen/_3sdp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8f53de6b..07a73534 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,7 +2,7 @@
 
     <!-- Base application theme. -->
 <!--    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">-->
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.Bridge">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -76,12 +76,28 @@
         <item name="android:colorControlNormal" tools:targetApi="lollipop">@color/gray</item>
     </style>
 
-    <style name="DatePickerTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@android:color/black</item>
+    <style name="DatePickerTheme" parent="Theme.MaterialComponents.Light.Dialog.Alert">
+<!--    <style name="DatePickerTheme" parent="Theme.AppCompat.Light.Dialog.Alert">-->
         <item name="android:textColorPrimary">@color/darkgray</item>
         <item name="android:windowBackground">@drawable/ic_date_picker_rd_background_white</item>
         <item name="android:windowTitleStyle">@style/DatePickerDialogTitle</item>
+        <item name="android:colorAccent" tools:targetApi="lollipop">@color/black</item>
         <item name="android:buttonStyle">@style/DatePickerButtonStyle</item>
+
+
+    </style>
+
+    <style name="Alert.Button.Positive" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+        <item name="android:fillColor" tools:targetApi="lollipop">@android:color/transparent</item>
+
+        <item name="android:textColor">@color/black</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
+
+    <style name="Alert.Button.Neutral" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+        <item name="android:fillColor" tools:targetApi="lollipop">@android:color/transparent</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="android:textAllCaps">false</item>
     </style>
 
     <style name="DatePickerDialogTitle" parent="Theme.AppCompat.Light.Dialog.Alert">
@@ -91,6 +107,7 @@
     </style>
 
     <style name="DatePickerButtonStyle">
+        <item name="colorButtonNormal">@android:color/holo_red_dark</item>
         <item name="android:textSize">15sp</item>
         <item name="android:textColor">@color/darkgray</item>
         <item name="android:textStyle">normal</item>