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 931db47..b54ae9c 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
@@ -128,10 +128,10 @@ class BajajFdMainActivity : AppCompatActivity(),BajajFDInterface {
         drawable2: Drawable?,
         drawable3: Drawable?
     ) {
-        binding.step1.background = drawable
-        binding.step2.background = drawable1
-        binding.step3.background = drawable2
-        binding.step4.background = drawable3
+        binding.stepOne.background = drawable
+        binding.stepTwo.background = drawable1
+        binding.stepThree.background = drawable2
+        binding.stepFour.background = drawable3
     }
 
     // step 1 response
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
index a0320d0..bf94fc1 100644
--- a/app/src/main/res/drawable/ic_arrow_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_down.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#181818"
+<vector android:height="28dp" android:tint="#181818"
     android:viewportHeight="24" android:viewportWidth="24"
     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"/>
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_four.xml b/app/src/main/res/layout/fragment_bajajfd_step_four.xml
index 21a4e85..f982d54 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_four.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_four.xml
@@ -104,7 +104,7 @@
                     android:layout_marginTop="12dp"
                     android:text="Congratulations"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/margin_16"
+                    android:textSize="@dimen/text_size_17"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.437"
                     app:layout_constraintStart_toStartOf="parent"
@@ -118,7 +118,7 @@
                     android:layout_marginTop="16dp"
                     android:text="Your transaction is successful."
                     android:textColor="@color/black"
-                    android:textSize="@dimen/margin_16"
+                    android:textSize="@dimen/text_size_16"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.419"
                     app:layout_constraintStart_toStartOf="parent"
@@ -133,7 +133,7 @@
                     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"
+                    android:textSize="@dimen/text_size_14"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.393"
@@ -158,7 +158,7 @@
         android:layout_height="wrap_content"
         android:text="Download Invoice"
         android:textColor="@color/blue"
-        android:textSize="@dimen/margin_16"
+        android:textSize="@dimen/text_size_16"
         app:layout_constraintBottom_toBottomOf="@+id/btnNext"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.152"
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_one.xml b/app/src/main/res/layout/fragment_bajajfd_step_one.xml
index 871f660..720e0f9 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_one.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_one.xml
@@ -16,9 +16,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginLeft="@dimen/margin_5"
-        android:layout_marginRight="@dimen/margin_5"
-        android:layout_marginTop="@dimen/margin_10"
+        android:layout_marginLeft="@dimen/_5sdp"
+        android:layout_marginRight="@dimen/_5sdp"
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -52,6 +51,7 @@
                             android:layout_width="@dimen/margin_150"
                             android:layout_height="18dp"
                             android:src="@drawable/bajaj_logo"
+                            android:layout_marginTop="@dimen/_2sdp"
                             app:layout_constraintBottom_toBottomOf="@+id/tvFdRating"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
@@ -75,6 +75,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/tilDepositAmount"
+                            android:layout_marginTop="@dimen/_2sdp"
                             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -86,7 +87,7 @@
 
                             <com.google.android.material.textfield.TextInputEditText
                                 android:layout_width="match_parent"
-                                android:layout_height="@dimen/margin_50"
+                                android:layout_height="@dimen/margin_45"
                                 android:drawableStart="@drawable/svg_rs"
                                 android:inputType="number"
                                 android:maxLength="12" />
@@ -110,7 +111,7 @@
                         <Spinner
                             android:id="@+id/spInterestPayout"
                             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:paddingStart="@dimen/margin_10"
                             android:paddingEnd="0dp"
@@ -174,7 +175,7 @@
                             android:text="@string/upto_0.25_next"
                             android:textColor="@color/black"
                             android:layout_marginStart="@dimen/margin_3"
-                            android:textSize="@dimen/margin_12"
+                            android:textSize="@dimen/text_size_12"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0.0"
@@ -365,6 +366,7 @@ Company for the same"
                             android:textSize="@dimen/text_size_14" />
 
                         <TextView
+                            android:id="@+id/tvROI"
                             style="@style/regularStyle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -391,6 +393,7 @@ Company for the same"
                             android:textSize="@dimen/text_size_14" />
 
                         <TextView
+                            android:id="@+id/tvFrequency"
                             style="@style/regularStyle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -417,6 +420,7 @@ Company for the same"
                             android:textSize="@dimen/text_size_14" />
 
                         <TextView
+                            android:id="@+id/tvMaturityAmount"
                             style="@style/regularStyle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_two.xml b/app/src/main/res/layout/fragment_bajajfd_step_two.xml
index 661085d..1f60a42 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_two.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_two.xml
@@ -101,7 +101,7 @@
                 <Spinner
                     android:id="@+id/spAddressType"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/margin_50"
+                    android:layout_height="@dimen/margin_45"
                     android:paddingStart="10dp"
                     android:paddingEnd="10dp"
                     android:layout_marginTop="5dp"
diff --git a/app/src/main/res/layout/fragment_step_one.xml b/app/src/main/res/layout/fragment_step_one.xml
index fe9a3bd..301bf67 100644
--- a/app/src/main/res/layout/fragment_step_one.xml
+++ b/app/src/main/res/layout/fragment_step_one.xml
@@ -73,7 +73,7 @@
                         android:layout_marginBottom="1dp"
                         android:text="All fields are mandatory other then optional"
                         android:textColor="@color/light_text"
-                        android:textSize="@dimen/margin_14" />
+                        android:textSize="@dimen/text_size_14" />
 
                 </LinearLayout>
 
@@ -89,7 +89,6 @@
                     android:text="Personal Details"
                     android:textColor="@color/black"
                     app:layout_constraintTop_toBottomOf="@+id/tvFdRating"
-                    tools:layout_editor_absoluteX="5dp"
                     app:drawableEndCompat="@drawable/svg_down_arrow" />
 
                 <LinearLayout
@@ -533,7 +532,7 @@
                         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" />
+                        android:textSize="@dimen/text_size_10" />
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/TLGuardianName"
@@ -613,10 +612,10 @@
                     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="Bank Details"
-                    android:textColor="@color/black" />
+                    android:textColor="@color/black"
+                    app:drawableRightCompat="@drawable/svg_down_arrow" />
 
                 <LinearLayout
                     android:id="@+id/llBankDetails"
@@ -651,7 +650,7 @@
                         <RadioButton
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="50dp"
+                            android:layout_marginStart="50dp"
                             android:text="Current account" />
 
                     </RadioGroup>
diff --git a/app/src/main/res/layout/fragmnet_step_fail.xml b/app/src/main/res/layout/fragmnet_step_fail.xml
index bcd14f2..0c4995c 100644
--- a/app/src/main/res/layout/fragmnet_step_fail.xml
+++ b/app/src/main/res/layout/fragmnet_step_fail.xml
@@ -93,7 +93,7 @@
                 android:layout_marginTop="12dp"
                 android:text="Sorry!"
                 android:textColor="@color/black"
-                android:textSize="@dimen/margin_16"
+                android:textSize="@dimen/text_size_16"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.437"
                 app:layout_constraintStart_toStartOf="parent"
@@ -107,7 +107,7 @@
                 android:layout_marginTop="16dp"
                 android:text="Your transaction is unsuccessful."
                 android:textColor="@color/black"
-                android:textSize="@dimen/margin_16"
+                android:textSize="@dimen/text_size_16"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.419"
                 app:layout_constraintStart_toStartOf="parent"
@@ -122,7 +122,7 @@
                 android:gravity="center"
                 android:text="Sorry for the inconvenience please try again later"
                 android:textColor="@color/black"
-                android:textSize="@dimen/margin_14"
+                android:textSize="@dimen/text_size_14"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.393"