diff --git a/app/src/main/res/layout/activity_bajaj_fd.xml b/app/src/main/res/layout/activity_bajaj_fd.xml
index 4c408c2..35d1884 100644
--- a/app/src/main/res/layout/activity_bajaj_fd.xml
+++ b/app/src/main/res/layout/activity_bajaj_fd.xml
@@ -54,7 +54,7 @@
             android:paddingBottom="10dp">
 
             <ImageView
-                android:id="@+id/step1"
+                android:id="@+id/stepOne"
                 android:layout_width="19dp"
                 android:layout_height="19dp"
                 android:contentDescription="@string/step1"
@@ -76,7 +76,7 @@
                 android:background="@color/color_green" />
 
             <ImageView
-                android:id="@+id/step2"
+                android:id="@+id/stepTwo"
                 android:layout_width="19dp"
                 android:layout_height="19dp"
                 android:contentDescription="@string/step2"
@@ -98,7 +98,7 @@
                 android:background="@color/color_green" />
 
             <ImageView
-                android:id="@+id/step3"
+                android:id="@+id/stepThree"
                 android:layout_width="19dp"
                 android:layout_height="19dp"
                 android:contentDescription="@string/step3"
@@ -120,7 +120,7 @@
                 android:background="@color/color_green" />
 
             <ImageView
-                android:id="@+id/step4"
+                android:id="@+id/stepFour"
                 android:layout_width="19dp"
                 android:layout_height="19dp"
                 android:contentDescription="@string/step4"
diff --git a/app/src/main/res/layout/bank_detail_select.xml b/app/src/main/res/layout/bank_detail_select.xml
index c08152d..13f27d4 100644
--- a/app/src/main/res/layout/bank_detail_select.xml
+++ b/app/src/main/res/layout/bank_detail_select.xml
@@ -100,7 +100,7 @@
         app:layout_constraintVertical_bias="0.0">
 
         <TextView
-            android:id="@+id/textView15"
+            android:id="@+id/tvPaymentModeLabel"
             style="@style/semiBoldStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -111,7 +111,7 @@
             tools:layout_editor_absoluteY="312dp" />
 
         <TextView
-            android:id="@+id/textView17"
+            android:id="@+id/tvAvailablePaymentMode"
             style="@style/regularStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_one.xml b/app/src/main/res/layout/fragment_bajajfd_step_one.xml
index ce8a989..6cb0773 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_one.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_one.xml
@@ -67,7 +67,6 @@
                             android:layout_height="wrap_content"
                             android:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
                             android:textColor="@color/light_text"
-                            app:layout_constraintBottom_toBottomOf="@+id/tilDepositAmount"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
                             app:layout_constraintStart_toStartOf="parent"
@@ -80,7 +79,6 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:hint="Select Investment Amount"
-                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tv_fd_rating"
@@ -104,7 +102,6 @@
                             android:text="@string/select_interest_payout"
                             android:textColor="@color/text_default"
                             android:textSize="@dimen/text_size_12"
-                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tilDepositAmount"
@@ -118,7 +115,6 @@
                             android:paddingStart="@dimen/margin_10"
                             android:paddingEnd="0dp"
                             android:entries="@array/intrest_payout_list"
-                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tvDepositLabel"
@@ -133,7 +129,6 @@
                             android:text="@string/select_interest_tenure"
                             android:textColor="@color/text_default"
                             android:textSize="@dimen/text_size_12"
-                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/spInterestPayout"
@@ -152,7 +147,6 @@
                             android:text=""
                             android:textColor="@color/text_default"
                             android:textSize="@dimen/text_size_16"
-                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tvInvestmentTenure"
@@ -205,7 +199,6 @@
                             android:text="@string/maturity_instructions"
                             android:textColor="@color/text_color_dark"
                             android:textSize="@dimen/text_size_12"
-                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
                             app:layout_constraintStart_toStartOf="parent"
@@ -222,7 +215,6 @@
                             android:text="@string/additional_detail_one"
                             android:textColor="@color/text_color_dark"
                             android:textSize="@dimen/text_size_12"
-                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tvMaturityInstruction"
@@ -239,7 +231,6 @@
                             android:text="@string/additional_detail_two"
                             android:textColor="@color/text_color_dark"
                             android:textSize="@dimen/text_size_12"
-                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tvAutomatically"
@@ -256,7 +247,6 @@
                             android:text="@string/additional_detail_three"
                             android:textColor="@color/text_color_dark"
                             android:textSize="@dimen/text_size_12"
-                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tvAdditional"
@@ -272,7 +262,6 @@
                             android:layout_marginTop="@dimen/margin_15"
                             android:text="@string/tax_deducted_at_source_tds"
                             android:textColor="@color/text_color_dark"
-                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
                             app:layout_constraintStart_toStartOf="parent"
@@ -290,7 +279,6 @@
 Company for the same"
                             android:textColor="@color/text_color_dark"
                             android:textSize="@dimen/text_size_12"
-                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
                             app:layout_constraintStart_toStartOf="parent"
@@ -307,7 +295,6 @@ Company for the same"
                             android:text="@string/deduct_tds"
                             android:textColor="@color/text_color_dark"
                             android:textSize="@dimen/text_size_12"
-                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
                             app:layout_constraintStart_toStartOf="parent"
@@ -327,7 +314,6 @@ Company for the same"
                             android:textColor="@color/text_color_dark"
                             android:textSize="@dimen/text_size_12"
                             android:paddingBottom="@dimen/margin_20"
-                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
                             app:layout_constraintStart_toStartOf="parent"
@@ -348,7 +334,6 @@ Company for the same"
                 android:foreground="?android:attr/selectableItemBackground"
                 android:padding="@dimen/margin_10"
                 app:cardBackgroundColor="@color/bg_color_info"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="1.0"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_three.xml b/app/src/main/res/layout/fragment_bajajfd_step_three.xml
index 45f4ec9..9f6b5a0 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_three.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_three.xml
@@ -38,19 +38,6 @@
                 android:layout_height="match_parent"
                 android:paddingBottom="@dimen/margin_10">
 
-                <!--                <TextView-->
-                <!--                    android:id="@+id/tvFDSchemeName"-->
-                <!--                    style="@style/semiBoldStyle"-->
-                <!--                    android:layout_width="match_parent"-->
-                <!--                    android:layout_height="wrap_content"-->
-                <!--                    android:layout_marginTop="10dp"-->
-                <!--                    android:paddingStart="@dimen/_5sdp"-->
-                <!--                    android:paddingEnd="@dimen/_5sdp"-->
-                <!--                    android:text="@string/bajaj_finance"-->
-                <!--                    app:layout_constraintLeft_toLeftOf="parent"-->
-                <!--                    app:layout_constraintRight_toRightOf="parent"-->
-                <!--                    app:layout_constraintTop_toTopOf="parent" />-->
-
                 <ImageView
                     android:id="@+id/logo"
                     android:layout_width="@dimen/margin_150"
@@ -201,7 +188,7 @@
                     android:paddingStart="0dp"
                     android:text="Rate of Interest"
                     android:textSize="@dimen/text_size_14"
-                    app:layout_constraintBottom_toTopOf="@+id/tvMakePayment2"
+                    app:layout_constraintBottom_toTopOf="@+id/tvTermsCondition"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/lblInterestPayout"
                     app:layout_constraintVertical_bias="0.0" />
@@ -221,26 +208,29 @@
                     app:layout_constraintHorizontal_bias="0.9"
                     app:layout_constraintStart_toEndOf="@+id/lblRateOfInterest"
                     app:layout_constraintTop_toBottomOf="@+id/tvInterestPayout"
-                    app:layout_constraintBottom_toTopOf="@+id/tvMakePayment2"
+                    app:layout_constraintBottom_toTopOf="@+id/tvTermsCondition"
                     app:layout_constraintVertical_bias="0.0" />
 
                 <TextView
-                    android:id="@+id/tvMakePayment2"
+                    android:id="@+id/tvTermsCondition"
                     style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="196dp"
                     android:background="@color/grey_bg"
-                    android:paddingTop="@dimen/margin_3"
-                    android:paddingBottom="@dimen/margin_3"
                     android:paddingStart="@dimen/margin_10"
+                    android:paddingTop="@dimen/margin_3"
                     android:paddingEnd="0dp"
+                    android:paddingBottom="@dimen/margin_3"
                     android:text="Terms &amp; condition"
                     android:textColor="@color/black"
+                    app:layout_constraintBottom_toTopOf="@+id/swDirectorBajajFinance"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvFDRating" />
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/switch2"
+                    android:id="@+id/swDirectorBajajFinance"
                     style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -249,12 +239,12 @@
                     android:text="Director of Bajaj Finance Ltd."
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvMakePayment2"
+                    app:layout_constraintTop_toBottomOf="@+id/tvTermsCondition"
                     app:layout_constraintVertical_bias="0.018" />
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     style="@style/regularStyle"
-                    android:id="@+id/switch3"
+                    android:id="@+id/swPromoterBajajFinance"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
@@ -264,11 +254,11 @@
                     android:text="Promoter of Bajaj Finance Ltd."
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/switch2"
+                    app:layout_constraintTop_toBottomOf="@+id/swDirectorBajajFinance"
                     app:layout_constraintVertical_bias="0.0" />
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/switch4"
+                    android:id="@+id/swRelativeDirector"
                     style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -280,11 +270,11 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/switch3"
+                    app:layout_constraintTop_toBottomOf="@+id/swPromoterBajajFinance"
                     app:layout_constraintVertical_bias="0.0" />
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/switch5"
+                    android:id="@+id/swShareholder"
                     style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -295,10 +285,10 @@
                     android:text="Shareholder of Bajaj Finance Ltd."
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/switch4" />
+                    app:layout_constraintTop_toBottomOf="@+id/swRelativeDirector" />
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/switch6"
+                    android:id="@+id/swPoliticallyExposed"
                     style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -309,7 +299,7 @@
                     android:text="Are you a politicallly exposed person"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/switch5" />
+                    app:layout_constraintTop_toBottomOf="@+id/swShareholder" />
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/switch7"
@@ -324,7 +314,7 @@
                     android:text="I am not a citizen, national or tax resident of any country outside of India"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/switch6"
+                    app:layout_constraintTop_toBottomOf="@+id/swPoliticallyExposed"
                     app:layout_constraintVertical_bias="0.0" />
 
                 <CheckBox
@@ -336,7 +326,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/switch7" />
 
                 <TextView
-                    android:id="@+id/textView14"
+                    android:id="@+id/tvTermsAndCondition"
                     android:layout_width="322dp"
                     android:layout_height="74dp"
                     android:layout_marginTop="15dp"
@@ -387,7 +377,7 @@
         app:layout_constraintVertical_bias="0.812" />
 
     <TextView
-        android:id="@+id/tv_terms_condition"
+        android:id="@+id/tvOnceClick"
         style="@style/regularStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_two.xml b/app/src/main/res/layout/fragment_bajajfd_step_two.xml
index 97ff9ea..661085d 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_two.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_two.xml
@@ -40,19 +40,6 @@
                 android:padding="@dimen/margin_10"
                 android:paddingBottom="@dimen/margin_30">
 
-                <!--            <TextView-->
-                <!--                android:id="@+id/tvFDSchemeName"-->
-                <!--                style="@style/semiBoldStyle"-->
-                <!--                android:layout_width="match_parent"-->
-                <!--                android:layout_height="wrap_content"-->
-                <!--                android:paddingStart="10dp"-->
-                <!--                android:paddingEnd="10dp"-->
-                <!--                android:layout_marginTop="13dp"-->
-                <!--                android:text="@string/bajaj_finance"-->
-                <!--                app:layout_constraintTop_toTopOf="parent"-->
-                <!--                app:layout_constraintLeft_toLeftOf="parent"-->
-                <!--                app:layout_constraintRight_toRightOf="parent" />-->
-
                 <ImageView
                     android:id="@+id/logo"
                     android:layout_width="@dimen/margin_150"
@@ -293,5 +280,4 @@
         app:layout_constraintStart_toEndOf="@+id/btnBack"
         app:layout_constraintTop_toBottomOf="@+id/scrollView" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_step_one.xml b/app/src/main/res/layout/fragment_step_one.xml
index c25baf5..2b30b23 100644
--- a/app/src/main/res/layout/fragment_step_one.xml
+++ b/app/src/main/res/layout/fragment_step_one.xml
@@ -54,14 +54,6 @@
                         app:layout_constraintVertical_bias="0.02"
                         android:contentDescription="@string/content_description"/>
 
-                    <!--                    <TextView-->
-                    <!--                        android:id="@+id/tvFDSchemeName"-->
-                    <!--                        style="@style/semiBoldStyle"-->
-                    <!--                        android:layout_width="wrap_content"-->
-                    <!--                        android:layout_height="wrap_content"-->
-                    <!--                        android:layout_marginTop="10dp"-->
-                    <!--                        android:text="@string/bajaj_finance" />-->
-
                     <TextView
                         android:id="@+id/tvFDRating"
                         style="@style/regularStyle"
diff --git a/app/src/main/res/layout/fragmnet_step_fail.xml b/app/src/main/res/layout/fragmnet_step_fail.xml
index e6cd370..22e8192 100644
--- a/app/src/main/res/layout/fragmnet_step_fail.xml
+++ b/app/src/main/res/layout/fragmnet_step_fail.xml
@@ -32,12 +32,12 @@
             app:layout_constraintVertical_bias="1.0">
 
             <ImageView
-                android:id="@+id/logo2"
+                android:id="@+id/logoTwo"
                 android:layout_width="@dimen/margin_150"
                 android:layout_height="18dp"
                 android:layout_marginTop="8dp"
                 android:src="@drawable/bajaj_logo"
-                app:layout_constraintBottom_toTopOf="@+id/tv_fd_rating2"
+                app:layout_constraintBottom_toTopOf="@+id/tvFdRatingTwo"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
@@ -45,7 +45,7 @@
                 android:contentDescription="@string/content_description"/>
 
             <TextView
-                android:id="@+id/tv_fd_rating2"
+                android:id="@+id/tvFdRatingTwo"
                 style="@style/regularStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/logo2"
+                app:layout_constraintTop_toBottomOf="@+id/logoTwo"
                 app:layout_constraintVertical_bias="0.0" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>