diff --git a/app/build.gradle b/app/build.gradle
index 790a929..7cb9e11 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace 'com.nivesh.production.bajajfd'
-    compileSdk 32
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.nivesh.production.bajajfd"
         minSdk 21
-        targetSdk 32
+        targetSdk 33
         versionCode 1
         versionName "1.0"
 
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepStartFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepStartFragment.kt
index 45271bb..b37e4bc 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepStartFragment.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepStartFragment.kt
@@ -46,9 +46,9 @@ class StepStartFragment : Fragment() {
         _binding = FragmentStepStartBinding.inflate(inflater,container,false)
         val root = binding.root
 
-        binding.txtInterestTenure.setOnClickListener {
-
-        }
+//        binding.txtInterestTenure.setOnClickListener {
+//
+//        }
 
         binding.btnNext.setOnClickListener {
             bajajFDInterface.stepOneApi("stepOneResponse")
diff --git a/app/src/main/res/drawable/bajaj_logo.png b/app/src/main/res/drawable/bajaj_logo.png
new file mode 100644
index 0000000..906f1fc
Binary files /dev/null and b/app/src/main/res/drawable/bajaj_logo.png differ
diff --git a/app/src/main/res/layout/fragment_bajaj_f_d_step_one.xml b/app/src/main/res/layout/fragment_bajaj_f_d_step_one.xml
index 58da278..e3d10cb 100644
--- a/app/src/main/res/layout/fragment_bajaj_f_d_step_one.xml
+++ b/app/src/main/res/layout/fragment_bajaj_f_d_step_one.xml
@@ -12,144 +12,144 @@
         android:padding="@dimen/_2sdp"
         android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/tv_fd_label"
-        style="@style/tv_semi_bold"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/bajaj_finance" />
-
-    <TextView
-        android:id="@+id/tv_fd_rating"
-        style="@style/tv_regular"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Rating: FAAA by CRISIL"
-        android:textColor="@color/light_text" />
-
-    <TextView
-        android:id="@+id/txt_inv_amount"
-        style="@style/tv_regular"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_18"
-        android:text="@string/investment_amount_fd"
-        android:textColor="@color/text_default"
-        android:textSize="@dimen/text_size_12" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
-        android:layout_marginTop="@dimen/margin_5"
-        android:background="@drawable/rounded_corner_with_line">
+        <TextView
+            android:id="@+id/tv_fd_label"
+            style="@style/tv_semi_bold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bajaj_finance" />
 
         <TextView
-            android:id="@+id/rs"
+            android:id="@+id/tv_fd_rating"
             style="@style/tv_regular"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/_2sdp"
-            android:layout_marginTop="@dimen/_5sdp"
-            android:gravity="center_vertical"
-            android:paddingStart="@dimen/_5sdp"
-            android:paddingTop="@dimen/_5sdp"
-            android:paddingEnd="@dimen/_1sdp"
-            android:paddingBottom="@dimen/_5sdp"
-            android:text="@string/rs"
-            android:textColor="@color/text_default"
-            android:textSize="@dimen/text_size_14" />
+            android:text="Rating: FAAA by CRISIL"
+            android:textColor="@color/light_text" />
 
-        <EditText
-            android:id="@+id/edit_deposit_amount"
-            style="@style/EditTextTheme"
+        <TextView
+            android:id="@+id/txt_inv_amount"
+            style="@style/tv_regular"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_toEndOf="@+id/rs"
-            android:background="@null"
-            android:imeOptions="actionNext"
-            android:inputType="number"
-            android:lines="1"
-            android:maxLines="1"
-            android:paddingTop="@dimen/_10sdp"
-            android:paddingBottom="@dimen/_10sdp"
+            android:layout_marginTop="@dimen/margin_18"
+            android:text="@string/investment_amount_fd"
             android:textColor="@color/text_default"
-            android:textColorHint="?theme_EdtTextHintColor"
-            android:textCursorDrawable="@drawable/cursor_color"
-            android:textSize="@dimen/text_size_14" />
+            android:textSize="@dimen/text_size_12" />
 
-    </RelativeLayout>
-
-    <TextView
-        android:id="@+id/tv_"
-        style="@style/tv_regular"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_18"
-        android:text="@string/select_interest_payout"
-        android:textColor="@color/text_default"
-        android:textSize="@dimen/text_size_12" />
-
-    <TextView
-        android:id="@+id/txt_interest_payout"
-        style="@style/tv_regular"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
-        android:layout_marginTop="@dimen/_2sdp"
-        android:background="@drawable/rounded_corner_with_line"
-        android:drawableEnd="@drawable/ic_arrow_down"
-        android:drawablePadding="@dimen/_9sdp"
-        android:gravity="center_vertical"
-        android:hint="@string/tv_select_hint"
-        android:paddingStart="@dimen/margin_20"
-        android:paddingEnd="@dimen/margin_30"
-        android:textColor="@color/text_default"
-        android:textSize="@dimen/text_size_16" />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/actionBarSize"
+            android:layout_marginTop="@dimen/margin_5"
+            android:background="@drawable/rounded_corner_with_line">
 
-    <TextView
-        style="@style/tv_regular"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/_7sdp"
-        android:text="@string/select_interest_tenure"
-        android:textColor="@color/text_default"
-        android:textSize="@dimen/text_size_12" />
+            <TextView
+                android:id="@+id/rs"
+                style="@style/tv_regular"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/_2sdp"
+                android:layout_marginTop="@dimen/_5sdp"
+                android:gravity="center_vertical"
+                android:paddingStart="@dimen/_5sdp"
+                android:paddingTop="@dimen/_5sdp"
+                android:paddingEnd="@dimen/_1sdp"
+                android:paddingBottom="@dimen/_5sdp"
+                android:text="@string/rs"
+                android:textColor="@color/text_default"
+                android:textSize="@dimen/text_size_14" />
+
+            <EditText
+                android:id="@+id/edit_deposit_amount"
+                style="@style/EditTextTheme"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toEndOf="@+id/rs"
+                android:background="@null"
+                android:imeOptions="actionNext"
+                android:inputType="number"
+                android:lines="1"
+                android:maxLines="1"
+                android:paddingTop="@dimen/_10sdp"
+                android:paddingBottom="@dimen/_10sdp"
+                android:textColor="@color/text_default"
+                android:textColorHint="?theme_EdtTextHintColor"
+                android:textCursorDrawable="@drawable/cursor_color"
+                android:textSize="@dimen/text_size_14" />
+
+        </RelativeLayout>
 
-    <TextView
-        android:id="@+id/txt_interest_tenure"
-        style="@style/tv_regular"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
-        android:layout_marginTop="@dimen/_2sdp"
-        android:background="@drawable/rounded_corner_with_line"
-        android:drawableEnd="@drawable/ic_arrow_down"
-        android:gravity="center_vertical"
-        android:hint="@string/tv_select_hint"
-        android:paddingLeft="@dimen/_5sdp"
-        android:paddingRight="@dimen/margin_30"
-        android:text=""
-        android:textColor="@color/text_default"
-        android:textSize="@dimen/text_size_16" />
+        <TextView
+            android:id="@+id/tv_"
+            style="@style/tv_regular"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_18"
+            android:text="@string/select_interest_payout"
+            android:textColor="@color/text_default"
+            android:textSize="@dimen/text_size_12" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:layout_marginTop="@dimen/_10sdp"
-        android:orientation="horizontal">
+        <TextView
+            android:id="@+id/txt_interest_payout"
+            style="@style/tv_regular"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/actionBarSize"
+            android:layout_marginTop="@dimen/_2sdp"
+            android:background="@drawable/rounded_corner_with_line"
+            android:drawableEnd="@drawable/ic_arrow_down"
+            android:drawablePadding="@dimen/_9sdp"
+            android:gravity="center_vertical"
+            android:hint="@string/tv_select_hint"
+            android:paddingStart="@dimen/margin_20"
+            android:paddingEnd="@dimen/margin_30"
+            android:textColor="@color/text_default"
+            android:textSize="@dimen/text_size_16" />
 
         <TextView
             style="@style/tv_regular"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/upto_0.25" />
+            android:layout_marginTop="@dimen/_7sdp"
+            android:text="@string/select_interest_tenure"
+            android:textColor="@color/text_default"
+            android:textSize="@dimen/text_size_12" />
+
+        <TextView
+            android:id="@+id/txt_interest_tenure"
+            style="@style/tv_regular"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/actionBarSize"
+            android:layout_marginTop="@dimen/_2sdp"
+            android:background="@drawable/rounded_corner_with_line"
+            android:drawableEnd="@drawable/ic_arrow_down"
+            android:gravity="center_vertical"
+            android:hint="@string/tv_select_hint"
+            android:paddingLeft="@dimen/_5sdp"
+            android:paddingRight="@dimen/margin_30"
+            android:text=""
+            android:textColor="@color/text_default"
+            android:textSize="@dimen/text_size_16" />
 
-        <Switch
-            android:id="@+id/switch1"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/upto_0.25_next" />
+            android:gravity="center_vertical"
+            android:layout_marginTop="@dimen/_10sdp"
+            android:orientation="horizontal">
 
-    </LinearLayout>
+            <TextView
+                style="@style/tv_regular"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/upto_0.25" />
+
+            <Switch
+                android:id="@+id/switch1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/upto_0.25_next" />
+
+        </LinearLayout>
 
     </LinearLayout>
 
@@ -171,16 +171,16 @@
         android:layout_marginTop="@dimen/margin_15"
         android:orientation="vertical">
 
-    <TextView
-        style="@style/tv_regular"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/margin_10"
-        android:textColor="@color/text_color_dark"
-        android:textSize="@dimen/text_size_12"
-        android:drawableLeft="@drawable/svg_grey_bullet"
-        android:drawablePadding="@dimen/margin_10"
-        android:text="@string/additional_detail_one"/>
+        <TextView
+            style="@style/tv_regular"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/margin_10"
+            android:textColor="@color/text_color_dark"
+            android:textSize="@dimen/text_size_12"
+            android:drawableLeft="@drawable/svg_grey_bullet"
+            android:drawablePadding="@dimen/margin_10"
+            android:text="@string/additional_detail_one"/>
 
         <TextView
             style="@style/tv_regular"
@@ -240,23 +240,23 @@
             android:gravity="center"
             android:orientation="horizontal">
 
-        <TextView
-            style="@style/tv_regular"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/text_color_dark"
-            android:textSize="@dimen/margin_16"
-            android:drawablePadding="@dimen/margin_10"
-            android:text="Non- Cumulative ROI:"/>
+            <TextView
+                style="@style/tv_regular"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/text_color_dark"
+                android:textSize="@dimen/margin_16"
+                android:drawablePadding="@dimen/margin_10"
+                android:text="Non- Cumulative ROI:"/>
 
-        <TextView
-            style="@style/tv_regular"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/text_color_blue"
-            android:textSize="@dimen/margin_16"
-            android:layout_marginLeft="@dimen/margin_2"
-            android:text="7.5 %"/>
+            <TextView
+                style="@style/tv_regular"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/text_color_blue"
+                android:textSize="@dimen/margin_16"
+                android:layout_marginLeft="@dimen/margin_2"
+                android:text="7.5 %"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_step_four.xml b/app/src/main/res/layout/fragment_step_four.xml
index 20bf056..9591533 100644
--- a/app/src/main/res/layout/fragment_step_four.xml
+++ b/app/src/main/res/layout/fragment_step_four.xml
@@ -5,142 +5,197 @@
     android:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_EFEFEF"
     android:layout_margin="@dimen/margin_10"
+    android:background="@color/color_EFEFEF"
     tools:context="com.nivesh.production.bajajfd.ui.fragment.StepFourFragment">
 
-    <com.google.android.material.card.MaterialCardView
-        style="@style/CustomCardViewTopStyle"
-        android:id="@+id/card_view_1"
+    <LinearLayout
+        android:id="@+id/linearLayout2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/margin_10"
-        android:layout_marginLeft="@dimen/margin_5"
-        android:layout_marginRight="@dimen/margin_5"
-        android:layout_marginTop="@dimen/margin_5"
+        android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/card_view_1"
+            style="@style/CustomCardViewTopStyle"
             android:layout_width="match_parent"
-            android:layout_height="70dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="12dp"
-            android:background="@color/white"
-            android:padding="@dimen/margin_5"
-            app:layout_constraintBottom_toTopOf="@+id/textView5"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="1.0">
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/margin_5"
+            android:layout_marginTop="@dimen/margin_5"
+            android:layout_marginRight="@dimen/margin_5"
+            android:padding="@dimen/margin_10">
 
-            <TextView
-                android:id="@+id/tv_fd_label"
-                style="@style/tv_semi_bold"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:text="@string/bajaj_finance"
-                app:layout_constraintBottom_toTopOf="@+id/tv_fd_rating"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="12dp"
+                android:background="@color/white"
+                android:padding="@dimen/margin_5"
+                app:layout_constraintBottom_toTopOf="@+id/textView5"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintHorizontal_bias="1.0"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="1.0">
 
-            <TextView
-                android:id="@+id/tv_fd_rating"
-                style="@style/tv_regular"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="25dp"
-                android:text="Rating: FAAA by CRISIL"
-                android:textColor="@color/light_text"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_fd_label"
-                app:layout_constraintVertical_bias="0.0" />
+                <ImageView
+                    android:id="@+id/logo"
+                    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_rating"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:contentDescription="@string/content_description"/>
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <TextView
+                    android:id="@+id/tv_fd_rating"
+                    style="@style/tv_regular"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
+                    android:textColor="@color/light_text"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/logo"
+                    app:layout_constraintVertical_bias="0.0" />
 
-    </com.google.android.material.card.MaterialCardView>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/card_view_2"
-        style="@style/CustomCardViewBottomStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/margin_5"
-        android:layout_marginRight="@dimen/margin_5"
-        android:layout_marginBottom="@dimen/margin_5"
-        android:padding="@dimen/margin_10"
-        app:cardBackgroundColor="@color/bg_color"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/card_view_1"
-        app:layout_constraintVertical_bias="0.0">
+        </com.google.android.material.card.MaterialCardView>
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/card_view_2"
+            style="@style/CustomCardViewBottomStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/margin_5"
+            android:layout_marginRight="@dimen/margin_5"
+            android:layout_marginBottom="@dimen/margin_5"
             android:padding="@dimen/margin_10"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:cardBackgroundColor="@color/bg_color"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/card_view_1"
+            app:layout_constraintVertical_bias="0.0">
 
-            <TextView
-                android:id="@+id/textView5"
-                style="@style/tv_semi_bold"
-                android:layout_width="wrap_content"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:text="Congratulations"
-                android:textColor="@color/black"
-                android:textSize="@dimen/margin_16"
-                app:layout_constraintBottom_toTopOf="@+id/textView9"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.437"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:padding="@dimen/margin_10"
+                app:layout_constraintBottom_toBottomOf="parent">
 
-            <TextView
-                android:id="@+id/textView13"
-                style="@style/tv_regular"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:gravity="center"
-                android:text="You will receive fixed deposit certificate\nwithin 3 working days on email"
-                android:textColor="@color/black"
-                android:textSize="@dimen/margin_14"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.393"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textView9" />
+                <TextView
+                    android:id="@+id/textView5"
+                    style="@style/tv_semi_bold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:text="Congratulations"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/margin_16"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.437"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/textView9"
-                style="@style/tv_regular"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="Your transaction is successful."
-                android:textColor="@color/black"
-                android:textSize="@dimen/margin_16"
-                app:layout_constraintBottom_toTopOf="@+id/textView13"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.419"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textView5" />
+                <TextView
+                    android:id="@+id/textView9"
+                    style="@style/tv_regular"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:text="Your transaction is successful."
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/margin_16"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.419"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/textView5" />
+
+                <TextView
+                    android:id="@+id/textView13"
+                    style="@style/tv_regular"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center"
+                    android:text="You will receive fixed deposit certificate\nwithin 3 working days on email"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/margin_14"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.393"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/textView9" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <include
+            android:id="@+id/fragmentStepFail"
+            layout="@layout/fragmnet_step_fail"
+            android:visibility="gone" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tvDownloadInvoice"
+        style="@style/tv_semi_bold"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Download Invoice"
+        android:textColor="@color/blue"
+        android:textSize="@dimen/margin_16"
+        app:layout_constraintBottom_toBottomOf="@+id/btnNext"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.152"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/btnNext" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btnNext"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="16dp"
+        android:backgroundTint="@color/colorPrimary"
+        android:text="View order"
+        android:textColor="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.545"
+        app:layout_constraintStart_toEndOf="@+id/tvDownloadInvoice"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
+        app:layout_constraintVertical_bias="0.951" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/tvRetry"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:backgroundTint="@color/blue"
+        android:text="Retry"
+        android:textColor="@color/white"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/btnNext"
+        app:layout_constraintHorizontal_bias="0.607"
+        app:layout_constraintStart_toEndOf="@+id/tvDownloadInvoice"
+        app:layout_constraintTop_toTopOf="@+id/linearLayout2"
+        app:layout_constraintVertical_bias="0.967" />
 
-    </com.google.android.material.card.MaterialCardView>
 
 </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 12c48a6..cb6aef8 100644
--- a/app/src/main/res/layout/fragment_step_one.xml
+++ b/app/src/main/res/layout/fragment_step_one.xml
@@ -41,13 +41,26 @@
                     android:orientation="vertical"
                     android:padding="10dp">
 
-                    <TextView
-                        android:id="@+id/tvFDSchemeName"
-                        style="@style/tv_semi_bold"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:text="@string/bajaj_finance" />
+                    <ImageView
+                        android:id="@+id/logo"
+                        android:layout_width="@dimen/margin_150"
+                        android:layout_height="18dp"
+                        android:src="@drawable/bajaj_logo"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.0"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.02"
+                        android:contentDescription="@string/content_description"/>
+
+                    <!--                    <TextView-->
+                    <!--                        android:id="@+id/tvFDSchemeName"-->
+                    <!--                        style="@style/tv_semi_bold"-->
+                    <!--                        android:layout_width="wrap_content"-->
+                    <!--                        android:layout_height="wrap_content"-->
+                    <!--                        android:layout_marginTop="10dp"-->
+                    <!--                        android:text="@string/bajaj_finance" />-->
 
                     <TextView
                         android:id="@+id/tvFDRating"
@@ -55,7 +68,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="1dp"
-                        android:text="Rating: FAAA by CRISIL"
+                        android:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
                         android:textColor="@color/light_text"
                         android:textSize="@dimen/text_size_12" />
 
@@ -64,9 +77,9 @@
                         style="@style/tv_regular"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_10"
+                        android:layout_marginTop="@dimen/margin_20"
                         android:layout_marginBottom="1dp"
-                        android:text="* Text"
+                        android:text="All fields are mandatory other then optional"
                         android:textColor="@color/light_text"
                         android:textSize="@dimen/margin_14" />
 
@@ -150,7 +163,9 @@
                         android:layout_marginTop="5dp"
                         android:background="@drawable/rounded_corner_with_line"
                         android:minHeight="48dp"
-                        android:entries="@array/interestPayoutList"/>
+                        android:paddingStart="@dimen/margin_10"
+                        android:paddingEnd="0dp"
+                        android:entries="@array/title"/>
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tlFirstName"
@@ -210,7 +225,9 @@
                         android:layout_margin="5dp"
                         android:background="@drawable/rounded_corner_with_line"
                         android:minHeight="48dp"
-                        android:entries="@array/interestPayoutList" />
+                        android:paddingStart="@dimen/margin_10"
+                        android:paddingEnd="0dp"
+                        android:entries="@array/gender" />
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tlEmail"
@@ -267,7 +284,9 @@
                         android:layout_margin="5dp"
                         android:background="@drawable/rounded_corner_with_line"
                         android:minHeight="48dp"
-                        android:entries="@array/interestPayoutList"/>
+                        android:paddingStart="@dimen/margin_10"
+                        android:paddingEnd="0dp"
+                        android:entries="@array/maritalStatus"/>
 
                     <Spinner
                         android:id="@+id/spRelation"
@@ -278,6 +297,22 @@
                         android:minHeight="48dp"
                         android:entries="@array/interestPayoutList" />
 
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/tlRelationName"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/margin_5"
+                        android:hint="Relation Name">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="text"
+                            android:maxEms="100" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tlAddressLine1"
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
@@ -392,17 +427,29 @@
 
                 </LinearLayout>
 
-                <TextView
-                    android:id="@+id/tvNomineeDetails"
-                    style="@style/tv_semi_bold"
+                <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="22dp"
-                    android:background="@color/grey_bg"
-                    android:drawableRight="@drawable/svg_down_arrow"
-                    android:padding="@dimen/margin_3"
-                    android:text="Nominee Details"
-                    android:textColor="@color/black" />
+                    android:background="@color/grey_bg">
+
+                    <TextView
+                        android:id="@+id/tvNomineeDetails"
+                        style="@style/tv_semi_bold"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/margin_3"
+                        android:layout_centerVertical="true"
+                        android:text="Nominee Details"
+                        android:textColor="@color/black" />
+
+                    <androidx.appcompat.widget.SwitchCompat
+                        android:theme="@style/SCBSwitch"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_marginEnd="@dimen/margin_5"/>
+
+                </RelativeLayout>
 
                 <LinearLayout
                     android:id="@+id/llNomineeDetail"
@@ -475,7 +522,7 @@
                         <com.google.android.material.textfield.TextInputEditText
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:drawableRight="@drawable/svg_cal"
+                            android:drawableEnd="@drawable/svg_cal"
                             android:inputType="date" />
 
                     </com.google.android.material.textfield.TextInputLayout>
@@ -706,8 +753,8 @@
                         android:layout_centerVertical="true"
                         android:layout_marginTop="12dp"
                         android:padding="@dimen/margin_3"
-                        android:text="View available payment modes"
-                        android:textColor="@color/text_color_blue"
+                        android:text="Eligible bank option"
+                        android:textColor="@color/blue_text_color"
                         tools:layout_editor_absoluteX="5dp" />
 
                 </RelativeLayout>
@@ -715,6 +762,7 @@
                 <RadioGroup
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_10"
                     android:orientation="horizontal">
 
                     <RadioButton
@@ -730,6 +778,18 @@
 
                 </RadioGroup>
 
+                <TextView
+                    style="@style/tv_regular"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:padding="@dimen/margin_3"
+                    android:text="Upto Rs. 1 lakh only"
+                    android:layout_marginStart="@dimen/margin_15"
+                    android:layout_marginBottom="@dimen/margin_20"
+                    android:textColor="@color/gray_text_color"
+                    tools:layout_editor_absoluteX="5dp" />
+
             </LinearLayout>
 
         </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/fragment_step_start.xml b/app/src/main/res/layout/fragment_step_start.xml
index 837d362..12e64c8 100644
--- a/app/src/main/res/layout/fragment_step_start.xml
+++ b/app/src/main/res/layout/fragment_step_start.xml
@@ -5,306 +5,364 @@
     android:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_gravity="center_vertical"
-    android:background="@color/Nivesh_color_AppBg"
+    android:background="@color/color_EFEFEF"
     tool:context="com.nivesh.production.bajajfd.ui.fragment.StepOneFragment">
 
     <ScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="60dp"
+        android:layout_height="wrap_content"
         android:fillViewport="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btnNext">
+        android:layout_marginLeft="@dimen/margin_5"
+        android:layout_marginRight="@dimen/margin_5"
+        android:layout_marginTop="@dimen/margin_10"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.card.MaterialCardView
-            style="@style/CustomCardViewStyle"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:foreground="?android:attr/selectableItemBackground"
-            app:cardElevation="1dp"
-            app:cardUseCompatPadding="true">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center_horizontal"
-                android:padding="10dp"
-                android:orientation="vertical">
+            android:orientation="vertical">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/card_view_1"
+                style="@style/CustomCardViewTopStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:cardPreventCornerOverlap="false">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/_2sdp"
                     android:orientation="vertical">
 
-                    <TextView
-                        android:id="@+id/tv_fd_label"
-                        style="@style/tv_semi_bold"
-                        android:layout_width="wrap_content"
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/constraintLayout2"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/bajaj_finance" />
+                        android:padding="@dimen/margin_10">
+
+                        <ImageView
+                            android:id="@+id/logo"
+                            android:layout_width="@dimen/margin_150"
+                            android:layout_height="18dp"
+                            android:src="@drawable/bajaj_logo"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintHorizontal_bias="0.0"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintVertical_bias="0.02"
+                            android:contentDescription="@string/content_description"/>
 
-                    <TextView
-                        android:id="@+id/tv_fd_rating"
-                        style="@style/tv_regular"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="Rating: FAAA by CRISIL"
-                        android:textColor="@color/light_text" />
-
-<!--                    <TextView-->
-<!--                        android:id="@+id/txt_inv_amount"-->
-<!--                        style="@style/tv_regular"-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_marginTop="@dimen/margin_18"-->
-<!--                        android:text="@string/investment_amount_fd"-->
-<!--                        android:textColor="@color/text_default"-->
-<!--                        android:textSize="@dimen/text_size_12" />-->
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/margin_50"
-                        android:layout_marginTop="@dimen/margin_5">
-
-<!--                        <TextView-->
-<!--                            android:id="@+id/rs"-->
-<!--                            style="@style/tv_regular"-->
-<!--                            android:layout_width="wrap_content"-->
-<!--                            android:layout_height="wrap_content"-->
-<!--                            android:gravity="center_vertical"-->
-<!--                            android:paddingStart="@dimen/_5sdp"-->
-<!--                            android:paddingTop="3dp"-->
-<!--                            android:paddingEnd="@dimen/_1sdp"-->
-<!--                            android:layout_centerVertical="true"-->
-<!--                            android:paddingBottom="3dp"-->
-<!--                            android:text="@string/rs"-->
-<!--                            android:textColor="@color/text_default"-->
-<!--                            android:textSize="@dimen/text_size_14" />-->
+                        <TextView
+                            android:id="@+id/tv_fd_rating"
+                            style="@style/tv_regular"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
+                            android:textColor="@color/light_text"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintHorizontal_bias="0.0"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/logo"
+                            app:layout_constraintVertical_bias="0.0" />
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/tilDepositAmount"
                             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:hint="Select Investment Amount">
+                            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"
+                            app:layout_constraintVertical_bias="0.02">
 
                             <com.google.android.material.textfield.TextInputEditText
                                 android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:drawableLeft="@drawable/svg_rs"
-                                android:padding="@dimen/margin_5"
+                                android:layout_height="@dimen/margin_50"
+                                android:drawableStart="@drawable/svg_rs"
                                 android:inputType="number"
-                                android:maxLength="12"/>
+                                android:maxLength="12" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
-<!--                        <EditText-->
-<!--                            android:id="@+id/edit_deposit_amount"-->
-<!--                            android:layout_width="match_parent"-->
-<!--                            android:layout_height="wrap_content"-->
-<!--                            android:layout_centerInParent="true"-->
-<!--                            android:layout_toEndOf="@+id/rs"-->
-<!--                            android:background="@null"-->
-<!--                            android:imeOptions="actionNext"-->
-<!--                            android:inputType="number"-->
-<!--                            android:lines="1"-->
-<!--                            android:maxEms="12"-->
-<!--                            android:maxLines="1"-->
-<!--                            android:textColor="@color/text_default"-->
-<!--                            android:textCursorDrawable="@drawable/cursor_color"-->
-<!--                            android:textSize="@dimen/text_size_14" />-->
-
-                    </RelativeLayout>
-
-                    <TextView
-                        android:id="@+id/tv_"
-                        style="@style/tv_regular"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/margin_18"
-                        android:text="@string/select_interest_payout"
-                        android:textColor="@color/text_default"
-                        android:textSize="@dimen/text_size_12" />
-
-                    <!--                    <TextView-->
-                    <!--                        android:id="@+id/txt_interest_payout"-->
-                    <!--                        style="@style/tv_regular"-->
-                    <!--                        android:layout_width="match_parent"-->
-                    <!--                        android:layout_height="?android:attr/actionBarSize"-->
-                    <!--                        android:layout_marginTop="@dimen/_2sdp"-->
-                    <!--                        android:background="@drawable/rounded_corner_with_line"-->
-                    <!--                        android:drawableEnd="@drawable/ic_arrow_down"-->
-                    <!--                        android:drawablePadding="@dimen/_9sdp"-->
-                    <!--                        android:gravity="center_vertical"-->
-                    <!--                        android:hint="@string/tv_select_hint"-->
-                    <!--                        android:paddingStart="@dimen/margin_20"-->
-                    <!--                        android:paddingEnd="@dimen/margin_30"-->
-                    <!--                        android:textColor="@color/text_default"-->
-                    <!--                        android:textSize="@dimen/text_size_16" />-->
-
-                    <Spinner
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/margin_50"
-                        android:background="@drawable/rounded_corner_with_line"
-                        android:entries="@array/intrest_payout_list"/>
+                        <TextView
+                            android:id="@+id/tvDepositLabel"
+                            style="@style/tv_regular"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/margin_18"
+                            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"
+                            app:layout_constraintVertical_bias="0.02" />
+
+                        <Spinner
+                            android:id="@+id/spInterestPayout"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/margin_50"
+                            android:background="@drawable/rounded_corner_with_line"
+                            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"
+                            app:layout_constraintVertical_bias="0.02" />
 
-                    <TextView
-                        style="@style/tv_regular"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/_7sdp"
-                        android:text="@string/select_interest_tenure"
-                        android:textColor="@color/text_default"
-                        android:textSize="@dimen/text_size_12" />
-
-                    <TextView
-                        android:id="@+id/txt_interest_tenure"
-                        style="@style/tv_regular"
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/margin_50"
-                        android:layout_marginTop="@dimen/_2sdp"
-                        android:background="@drawable/rounded_corner_with_line"
-                        android:drawableEnd="@drawable/ic_arrow_down"
-                        android:gravity="center_vertical"
-                        android:hint="@string/tv_select_hint"
-                        android:paddingLeft="@dimen/_5sdp"
-                        android:paddingRight="@dimen/margin_30"
-                        android:text=""
-                        android:textColor="@color/text_default"
-                        android:textSize="@dimen/text_size_16" />
+                        <TextView
+                            android:id="@+id/tvInvestmentTenure"
+                            style="@style/tv_regular"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/_7sdp"
+                            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"
+                            app:layout_constraintVertical_bias="0.02" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:layout_marginTop="@dimen/_10sdp"
-                        android:orientation="horizontal">
+                        <TextView
+                            android:id="@+id/tvInterestTenure"
+                            style="@style/tv_regular"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/margin_50"
+                            android:background="@drawable/rounded_corner_with_line"
+                            android:gravity="center_vertical"
+                            android:hint="@string/tv_select_hint"
+                            android:paddingStart="@dimen/_5sdp"
+                            android:paddingEnd="@dimen/margin_30"
+                            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"
+                            app:layout_constraintVertical_bias="0.02"
+                            app:drawableRightCompat="@drawable/ic_arrow_down"/>
 
                         <TextView
+                            android:id="@+id/tvSwitchLabel"
                             style="@style/tv_regular"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/upto_0.25" />
+                            android:layout_marginTop="@dimen/margin_15"
+                            android:text="@string/upto_0.25"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintHorizontal_bias="0.0"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tvInterestTenure"
+                            app:layout_constraintVertical_bias="0.018" />
+
+                        <androidx.appcompat.widget.SwitchCompat
+                            android:id="@+id/swSeniorCitizen"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:text="@string/upto_0.25_next"
+                            android:textColor="@color/black"
+                            android:layout_marginStart="@dimen/margin_3"
+                            android:textSize="@dimen/margin_12"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintHorizontal_bias="0.0"
+                            app:layout_constraintStart_toEndOf="@+id/tvSwitchLabel"
+                            app:layout_constraintTop_toBottomOf="@+id/tvInterestTenure"
+                            app:layout_constraintVertical_bias="0.018" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/constraintLayout3"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
 
-                        <Switch
-                            android:id="@+id/switch1"
+                        <TextView
+                            android:id="@+id/tvMaturityInstruction"
+                            style="@style/tv_regular"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:textColor="@color/black"
-                            android:layout_marginLeft="@dimen/_2sdp"
-                            android:text="@string/upto_0.25_next" />
+                            android:background="@color/grey_bg"
+                            android:padding="@dimen/margin_10"
+                            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"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintVertical_bias="0.02" />
 
-                    </LinearLayout>
+                        <TextView
+                            android:id="@+id/tvAutomatically"
+                            style="@style/tv_regular"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:drawablePadding="@dimen/margin_10"
+                            android:padding="@dimen/margin_10"
+                            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"
+                            app:layout_constraintVertical_bias="0.02"
+                            app:drawableLeftCompat="@drawable/svg_grey_bullet" />
 
-                </LinearLayout>
+                        <TextView
+                            android:id="@+id/tvAdditional"
+                            style="@style/tv_regular"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:drawablePadding="@dimen/margin_10"
+                            android:padding="@dimen/margin_10"
+                            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"
+                            app:layout_constraintVertical_bias="0.02"
+                            app:drawableLeftCompat="@drawable/svg_grey_bullet"/>
 
-                <TextView
-                    style="@style/tv_regular"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="@dimen/margin_10"
-                    android:background="@color/grey_bg"
-                    android:textColor="@color/text_color_dark"
-                    android:textSize="@dimen/text_size_12"
-                    android:layout_marginTop="@dimen/margin_25"
-                    android:text="@string/maturity_instructions"/>
+                        <TextView
+                            android:id="@+id/tvInterestAmount"
+                            style="@style/tv_regular"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:drawablePadding="@dimen/margin_10"
+                            android:padding="@dimen/margin_10"
+                            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"
+                            app:layout_constraintVertical_bias="0.02"
+                            app:drawableLeftCompat="@drawable/svg_grey_bullet"/>
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="@dimen/_2sdp"
-                    android:layout_marginTop="@dimen/margin_15"
-                    android:orientation="vertical">
+                        <TextView
+                            android:id="@+id/tvTaxDeducted"
+                            style="@style/tv_semi_bold"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/margin_10"
+                            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"
+                            app:layout_constraintTop_toBottomOf="@+id/tvInterestAmount"
+                            app:layout_constraintVertical_bias="0.0" />
 
-                    <TextView
-                        style="@style/tv_regular"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/margin_10"
-                        android:textColor="@color/text_color_dark"
-                        android:textSize="@dimen/text_size_12"
-                        android:drawableLeft="@drawable/svg_grey_bullet"
-                        android:drawablePadding="@dimen/margin_10"
-                        android:text="@string/additional_detail_one"/>
-
-                    <TextView
-                        style="@style/tv_regular"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/margin_10"
-                        android:textColor="@color/text_color_dark"
-                        android:textSize="@dimen/text_size_12"
-                        android:drawableLeft="@drawable/svg_grey_bullet"
-                        android:drawablePadding="@dimen/margin_10"
-                        android:text="@string/additional_detail_two"/>
-
-                    <TextView
-                        style="@style/tv_regular"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/margin_10"
-                        android:textColor="@color/text_color_dark"
-                        android:textSize="@dimen/text_size_12"
-                        android:drawableLeft="@drawable/svg_grey_bullet"
-                        android:drawablePadding="@dimen/margin_10"
-                        android:text="@string/additional_detail_three"/>
-
-                    <TextView
-                        style="@style/tv_semi_bold"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/margin_10"
-                        android:layout_marginTop="@dimen/margin_15"
-                        android:textColor="@color/text_color_dark"
-                        android:text="@string/tax_deducted_at_source_tds" />
+                        <TextView
+                            android:id="@+id/tvUploadFormLabel"
+                            style="@style/tv_regular"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:drawablePadding="@dimen/margin_10"
+                            android:padding="@dimen/margin_10"
+                            android:text="Please ensure to upload the Form 15 G / H, when you receive a mail from the
+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"
+                            app:layout_constraintTop_toBottomOf="@+id/tvTaxDeducted"
+                            app:layout_constraintVertical_bias="0.0" />
 
-                    <TextView
-                        style="@style/tv_regular"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/margin_10"
-                        android:textColor="@color/text_color_dark"
-                        android:textSize="@dimen/text_size_12"
-                        android:drawablePadding="@dimen/margin_10"
-                        android:text="Please ensure to upload the Form 15 G / H, when you receive a mail from the
-Company for the same"/>
-
-                    <TextView
-                        style="@style/tv_regular"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/margin_10"
-                        android:textColor="@color/text_color_dark"
-                        android:textSize="@dimen/text_size_12"
-                        android:drawableLeft="@drawable/svg_grey_bullet"
-                        android:drawablePadding="@dimen/margin_10"
-                        android:text="@string/deduct_tds"/>
-
-                    <TextView
-                        style="@style/tv_regular"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingLeft="@dimen/margin_10"
-                        android:paddingRight="@dimen/margin_10"
-                        android:textColor="@color/text_color_dark"
-                        android:textSize="@dimen/text_size_12"
-                        android:text="In case you are eligible for non deduction of TDS then please submit
-15G/H form to Bajaj or Nivesh team"/>
+                        <TextView
+                            android:id="@+id/tvDeductTaxableLabel"
+                            style="@style/tv_regular"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:drawablePadding="@dimen/margin_10"
+                            android:padding="@dimen/margin_10"
+                            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"
+                            app:layout_constraintTop_toBottomOf="@+id/tvUploadFormLabel"
+                            app:layout_constraintVertical_bias="0.0"
+                            app:drawableLeftCompat="@drawable/svg_grey_bullet"/>
+
+                        <TextView
+                            android:id="@+id/tvSubmitLabel"
+                            style="@style/tv_regular"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:paddingLeft="@dimen/margin_10"
+                            android:paddingRight="@dimen/margin_10"
+                            android:text="In case you are eligible for non deduction of TDS then please submit
+15G/H form to Bajaj or Nivesh team"
+                            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"
+                            app:layout_constraintTop_toBottomOf="@+id/tvDeductTaxableLabel"
+                            app:layout_constraintVertical_bias="0.0" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                 </LinearLayout>
 
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/card_view_2"
+                style="@style/CustomCardViewBottomStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                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"
+                app:layout_constraintTop_toBottomOf="@+id/card_view_1"
+                android:background="@drawable/bajaj_logo"
+                app:layout_constraintVertical_bias="0.0"
+                app:cardPreventCornerOverlap="true">
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:gravity="center"
                     android:orientation="vertical"
-                    android:padding="@dimen/margin_20"
-                    android:background="@color/bg_color_info"
-                    android:gravity="center">
+                    android:padding="@dimen/margin_20">
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -316,19 +374,19 @@ Company for the same"/>
                             style="@style/tv_regular"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="@color/text_color_dark"
-                            android:textSize="@dimen/margin_16"
                             android:drawablePadding="@dimen/margin_10"
-                            android:text="Non- Cumulative ROI:"/>
+                            android:text="Non- Cumulative ROI:"
+                            android:textColor="@color/text_color_dark"
+                            android:textSize="@dimen/margin_16" />
 
                         <TextView
                             style="@style/tv_regular"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/margin_2"
+                            android:text="7.5 %"
                             android:textColor="@color/text_color_blue"
-                            android:textSize="@dimen/margin_16"
-                            android:layout_marginLeft="@dimen/margin_2"
-                            android:text="7.5 %"/>
+                            android:textSize="@dimen/margin_16" />
 
                     </LinearLayout>
 
@@ -342,19 +400,19 @@ Company for the same"/>
                             style="@style/tv_regular"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="@color/text_color_dark"
-                            android:textSize="@dimen/margin_16"
                             android:drawablePadding="@dimen/margin_10"
-                            android:text="Regular Interest Payment:"/>
+                            android:text="Regular Interest Payment:"
+                            android:textColor="@color/text_color_dark"
+                            android:textSize="@dimen/margin_16" />
 
                         <TextView
                             style="@style/tv_regular"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/margin_2"
+                            android:text="Quarterly"
                             android:textColor="@color/text_color_blue"
-                            android:textSize="@dimen/margin_16"
-                            android:layout_marginLeft="@dimen/margin_2"
-                            android:text="Quarterly"/>
+                            android:textSize="@dimen/margin_16" />
 
                     </LinearLayout>
 
@@ -368,41 +426,42 @@ Company for the same"/>
                             style="@style/tv_regular"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="@color/text_color_dark"
-                            android:textSize="@dimen/margin_16"
                             android:drawablePadding="@dimen/margin_10"
-                            android:text="Maturity Amount:"/>
+                            android:text="Maturity Amount:"
+                            android:textColor="@color/text_color_dark"
+                            android:textSize="@dimen/margin_16" />
 
                         <TextView
                             style="@style/tv_regular"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/margin_2"
+                            android:text="5XXXXXX"
                             android:textColor="@color/text_color_blue"
-                            android:textSize="@dimen/margin_16"
-                            android:layout_marginLeft="@dimen/margin_2"
-                            android:text="5XXXXXX"/>
+                            android:textSize="@dimen/margin_16" />
 
                     </LinearLayout>
 
                 </LinearLayout>
 
-            </LinearLayout>
-        </com.google.android.material.card.MaterialCardView>
+            </com.google.android.material.card.MaterialCardView>
 
-    </ScrollView>
+            <Button
+                android:id="@+id/btnNext"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:backgroundTint="@color/colorPrimary"
+                android:text="@string/next"
+                android:textColor="#FFFFFF"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/card_view_2" />
 
-    <Button
-        android:id="@+id/btnNext"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
-        android:text="@string/next"
-        android:textColor="@color/white"
-        android:backgroundTint="@color/colorPrimary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/scrollView" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_step_three.xml b/app/src/main/res/layout/fragment_step_three.xml
index 8905239..c61a9b3 100644
--- a/app/src/main/res/layout/fragment_step_three.xml
+++ b/app/src/main/res/layout/fragment_step_three.xml
@@ -38,18 +38,30 @@
                 android:layout_height="match_parent"
                 android:paddingBottom="@dimen/margin_10">
 
-                <TextView
-                    android:id="@+id/tvFDSchemeName"
-                    style="@style/tv_semi_bold"
-                    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"
+                <!--                <TextView-->
+                <!--                    android:id="@+id/tvFDSchemeName"-->
+                <!--                    style="@style/tv_semi_bold"-->
+                <!--                    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"
+                    android:layout_height="18dp"
+                    android:layout_marginTop="8dp"
+                    android:src="@drawable/bajaj_logo"
+                    app:layout_constraintHorizontal_bias="0.065"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:contentDescription="@string/content_description"/>
 
                 <TextView
                     android:id="@+id/tvFDRating"
@@ -63,7 +75,7 @@
                     android:textColor="@color/light_text"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvFDSchemeName" />
+                    app:layout_constraintTop_toBottomOf="@+id/logo" />
 
                 <TextView
                     android:id="@+id/tvMakePayment"
@@ -85,14 +97,14 @@
                     style="@style/tv_regular"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/_5sdp"
+                    android:layout_marginStart="10dp"
                     android:paddingEnd="@dimen/_5sdp"
-                    android:layout_marginStart="@dimen/_5sdp"
+                    android:paddingStart="0dp"
                     android:text="Invested Amount"
                     android:textSize="@dimen/text_size_14"
-                    app:layout_constraintTop_toBottomOf="@+id/tvMakePayment"
                     app:layout_constraintBottom_toTopOf="@id/lblTenure"
                     app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvMakePayment"
                     app:layout_constraintVertical_bias="0.0" />
 
                 <TextView
@@ -118,15 +130,15 @@
                     style="@style/tv_regular"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/_5sdp"
+                    android:layout_marginStart="10dp"
                     android:paddingEnd="@dimen/_5sdp"
-                    android:layout_marginStart="@dimen/_5sdp"
+                    android:paddingStart="0dp"
                     android:text="Tenure"
                     android:textSize="@dimen/text_size_14"
-                    app:layout_constraintVertical_bias="0.0"
-                    app:layout_constraintTop_toBottomOf="@+id/lblMakePayment"
+                    app:layout_constraintBottom_toTopOf="@+id/lblInterestPayout"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintBottom_toTopOf="@+id/lblInterestPayout" />
+                    app:layout_constraintTop_toBottomOf="@+id/lblMakePayment"
+                    app:layout_constraintVertical_bias="0.0" />
 
                 <TextView
                     android:id="@+id/tvTenure"
@@ -152,10 +164,10 @@
                     style="@style/tv_regular"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Interest Payout"
-                    android:layout_marginStart="@dimen/_5sdp"
-                    android:paddingStart="@dimen/_5sdp"
+                    android:layout_marginStart="10dp"
                     android:paddingEnd="@dimen/_5sdp"
+                    android:paddingStart="0dp"
+                    android:text="Interest Payout"
                     android:textSize="@dimen/text_size_14"
                     app:layout_constraintBottom_toTopOf="@+id/lblRateOfInterest"
                     app:layout_constraintStart_toStartOf="parent"
@@ -184,9 +196,9 @@
                     style="@style/tv_regular"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/_5sdp"
+                    android:layout_marginStart="10dp"
                     android:paddingEnd="@dimen/_5sdp"
-                    android:layout_marginStart="@dimen/_5sdp"
+                    android:paddingStart="0dp"
                     android:text="Rate of Interest"
                     android:textSize="@dimen/text_size_14"
                     app:layout_constraintBottom_toTopOf="@+id/tvMakePayment2"
@@ -219,7 +231,10 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="196dp"
                     android:background="@color/grey_bg"
-                    android:padding="@dimen/margin_3"
+                    android:paddingTop="@dimen/margin_3"
+                    android:paddingBottom="@dimen/margin_3"
+                    android:paddingStart="@dimen/margin_10"
+                    android:paddingEnd="0dp"
                     android:text="Terms &amp; condition"
                     android:textColor="@color/black"
                     app:layout_constraintTop_toBottomOf="@+id/tvFDRating" />
@@ -305,6 +320,7 @@
                     android:layout_marginTop="8dp"
                     android:layout_marginEnd="5dp"
                     android:layout_marginBottom="8dp"
+                    android:textSize="@dimen/margin_8"
                     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"
@@ -316,11 +332,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
-                    android:layout_marginTop="25dp"
-                    app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/switch7"
-                    app:layout_constraintVertical_bias="0.0" />
+                    app:layout_constraintTop_toBottomOf="@+id/switch7" />
 
                 <TextView
                     android:id="@+id/textView14"
diff --git a/app/src/main/res/layout/fragment_step_two.xml b/app/src/main/res/layout/fragment_step_two.xml
index 7498813..71eaaa5 100644
--- a/app/src/main/res/layout/fragment_step_two.xml
+++ b/app/src/main/res/layout/fragment_step_two.xml
@@ -21,233 +21,244 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btnNext">
 
-    <com.google.android.material.card.MaterialCardView
-        style="@style/CustomCardViewStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:foreground="?android:attr/selectableItemBackground"
-        android:padding="@dimen/margin_10"
-        app:cardElevation="1dp"
-        app:cardUseCompatPadding="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/childConstraint"
+        <com.google.android.material.card.MaterialCardView
+            style="@style/CustomCardViewStyle"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingBottom="@dimen/margin_30">
+            android:layout_height="wrap_content"
+            android:foreground="?android:attr/selectableItemBackground"
+            android:padding="@dimen/margin_10"
+            app:cardElevation="1dp"
+            app:cardUseCompatPadding="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
-            <TextView
-                android:id="@+id/tvFDSchemeName"
-                style="@style/tv_semi_bold"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/childConstraint"
                 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" />
+                android:layout_height="match_parent"
+                android:padding="@dimen/margin_10"
+                android:paddingBottom="@dimen/margin_30">
 
-            <TextView
-                android:id="@+id/tvFDRating"
-                style="@style/tv_regular"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="7dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
-                android:textSize="@dimen/text_size_12"
-                android:layout_marginBottom="1dp"
-                android:text="Rating: FAAA by CRISIL"
-                android:textColor="@color/light_text"
-                app:layout_constraintTop_toBottomOf="@+id/tvFDSchemeName"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent" />
+                <!--            <TextView-->
+                <!--                android:id="@+id/tvFDSchemeName"-->
+                <!--                style="@style/tv_semi_bold"-->
+                <!--                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" />-->
 
-            <TextView
-                android:id="@+id/tvUploadKYCDocument"
-                style="@style/tv_semi_bold"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="7dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
-                android:background="@color/grey_text_bg"
-                android:padding="@dimen/margin_1"
-                android:text="upload KYC Documents"
-                android:textColor="@color/black"
-                app:drawableEndCompat="@drawable/svg_down_arrow"
-                app:layout_constraintTop_toBottomOf="@+id/tvFDRating"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent" />
+                <ImageView
+                    android:id="@+id/logo"
+                    android:layout_width="@dimen/margin_150"
+                    android:layout_height="18dp"
+                    android:layout_marginTop="4dp"
+                    android:src="@drawable/bajaj_logo"
+                    app:layout_constraintBottom_toTopOf="@+id/tvFDRating"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:contentDescription="@string/content_description"/>
 
-            <TextView
-                android:id="@+id/tvAddressProofType"
-                style="@style/tv_regular"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:layout_marginTop="12dp"
-                android:text="@string/address_proof_type"
-                android:textColor="@color/text_default"
-                android:textSize="@dimen/text_size_12"
-                app:layout_constraintTop_toBottomOf="@+id/tvUploadKYCDocument"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent" />
+                <TextView
+                    android:id="@+id/tvFDRating"
+                    style="@style/tv_regular"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="Rating: FAAA by CRISIL"
+                    android:textColor="@color/light_text"
+                    android:textSize="@dimen/text_size_12"
+                    app:layout_constraintBottom_toTopOf="@+id/tvUploadKYCDocument"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/logo" />
 
-            <Spinner
-                android:id="@+id/spAddressType"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/margin_50"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginStart="20dp"
-                android:layout_marginEnd="20dp"
-                android:background="@drawable/rounded_corner_with_line"
-                android:entries="@array/address_type"
-                app:layout_constraintTop_toBottomOf="@+id/tvAddressProofType"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent" />
+                <TextView
+                    android:id="@+id/tvUploadKYCDocument"
+                    style="@style/tv_semi_bold"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="7dp"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp"
+                    android:background="@color/grey_text_bg"
+                    android:padding="@dimen/margin_1"
+                    android:text="upload KYC Documents"
+                    android:textColor="@color/black"
+                    app:drawableEndCompat="@drawable/svg_down_arrow"
+                    app:layout_constraintTop_toBottomOf="@+id/tvFDRating"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent" />
+
+                <TextView
+                    android:id="@+id/tvAddressProofType"
+                    style="@style/tv_regular"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:layout_marginTop="12dp"
+                    android:text="@string/address_proof_type"
+                    android:textColor="@color/text_default"
+                    android:textSize="@dimen/text_size_12"
+                    app:layout_constraintTop_toBottomOf="@+id/tvUploadKYCDocument"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent" />
+
+                <Spinner
+                    android:id="@+id/spAddressType"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/margin_50"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
+                    android:background="@drawable/rounded_corner_with_line"
+                    android:entries="@array/address_type"
+                    app:layout_constraintTop_toBottomOf="@+id/tvAddressProofType"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent" />
 
-            <TextView
-                android:id="@+id/tvAadhaarFront"
-                style="@style/tv_regular"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/aadhaar_front"
-                android:textColor="@color/text_default"
-                android:textSize="@dimen/text_size_12"
-                app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarFrontUpload"
-                app:layout_constraintStart_toStartOf="@+id/spAddressType"
-                app:layout_constraintTop_toTopOf="@+id/btnAadhaarFrontUpload"
-                app:layout_constraintVertical_bias="0.562" />
+                <TextView
+                    android:id="@+id/tvAadhaarFront"
+                    style="@style/tv_regular"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/aadhaar_front"
+                    android:textColor="@color/text_default"
+                    android:textSize="@dimen/text_size_12"
+                    app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarFrontUpload"
+                    app:layout_constraintStart_toStartOf="@+id/spAddressType"
+                    app:layout_constraintTop_toTopOf="@+id/btnAadhaarFrontUpload"
+                    app:layout_constraintVertical_bias="0.562" />
 
-            <Button
-                android:id="@+id/btnAadhaarFrontUpload"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="8dp"
-                android:backgroundTint="@color/color_EFEFEF"
-                android:paddingLeft="@dimen/margin_30"
-                android:paddingRight="@dimen/margin_30"
-                android:text="Upload File"
-                android:textAllCaps="false"
-                android:textColor="@color/black"
-                app:layout_constraintBottom_toTopOf="@+id/btnAadhaarBackUpload"
-                app:layout_constraintEnd_toEndOf="@+id/spAddressType"
-                app:layout_constraintHorizontal_bias="1.0"
-                app:layout_constraintStart_toEndOf="@+id/tvAadhaarFront"
-                app:layout_constraintTop_toBottomOf="@+id/spAddressType"
-                app:layout_constraintVertical_bias="0.0" />
+                <Button
+                    android:id="@+id/btnAadhaarFrontUpload"
+                    android:layout_width="wrap_content"
+                    android:layout_height="48dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="8dp"
+                    android:backgroundTint="@color/color_EFEFEF"
+                    android:paddingLeft="@dimen/margin_30"
+                    android:paddingRight="@dimen/margin_30"
+                    android:text="Upload File"
+                    android:textAllCaps="false"
+                    android:textColor="@color/black"
+                    app:layout_constraintBottom_toTopOf="@+id/btnAadhaarBackUpload"
+                    app:layout_constraintEnd_toEndOf="@+id/spAddressType"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toEndOf="@+id/tvAadhaarFront"
+                    app:layout_constraintTop_toBottomOf="@+id/spAddressType"
+                    app:layout_constraintVertical_bias="0.0" />
 
-            <TextView
-                android:id="@+id/tvAadhaarBack"
-                style="@style/tv_regular"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:text="@string/aadhaar_back"
-                android:textColor="@color/text_default"
-                android:textSize="@dimen/text_size_12"
-                app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarBackUpload"
-                app:layout_constraintStart_toStartOf="@+id/tvAadhaarFront"
-                app:layout_constraintTop_toTopOf="@+id/btnAadhaarBackUpload" />
+                <TextView
+                    android:id="@+id/tvAadhaarBack"
+                    style="@style/tv_regular"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="@string/aadhaar_back"
+                    android:textColor="@color/text_default"
+                    android:textSize="@dimen/text_size_12"
+                    app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarBackUpload"
+                    app:layout_constraintStart_toStartOf="@+id/tvAadhaarFront"
+                    app:layout_constraintTop_toTopOf="@+id/btnAadhaarBackUpload" />
 
-            <Button
-                android:id="@+id/btnAadhaarBackUpload"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="6dp"
-                android:layout_marginBottom="8dp"
-                android:backgroundTint="@color/color_EFEFEF"
-                android:paddingLeft="@dimen/margin_30"
-                android:paddingRight="@dimen/margin_30"
-                android:text="Upload File"
-                android:textAllCaps="false"
-                android:textColor="@color/black"
-                app:layout_constraintBottom_toTopOf="@+id/btnPANUpload"
-                app:layout_constraintEnd_toEndOf="@+id/btnAadhaarFrontUpload"
-                app:layout_constraintHorizontal_bias="1.0"
-                app:layout_constraintStart_toEndOf="@+id/tvAadhaarBack"
-                app:layout_constraintTop_toBottomOf="@+id/btnAadhaarFrontUpload" />
+                <Button
+                    android:id="@+id/btnAadhaarBackUpload"
+                    android:layout_width="wrap_content"
+                    android:layout_height="48dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginBottom="8dp"
+                    android:backgroundTint="@color/color_EFEFEF"
+                    android:paddingLeft="@dimen/margin_30"
+                    android:paddingRight="@dimen/margin_30"
+                    android:text="Upload File"
+                    android:textAllCaps="false"
+                    android:textColor="@color/black"
+                    app:layout_constraintBottom_toTopOf="@+id/btnPANUpload"
+                    app:layout_constraintEnd_toEndOf="@+id/btnAadhaarFrontUpload"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toEndOf="@+id/tvAadhaarBack"
+                    app:layout_constraintTop_toBottomOf="@+id/btnAadhaarFrontUpload" />
 
-            <TextView
-                android:id="@+id/tvPAN"
-                style="@style/tv_regular"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:text="@string/pan_upload"
-                android:textColor="@color/text_default"
-                android:textSize="@dimen/text_size_12"
-                app:layout_constraintBottom_toBottomOf="@+id/btnPANUpload"
-                app:layout_constraintEnd_toStartOf="@+id/btnAadhaarBackUpload"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="@+id/tvAadhaarBack"
-                app:layout_constraintTop_toTopOf="@+id/btnPANUpload"
-                app:layout_constraintVertical_bias="0.281" />
+                <TextView
+                    android:id="@+id/tvPAN"
+                    style="@style/tv_regular"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="@string/pan_upload"
+                    android:textColor="@color/text_default"
+                    android:textSize="@dimen/text_size_12"
+                    app:layout_constraintBottom_toBottomOf="@+id/btnPANUpload"
+                    app:layout_constraintEnd_toStartOf="@+id/btnAadhaarBackUpload"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="@+id/tvAadhaarBack"
+                    app:layout_constraintTop_toTopOf="@+id/btnPANUpload"
+                    app:layout_constraintVertical_bias="0.468" />
 
-            <Button
-                android:id="@+id/btnPANUpload"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="6dp"
-                android:layout_marginBottom="8dp"
-                android:backgroundTint="@color/color_EFEFEF"
-                android:paddingLeft="@dimen/margin_30"
-                android:paddingRight="@dimen/margin_30"
-                android:text="Upload File"
-                android:textAllCaps="false"
-                android:textColor="@color/black"
-                app:layout_constraintBottom_toTopOf="@+id/btnPhotoUpload"
-                app:layout_constraintEnd_toEndOf="@+id/btnAadhaarBackUpload"
-                app:layout_constraintHorizontal_bias="1.0"
-                app:layout_constraintStart_toEndOf="@+id/tvPAN"
-                app:layout_constraintTop_toBottomOf="@+id/btnAadhaarBackUpload" />
+                <Button
+                    android:id="@+id/btnPANUpload"
+                    android:layout_width="wrap_content"
+                    android:layout_height="48dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginBottom="8dp"
+                    android:backgroundTint="@color/color_EFEFEF"
+                    android:paddingLeft="@dimen/margin_30"
+                    android:paddingRight="@dimen/margin_30"
+                    android:text="Upload File"
+                    android:textAllCaps="false"
+                    android:textColor="@color/black"
+                    app:layout_constraintBottom_toTopOf="@+id/btnPhotoUpload"
+                    app:layout_constraintEnd_toEndOf="@+id/btnAadhaarBackUpload"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toEndOf="@+id/tvPAN"
+                    app:layout_constraintTop_toBottomOf="@+id/btnAadhaarBackUpload" />
 
-            <TextView
-                android:id="@+id/tvPhotoUpload"
-                style="@style/tv_regular"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:text="@string/photo_upload"
-                android:textColor="@color/text_default"
-                android:textSize="@dimen/text_size_12"
-                app:layout_constraintBottom_toBottomOf="@+id/btnPhotoUpload"
-                app:layout_constraintStart_toStartOf="@+id/tvPAN"
-                app:layout_constraintTop_toTopOf="@+id/btnPhotoUpload" />
+                <TextView
+                    android:id="@+id/tvPhotoUpload"
+                    style="@style/tv_regular"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="@string/photo_upload"
+                    android:textColor="@color/text_default"
+                    android:textSize="@dimen/text_size_12"
+                    app:layout_constraintBottom_toBottomOf="@+id/btnPhotoUpload"
+                    app:layout_constraintStart_toStartOf="@+id/tvPAN"
+                    app:layout_constraintTop_toTopOf="@+id/btnPhotoUpload" />
 
-            <Button
-                android:id="@+id/btnPhotoUpload"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="10dp"
-                android:backgroundTint="@color/color_EFEFEF"
-                android:paddingLeft="@dimen/margin_30"
-                android:paddingRight="@dimen/margin_30"
-                android:text="Upload File"
-                android:textAllCaps="false"
-                android:textColor="@color/black"
-                app:layout_constraintEnd_toEndOf="@+id/btnPANUpload"
-                app:layout_constraintHorizontal_bias="1.0"
-                app:layout_constraintStart_toEndOf="@+id/tvPhotoUpload"
-                app:layout_constraintTop_toBottomOf="@+id/btnPANUpload" />
+                <Button
+                    android:id="@+id/btnPhotoUpload"
+                    android:layout_width="wrap_content"
+                    android:layout_height="48dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginTop="10dp"
+                    android:backgroundTint="@color/color_EFEFEF"
+                    android:paddingLeft="@dimen/margin_30"
+                    android:paddingRight="@dimen/margin_30"
+                    android:text="Upload File"
+                    android:textAllCaps="false"
+                    android:textColor="@color/black"
+                    app:layout_constraintEnd_toEndOf="@+id/btnPANUpload"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toEndOf="@+id/tvPhotoUpload"
+                    app:layout_constraintTop_toBottomOf="@+id/btnPANUpload" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.card.MaterialCardView>
 
     </androidx.core.widget.NestedScrollView>
 
diff --git a/app/src/main/res/layout/fragmnet_step_fail.xml b/app/src/main/res/layout/fragmnet_step_fail.xml
new file mode 100644
index 0000000..c854413
--- /dev/null
+++ b/app/src/main/res/layout/fragmnet_step_fail.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/cardViewThree"
+        style="@style/CustomCardViewTopStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/margin_5"
+        android:layout_marginTop="@dimen/margin_5"
+        android:layout_marginRight="@dimen/margin_5"
+        android:padding="@dimen/margin_10"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="70dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="12dp"
+            android:background="@color/white"
+            android:padding="@dimen/margin_5"
+            app:layout_constraintBottom_toTopOf="@+id/textView5"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0">
+
+            <ImageView
+                android:id="@+id/logo2"
+                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_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:contentDescription="@string/content_description"/>
+
+            <TextView
+                android:id="@+id/tv_fd_rating2"
+                style="@style/tv_regular"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
+                android:textColor="@color/light_text"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/logo2"
+                app:layout_constraintVertical_bias="0.0" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/cardViewFour"
+        style="@style/CustomCardViewBottomStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/margin_5"
+        android:layout_marginRight="@dimen/margin_5"
+        android:layout_marginBottom="@dimen/margin_5"
+        android:padding="@dimen/margin_10"
+        app:cardBackgroundColor="@color/bg_color"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/cardViewThree"
+        app:layout_constraintVertical_bias="0.0">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/margin_10"
+            app:layout_constraintBottom_toBottomOf="parent">
+
+            <TextView
+                android:id="@+id/textViewFail1"
+                style="@style/tv_semi_bold"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="Sorry!"
+                android:textColor="@color/black"
+                android:textSize="@dimen/margin_16"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.437"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tvFailMsg"
+                style="@style/tv_regular"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="Your transaction is unsuccessful."
+                android:textColor="@color/black"
+                android:textSize="@dimen/margin_16"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.419"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textViewFail1" />
+
+            <TextView
+                android:id="@+id/tvSorryMsg"
+                style="@style/tv_regular"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:gravity="center"
+                android:text="Sorry for the inconvenience please try again later"
+                android:textColor="@color/black"
+                android:textSize="@dimen/margin_14"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.393"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvFailMsg" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/header_progress_layout.xml b/app/src/main/res/layout/header_progress_layout.xml
index 24bf2a1..93cb230 100644
--- a/app/src/main/res/layout/header_progress_layout.xml
+++ b/app/src/main/res/layout/header_progress_layout.xml
@@ -18,11 +18,11 @@
             android:layout_gravity="center"
             android:layout_marginStart="24sp"/>
 
-            <TextView
-                android:id="@+id/tv_title"
-                android:text="Hello World"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+        <TextView
+            android:id="@+id/tv_title"
+            android:text="Hello World"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
     </LinearLayout>
 
@@ -105,4 +105,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/test_layout.xml b/app/src/main/res/layout/test_layout.xml
index ecde162..d44d8fe 100644
--- a/app/src/main/res/layout/test_layout.xml
+++ b/app/src/main/res/layout/test_layout.xml
@@ -1,808 +1,350 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tool="http://schemas.android.com/tools"
     android:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical"
     android:background="@color/Nivesh_color_AppBg"
-    android:padding="@dimen/margin_5"
-    tools:context=".ui.fragment.StepTwoFragment">
+    tool:context="com.nivesh.production.bajajfd.ui.fragment.StepOneFragment">
 
-    <androidx.core.widget.NestedScrollView
+    <ScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="60dp"
-        android:background="@color/Nivesh_color_AppBg"
         android:fillViewport="true"
-        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btnNext">
 
         <com.google.android.material.card.MaterialCardView
+            style="@style/CustomCardViewStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:foreground="?android:attr/selectableItemBackground"
-            app:cardBackgroundColor="@android:color/white"
-            app:cardCornerRadius="5dp"
-            app:cardElevation="5dp"
+            app:cardElevation="1dp"
             app:cardUseCompatPadding="true">
 
-            <!--            <LinearLayout-->
-            <!--                android:layout_width="match_parent"-->
-            <!--                android:layout_height="match_parent"-->
-            <!--                android:gravity="center_horizontal"-->
-            <!--                android:padding="10dp"-->
-            <!--                android:orientation="vertical">-->
-
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_horizontal"
+                android:padding="10dp"
                 android:orientation="vertical">
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/constraintLayoutInner"
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center_vertical"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/btnNext">
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/_2sdp"
+                    android:orientation="vertical">
 
-                    <TextView
-                        android:id="@+id/tv_fd_label"
-                        style="@style/tv_semi_bold"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginTop="16dp"
-                        android:text="@string/bajaj_finance"
-                        app:layout_constraintBottom_toTopOf="@+id/tv_fd_rating"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                    <ImageView
+                        android:id="@+id/logo"
+                        android:layout_width="@dimen/margin_150"
+                        android:layout_height="18dp"
+                        android:src="@drawable/bajaj_logo" />
 
                     <TextView
                         android:id="@+id/tv_fd_rating"
                         style="@style/tv_regular"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
-                        android:layout_marginEnd="272dp"
-                        android:layout_marginBottom="1dp"
-                        android:text="Rating: FAAA by CRISIL"
-                        android:textColor="@color/light_text"
-                        android:textSize="@dimen/margin_14"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toStartOf="@+id/tv_fd_label"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.023" />
+                        android:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
+                        android:textColor="@color/light_text" />
 
-                    <TextView
-                        android:id="@+id/tvPersonalDetails"
-                        style="@style/tv_semi_bold"
+                    <RelativeLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="12dp"
-                        android:background="@color/grey_bg"
-                        android:drawableRight="@drawable/svg_down_arrow"
-                        android:padding="@dimen/margin_3"
-                        android:text="Personal Details"
-                        android:textColor="@color/black"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_fd_rating"
-                        tools:layout_editor_absoluteX="5dp" />
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tilName"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Enter Mobile Number"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.8"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.095">
-
-                        <com.google.android.material.textfield.TextInputEditText
+                        android:layout_height="@dimen/margin_50"
+                        android:layout_marginTop="@dimen/margin_5">
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/tilDepositAmount"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:inputType="phone"
-                            android:maxEms="10" />
+                            android:hint="Select Investment Amount">
 
-                    </com.google.android.material.textfield.TextInputLayout>
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:drawableLeft="@drawable/svg_rs"
+                                android:padding="@dimen/margin_5"
+                                android:inputType="number"
+                                android:maxLength="12"/>
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/tilDOB"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Date Of Birth"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tilName"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:drawableRight="@drawable/svg_cal"
-                            android:inputType="date" />
+                        </com.google.android.material.textfield.TextInputLayout>
 
-                    </com.google.android.material.textfield.TextInputLayout>
+                    </RelativeLayout>
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    <TextView
+                        android:id="@+id/tv_"
+                        style="@style/tv_regular"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:layout_marginTop="5dp"
-                        android:hint="Enter PAN Number"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tilDOB"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:maxEms="10" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
+                        android:layout_marginTop="@dimen/margin_18"
+                        android:text="@string/select_interest_payout"
+                        android:textColor="@color/text_default"
+                        android:textSize="@dimen/text_size_12" />
 
                     <Spinner
-                        android:id="@+id/spDuration"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:layout_marginTop="5dp"
-                        android:background="@drawable/sp_bg"
-                        android:minHeight="48dp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout"
-                        app:layout_constraintVertical_bias="0.0" />
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout2"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Enter First Name"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/spDuration"
-                        app:layout_constraintVertical_bias="0.009">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="40" />
+                        android:layout_height="@dimen/margin_50"
+                        android:background="@drawable/rounded_corner_with_line"
+                        android:entries="@array/intrest_payout_list"/>
 
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout3"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    <TextView
+                        style="@style/tv_regular"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:layout_marginTop="5dp"
-                        android:hint="@string/middle_name"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout2"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="40" />
+                        android:layout_marginTop="@dimen/_7sdp"
+                        android:text="@string/select_interest_tenure"
+                        android:textColor="@color/text_default"
+                        android:textSize="@dimen/text_size_12" />
 
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout4"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    <TextView
+                        android:id="@+id/txt_interest_tenure"
+                        style="@style/tv_regular"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Enter Last Name"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout3"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="40" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
+                        android:layout_height="@dimen/margin_50"
+                        android:layout_marginTop="@dimen/_2sdp"
+                        android:background="@drawable/rounded_corner_with_line"
+                        android:drawableEnd="@drawable/ic_arrow_down"
+                        android:gravity="center_vertical"
+                        android:hint="@string/tv_select_hint"
+                        android:paddingLeft="@dimen/_5sdp"
+                        android:paddingRight="@dimen/margin_30"
+                        android:text=""
+                        android:textColor="@color/text_default"
+                        android:textSize="@dimen/text_size_16" />
 
-                    <Spinner
-                        android:id="@+id/spGender"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:background="@drawable/sp_bg"
-                        android:minHeight="48dp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout4"
-                        app:layout_constraintVertical_bias="0.0" />
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout5"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Enter Email Address"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/spGender"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="textEmailAddress"
-                            android:maxEms="50" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
+                        android:gravity="center_vertical"
+                        android:layout_marginTop="@dimen/_10sdp"
+                        android:orientation="horizontal">
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout6"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Enter Occupation"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout5"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
+                        <TextView
+                            style="@style/tv_regular"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="60" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
+                            android:text="@string/upto_0.25" />
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout7"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Enter Qualification"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout6"
-                        app:layout_constraintVertical_bias="0.009">
-
-                        <com.google.android.material.textfield.TextInputEditText
+                        <Switch
+                            android:id="@+id/switch1"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="60" />
+                            android:textColor="@color/black"
+                            android:layout_marginLeft="@dimen/_2sdp"
+                            android:text="@string/upto_0.25_next" />
 
-                    </com.google.android.material.textfield.TextInputLayout>
+                    </LinearLayout>
 
-                    <Spinner
-                        android:id="@+id/spMarital"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:background="@drawable/sp_bg"
-                        android:minHeight="48dp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout7"
-                        app:layout_constraintVertical_bias="0.033" />
+                </LinearLayout>
 
-                    <Spinner
-                        android:id="@+id/spRelation"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:background="@drawable/sp_bg"
-                        android:minHeight="48dp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.8"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/spMarital"
-                        app:layout_constraintVertical_bias="0.0" />
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout8"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="Enter Address 1"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.8"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/spRelation"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
+                <TextView
+                    style="@style/tv_regular"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/margin_10"
+                    android:background="@color/grey_bg"
+                    android:textColor="@color/text_color_dark"
+                    android:textSize="@dimen/text_size_12"
+                    android:layout_marginTop="@dimen/margin_25"
+                    android:text="@string/maturity_instructions"/>
 
-                    </com.google.android.material.textfield.TextInputLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/_2sdp"
+                    android:layout_marginTop="@dimen/margin_15"
+                    android:orientation="vertical">
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout9"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    <TextView
+                        style="@style/tv_regular"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="Enter Address 2"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.8"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout8"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
+                        android:padding="@dimen/margin_10"
+                        android:textColor="@color/text_color_dark"
+                        android:textSize="@dimen/text_size_12"
+                        android:drawableLeft="@drawable/svg_grey_bullet"
+                        android:drawablePadding="@dimen/margin_10"
+                        android:text="@string/additional_detail_one"/>
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout10"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    <TextView
+                        style="@style/tv_regular"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="Area"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.8"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout9"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="200" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
+                        android:padding="@dimen/margin_10"
+                        android:textColor="@color/text_color_dark"
+                        android:textSize="@dimen/text_size_12"
+                        android:drawableLeft="@drawable/svg_grey_bullet"
+                        android:drawablePadding="@dimen/margin_10"
+                        android:text="@string/additional_detail_two"/>
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout11"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    <TextView
+                        style="@style/tv_regular"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="Country"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.8"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout10"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="200" />
+                        android:padding="@dimen/margin_10"
+                        android:textColor="@color/text_color_dark"
+                        android:textSize="@dimen/text_size_12"
+                        android:drawableLeft="@drawable/svg_grey_bullet"
+                        android:drawablePadding="@dimen/margin_10"
+                        android:text="@string/additional_detail_three"/>
 
-                    </com.google.android.material.textfield.TextInputLayout>
+                    <TextView
+                        style="@style/tv_semi_bold"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/margin_10"
+                        android:layout_marginTop="@dimen/margin_15"
+                        android:textColor="@color/text_color_dark"
+                        android:text="@string/tax_deducted_at_source_tds" />
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout12"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    <TextView
+                        style="@style/tv_regular"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="State"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.8"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout11"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
+                        android:padding="@dimen/margin_10"
+                        android:textColor="@color/text_color_dark"
+                        android:textSize="@dimen/text_size_12"
+                        android:drawablePadding="@dimen/margin_10"
+                        android:text="Please ensure to upload the Form 15 G / H, when you receive a mail from the
+Company for the same"/>
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout13"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    <TextView
+                        style="@style/tv_regular"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="City"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.8"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout12"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
+                        android:padding="@dimen/margin_10"
+                        android:textColor="@color/text_color_dark"
+                        android:textSize="@dimen/text_size_12"
+                        android:drawableLeft="@drawable/svg_grey_bullet"
+                        android:drawablePadding="@dimen/margin_10"
+                        android:text="@string/deduct_tds"/>
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout14"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    <TextView
+                        style="@style/tv_regular"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="Pincode"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.8"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout13"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="6" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
+                        android:paddingLeft="@dimen/margin_10"
+                        android:paddingRight="@dimen/margin_10"
+                        android:textColor="@color/text_color_dark"
+                        android:textSize="@dimen/text_size_12"
+                        android:text="In case you are eligible for non deduction of TDS then please submit
+15G/H form to Bajaj or Nivesh team"/>
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                </LinearLayout>
 
-                <TextView
-                    android:id="@+id/tvNomineeDetails"
-                    style="@style/tv_semi_bold"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="22dp"
-                    android:background="@color/grey_bg"
-                    android:drawableRight="@drawable/svg_down_arrow"
-                    android:padding="@dimen/margin_3"
-                    android:text="Nominee Details"
-                    android:textColor="@color/black"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/margin_20">
+                    android:orientation="vertical"
+                    android:padding="@dimen/margin_20"
+                    android:background="@color/bg_color_info"
+                    android:gravity="center">
 
-                    <Spinner
-                        android:id="@+id/spTitle"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:background="@drawable/sp_bg"
-                        android:minHeight="48dp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"/>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout15"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="Nominee First Name"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/spTitle">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
+                        android:gravity="center"
+                        android:orientation="horizontal">
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout16"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="@string/nominee_middle_name"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.8"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/spTitle"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
+                        <TextView
+                            style="@style/tv_regular"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout17"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/margin_5"
-                        android:hint="Nominee Last Name"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.8"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout16"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
+                            android:textColor="@color/text_color_dark"
+                            android:textSize="@dimen/margin_16"
+                            android:drawablePadding="@dimen/margin_10"
+                            android:text="Non- Cumulative ROI:"/>
+
+                        <TextView
+                            style="@style/tv_regular"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="100" />
+                            android:textColor="@color/text_color_blue"
+                            android:textSize="@dimen/margin_16"
+                            android:layout_marginLeft="@dimen/margin_2"
+                            android:text="7.5 %"/>
 
-                    </com.google.android.material.textfield.TextInputLayout>
+                    </LinearLayout>
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout18"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="Nominee Date Of Birth"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout17"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:drawableRight="@drawable/svg_cal"
-                            android:inputType="date" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
+                        android:gravity="center"
+                        android:orientation="horizontal">
 
-                    <Spinner
-                        android:id="@+id/spNomineeRelation"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:background="@drawable/sp_bg"
-                        android:minHeight="48dp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout18"
-                        app:layout_constraintVertical_bias="0.0"/>
-
-                    <CheckBox
-                        android:id="@+id/cbNomineeSameAddress"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="Nominee address is same as Primary Applicant’s address"
-                        android:textSize="@dimen/margin_10"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/spNomineeRelation"
-                        app:layout_constraintVertical_bias="0.064" />
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout19"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="@string/guardian_name_optional"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/cbNomineeSameAddress"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
+                        <TextView
+                            style="@style/tv_regular"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="60"/>
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout20"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="@string/guardian_age_optional"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout19"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
+                            android:textColor="@color/text_color_dark"
+                            android:textSize="@dimen/margin_16"
+                            android:drawablePadding="@dimen/margin_10"
+                            android:text="Regular Interest Payment:"/>
+
+                        <TextView
+                            style="@style/tv_regular"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="60"/>
+                            android:textColor="@color/text_color_blue"
+                            android:textSize="@dimen/margin_16"
+                            android:layout_marginLeft="@dimen/margin_2"
+                            android:text="Quarterly"/>
 
-                    </com.google.android.material.textfield.TextInputLayout>
+                    </LinearLayout>
 
-                    <Spinner
-                        android:id="@+id/spGuardianRelation"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:background="@drawable/sp_bg"
-                        android:minHeight="48dp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout20"
-                        app:layout_constraintVertical_bias="0.0"/>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout21"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="@string/guardian_address_optional"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/spGuardianRelation"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="60"/>
-
-                    </com.google.android.material.textfield.TextInputLayout>
+                        android:gravity="center"
+                        android:orientation="horizontal">
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/textInputLayout22"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:hint="@string/guardian_pincode_optional"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="1.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/textInputLayout21"
-                        app:layout_constraintVertical_bias="0.0">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
+                        <TextView
+                            style="@style/tv_regular"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:inputType="text"
-                            android:maxEms="60"/>
+                            android:textColor="@color/text_color_dark"
+                            android:textSize="@dimen/margin_16"
+                            android:drawablePadding="@dimen/margin_10"
+                            android:text="Maturity Amount:"/>
+
+                        <TextView
+                            style="@style/tv_regular"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/text_color_blue"
+                            android:textSize="@dimen/margin_16"
+                            android:layout_marginLeft="@dimen/margin_2"
+                            android:text="5XXXXXX"/>
 
-                    </com.google.android.material.textfield.TextInputLayout>
+                    </LinearLayout>
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                </LinearLayout>
 
             </LinearLayout>
-
         </com.google.android.material.card.MaterialCardView>
 
+    </ScrollView>
 
-    </androidx.core.widget.NestedScrollView>
-
-    <include
-        android:id="@+id/bank_detail"
-        layout="@layout/bank_detail_select"
-        android:visibility="gone"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnBack"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
-        android:backgroundTint="@color/blue"
-        android:text="@string/back"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/btnNext"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/scrollView" />
-
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/btnNext"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="10dp"
-        android:backgroundTint="@color/colorPrimary"
         android:text="@string/next"
         android:textColor="@color/white"
+        android:backgroundTint="@color/colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/btnBack"
-        app:layout_constraintTop_toBottomOf="@+id/scrollView"
-
-        />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/scrollView" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e773b8f..670d2e0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1190,7 +1190,7 @@
     <color name="step_text_color">#323131</color>
     <color name="bg_image">#F0EBEF</color>
     <color name="red_title">#E9161E</color>
-    <color name="light_text">#A1A1A1</color>
+    <color name="light_text">#A2A2A2</color>
     <color name="grey_bg">#D9D9D9</color>
     <color name="grey_text_bg">#E2DEDE</color>
     <color name="text_color_dark">#0B0B0B</color>
@@ -1209,5 +1209,6 @@
     <color name="purpleAlpha15">#26673AB7</color>
     <color name="bg_color">#F4EEEE</color>
     <color name="mtrl_textinput_default_box_stroke_color" tools:override="true">#673AB7</color>
+    <color name="gray_text_color">#0E0E0E</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 806f021..be619ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,6 +54,7 @@
     <string name="guardian_age_optional">Guardian Age <font color='#33000000'>(Optional)</font></string>
     <string name="guardian_address_optional">Guardian Address <font color='#33000000'>(Optional)</font></string>
     <string name="guardian_pinCode_optional">Guardian PinCode <font color='#33000000'>(Optional)</font></string>
+    <string name="content_description">content description</string>
 
     <array name="interestPayoutList">
         <item>Interest Payout</item>
@@ -72,8 +73,30 @@
     </array>
 
     <array name="title">
+        <item>Select Title</item>
         <item>Mr</item>
         <item>Mrs</item>
     </array>
 
+    <array name="gender">
+        <item>Select Gender</item>
+        <item>Male</item>
+        <item>Female</item>
+    </array>
+
+    <array name="maritalStatus">
+        <item>Marital Status</item>
+        <item>Married</item>
+        <item>Unmarried</item>
+    </array>
+
+    <array name="intrest_payout_list">
+        <item>Interest Payout</item>
+        <item>On Maturity</item>
+        <item>Monthly</item>
+        <item>Quarterly</item>
+        <item>Half Yearly</item>
+        <item>Yearly</item>
+    </array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index ce4bfe9..e42ad18 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -30,14 +30,14 @@
     </style>
 
     <style name="EditTextTheme" parent="Widget.AppCompat.EditText">
-    <!-- Customize your theme here. -->
-    <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-    <item name="colorAccent">@color/Black</item>
-    <item name="android:textCursorDrawable">?theme_TextBlackColor</item>
-    <item name="colorControlNormal">?theme_TextBlackColor</item>
-    <item name="colorControlActivated">?theme_TextBlackColor</item>
-    <item name="colorControlHighlight">?theme_TextBlackColor</item>
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/Black</item>
+        <item name="android:textCursorDrawable">?theme_TextBlackColor</item>
+        <item name="colorControlNormal">?theme_TextBlackColor</item>
+        <item name="colorControlActivated">?theme_TextBlackColor</item>
+        <item name="colorControlHighlight">?theme_TextBlackColor</item>
     </style>
 
     <style name="ErrorTextAppearance" parent="TextAppearance.AppCompat">
@@ -88,6 +88,7 @@
         <item name="cornerSizeTopLeft">20dp</item>
         <item name="cornerSizeBottomRight">0dp</item>
         <item name="cornerSizeBottomLeft">0dp</item>
+        <item name="backgroundColor">@color/color_EFEFEF</item>
     </style>
 
     <style name="ShapeAppearanceOverlay_card_bottom_custom_corners" parent="">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6151ecf..8d35d8f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -13,4 +13,16 @@
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
+
+    <style name="SCBSwitch" parent="Theme.AppCompat.Light">
+        <!-- active thumb & track color (30% transparency) -->
+        <item name="colorControlActivated">#E9161E</item>
+
+        <!-- inactive thumb color -->
+        <item name="colorSwitchThumbNormal">#E9161E</item>
+
+        <!-- inactive track color (30% transparency) -->
+        <item name="android:colorForeground">#C68D8D</item>
+    </style>
+
 </resources>
\ No newline at end of file