diff --git a/app/src/main/java/com/nivesh/production/bajajfd/interface/ApiInterface.kt b/app/src/main/java/com/nivesh/production/bajajfd/interface/ApiInterface.kt
new file mode 100644
index 0000000..aac0e97
--- /dev/null
+++ b/app/src/main/java/com/nivesh/production/bajajfd/interface/ApiInterface.kt
@@ -0,0 +1,6 @@
+package com.nivesh.production.bajajfd.`interface`
+
+interface ApiInterface {
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
index 74b2e94..931db47 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
@@ -9,12 +9,12 @@ import android.util.Log
 import androidx.viewpager.widget.ViewPager
 import com.nivesh.production.bajajfd.`interface`.BajajFDInterface
 import com.nivesh.production.bajajfd.adapter.SectionsPagerAdapter
-import com.nivesh.production.bajajfd.databinding.BajajFdMainActivityBinding
+import com.nivesh.production.bajajfd.databinding.ActivityBajajFdBinding
 import com.nivesh.production.bajajfd.ui.fragment.*
 import com.nivesh.production.bajajfd.util.Colors
 
 class BajajFdMainActivity : AppCompatActivity(),BajajFDInterface {
-    private lateinit var binding: BajajFdMainActivityBinding
+    private lateinit var binding: ActivityBajajFdBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -22,7 +22,7 @@ class BajajFdMainActivity : AppCompatActivity(),BajajFDInterface {
     }
 
     private fun init(){
-        binding = BajajFdMainActivityBinding.inflate(layoutInflater)
+        binding = ActivityBajajFdBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
         binding.imgBack.setOnClickListener {
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourFragment.kt
index ff338e8..a90ba7b 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourFragment.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourFragment.kt
@@ -8,13 +8,13 @@ import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import com.nivesh.production.bajajfd.`interface`.BajajFDInterface
-import com.nivesh.production.bajajfd.databinding.FragmentStepFourBinding
+import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFourBinding
 import com.nivesh.production.bajajfd.viewModel.StepFourViewModel
 
 class StepFourFragment : Fragment() {
 
     private lateinit var stepFourViewModel: StepFourViewModel
-    private var _binding: FragmentStepFourBinding? = null
+    private var _binding: FragmentBajajfdStepFourBinding? = null
     private val binding get() = _binding!!
 
     private lateinit var bajajFDInterface: BajajFDInterface
@@ -41,7 +41,7 @@ class StepFourFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
 
-        _binding = FragmentStepFourBinding.inflate(inflater, container, false)
+        _binding = FragmentBajajfdStepFourBinding.inflate(inflater, container, false)
         val root = binding.root
 
 //        val textView: TextView = binding.sectionLabel
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 6eaba09..42ba659 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
@@ -8,13 +8,13 @@ import android.view.View
 import android.view.ViewGroup
 import com.nivesh.production.bajajfd.R
 import com.nivesh.production.bajajfd.`interface`.BajajFDInterface
-import com.nivesh.production.bajajfd.databinding.FragmentStepStartBinding
+import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepOneBinding
 import com.nivesh.production.bajajfd.viewModel.StepStartViewModel
 
 class StepStartFragment : Fragment() {
     private lateinit var viewModel: StepStartViewModel
     private lateinit var stepStartViewModel: StepStartViewModel
-    private var _binding: FragmentStepStartBinding? = null
+    private var _binding: FragmentBajajfdStepOneBinding? = null
     private val binding get() = _binding!!
 
     private lateinit var bajajFDInterface: BajajFDInterface
@@ -42,7 +42,7 @@ class StepStartFragment : Fragment() {
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        _binding = FragmentStepStartBinding.inflate(inflater,container,false)
+        _binding = FragmentBajajfdStepOneBinding.inflate(inflater,container,false)
         val root = binding.root
 
 //        binding.txtInterestTenure.setOnClickListener {
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeFragment.kt
index fa045ea..aae61b8 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeFragment.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeFragment.kt
@@ -8,13 +8,13 @@ import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import com.nivesh.production.bajajfd.`interface`.BajajFDInterface
-import com.nivesh.production.bajajfd.databinding.FragmentStepThreeBinding
+import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepThreeBinding
 import com.nivesh.production.bajajfd.viewModel.StepThreeViewModel
 
 class StepThreeFragment : Fragment() {
 
     private lateinit var stepThreeViewModel: StepThreeViewModel
-    private var _binding: FragmentStepThreeBinding? = null
+    private var _binding: FragmentBajajfdStepThreeBinding? = null
     private val binding get() = _binding!!
 
     private lateinit var bajajFDInterface: BajajFDInterface
@@ -42,7 +42,7 @@ class StepThreeFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
 
-        _binding = FragmentStepThreeBinding.inflate(inflater, container, false)
+        _binding = FragmentBajajfdStepThreeBinding.inflate(inflater, container, false)
         val root = binding.root
 
 //        val textView: TextView = binding.sectionLabel
diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoFragment.kt
index eaccc46..e1b62e6 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoFragment.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoFragment.kt
@@ -8,13 +8,13 @@ import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import com.nivesh.production.bajajfd.`interface`.BajajFDInterface
-import com.nivesh.production.bajajfd.databinding.FragmentStepTwoBinding
+import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepTwoBinding
 import com.nivesh.production.bajajfd.viewModel.StepTwoViewModel
 
 class StepTwoFragment : Fragment() {
 
     private lateinit var stepTwoFragment: StepTwoViewModel
-    private var _binding: FragmentStepTwoBinding? = null
+    private var _binding: FragmentBajajfdStepTwoBinding? = null
     private val binding get() = _binding!!
 
     private lateinit var bajajFDInterface: BajajFDInterface
@@ -41,7 +41,7 @@ class StepTwoFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
 
-        _binding = FragmentStepTwoBinding.inflate(inflater, container, false)
+        _binding = FragmentBajajfdStepTwoBinding.inflate(inflater, container, false)
         val root = binding.root
 
 //        val textView: TextView = binding.sectionLabel
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
index e2b4e90..a0320d0 100644
--- a/app/src/main/res/drawable/ic_arrow_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_down.xml
@@ -1,5 +1,5 @@
-<vector android:height="15dp" android:tint="#181818"
+<vector android:height="24dp" android:tint="#181818"
     android:viewportHeight="24" android:viewportWidth="24"
-    android:width="15dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="28dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"/>
 </vector>
diff --git a/app/src/main/res/layout/bajaj_fd_main_activity.xml b/app/src/main/res/layout/activity_bajaj_fd.xml
similarity index 97%
rename from app/src/main/res/layout/bajaj_fd_main_activity.xml
rename to app/src/main/res/layout/activity_bajaj_fd.xml
index aa86de5..4c408c2 100644
--- a/app/src/main/res/layout/bajaj_fd_main_activity.xml
+++ b/app/src/main/res/layout/activity_bajaj_fd.xml
@@ -44,7 +44,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/ll_steps"
+            android:id="@+id/llSteps"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -138,7 +138,7 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.viewpager.widget.ViewPager
-        android:id="@+id/view_pager"
+        android:id="@+id/viewPager"
         android:contentDescription="@string/viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/bank_detail_select.xml b/app/src/main/res/layout/bank_detail_select.xml
index 6d1c883..c08152d 100644
--- a/app/src/main/res/layout/bank_detail_select.xml
+++ b/app/src/main/res/layout/bank_detail_select.xml
@@ -8,48 +8,48 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <TextView
-        android:id="@+id/tv_upload_kyc_label"
-        style="@style/tv_semi_bold"
+        android:id="@+id/tvBankDetails"
+        style="@style/semiBoldStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/grey_bg"
-        android:drawableRight="@drawable/ic_arrow_down"
         android:drawablePadding="@dimen/margin_5"
         android:padding="@dimen/margin_3"
         android:text="Bank Details"
         android:textColor="@color/black"
-        app:layout_constraintBottom_toTopOf="@+id/rv_bank_list"
+        app:layout_constraintBottom_toTopOf="@+id/rVBankList"
         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.012" />
+        app:layout_constraintVertical_bias="0.012"
+        app:drawableEndCompat="@drawable/ic_arrow_down" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_bank_list"
+        android:id="@+id/rVBankList"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/margin_5"
-        app:layout_constraintBottom_toTopOf="@+id/textView16"
+        app:layout_constraintBottom_toTopOf="@+id/tvAddAccount"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_upload_kyc_label" />
+        app:layout_constraintTop_toBottomOf="@+id/tvBankDetails" />
 
     <TextView
-        android:id="@+id/textView16"
-        style="@style/tv_bold"
+        android:id="@+id/tvAddAccount"
+        style="@style/BoldStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:text="+ Add New Account"
         android:textColor="@color/black"
-        android:paddingLeft="@dimen/margin_5"
-        app:layout_constraintBottom_toTopOf="@+id/relativeLayout"
+        android:paddingStart="@dimen/margin_5"
+        app:layout_constraintBottom_toTopOf="@+id/rlPaymentMode"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rv_bank_list" />
+        app:layout_constraintTop_toBottomOf="@+id/rVBankList" />
 
     <RadioGroup
         android:id="@+id/radioGroup"
@@ -60,32 +60,33 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/relativeLayout">
+        app:layout_constraintTop_toBottomOf="@+id/rlPaymentMode">
 
         <RadioButton
-            style="@style/tv_regular"
+            android:id="@+id/rbUPI"
+            style="@style/regularStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="UPI"
-            android:textSize="@dimen/margin_14"
+            android:textSize="@dimen/text_size_14"
             tools:layout_editor_absoluteX="11dp"
             tools:layout_editor_absoluteY="355dp" />
 
         <RadioButton
-            style="@style/tv_regular"
+            android:id="@+id/rbNetBanking"
+            style="@style/regularStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_marginLeft="@dimen/margin_150"
-            android:text="Netbanking"
-            android:textSize="@dimen/margin_14"
+            android:layout_marginStart="@dimen/margin_150"
+            android:text="NetBanking"
+            android:textSize="@dimen/text_size_14"
             tools:layout_editor_absoluteX="11dp"
             tools:layout_editor_absoluteY="355dp" />
 
     </RadioGroup>
 
     <RelativeLayout
-        android:id="@+id/relativeLayout"
+        android:id="@+id/rlPaymentMode"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="28dp"
@@ -95,30 +96,30 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView16"
+        app:layout_constraintTop_toBottomOf="@+id/tvAddAccount"
         app:layout_constraintVertical_bias="0.0">
 
         <TextView
             android:id="@+id/textView15"
-            style="@style/tv_semi_bold"
+            style="@style/semiBoldStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Payment mode"
             android:textColor="@color/black"
-            android:textSize="@dimen/margin_14"
+            android:textSize="@dimen/text_size_14"
             tools:layout_editor_absoluteX="5dp"
             tools:layout_editor_absoluteY="312dp" />
 
         <TextView
             android:id="@+id/textView17"
-            style="@style/tv_regular"
+            style="@style/regularStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:gravity="center_vertical"
             android:text="View available payment modes"
             android:textColor="@color/blue_text_color"
-            android:textSize="@dimen/margin_10"
+            android:textSize="@dimen/text_size_10"
             tools:layout_editor_absoluteX="5dp"
             tools:layout_editor_absoluteY="312dp" />
 
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
deleted file mode 100644
index e3d10cb..0000000
--- a/app/src/main/res/layout/fragment_bajaj_f_d_step_one.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <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"
-            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/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/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" />
-
-        <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="?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" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:layout_marginTop="@dimen/_10sdp"
-            android:orientation="horizontal">
-
-            <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>
-
-    <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/following_option"/>
-
-    <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
-            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/maturity_instructions" />
-
-        <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"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="@dimen/margin_20"
-        android:background="@color/bg_color_info"
-        android:gravity="center">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            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_blue"
-                android:textSize="@dimen/margin_16"
-                android:layout_marginLeft="@dimen/margin_2"
-                android:text="7.5 %"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            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="Regular Interest Payment:"/>
-
-            <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="Quarterly"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            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="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"/>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/next"
-        android:background="@color/red_title"
-        android:textColor="@color/white"
-        android:layout_marginTop="@dimen/margin_20"
-        android:paddingLeft="@dimen/margin_20"
-        android:paddingRight="@dimen/margin_20"
-        android:paddingTop="@dimen/margin_10"
-        android:paddingBottom="@dimen/margin_10"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_step_four.xml b/app/src/main/res/layout/fragment_bajajfd_step_four.xml
similarity index 97%
rename from app/src/main/res/layout/fragment_step_four.xml
rename to app/src/main/res/layout/fragment_bajajfd_step_four.xml
index 9591533..f945715 100644
--- a/app/src/main/res/layout/fragment_step_four.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_four.xml
@@ -57,7 +57,7 @@
 
                 <TextView
                     android:id="@+id/tv_fd_rating"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
@@ -98,7 +98,7 @@
 
                 <TextView
                     android:id="@+id/textView5"
-                    style="@style/tv_semi_bold"
+                    style="@style/semiBoldStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
@@ -112,7 +112,7 @@
 
                 <TextView
                     android:id="@+id/textView9"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
@@ -126,7 +126,7 @@
 
                 <TextView
                     android:id="@+id/textView13"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
@@ -153,7 +153,7 @@
 
     <TextView
         android:id="@+id/tvDownloadInvoice"
-        style="@style/tv_semi_bold"
+        style="@style/semiBoldStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Download Invoice"
diff --git a/app/src/main/res/layout/fragment_step_start.xml b/app/src/main/res/layout/fragment_bajajfd_step_one.xml
similarity index 93%
rename from app/src/main/res/layout/fragment_step_start.xml
rename to app/src/main/res/layout/fragment_bajajfd_step_one.xml
index 12e64c8..ce8a989 100644
--- a/app/src/main/res/layout/fragment_step_start.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_one.xml
@@ -52,7 +52,7 @@
                             android:layout_width="@dimen/margin_150"
                             android:layout_height="18dp"
                             android:src="@drawable/bajaj_logo"
-                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintBottom_toBottomOf="@+id/tv_fd_rating"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
                             app:layout_constraintStart_toStartOf="parent"
@@ -62,12 +62,12 @@
 
                         <TextView
                             android:id="@+id/tv_fd_rating"
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             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_constraintBottom_toBottomOf="@+id/tilDepositAmount"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
                             app:layout_constraintStart_toStartOf="parent"
@@ -97,10 +97,10 @@
 
                         <TextView
                             android:id="@+id/tvDepositLabel"
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/margin_18"
+                            android:layout_marginTop="@dimen/_2sdp"
                             android:text="@string/select_interest_payout"
                             android:textColor="@color/text_default"
                             android:textSize="@dimen/text_size_12"
@@ -126,10 +126,10 @@
 
                         <TextView
                             android:id="@+id/tvInvestmentTenure"
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/_7sdp"
+                            android:layout_marginTop="@dimen/_2sdp"
                             android:text="@string/select_interest_tenure"
                             android:textColor="@color/text_default"
                             android:textSize="@dimen/text_size_12"
@@ -141,14 +141,14 @@
 
                         <TextView
                             android:id="@+id/tvInterestTenure"
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="match_parent"
-                            android:layout_height="@dimen/margin_50"
+                            android:layout_height="@dimen/margin_45"
                             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:paddingEnd="@dimen/margin_15"
                             android:text=""
                             android:textColor="@color/text_default"
                             android:textSize="@dimen/text_size_16"
@@ -161,7 +161,7 @@
 
                         <TextView
                             android:id="@+id/tvSwitchLabel"
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/margin_15"
@@ -197,7 +197,7 @@
 
                         <TextView
                             android:id="@+id/tvMaturityInstruction"
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:background="@color/grey_bg"
@@ -214,7 +214,7 @@
 
                         <TextView
                             android:id="@+id/tvAutomatically"
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:drawablePadding="@dimen/margin_10"
@@ -231,7 +231,7 @@
 
                         <TextView
                             android:id="@+id/tvAdditional"
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:drawablePadding="@dimen/margin_10"
@@ -248,7 +248,7 @@
 
                         <TextView
                             android:id="@+id/tvInterestAmount"
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:drawablePadding="@dimen/margin_10"
@@ -265,7 +265,7 @@
 
                         <TextView
                             android:id="@+id/tvTaxDeducted"
-                            style="@style/tv_semi_bold"
+                            style="@style/semiBoldStyle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/margin_10"
@@ -281,7 +281,7 @@
 
                         <TextView
                             android:id="@+id/tvUploadFormLabel"
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:drawablePadding="@dimen/margin_10"
@@ -299,7 +299,7 @@ Company for the same"
 
                         <TextView
                             android:id="@+id/tvDeductTaxableLabel"
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:drawablePadding="@dimen/margin_10"
@@ -317,7 +317,7 @@ Company for the same"
 
                         <TextView
                             android:id="@+id/tvSubmitLabel"
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingLeft="@dimen/margin_10"
@@ -371,22 +371,22 @@ Company for the same"
                         android:orientation="horizontal">
 
                         <TextView
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:drawablePadding="@dimen/margin_10"
                             android:text="Non- Cumulative ROI:"
                             android:textColor="@color/text_color_dark"
-                            android:textSize="@dimen/margin_16" />
+                            android:textSize="@dimen/text_size_14" />
 
                         <TextView
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             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:textSize="@dimen/text_size_14" />
 
                     </LinearLayout>
 
@@ -397,22 +397,22 @@ Company for the same"
                         android:orientation="horizontal">
 
                         <TextView
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:drawablePadding="@dimen/margin_10"
                             android:text="Regular Interest Payment:"
                             android:textColor="@color/text_color_dark"
-                            android:textSize="@dimen/margin_16" />
+                            android:textSize="@dimen/text_size_14" />
 
                         <TextView
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             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:textSize="@dimen/text_size_14" />
 
                     </LinearLayout>
 
@@ -423,22 +423,22 @@ Company for the same"
                         android:orientation="horizontal">
 
                         <TextView
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:drawablePadding="@dimen/margin_10"
                             android:text="Maturity Amount:"
                             android:textColor="@color/text_color_dark"
-                            android:textSize="@dimen/margin_16" />
+                            android:textSize="@dimen/text_size_14" />
 
                         <TextView
-                            style="@style/tv_regular"
+                            style="@style/regularStyle"
                             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:textSize="@dimen/text_size_14" />
 
                     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_step_three.xml b/app/src/main/res/layout/fragment_bajajfd_step_three.xml
similarity index 95%
rename from app/src/main/res/layout/fragment_step_three.xml
rename to app/src/main/res/layout/fragment_bajajfd_step_three.xml
index c61a9b3..45f4ec9 100644
--- a/app/src/main/res/layout/fragment_step_three.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_three.xml
@@ -40,7 +40,7 @@
 
                 <!--                <TextView-->
                 <!--                    android:id="@+id/tvFDSchemeName"-->
-                <!--                    style="@style/tv_semi_bold"-->
+                <!--                    style="@style/semiBoldStyle"-->
                 <!--                    android:layout_width="match_parent"-->
                 <!--                    android:layout_height="wrap_content"-->
                 <!--                    android:layout_marginTop="10dp"-->
@@ -65,7 +65,7 @@
 
                 <TextView
                     android:id="@+id/tvFDRating"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
@@ -79,7 +79,7 @@
 
                 <TextView
                     android:id="@+id/tvMakePayment"
-                    style="@style/tv_semi_bold"
+                    style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="15dp"
@@ -94,7 +94,7 @@
 
                 <TextView
                     android:id="@+id/lblMakePayment"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
@@ -109,7 +109,7 @@
 
                 <TextView
                     android:id="@+id/tvInvestedAmount"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/_5sdp"
@@ -127,7 +127,7 @@
 
                 <TextView
                     android:id="@+id/lblTenure"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
@@ -142,7 +142,7 @@
 
                 <TextView
                     android:id="@+id/tvTenure"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="2 Years"
@@ -161,7 +161,7 @@
 
                 <TextView
                     android:id="@+id/lblInterestPayout"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
@@ -176,7 +176,7 @@
 
                 <TextView
                     android:id="@+id/tvInterestPayout"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
@@ -193,7 +193,7 @@
 
                 <TextView
                     android:id="@+id/lblRateOfInterest"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
@@ -208,7 +208,7 @@
 
                 <TextView
                     android:id="@+id/tvRateOfInterest"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
@@ -226,7 +226,7 @@
 
                 <TextView
                     android:id="@+id/tvMakePayment2"
-                    style="@style/tv_semi_bold"
+                    style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="196dp"
@@ -241,7 +241,7 @@
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/switch2"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -253,7 +253,7 @@
                     app:layout_constraintVertical_bias="0.018" />
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:id="@+id/switch3"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -269,7 +269,7 @@
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/switch4"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -285,7 +285,7 @@
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/switch5"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -299,7 +299,7 @@
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/switch6"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -313,7 +313,7 @@
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/switch7"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -388,7 +388,7 @@
 
     <TextView
         android:id="@+id/tv_terms_condition"
-        style="@style/tv_regular"
+        style="@style/regularStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/fragment_step_two.xml b/app/src/main/res/layout/fragment_bajajfd_step_two.xml
similarity index 97%
rename from app/src/main/res/layout/fragment_step_two.xml
rename to app/src/main/res/layout/fragment_bajajfd_step_two.xml
index 71eaaa5..97ff9ea 100644
--- a/app/src/main/res/layout/fragment_step_two.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_two.xml
@@ -42,7 +42,7 @@
 
                 <!--            <TextView-->
                 <!--                android:id="@+id/tvFDSchemeName"-->
-                <!--                style="@style/tv_semi_bold"-->
+                <!--                style="@style/semiBoldStyle"-->
                 <!--                android:layout_width="match_parent"-->
                 <!--                android:layout_height="wrap_content"-->
                 <!--                android:paddingStart="10dp"-->
@@ -68,7 +68,7 @@
 
                 <TextView
                     android:id="@+id/tvFDRating"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="Rating: FAAA by CRISIL"
@@ -81,7 +81,7 @@
 
                 <TextView
                     android:id="@+id/tvUploadKYCDocument"
-                    style="@style/tv_semi_bold"
+                    style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="7dp"
@@ -98,7 +98,7 @@
 
                 <TextView
                     android:id="@+id/tvAddressProofType"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="20dp"
@@ -128,7 +128,7 @@
 
                 <TextView
                     android:id="@+id/tvAadhaarFront"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/aadhaar_front"
@@ -161,7 +161,7 @@
 
                 <TextView
                     android:id="@+id/tvAadhaarBack"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -193,7 +193,7 @@
 
                 <TextView
                     android:id="@+id/tvPAN"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -228,7 +228,7 @@
 
                 <TextView
                     android:id="@+id/tvPhotoUpload"
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/fragment_step_one.xml b/app/src/main/res/layout/fragment_step_one.xml
index cb6aef8..c25baf5 100644
--- a/app/src/main/res/layout/fragment_step_one.xml
+++ b/app/src/main/res/layout/fragment_step_one.xml
@@ -56,7 +56,7 @@
 
                     <!--                    <TextView-->
                     <!--                        android:id="@+id/tvFDSchemeName"-->
-                    <!--                        style="@style/tv_semi_bold"-->
+                    <!--                        style="@style/semiBoldStyle"-->
                     <!--                        android:layout_width="wrap_content"-->
                     <!--                        android:layout_height="wrap_content"-->
                     <!--                        android:layout_marginTop="10dp"-->
@@ -64,7 +64,7 @@
 
                     <TextView
                         android:id="@+id/tvFDRating"
-                        style="@style/tv_regular"
+                        style="@style/regularStyle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="1dp"
@@ -74,7 +74,7 @@
 
                     <TextView
                         android:id="@+id/tvNote"
-                        style="@style/tv_regular"
+                        style="@style/regularStyle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/margin_20"
@@ -87,7 +87,7 @@
 
                 <TextView
                     android:id="@+id/tvPersonalDetails"
-                    style="@style/tv_semi_bold"
+                    style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="10dp"
@@ -434,7 +434,7 @@
 
                     <TextView
                         android:id="@+id/tvNomineeDetails"
-                        style="@style/tv_semi_bold"
+                        style="@style/semiBoldStyle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:padding="@dimen/margin_3"
@@ -616,7 +616,7 @@
 
                 <TextView
                     android:id="@+id/tvBankDetails"
-                    style="@style/tv_semi_bold"
+                    style="@style/semiBoldStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="22dp"
@@ -636,7 +636,7 @@
 
                     <TextView
                         android:id="@+id/tvAccountType"
-                        style="@style/tv_regular"
+                        style="@style/regularStyle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="12dp"
@@ -735,7 +735,7 @@
 
                     <TextView
                         android:id="@+id/tvPaymentMode"
-                        style="@style/tv_semi_bold"
+                        style="@style/semiBoldStyle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -746,7 +746,7 @@
                         tools:layout_editor_absoluteX="5dp" />
 
                     <TextView
-                        style="@style/tv_regular"
+                        style="@style/regularStyle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -779,7 +779,7 @@
                 </RadioGroup>
 
                 <TextView
-                    style="@style/tv_regular"
+                    style="@style/regularStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
diff --git a/app/src/main/res/layout/fragmnet_step_fail.xml b/app/src/main/res/layout/fragmnet_step_fail.xml
index c854413..e6cd370 100644
--- a/app/src/main/res/layout/fragmnet_step_fail.xml
+++ b/app/src/main/res/layout/fragmnet_step_fail.xml
@@ -46,7 +46,7 @@
 
             <TextView
                 android:id="@+id/tv_fd_rating2"
-                style="@style/tv_regular"
+                style="@style/regularStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
@@ -87,7 +87,7 @@
 
             <TextView
                 android:id="@+id/textViewFail1"
-                style="@style/tv_semi_bold"
+                style="@style/semiBoldStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
@@ -101,7 +101,7 @@
 
             <TextView
                 android:id="@+id/tvFailMsg"
-                style="@style/tv_regular"
+                style="@style/regularStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
@@ -115,7 +115,7 @@
 
             <TextView
                 android:id="@+id/tvSorryMsg"
-                style="@style/tv_regular"
+                style="@style/regularStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
diff --git a/app/src/main/res/layout/header_progress_layout.xml b/app/src/main/res/layout/header_progress_layout.xml
deleted file mode 100644
index 93cb230..0000000
--- a/app/src/main/res/layout/header_progress_layout.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
-        android:background="#FB0000"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/svg_back"
-            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"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/iv_step_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/svg_step_process"/>
-
-        <!--        <TextView-->
-        <!--            style="@style/tv_regular"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:text="@string/step_1"-->
-        <!--            android:layout_marginStart="@dimen/margin_10"/>-->
-
-        <View
-            android:layout_width="30dp"
-            android:layout_height="1dp"
-            android:background="@color/color_0C9A21"/>
-
-        <ImageView
-            android:id="@+id/iv_step_2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/svg_step_process"/>
-
-        <!--        <TextView-->
-        <!--            style="@style/tv_regular"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:text="@string/step_2"-->
-        <!--            android:layout_marginStart="@dimen/margin_10"/>-->
-
-        <View
-            android:id="@+id/iv_step_3"
-            android:layout_width="30dp"
-            android:layout_height="1dp"
-            android:layout_marginLeft="@dimen/margin_5"
-            android:layout_marginRight="@dimen/margin_5"
-            android:background="@color/color_0C9A21"/>
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/svg_step_process"/>
-
-        <!--        <TextView-->
-        <!--            style="@style/tv_regular"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:text="@string/step_3"-->
-        <!--            android:layout_marginStart="@dimen/margin_10"/>-->
-
-        <View
-            android:layout_width="30dp"
-            android:layout_height="1dp"
-            android:layout_marginLeft="@dimen/margin_5"
-            android:layout_marginRight="@dimen/margin_5"
-            android:background="@color/color_0C9A21"/>
-
-        <ImageView
-            android:id="@+id/iv_step_4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/svg_step_process"/>
-
-        <!--        <TextView-->
-        <!--            style="@style/tv_regular"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:text="@string/step_4"-->
-        <!--            android:layout_marginStart="@dimen/margin_10"/>-->
-
-    </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
deleted file mode 100644
index d44d8fe..0000000
--- a/app/src/main/res/layout/test_layout.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?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: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"
-    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:fillViewport="true"
-        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: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:padding="@dimen/_2sdp"
-                    android:orientation="vertical">
-
-                    <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:text="Ratings: CRISIL AAA/Stable &amp; ICRA AAA/Stable"
-                        android:textColor="@color/light_text" />
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        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:hint="Select Investment Amount">
-
-                            <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>
-
-                    </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" />
-
-                    <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
-                        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" />
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:layout_marginTop="@dimen/_10sdp"
-                        android:orientation="horizontal">
-
-                        <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:textColor="@color/black"
-                            android:layout_marginLeft="@dimen/_2sdp"
-                            android:text="@string/upto_0.25_next" />
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <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"/>
-
-                <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
-                        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
-                        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"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:padding="@dimen/margin_20"
-                    android:background="@color/bg_color_info"
-                    android:gravity="center">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        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_blue"
-                            android:textSize="@dimen/margin_16"
-                            android:layout_marginLeft="@dimen/margin_2"
-                            android:text="7.5 %"/>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        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="Regular Interest Payment:"/>
-
-                        <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="Quarterly"/>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        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="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"/>
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-            </LinearLayout>
-        </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: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>
\ 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 e42ad18..1a96e60 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -11,19 +11,19 @@
         <item name="android:windowDisablePreview">true</item>
     </style>
 
-    <style name="tv_regular">
+    <style name="regularStyle">
         <item name="android:fontFamily">@font/robotoregular</item>
         <item name="android:textSize">@dimen/margin_12</item>
         <item name="android:textColor">@color/step_text_color</item>
     </style>
 
-    <style name="tv_semi_bold">
+    <style name="semiBoldStyle">
         <item name="android:fontFamily">@font/robotobold</item>
         <item name="android:textSize">@dimen/margin_14</item>
         <item name="android:textColor">@color/red_title</item>
     </style>
 
-    <style name="tv_bold">
+    <style name="BoldStyle">
         <item name="android:fontFamily">@font/robotobold</item>
         <item name="android:textSize">@dimen/margin_16</item>
         <item name="android:textColor">@color/text_default</item>
@@ -76,16 +76,16 @@
 
     <style name="ShapeAppearanceOverlay_card_custom_corners" parent="">
         <item name="cornerFamily">rounded</item>
-        <item name="cornerSizeTopRight">20dp</item>
-        <item name="cornerSizeTopLeft">20dp</item>
-        <item name="cornerSizeBottomRight">20dp</item>
-        <item name="cornerSizeBottomLeft">20dp</item>
+        <item name="cornerSizeTopRight">10dp</item>
+        <item name="cornerSizeTopLeft">10dp</item>
+        <item name="cornerSizeBottomRight">10dp</item>
+        <item name="cornerSizeBottomLeft">10dp</item>
     </style>
 
     <style name="ShapeAppearanceOverlay_card_top_custom_corners" parent="">
         <item name="cornerFamily">rounded</item>
-        <item name="cornerSizeTopRight">20dp</item>
-        <item name="cornerSizeTopLeft">20dp</item>
+        <item name="cornerSizeTopRight">10dp</item>
+        <item name="cornerSizeTopLeft">10dp</item>
         <item name="cornerSizeBottomRight">0dp</item>
         <item name="cornerSizeBottomLeft">0dp</item>
         <item name="backgroundColor">@color/color_EFEFEF</item>
@@ -95,8 +95,8 @@
         <item name="cornerFamily">rounded</item>
         <item name="cornerSizeTopRight">0dp</item>
         <item name="cornerSizeTopLeft">0dp</item>
-        <item name="cornerSizeBottomRight">20dp</item>
-        <item name="cornerSizeBottomLeft">20dp</item>
+        <item name="cornerSizeBottomRight">10dp</item>
+        <item name="cornerSizeBottomLeft">10dp</item>
     </style>
 
 </resources>
\ No newline at end of file