diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt
index 64d450d..c842662 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt
@@ -64,7 +64,7 @@ class StepOneBajajFDFragment : Fragment() {
         // Frequency
         val adapter = ArrayAdapter(
             activity as BajajFdMainActivity,
-            android.R.layout.simple_spinner_item,
+            R.layout.spinner_dropdown,
             resources.getStringArray(
                 R.array.interestPayoutList
             )
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 f945ab8..c6cdaa0 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_one.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_one.xml
@@ -49,7 +49,7 @@
                             android:id="@+id/logo"
                             android:layout_width="@dimen/margin_150"
                             android:layout_height="18dp"
-                            android:layout_marginStart="@dimen/margin_5"
+                            android:layout_marginStart="@dimen/margin_10"
                             android:layout_marginTop="@dimen/_2sdp"
                             android:contentDescription="@string/content_description"
                             android:src="@drawable/bajaj_logo"
@@ -65,7 +65,7 @@
                             style="@style/regularStyle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/margin_5"
+                            android:layout_marginStart="@dimen/margin_10"
                             android:text="@string/schemeRating"
                             android:textColor="@color/light_text"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -79,7 +79,7 @@
                             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/margin_53"
-                            android:layout_margin="5dp"
+                            android:layout_margin="@dimen/margin_10"
                             android:hint="@string/investmentAmount"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
@@ -102,21 +102,23 @@
                             android:id="@+id/spInterestPayout"
                             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                             android:layout_width="match_parent"
-                            android:layout_height="@dimen/margin_53"
-                            android:layout_margin="@dimen/margin_5"
-                            android:hint="@string/select_interest_payout"
+                            android:layout_height="@dimen/margin_48"
+                            android:layout_margin="@dimen/margin_10"
+                            app:hintEnabled="false"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tlDepositAmount">
 
-                            <AutoCompleteTextView
+                            <com.google.android.material.textfield.MaterialAutoCompleteTextView
                                 android:id="@+id/tvInterestPayout"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:background="@drawable/rounded_corner_with_line"
+                                android:hint="@string/select_interest_payout"
                                 android:inputType="none"
                                 android:labelFor="@+id/spInterestPayout"
                                 android:textColorHint="#757575"
+
                                 android:textSize="@dimen/text_size_14"
                                 tool:ignore="DuplicateSpeakableTextCheck,LabelFor,TextContrastCheck" />
                         </com.google.android.material.textfield.TextInputLayout>
@@ -125,9 +127,9 @@
                             android:id="@+id/spInterestTenure"
                             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                             android:layout_width="match_parent"
-                            android:layout_height="@dimen/margin_53"
-                            android:layout_margin="@dimen/margin_5"
-                            android:hint="@string/select_interest_tenure"
+                            android:layout_height="@dimen/margin_48"
+                            android:layout_margin="@dimen/margin_10"
+                            app:hintEnabled="false"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/spInterestPayout">
@@ -137,6 +139,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:background="@drawable/rounded_corner_with_line"
+                                android:hint="@string/select_interest_tenure"
                                 android:inputType="none"
                                 android:labelFor="@+id/spInterestTenure"
                                 android:textColorHint="@color/light_text"
@@ -149,7 +152,7 @@
                             style="@style/regularStyle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/margin_5"
+                            android:layout_marginStart="@dimen/margin_10"
                             android:layout_marginTop="@dimen/margin_15"
                             android:text="@string/upto_0.25"
                             android:textColor="@color/black"
@@ -164,7 +167,7 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/margin_5"
-                            android:layout_marginEnd="@dimen/margin_5"
+                            android:layout_marginEnd="@dimen/margin_10"
                             android:text="@string/upto_0.25_next"
                             android:textColor="@color/black"
                             android:textSize="@dimen/text_size_12"
@@ -183,10 +186,10 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:background="@color/grey_bg"
+                        android:paddingStart="@dimen/margin_20"
                         android:paddingTop="@dimen/margin_3"
-                        android:paddingBottom="@dimen/margin_3"
-                        android:paddingStart="@dimen/margin_15"
                         android:paddingEnd="@dimen/margin_1"
+                        android:paddingBottom="@dimen/margin_3"
                         android:text="@string/maturity_instructions"
                         android:textColor="@color/text_color_dark"
                         android:textSize="@dimen/text_size_12" />
@@ -195,7 +198,8 @@
                         android:id="@+id/constraintLayoutThree"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:padding="@dimen/margin_10">
+                        android:paddingStart="@dimen/margin_15"
+                        android:paddingEnd="@dimen/margin_15">
 
                         <RadioGroup
                             android:id="@+id/radioGroup"
diff --git a/app/src/main/res/layout/spinner_dropdown.xml b/app/src/main/res/layout/spinner_dropdown.xml
new file mode 100644
index 0000000..1fdd884
--- /dev/null
+++ b/app/src/main/res/layout/spinner_dropdown.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/margin_10"
+    android:textColor="@color/black"
+    android:textSize="@dimen/text_size_14"
+    style="@style/regularStyle">
+
+</TextView>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index fcead0e..dc0501e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -53,6 +53,8 @@
     <dimen name="margin_40">40dp</dimen>
     <dimen name="margin_44">44dp</dimen>
     <dimen name="margin_45">45dp</dimen>
+    <dimen name="margin_46">46dp</dimen>
+    <dimen name="margin_47">47dp</dimen>
     <dimen name="margin_48">48dp</dimen>
     <dimen name="margin_50">50dp</dimen>
     <dimen name="margin_53">53dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 01a7f72..b1dce77 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -65,7 +65,6 @@
     <string name="maturityAmount">Maturity Amount:</string>
 
     <string-array name="interestPayoutList">
-        <item>Interest Payout</item>
         <item>On Maturity</item>
         <item>Monthly</item>
         <item>Quarterly</item>