diff --git a/app/src/main/java/com/nivesh/production/niveshfd/fd/db/PreferenceManager.kt b/app/src/main/java/com/nivesh/production/niveshfd/fd/db/PreferenceManager.kt
index f65057f..010bb76 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/fd/db/PreferenceManager.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/fd/db/PreferenceManager.kt
@@ -17,6 +17,8 @@ open class PreferenceManager(context: Context) : IPreferenceHelper {
         const val KEY_CLIENT_CODE = "ClientCode"
         const val KEY_GET_TOKEN = "GetToken"
         const val CLIENT_LANGUAGE = "LANGUAGE"
+
+        const val ISFIRST_TIME = "IS FIRST TIME"
     }
 
 
@@ -86,6 +88,16 @@ open class PreferenceManager(context: Context) : IPreferenceHelper {
     }
 
 
+    override fun setIsFirstTime(appName: Boolean) {
+        preferences[ISFIRST_TIME] = appName
+    }
+
+    override fun getFirstTime(): Boolean {
+        return preferences[ISFIRST_TIME] ?: false
+    }
+
+
+
     override fun clearPrefs() {
         preferences.edit().clear().apply()
     }
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/fd/interfaces/IPreferenceHelper.kt b/app/src/main/java/com/nivesh/production/niveshfd/fd/interfaces/IPreferenceHelper.kt
index 5a98806..6b4ea1e 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/fd/interfaces/IPreferenceHelper.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/fd/interfaces/IPreferenceHelper.kt
@@ -26,5 +26,8 @@ interface IPreferenceHelper {
     fun setLanguage(appName: String)
     fun getLanguage(): String
 
+    fun setIsFirstTime(appName: Boolean)
+    fun getFirstTime(): Boolean
+
     fun clearPrefs()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/RegisterActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/RegisterActivity.kt
index dcc8ff6..c4766a2 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/RegisterActivity.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/RegisterActivity.kt
@@ -7,6 +7,7 @@ import android.util.DisplayMetrics
 import android.view.Display
 import androidx.core.hardware.display.DisplayManagerCompat
 import com.nivesh.production.niveshfd.databinding.ActivityRegisterBinding
+import com.nivesh.production.niveshfd.fd.db.PreferenceManager
 import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity
 import com.nivesh.production.niveshfd.fd.util.Common.Companion.showWebViewDialogBottom
 
@@ -34,12 +35,26 @@ class RegisterActivity : BaseActivity() {
             startActivity(intent)
         }
         binding.btnDistributor.setOnClickListener {
-            intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java)
-            startActivity(intent)
+            if (!PreferenceManager(this@RegisterActivity).getFirstTime()){
+                intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java)
+                intent.putExtra("type", 4)
+                startActivity(intent)
+            }else{
+                intent = Intent(this@RegisterActivity, SignUpActivity::class.java)
+                intent.putExtra("type", 4)
+                startActivity(intent)
+            }
         }
         binding.btnReferrer.setOnClickListener {
-            intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java)
-            startActivity(intent)
+            if (!PreferenceManager(this@RegisterActivity).getFirstTime()){
+                intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java)
+                intent.putExtra("type", 3)
+                startActivity(intent)
+            }else{
+                intent = Intent(this@RegisterActivity, SignUpActivity::class.java)
+                intent.putExtra("type", 3)
+                startActivity(intent)
+            }
         }
         binding.imgInfo.setOnClickListener {
             showWebViewDialogBottom(
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt
index 533aa1f..9ee5946 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt
@@ -12,6 +12,7 @@ import com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.SignUpFrag
 
 class SignUpActivity : BaseActivity() {
     lateinit var binding: ActivitySignupBinding
+    var type : Int? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -19,6 +20,8 @@ class SignUpActivity : BaseActivity() {
     }
 
     private fun init() {
+        type = intent.getIntExtra("type", 0);
+
         binding = ActivitySignupBinding.inflate(layoutInflater)
         binding.apply {
             setContentView(this.root)
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt
index 67812a8..12bb248 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.viewpager.widget.ViewPager
 import com.nivesh.production.niveshfd.databinding.ActivityViewpagerBinding
+import com.nivesh.production.niveshfd.fd.db.PreferenceManager
 import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity
 import com.nivesh.production.niveshfd.partnerOnBoarding.adapters1.DisableAdapter1
 import com.nivesh.production.niveshfd.partnerOnBoarding.adapters1.SectionsPagerAdapter1
@@ -19,6 +20,7 @@ class ViewPagerActivity : BaseActivity() {
     private val stepOnePagerFragment = StepOnePagerFragment()
     private val stepTwoPagerFragment = StepTwoPagerFragment()
     private val stepThreePagerFragment = StepThreePagerFragment()
+    var type : Int? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         init()
@@ -33,6 +35,10 @@ class ViewPagerActivity : BaseActivity() {
     }
 
     private fun setViewPager() {
+
+        PreferenceManager(this@ViewPagerActivity).setIsFirstTime(true)
+        type = intent.getIntExtra("type", 0);
+
         fragments = arrayOf(
             stepOnePagerFragment,
             stepTwoPagerFragment,
@@ -71,6 +77,11 @@ class ViewPagerActivity : BaseActivity() {
 
             }
         })
+
+
+        binding.tvSkip.setOnClickListener{
+            stepFourApi()
+        }
     }
 
     // step 1 response
@@ -91,6 +102,7 @@ class ViewPagerActivity : BaseActivity() {
     // step 4 response
     fun stepFourApi() {
         intent = Intent(this@ViewPagerActivity, SignUpActivity::class.java)
+        intent.putExtra("type", type)
         startActivity(intent)
     }
 
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/OTPFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/OTPFragment.kt
index 6eb7d6a..4f07a57 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/OTPFragment.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/OTPFragment.kt
@@ -2,6 +2,7 @@ package com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1
 
 import android.os.Bundle
 import android.text.Editable
+import android.text.InputFilter
 import android.text.TextWatcher
 import android.view.KeyEvent
 import android.view.LayoutInflater
@@ -31,6 +32,14 @@ class OTPFragment : BaseFragment() {
     }
 
     private fun init() {
+
+        binding.edtOTP1.filters = arrayOf<InputFilter>(InputFilter.LengthFilter(1))
+        binding.edtOTP2.filters = arrayOf<InputFilter>(InputFilter.LengthFilter(1))
+        binding.edtOTP3.filters = arrayOf<InputFilter>(InputFilter.LengthFilter(1))
+        binding.edtOTP4.filters = arrayOf<InputFilter>(InputFilter.LengthFilter(1))
+        binding.edtOTP5.filters = arrayOf<InputFilter>(InputFilter.LengthFilter(1))
+        binding.edtOTP6.filters = arrayOf<InputFilter>(InputFilter.LengthFilter(1))
+
         binding.edtOTP1.addTextChangedListener(GenericTextWatcher(binding.edtOTP1, binding.edtOTP2))
         binding.edtOTP2.addTextChangedListener(GenericTextWatcher(binding.edtOTP2, binding.edtOTP3))
         binding.edtOTP3.addTextChangedListener(GenericTextWatcher(binding.edtOTP3, binding.edtOTP4))
@@ -54,7 +63,7 @@ class OTPFragment : BaseFragment() {
 
         binding.btnSubmit.setOnClickListener {
             if (validate()) {
-                addFragment(activity as BaseActivity, R.id.signUpContainer,OTPFragment(),"", true)
+                replaceFragment(activity as BaseActivity, R.id.signUpContainer,OTPFragment(),"GET STARTED", true)
             }
         }
     }
@@ -64,37 +73,37 @@ class OTPFragment : BaseFragment() {
             Common.commonErrorMethod(
                 binding.edtOTP1,
                 binding.tlOTP1,
-                getString(R.string.invalidOTP)
+                ""
             )
         } else if (binding.edtOTP2.text.toString().isEmpty()) { // EditText
             Common.commonErrorMethod(
                 binding.edtOTP2,
                 binding.tlOTP2,
-                getString(R.string.invalidOTP)
+                ""
             )
         } else if (binding.edtOTP3.text.toString().isEmpty()) { // EditText
             Common.commonErrorMethod(
                 binding.edtOTP3,
                 binding.tlOTP3,
-                getString(R.string.invalidOTP)
+                ""
             )
         } else if (binding.edtOTP4.text.toString().isEmpty()) { // EditText
             Common.commonErrorMethod(
                 binding.edtOTP4,
                 binding.tlOTP4,
-                getString(R.string.invalidOTP)
+                ""
             )
         } else if (binding.edtOTP5.text.toString().isEmpty()) { // EditText
             Common.commonErrorMethod(
                 binding.edtOTP5,
                 binding.tlOTP5,
-                getString(R.string.invalidOTP)
+                ""
             )
         } else if (binding.edtOTP6.text.toString().isEmpty()) { // EditText
             Common.commonErrorMethod(
                 binding.edtOTP6,
                 binding.tlOTP6,
-                getString(R.string.invalidOTP)
+                ""
             )
         } else {
             return true
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt
index 79ae161..037d684 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt
@@ -2,6 +2,7 @@ package com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1
 
 import android.os.Bundle
 import android.text.Editable
+import android.text.InputFilter
 import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
@@ -29,6 +30,7 @@ class SignUpFragment : BaseFragment() {
     }
 
     private fun init() {
+        binding.edtMobileNumber.filters = arrayOf<InputFilter>(InputFilter.LengthFilter(10))
         binding.edtMobileNumber.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {}
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
@@ -39,11 +41,11 @@ class SignUpFragment : BaseFragment() {
 
         binding.btnSignUp.setOnClickListener {
             if (validate()) {
-                addFragment(
+                replaceFragment(
                     activity as BaseActivity,
                     com.nivesh.production.niveshfd.R.id.signUpContainer,
                     OTPFragment(),
-                    "",
+                    "OTP",
                     true
                 )
             }
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepThreePagerFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepThreePagerFragment.kt
index c7c69cf..447f122 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepThreePagerFragment.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepThreePagerFragment.kt
@@ -30,9 +30,9 @@ class StepThreePagerFragment : Fragment() {
             (activity as ViewPagerActivity).stepFourApi()
         }
 
-//        binding.btnNext.setOnClickListener {
-//            (activity as ViewPagerActivity).stepThreeApi()
-//        }
+        binding.btnBack.setOnClickListener {
+            (activity as ViewPagerActivity).stepTwoApi()
+        }
 
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepTwoPagerFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepTwoPagerFragment.kt
index a60752e..4691a08 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepTwoPagerFragment.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepTwoPagerFragment.kt
@@ -30,7 +30,7 @@ class StepTwoPagerFragment : Fragment() {
             (activity as ViewPagerActivity).stepThreeApi()
         }
         binding.btnBack.setOnClickListener {
-            (activity as ViewPagerActivity).stepTwoApi()
+            (activity as ViewPagerActivity).stepOneApi()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/default_pager_dot.xml b/app/src/main/res/drawable/default_pager_dot.xml
index d8635d1..713ba10 100644
--- a/app/src/main/res/drawable/default_pager_dot.xml
+++ b/app/src/main/res/drawable/default_pager_dot.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape
             android:innerRadius="0dp"
             android:shape="ring"
-            android:thickness="@dimen/margin_2"
+            android:thickness="10dp"
             android:useLevel="false">
-            <size android:width="@dimen/margin_5"
-                android:height="@dimen/margin_5"/>
-            <stroke
-                android:width="1dp"
-                android:color="@color/red"/>
-            <solid android:color="@color/white"/>
+            <stroke android:width="@dimen/margin_2" android:color="@color/red"/>
+            <solid android:color="@android:color/white"/>
         </shape>
-
-        </item>
-    </layer-list>
\ No newline at end of file
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/pager_1.png b/app/src/main/res/drawable/pager_1.png
new file mode 100644
index 0000000..8b1da12
Binary files /dev/null and b/app/src/main/res/drawable/pager_1.png differ
diff --git a/app/src/main/res/drawable/pager_2.png b/app/src/main/res/drawable/pager_2.png
new file mode 100644
index 0000000..9987985
Binary files /dev/null and b/app/src/main/res/drawable/pager_2.png differ
diff --git a/app/src/main/res/drawable/pager_3.png b/app/src/main/res/drawable/pager_3.png
new file mode 100644
index 0000000..e736d49
Binary files /dev/null and b/app/src/main/res/drawable/pager_3.png differ
diff --git a/app/src/main/res/drawable/selected_pager_dot.xml b/app/src/main/res/drawable/selected_pager_dot.xml
index 29af010..22ac7a6 100644
--- a/app/src/main/res/drawable/selected_pager_dot.xml
+++ b/app/src/main/res/drawable/selected_pager_dot.xml
@@ -4,7 +4,7 @@
         <shape
             android:innerRadius="0dp"
             android:shape="ring"
-            android:thickness="@dimen/margin_8"
+            android:thickness="@dimen/margin_10"
             android:useLevel="false">
             <solid android:color="@color/red" />
         </shape>
diff --git a/app/src/main/res/drawable/svg_indicator_bg.xml b/app/src/main/res/drawable/svg_indicator_bg.xml
new file mode 100644
index 0000000..4bd629e
--- /dev/null
+++ b/app/src/main/res/drawable/svg_indicator_bg.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="75dp"
+    android:height="19dp"
+    android:viewportWidth="75"
+    android:viewportHeight="19">
+
+    <path
+        android:fillColor="#ffffff"
+        android:fillAlpha="0.7"
+        android:pathData="M 9.5 0 L 65.5 0 Q 75 0 75 9.5 L 75 9.5 Q 75 19 65.5 19 L 9.5 19 Q 0 19 0 9.5 L 0 9.5 Q 0 0 9.5 0 Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_viewpager.xml b/app/src/main/res/layout/activity_viewpager.xml
index 0a81029..babf141 100644
--- a/app/src/main/res/layout/activity_viewpager.xml
+++ b/app/src/main/res/layout/activity_viewpager.xml
@@ -14,15 +14,28 @@
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabDots"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@color/transparent"
+        android:background="@drawable/svg_indicator_bg"
         app:tabBackground="@drawable/tab_pager_selector"
         app:tabGravity="center"
+        app:tabMinWidth="@dimen/margin_50"
+        android:clipToPadding="false"
+        android:paddingLeft="@dimen/margin_20"
+        android:paddingRight="@dimen/margin_20"
+        app:tabIndicator="@null"
+        android:layout_centerHorizontal="true"
         android:layout_marginBottom="@dimen/margin_70"
-        android:layout_alignParentBottom="true"
-        app:tabPaddingStart="@dimen/margin_25"
-        app:tabPaddingEnd="@dimen/margin_25"
-        app:tabIndicatorHeight="0dp" />
+        android:layout_alignParentBottom="true" />
+
+    <TextView
+        android:id="@+id/tvSkip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/white"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/margin_20"
+        android:layout_marginEnd="@dimen/margin_20"
+        android:text="@string/skip"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_otp.xml b/app/src/main/res/layout/fragment_otp.xml
index 362b40b..b059591 100644
--- a/app/src/main/res/layout/fragment_otp.xml
+++ b/app/src/main/res/layout/fragment_otp.xml
@@ -4,14 +4,15 @@
     xmlns:tool="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:id="@+id/containerOTP"
     android:orientation="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/margin_15"
+        android:layout_marginStart="@dimen/margin_10"
         android:layout_marginTop="@dimen/margin_150"
-        android:layout_marginEnd="@dimen/margin_15"
+        android:layout_marginEnd="@dimen/margin_10"
         android:orientation="vertical"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -43,6 +44,7 @@
             android:id="@+id/txtChangeNumber"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/margin_20"
             android:layout_marginStart="@dimen/margin_10"
             android:layout_marginTop="@dimen/margin_5"
             android:gravity="end"
@@ -62,140 +64,166 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/txtChangeNumber" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <LinearLayout
             android:id="@+id/otpLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:weightSum="6"
+            android:gravity="center"
+            android:orientation="horizontal"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/txtCode">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/tlOTP1"
+                android:layout_weight="1"
+                android:gravity="center"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_marginEnd="@dimen/margin_2"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/margin_10"
-                android:padding="@dimen/margin_1"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edtOTP1"
-                    android:layout_width="@dimen/margin_50"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:gravity="center"
                     android:inputType="number"
+                    android:textColor="@color/black"
                     android:textColorHint="@color/greyColor2"
                     android:textSize="@dimen/text_size_14"
-                    tool:ignore="TextContrastCheck" />
+                    tool:ignore="TextContrastCheck,SpeakableTextPresentCheck" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/tlOTP2"
+                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/margin_2"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:gravity="center"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/margin_1"
                 app:layout_constraintStart_toEndOf="@+id/tlOTP1"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edtOTP2"
-                    android:layout_width="@dimen/margin_50"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:gravity="center"
                     android:inputType="number"
+                    android:textColor="@color/black"
                     android:textColorHint="@color/greyColor2"
                     android:textSize="@dimen/text_size_14"
-                    tool:ignore="TextContrastCheck" />
+                    tool:ignore="TextContrastCheck,SpeakableTextPresentCheck" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/tlOTP3"
+                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/margin_2"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/margin_1"
+                android:gravity="center"
                 app:layout_constraintStart_toEndOf="@+id/tlOTP2"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edtOTP3"
-                    android:layout_width="@dimen/margin_50"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:gravity="center"
                     android:inputType="number"
+                    android:textColor="@color/black"
                     android:textColorHint="@color/greyColor2"
                     android:textSize="@dimen/text_size_14"
-                    tool:ignore="TextContrastCheck" />
+                    tool:ignore="TextContrastCheck,SpeakableTextPresentCheck" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/tlOTP4"
+                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/margin_2"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/margin_1"
+                android:gravity="center"
                 app:layout_constraintStart_toEndOf="@+id/tlOTP3"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edtOTP4"
-                    android:layout_width="@dimen/margin_50"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:gravity="center"
                     android:inputType="number"
+                    android:textColor="@color/black"
                     android:textColorHint="@color/greyColor2"
                     android:textSize="@dimen/text_size_14"
-                    tool:ignore="TextContrastCheck" />
+                    tool:ignore="TextContrastCheck,SpeakableTextPresentCheck" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/tlOTP5"
+                android:layout_weight="1"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:gravity="center"
+                android:layout_marginEnd="@dimen/margin_2"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/margin_1"
                 app:layout_constraintStart_toEndOf="@+id/tlOTP4"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edtOTP5"
-                    android:layout_width="@dimen/margin_50"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:gravity="center"
                     android:inputType="number"
+                    android:textColor="@color/black"
                     android:textSize="@dimen/text_size_14"
-                    tool:ignore="TextContrastCheck" />
+                    tool:ignore="TextContrastCheck,SpeakableTextPresentCheck" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/tlOTP6"
+                android:layout_weight="1"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:gravity="center"
+                android:layout_marginEnd="@dimen/margin_2"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/margin_1"
                 app:layout_constraintStart_toEndOf="@+id/tlOTP5"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edtOTP6"
-                    android:layout_width="@dimen/margin_50"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:gravity="center"
                     android:inputType="number"
+                    android:textColor="@color/black"
                     android:textSize="@dimen/text_size_14"
-                    tool:ignore="TextContrastCheck" />
+                    tool:ignore="TextContrastCheck,SpeakableTextPresentCheck,TouchTargetSizeCheck" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
 
         <TextView
             android:id="@+id/txtTimer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin_5"
-            android:layout_marginEnd="@dimen/margin_25"
+            android:layout_marginEnd="@dimen/margin_20"
             android:gravity="end"
             android:text="(00:30)"
             android:textColor="@color/black"
diff --git a/app/src/main/res/layout/fragment_pager_step_one.xml b/app/src/main/res/layout/fragment_pager_step_one.xml
index edfd79e..2a8c176 100644
--- a/app/src/main/res/layout/fragment_pager_step_one.xml
+++ b/app/src/main/res/layout/fragment_pager_step_one.xml
@@ -6,32 +6,26 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical"
-    android:background="@color/NiveshColorAppBg"
+    android:background="@drawable/pager_1"
     tool:context="com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.StepOnePagerFragment">
 
-    <ImageView
-        android:id="@+id/logo"
-        app:layout_constraintBottom_toTopOf="@+id/btnNext"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_width="@dimen/margin_150"
-        android:layout_height="@dimen/margin_18"
-        android:layout_marginStart="@dimen/margin_20"
-        android:layout_marginTop="@dimen/margin_5"
-        android:contentDescription="@string/contentDescription"
-        android:src="@drawable/bajaj_logo" />
-
-    <Button
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#66ffffff"/>
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnNext"
-        android:layout_width="wrap_content"
+        android:theme="@style/Theme.lightRed"
+        app:cornerRadius="@dimen/margin_15"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
         android:layout_marginTop="@dimen/margin_10"
-        android:layout_marginBottom="@dimen/margin_15"
-        android:backgroundTint="@color/colorPrimary"
+        android:layout_marginStart="@dimen/margin_50"
+        android:layout_marginEnd="@dimen/margin_50"
+        android:layout_marginBottom="@dimen/margin_10"
+        android:textAllCaps="false"
+        android:textColor="@color/white"
         android:text="@string/next"
-        android:textColor="#FFFFFF"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_pager_step_three.xml b/app/src/main/res/layout/fragment_pager_step_three.xml
index 13a9930..af73bf4 100644
--- a/app/src/main/res/layout/fragment_pager_step_three.xml
+++ b/app/src/main/res/layout/fragment_pager_step_three.xml
@@ -6,35 +6,55 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical"
-    android:background="@color/NiveshColorAppBg"
+    android:background="@drawable/pager_3"
     tool:context="com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.StepThreePagerFragment">
-
-    <ImageView
-        android:id="@+id/logo"
-        app:layout_constraintBottom_toTopOf="@+id/btnNext"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_width="@dimen/margin_150"
-        android:layout_height="@dimen/margin_18"
-        android:layout_marginStart="@dimen/margin_20"
-        android:layout_marginTop="@dimen/margin_5"
-        android:contentDescription="@string/contentDescription"
-        android:src="@drawable/bajaj_logo" />
-
-    <Button
-        android:id="@+id/btnNext"
-        android:layout_width="wrap_content"
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#66ffffff"/>
+    <LinearLayout
+        android:id="@+id/llBottom"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginTop="@dimen/margin_10"
-        android:layout_marginBottom="@dimen/margin_15"
-        android:backgroundTint="@color/colorPrimary"
-        android:text="@string/next"
-        android:textColor="#FFFFFF"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:layout_marginLeft="@dimen/margin_10"
+        android:layout_marginRight="@dimen/margin_10"
+        android:paddingBottom="@dimen/margin_10"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tool:ignore="TextContrastCheck" />
+        app:layout_constraintEnd_toStartOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnBack"
+            android:theme="@style/Theme.lightRed"
+            app:cornerRadius="@dimen/margin_15"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight=".5"
+            android:text="@string/back"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:layout_marginEnd="@dimen/margin_10"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/btnNext"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnNext"
+            android:theme="@style/Theme.lightRed"
+            app:cornerRadius="@dimen/margin_15"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginStart="@dimen/margin_10"
+            android:text="@string/next"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/btnBack" />
+
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_pager_step_two.xml b/app/src/main/res/layout/fragment_pager_step_two.xml
index bad8535..38e6082 100644
--- a/app/src/main/res/layout/fragment_pager_step_two.xml
+++ b/app/src/main/res/layout/fragment_pager_step_two.xml
@@ -6,50 +6,55 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical"
-    android:background="@color/NiveshColorAppBg"
+    android:background="@drawable/pager_2"
     tool:context="com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.StepTwoPagerFragment">
 
-    <ImageView
-        android:id="@+id/logo"
-        app:layout_constraintBottom_toTopOf="@+id/btnNext"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_width="@dimen/margin_150"
-        android:layout_height="@dimen/margin_18"
-        android:layout_marginStart="@dimen/margin_20"
-        android:layout_marginTop="@dimen/margin_5"
-        android:contentDescription="@string/contentDescription"
-        android:src="@drawable/bajaj_logo" />
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#66ffffff"/>
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnBack"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/llBottom"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginTop="@dimen/margin_15"
-        android:layout_marginBottom="@dimen/margin_15"
-        android:backgroundTint="@color/blue"
-        android:text="@string/back"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_size_14"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/btnNext"
-        app:layout_constraintStart_toStartOf="parent"/>
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:layout_marginLeft="@dimen/margin_10"
+        android:layout_marginRight="@dimen/margin_10"
+        android:paddingBottom="@dimen/margin_10"
+        app:layout_constraintBottom_toBottomOf="parent">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnNext"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginBottom="@dimen/margin_15"
-        android:layout_marginTop="@dimen/margin_10"
-        android:backgroundTint="@color/colorPrimary"
-        android:text="@string/next"
-        android:textSize="@dimen/text_size_14"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/btnBack" />
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnBack"
+            android:theme="@style/Theme.lightRed"
+            app:cornerRadius="@dimen/margin_15"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight=".5"
+            android:text="@string/back"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:layout_marginEnd="@dimen/margin_10"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/btnNext"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnNext"
+            android:theme="@style/Theme.lightRed"
+            app:cornerRadius="@dimen/margin_15"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginStart="@dimen/margin_10"
+            android:text="@string/next"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/btnBack" />
+
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_signup.xml b/app/src/main/res/layout/fragment_signup.xml
index 6359d6c..8b134b1 100644
--- a/app/src/main/res/layout/fragment_signup.xml
+++ b/app/src/main/res/layout/fragment_signup.xml
@@ -87,7 +87,7 @@
                 android:id="@+id/edtMobileNumber"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inputType="text"
+                android:inputType="number"
                 android:textColorHint="@color/greyColor2"
                 android:textSize="@dimen/text_size_14"
                 tool:ignore="TextContrastCheck" />
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 05b9fca..8cffa42 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -302,6 +302,7 @@
     <string name="mobNoText">We sent a code to your mobile number</string>
     <string name="txtChange">Change</string>
     <string name="code">Code</string>
+    <string name="skip">Skip</string>
 
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3949958..0ba9ee0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -16,7 +16,7 @@
     <color name="blue1">#006BFF</color>
 
 
-
+    <color name="button_red">#E92629</color>
 
     <color name="greyColor1">#323131</color>
     <color name="greyColor2">#757575</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6da2dc3..e9a55d8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -309,6 +309,7 @@
     <string name="mobNoText">We sent a code to your mobile number</string>
     <string name="txtChange">Change</string>
     <string name="code">Code</string>
+    <string name="skip">Skip</string>
 
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index bef7373..f4062d8 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -151,4 +151,9 @@
         <attr name="dotsClickable" />
     </declare-styleable>
 
+    <style name="Theme.lightRed" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="colorPrimary">@color/button_red</item>
+        <item name="elevation">@dimen/margin_8</item>
+        <item name="android:solidColor">@color/white</item>
+    </style>
 </resources>
\ No newline at end of file