diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/UploadPanViewModel.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/UploadPanViewModel.kt
index d1f7caa0c4..6739598fb0 100644
--- a/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/UploadPanViewModel.kt
+++ b/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/UploadPanViewModel.kt
@@ -30,8 +30,8 @@ class UploadPanViewModel : ViewModel() {
     private val loanApplicationRepository = LoanApplicationRepository(LoanApplicationApi())
 
     fun uploadPan(file: File, context: Context) {
-        val reqFile = RequestBody.create(MediaType.parse("image/*"), file)
-        val body = MultipartBody.Part.createFormData("upload", file.name, reqFile)
+        val reqFile = RequestBody.create(MediaType.parse("application/x-www-form-urlencoded"), file)
+        val body = MultipartBody.Part.createFormData("file", file.name, reqFile)
         val requestType = RequestBody.create(
             MediaType.parse("text/plain"), "PAN"
         )
diff --git a/app/src/main/res/layout/activity_input_pan.xml b/app/src/main/res/layout/activity_input_pan.xml
index c205fb89f2..a67c06564b 100644
--- a/app/src/main/res/layout/activity_input_pan.xml
+++ b/app/src/main/res/layout/activity_input_pan.xml
@@ -16,23 +16,17 @@
             android:adjustViewBounds="true"
             android:scaleType="centerInside"
             android:src="@drawable/navi_logo_unit_cmyk"
-            app:layout_constraintEnd_toStartOf="@+id/guideline"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_percent="0.9" />
-
         <TextView
             android:id="@+id/enter_pan_text"
             style="@style/largeCustomFontStyle"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@string/enter_pan"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/logo_image" />
 
@@ -41,25 +35,21 @@
             style="@style/mediumCustomFontStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="64dp"
+            android:layout_marginTop="56sp"
             android:text="@string/pan_label"
-            app:layout_constraintEnd_toStartOf="@+id/guideline"
-            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/enter_pan_text" />
 
         <EditText
-            android:textSize="40sp"
             android:id="@+id/pan_edit"
             style="@style/largeCustomFontStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="64dp"
+            android:layout_marginTop="56sp"
             android:backgroundTint="@android:color/darker_gray"
-            android:maxLength="10"
             android:ems="10"
-            android:textColorHighlight="@android:color/darker_gray"
-            android:textColorLink="@android:color/darker_gray"
+            android:maxLength="10"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/pan_label_text" />
@@ -68,35 +58,23 @@
             android:id="@+id/continue_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="64dp"
+            android:layout_marginTop="56sp"
             android:enabled="false"
             android:text="@string/continue_text"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/pan_edit" />
 
-        <LinearLayout
-            android:id="@+id/checkbox_layout"
-            android:layout_width="match_parent"
+        <CheckBox
+            android:id="@+id/checkbox"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:clickable="true"
+            android:text="@string/consent_text"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
-            ​
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/continue_button" />
 
-            <CheckBox
-                android:id="@+id/checkbox"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-            ​
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="10sp"
-                android:text="@string/consent_text" />
-        </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file