diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt
new file mode 100644
index 0000000..167d224
--- /dev/null
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt
@@ -0,0 +1,57 @@
+package com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.nivesh.production.niveshfd.R
+
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+
+class GetStartedFragment : BaseFragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        arguments?.let {
+            param1 = it.getString(ARG_PARAM1)
+            param2 = it.getString(ARG_PARAM2)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_get_started, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+    }
+
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment GetStarted.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            GetStartedFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
+                }
+            }
+    }
+}
\ No newline at end of file
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 0286ec1..deb6507 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
@@ -11,10 +12,10 @@ import android.widget.EditText
 import androidx.fragment.app.Fragment
 import com.nivesh.production.niveshfd.R
 import com.nivesh.production.niveshfd.databinding.FragmentOtpBinding
-import com.nivesh.production.niveshfd.databinding.FragmentSignupBinding
+import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity
 import com.nivesh.production.niveshfd.fd.util.Common
 
-class OTPFragment : Fragment() {
+class OTPFragment : BaseFragment() {
     private var _binding: FragmentOtpBinding? = null
     private val binding get() = _binding!!
 
@@ -31,6 +32,14 @@ class OTPFragment : Fragment() {
     }
 
     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))
@@ -41,19 +50,72 @@ class OTPFragment : Fragment() {
         binding.edtOTP1.setOnKeyListener(GenericKeyEvent(binding.edtOTP1, null))
         binding.edtOTP2.setOnKeyListener(GenericKeyEvent(binding.edtOTP2, binding.edtOTP1))
         binding.edtOTP3.setOnKeyListener(GenericKeyEvent(binding.edtOTP3, binding.edtOTP2))
-        binding.edtOTP4.setOnKeyListener(GenericKeyEvent(binding.edtOTP4,binding.edtOTP3))
-        binding.edtOTP5.setOnKeyListener(GenericKeyEvent(binding.edtOTP5,binding.edtOTP4))
-        binding.edtOTP6.setOnKeyListener(GenericKeyEvent(binding.edtOTP6,binding.edtOTP5))
+        binding.edtOTP4.setOnKeyListener(GenericKeyEvent(binding.edtOTP4, binding.edtOTP3))
+        binding.edtOTP5.setOnKeyListener(GenericKeyEvent(binding.edtOTP5, binding.edtOTP4))
+        binding.edtOTP6.setOnKeyListener(GenericKeyEvent(binding.edtOTP6, binding.edtOTP5))
+
+        binding.txtDigit.text = getString(R.string.sixDigitOTP).plus(" ").plus("+91.00000.00000")
 
+
+        binding.txtResendOTP.setOnClickListener{
+
+        }
+
+        binding.btnSubmit.setOnClickListener {
+            if (validate()) {
+                replaceFragment(activity as BaseActivity, R.id.signUpContainer,GetStartedFragment(),"GET STARTED", true)
+            }
+        }
     }
 
     private fun validate(): Boolean {
-       return false;
+        return if (binding.edtOTP1.text.toString().isEmpty()) { // EditText
+            Common.commonErrorMethod(
+                binding.edtOTP1,
+                binding.tlOTP1,
+                ""
+            )
+        } else if (binding.edtOTP2.text.toString().isEmpty()) { // EditText
+            Common.commonErrorMethod(
+                binding.edtOTP2,
+                binding.tlOTP2,
+                ""
+            )
+        } else if (binding.edtOTP3.text.toString().isEmpty()) { // EditText
+            Common.commonErrorMethod(
+                binding.edtOTP3,
+                binding.tlOTP3,
+                ""
+            )
+        } else if (binding.edtOTP4.text.toString().isEmpty()) { // EditText
+            Common.commonErrorMethod(
+                binding.edtOTP4,
+                binding.tlOTP4,
+                ""
+            )
+        } else if (binding.edtOTP5.text.toString().isEmpty()) { // EditText
+            Common.commonErrorMethod(
+                binding.edtOTP5,
+                binding.tlOTP5,
+                ""
+            )
+        } else if (binding.edtOTP6.text.toString().isEmpty()) { // EditText
+            Common.commonErrorMethod(
+                binding.edtOTP6,
+                binding.tlOTP6,
+                ""
+            )
+        } else {
+            return true
+        }
     }
 
-    class GenericKeyEvent internal constructor(private val currentView: EditText, private val previousView: EditText?) : View.OnKeyListener{
+    class GenericKeyEvent internal constructor(
+        private val currentView: EditText,
+        private val previousView: EditText?
+    ) : View.OnKeyListener {
         override fun onKey(p0: View?, keyCode: Int, event: KeyEvent?): Boolean {
-            if(event!!.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_DEL && currentView.id != R.id.edtOTP1 && currentView.text.isEmpty()) {
+            if (event!!.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_DEL && currentView.id != R.id.edtOTP1 && currentView.text.isEmpty()) {
                 //If current is empty then previous EditText's number will also be deleted
                 previousView!!.text = null
                 previousView.requestFocus()
@@ -63,7 +125,10 @@ class OTPFragment : Fragment() {
         }
     }
 
-    class GenericTextWatcher internal constructor(private val currentView: View, private val nextView: View?) : TextWatcher {
+    class GenericTextWatcher internal constructor(
+        private val currentView: View,
+        private val nextView: View?
+    ) : TextWatcher {
         override fun afterTextChanged(editable: Editable) { // TODO Auto-generated method stub
             val text = editable.toString()
             when (currentView.id) {
@@ -95,4 +160,5 @@ class OTPFragment : Fragment() {
     }
 
 
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_view.xml b/app/src/main/res/drawable/rounded_view.xml
new file mode 100644
index 0000000..32a1927
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="1dp"
+        android:color="#F5F5F5" >
+    </stroke>
+
+    <solid android:color="#F5F5F5"/>
+
+    <corners
+        android:radius="12dp"/>
+
+    <padding
+        android:top="10dp"
+        android:bottom="10dp"
+        android:left="20dp"
+        android:right="20dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/upload_background.xml b/app/src/main/res/drawable/upload_background.xml
new file mode 100644
index 0000000..6a02ce4
--- /dev/null
+++ b/app/src/main/res/drawable/upload_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="1dp"
+        android:color="#0050A1" >
+    </stroke>
+
+    <padding
+        android:top="10dp"
+        android:bottom="10dp"
+        android:left="20dp"
+        android:right="20dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_get_started.xml b/app/src/main/res/layout/fragment_get_started.xml
new file mode 100644
index 0000000..f9659bc
--- /dev/null
+++ b/app/src/main/res/layout/fragment_get_started.xml
@@ -0,0 +1,360 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="@dimen/margin_90"
+        android:fillViewport="true"
+        android:padding="@dimen/margin_15"
+        app:layout_constraintTop_toTopOf="parent">
+
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/signUp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/margin_10"
+            android:orientation="vertical"
+            app:layout_constraintBottom_toBottomOf="parent">
+
+            <TextView
+                android:id="@+id/txtGetStart"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="2"
+                android:padding="@dimen/margin_5"
+                android:text="@string/let_s_get_started"
+                android:textColor="@color/black"
+                android:textSize="@dimen/text_size_20"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/subHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_8"
+                android:text="Start your online business in few steps"
+                android:textColor="@color/black"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/txtGetStart" />
+
+
+
+            <!--Full Name  -->
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/tlArnNumber"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_22"
+                android:hint="@string/enter_your_arn_number"
+                android:padding="@dimen/margin_3"
+                app:layout_constraintTop_toBottomOf="@+id/subHeader">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/edtArnNumber"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"
+                    android:textColorHint="@color/greyColor2"
+                    android:textSize="@dimen/text_size_14"
+                    tool:ignore="TextContrastCheck" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <!--Email  -->
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/tlPanNumber"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_5"
+                android:hint="@string/enter_pan_card_number"
+                android:padding="@dimen/margin_3"
+                app:layout_constraintTop_toBottomOf="@+id/tlArnNumber">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/edtPanNumber"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"
+                    android:textColorHint="@color/greyColor2"
+                    android:textSize="@dimen/text_size_14"
+                    tool:ignore="TextContrastCheck" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <!--Address Line 1  -->
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/tlFullNamePanCard"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_5"
+                android:hint="@string/full_name_as_on_pan_card"
+                android:padding="@dimen/margin_3"
+                app:layout_constraintTop_toBottomOf="@+id/tlPanNumber">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/edtFullNamePanCard"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"
+                    android:textColorHint="@color/greyColor2"
+                    android:textSize="@dimen/text_size_14"
+                    tool:ignore="TextContrastCheck" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <View
+                android:id="@+id/viewHelper"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_16"
+                android:background="@drawable/rounded_view"
+                android:layout_marginBottom="@dimen/margin_16"
+                app:layout_constraintTop_toBottomOf="@+id/tlFullNamePanCard"
+
+                >
+
+            </View>
+
+            <TextView
+                android:id="@+id/addAddressProof"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/margin_4"
+                android:layout_marginStart="@dimen/margin_8"
+                android:text="Add ADDRESS PROOF"
+                android:textColor="@color/black"
+                android:textSize="@dimen/text_size_14"
+                android:textStyle="bold"
+                android:layout_marginTop="@dimen/margin_25"
+                app:layout_constraintTop_toBottomOf="@+id/tlFullNamePanCard"
+                app:layout_constraintStart_toStartOf= "parent"
+                app:layout_constraintHorizontal_chainStyle="spread"
+                app:layout_constraintHorizontal_bias="0.5"
+
+              />
+
+
+            <TextView
+                android:id="@+id/format"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/margin_4"
+                android:text="@string/format_png_or_jpg"
+                android:textColor="#909090"
+                android:textSize="@dimen/text_size_14"
+                android:layout_marginTop="@dimen/margin_25"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tlFullNamePanCard"
+                />
+
+
+
+            <TextView
+                android:id="@+id/docTypeHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/margin_4"
+                android:text="Choose the document type"
+                android:textColor="@color/black"
+                android:textSize="@dimen/text_size_14"
+                android:textStyle="bold"
+                android:layout_marginStart="@dimen/margin_8"
+                android:layout_marginTop="@dimen/margin_3"
+                app:layout_constraintTop_toBottomOf="@+id/addAddressProof"
+                app:layout_constraintStart_toStartOf= "parent"
+                />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/spAddressType"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/margin_48"
+                android:layout_marginTop="@dimen/margin_15"
+                android:layout_marginBottom="@dimen/margin_5"
+                android:layout_marginStart="@dimen/margin_8"
+                android:layout_marginEnd="@dimen/margin_15"
+                app:hintEnabled="false"
+                app:layout_constraintTop_toBottomOf="@+id/docTypeHeader">
+
+                <com.google.android.material.textfield.MaterialAutoCompleteTextView
+                    android:id="@+id/spDocType"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/rounded_corner_with_line1"
+                    android:hint="@string/addressProofType"
+                    android:inputType="none"
+                    android:padding="@dimen/margin_5"
+                    android:labelFor="@+id/spInterestPayout"
+                    android:textColorHint="@color/greyColor2"
+                    android:textSize="@dimen/text_size_14"
+                   />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+
+
+            <TextView
+                android:id="@+id/txtFront"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/margin_4"
+                android:text="Front"
+                android:textColor="@color/black"
+                android:textSize="@dimen/text_size_14"
+                android:textStyle="bold"
+                android:layout_marginStart="@dimen/margin_8"
+                android:layout_marginTop="@dimen/margin_30"
+                app:layout_constraintTop_toBottomOf="@+id/spAddressType"
+                app:layout_constraintStart_toStartOf= "parent"
+                />
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/uploadViewFront"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@+id/txtFront"
+                app:layout_constraintStart_toStartOf="parent"
+                android:layout_marginStart="@dimen/margin_8"
+                android:layout_marginTop="@dimen/margin_4"
+                app:layout_constraintHorizontal_chainStyle="spread_inside"
+                app:layout_constraintHorizontal_bias="0.5"
+                android:background="@drawable/upload_background">
+
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/uploadFront"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Upload"
+                    android:backgroundTint="@color/white"
+                    android:textColor="@color/red"
+                    app:cornerRadius="@dimen/margin_15"
+                    app:layout_constraintTop_toTopOf="@+id/uploadViewFront"
+                    app:layout_constraintBottom_toBottomOf="@+id/uploadViewFront"
+                    app:layout_constraintStart_toStartOf="@+id/uploadViewFront"
+                    app:layout_constraintEnd_toEndOf="@+id/uploadViewFront"
+                    />
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+            <TextView
+                android:id="@+id/txtBack"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/margin_4"
+                android:text="Back"
+                android:textColor="@color/black"
+                android:textSize="@dimen/text_size_14"
+                android:textStyle="bold"
+                android:layout_marginTop="@dimen/margin_30"
+                app:layout_constraintTop_toBottomOf="@+id/spAddressType"
+                app:layout_constraintStart_toStartOf="@+id/uploadViewBack"
+
+
+                />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/uploadViewBack"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@+id/txtBack"
+                android:layout_marginStart="@dimen/margin_25"
+                android:layout_marginTop="@dimen/margin_4"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/uploadViewFront"
+                app:layout_constraintHorizontal_bias="0.5"
+                android:background="@drawable/upload_background">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/uploadBack"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_15"
+                    android:layout_marginEnd="@dimen/margin_5"
+                    android:text="Upload"
+                    android:backgroundTint="@color/white"
+                    android:textColor="@color/red"
+                    app:cornerRadius="@dimen/margin_15"
+                    app:layout_constraintTop_toTopOf="@+id/uploadViewBack"
+                    app:layout_constraintBottom_toBottomOf="@+id/uploadViewBack"
+                    app:layout_constraintStart_toStartOf="@+id/uploadViewBack"
+                    app:layout_constraintEnd_toEndOf="@+id/uploadViewBack"
+                    />
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+`
+
+    </androidx.core.widget.NestedScrollView>
+
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/saveDraft"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_15"
+        android:layout_marginEnd="@dimen/margin_5"
+        android:layout_marginBottom="@dimen/margin_20"
+        android:text="@string/save_draft"
+        android:backgroundTint="@color/white"
+        android:textColor="@color/red"
+        app:cornerRadius="@dimen/margin_15"
+        app:layout_constraintHorizontal_chainStyle="spread"
+        app:layout_constraintEnd_toStartOf="@+id/btnNext"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/btnNext"
+        app:layout_constraintBottom_toBottomOf="parent"
+
+
+        />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btnNext"
+        android:layout_width="170dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/margin_20"
+        android:layout_marginStart="@dimen/margin_5"
+        android:layout_marginEnd="@dimen/margin_15"
+        android:text="@string/next"
+        android:textColor="@color/white"
+        android:backgroundTint="@color/red"
+        app:cornerRadius="@dimen/margin_15"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/saveDraft"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/saveDraft"
+        app:layout_constraintRight_toRightOf="parent"
+        />
+
+
+
+
+
+
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 c19aa05..b059591 100644
--- a/app/src/main/res/layout/fragment_otp.xml
+++ b/app/src/main/res/layout/fragment_otp.xml
@@ -4,15 +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:id="@+id/signUp"
-        android:layout_marginTop="@dimen/margin_150"
-        android:layout_marginStart="@dimen/margin_15"
-        android:layout_marginEnd="@dimen/margin_15"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/margin_10"
+        android:layout_marginTop="@dimen/margin_150"
+        android:layout_marginEnd="@dimen/margin_10"
         android:orientation="vertical"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -21,7 +21,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="@dimen/margin_5"
-            android:text="We sent a code to your mobile number"
+            android:text="@string/mobNoText"
             android:textColor="@color/black"
             android:textSize="@dimen/text_size_20"
             android:textStyle="bold"
@@ -33,153 +33,258 @@
             android:id="@+id/txtDigit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_10"
             android:layout_marginTop="@dimen/margin_5"
-            android:text="Enter the 6-digit verification code sent to +91-00000-00000"
             android:textColor="@color/black"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/txtSignUp" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <TextView
+            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"
+            android:text="@string/txtChange"
+            android:textColor="@color/blue1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/txtDigit" />
+
+        <TextView
+            android:id="@+id/txtCode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_10"
+            android:layout_marginTop="@dimen/margin_5"
+            android:text="@string/code"
+            android:textColor="@color/black"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/txtChangeNumber" />
+
+        <LinearLayout
+            android:id="@+id/otpLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_15"
+            android:weightSum="6"
+            android:gravity="center"
+            android:orientation="horizontal"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/txtDigit"
-            android:id="@+id/otpLayout">
+            app:layout_constraintTop_toBottomOf="@+id/txtCode">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/tlOTP1"
-                android:layout_marginStart="@dimen/margin_10"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+                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: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"
-                app:layout_constraintStart_toEndOf="@+id/tlOTP1"
-                app:layout_constraintTop_toTopOf="parent"
+                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"
-                app:layout_constraintStart_toEndOf="@+id/tlOTP2"
-                app:layout_constraintTop_toTopOf="parent"
+                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"
-                app:layout_constraintStart_toEndOf="@+id/tlOTP3"
-                app:layout_constraintTop_toTopOf="parent"
+                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"
-                app:layout_constraintStart_toEndOf="@+id/tlOTP4"
-                app:layout_constraintTop_toTopOf="parent"
+                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"
-                app:layout_constraintStart_toEndOf="@+id/tlOTP5"
-                app:layout_constraintTop_toTopOf="parent"
+                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_20"
+            android:gravity="end"
+            android:text="(00:30)"
+            android:textColor="@color/black"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/otpLayout" />
+
 
         <com.google.android.material.button.MaterialButton
-            android:id="@+id/btnSignUp"
-            app:cornerRadius="@dimen/margin_15"
-            android:theme="@style/Theme.NormalLogin"
+            android:id="@+id/btnSubmit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/margin_30"
-            android:layout_marginTop="@dimen/margin_30"
+            android:layout_marginTop="@dimen/margin_50"
             android:layout_marginEnd="@dimen/margin_30"
-            android:text="@string/continueText"
+            android:text="@string/submit"
             android:textColor="@color/white"
+            android:backgroundTint="@color/red"
+            app:cornerRadius="@dimen/margin_15"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/otpLayout" />
 
 
+        <TextView
+            android:id="@+id/txtTimerText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_10"
+            android:layout_marginTop="@dimen/margin_40"
+            android:gravity="center"
+            android:text="@string/secondsTimer"
+            android:textColor="@color/black"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/btnSubmit" />
+
+        <TextView
+            android:id="@+id/txtDidNotGetOTP"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_50"
+            android:layout_marginTop="@dimen/margin_15"
+            android:text="@string/didNotGetOTP"
+            android:textColor="@color/black"
+            android:textSize="@dimen/text_size_16"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/txtTimerText" />
+
+        <TextView
+            android:id="@+id/txtResendOTP"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_15"
+            android:text="@string/resendOTP"
+            android:textColor="@color/blue1"
+            android:textSize="@dimen/text_size_16"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/txtDidNotGetOTP"
+            app:layout_constraintTop_toBottomOf="@id/txtTimerText" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 5ad78e7..ba1f748 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -276,6 +276,39 @@
     <string name="mobileNumber">Mobile Number</string>
     <string name="signUp">Sign Up</string>
     <string name="continueText">CONTINUE</string>
-
+    <string name="almostThere">Almost There</string>
+    <string name="moreInfo">We need some basic information about you to help you personalize your experience better!</string>
+    <string name="fullName">Full Name</string>
+    <string name="Email">Email</string>
+    <string name="AddressLine1">Address Line 1</string>
+    <string name="addressLine2">Address Line 2  (Optional) </string>
+    <string name="day">DD</string>
+    <string name="month">MM</string>
+    <string name="year">YYYY</string>
+    <string name="byClicking">By clicking on next, you agree to accept our</string>
+    <string name="terms_and_conditions">terms and conditions,</string>
+    <string name="and">and</string>
+    <string name="privacyPolicy">privacy policy</string>
+    <string name="number">0123456789</string>
+    <string name="agreement">Agreement</string>
+    <string name="upNextHome">Up Next: Home</string>
+    <string name="onlyAlphabets">abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
+    <string name="invalidOTP">Please enter valid OTP</string>
+    <string name="sixDigitOTP">Enter the 6-digit verification code sent to</string>
+    <string name="submit">SUBMIT</string>
+    <string name="secondsTimer">This session will end in 30 seconds.</string>
+    <string name="didNotGetOTP">Didn\'t get the OTP</string>
+    <string name="resendOTP">RESEND OTP</string>
+    <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>
+    <string name="enter_pan_card_number">Enter PAN Card Number</string>
+    <string name="full_name_as_on_pan_card">Full name as on Pan card</string>
+    <string name="enter_your_arn_number">Enter your ARN number</string>
+    <string name="let_s_get_started">Let’s get started</string>
+    <string name="save_draft">SAVE DRAFT</string>
+    <string name="format_png_or_jpg">Format (.png or .jpg)</string>
+    <string name="hello_blank_fragment">Hello blank fragment</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 dfdeb6d..0ba9ee0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,6 +13,10 @@
     <color name="blue">#1F5ACE</color>
     <color name="transparent">#00000000</color>
     <color name="lightBlue">#5077FF</color>
+    <color name="blue1">#006BFF</color>
+
+
+    <color name="button_red">#E92629</color>
 
     <color name="greyColor1">#323131</color>
     <color name="greyColor2">#757575</color>
@@ -20,8 +24,6 @@
     <color name="greyColor4">#E6EBE0</color>
     <color name="greyColor5">#303030</color>
 
-    <color name="button_red">#E92629</color>
-
 
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5801789..3845d2a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -262,8 +262,6 @@
     <string name="validNRI">Sorry! We are not serving NRI residents at present.</string>
 
 
-
-
     <!-- Partner OnBoarding   -->
     <string name="hintEmailMobile">enter Mobile or Email</string>
     <string name="hintPassword">enter Password</string>
@@ -283,7 +281,41 @@
     <string name="mobileNumber">Mobile Number</string>
     <string name="signUp">Sign Up</string>
     <string name="continueText">CONTINUE</string>
+    <string name="almostThere">Almost There</string>
+    <string name="moreInfo">We need some basic information about you to help you personalize your experience better!</string>
+    <string name="fullName">Full Name</string>
+    <string name="Email">Email</string>
+    <string name="AddressLine1">Address Line 1</string>
+    <string name="addressLine2">Address Line 2  (Optional) </string>
+    <string name="day">DD</string>
+    <string name="month">MM</string>
+    <string name="year">YYYY</string>
+    <string name="byClicking">By clicking on next, you agree to accept our</string>
+    <string name="terms_and_conditions">terms and conditions,</string>
+    <string name="and">and</string>
+    <string name="privacyPolicy">privacy policy</string>
+    <string name="number">0123456789</string>
+    <string name="agreement">Agreement</string>
+    <string name="upNextHome">Up Next: Home</string>
+    <string name="onlyAlphabets">abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
+    <string name="invalidOTP">Please enter valid OTP</string>
+    <string name="sixDigitOTP">Enter the 6-digit verification code sent to</string>
+    <string name="submit">SUBMIT</string>
+    <string name="secondsTimer">This session will end in 30 seconds.</string>
+    <string name="didNotGetOTP">Didn\'t get the OTP</string>
+    <string name="resendOTP">RESEND OTP</string>
+    <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>
 
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="enter_pan_card_number">Enter PAN Card Number</string>
+    <string name="full_name_as_on_pan_card">Full name as on Pan card</string>
+    <string name="enter_your_arn_number">Enter your ARN number</string>
+    <string name="let_s_get_started">Let’s get started</string>
+    <string name="save_draft">SAVE DRAFT</string>
+    <string name="format_png_or_jpg">Format (.png or .jpg)</string>
 
 </resources>
\ No newline at end of file