diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 5c73e3b..aaf7314 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -20,7 +20,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.19" />
+        app:layout_constraintGuide_percent="0.15" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_bottom"
@@ -34,7 +34,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.45" />
+        app:layout_constraintGuide_percent="0.47" />
 
 
     <TextView
@@ -59,67 +59,61 @@
         android:textColor="@color/black"
         android:textSize="18sp"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/textView3"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView" />
 
     <TextView
         android:id="@+id/textView3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="30dp"
         android:gravity="center"
         android:text="@string/welcomeDescriptionLoginText"
         android:textColor="@color/black"
         android:textSize="15sp"
-        app:layout_constraintBottom_toTopOf="@+id/username"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <View
-        android:id="@+id/field_view"
-        android:layout_width="320dp"
-        android:layout_height="40dp"
-        android:background="@drawable/button_grestroke_whiteback"
-        app:layout_constraintBottom_toTopOf="@+id/guideline_mid"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <EditText
-        android:id="@+id/username"
-        style="@style/NoUnderLineEditText"
-        android:layout_width="320dp"
-        android:layout_height="wrap_content"
-        android:autofillHints=""
-        android:hint="@string/loginText"
-        android:inputType="text"
-        android:padding="12dp"
-        app:layout_constraintBottom_toBottomOf="@+id/field_view"
-        app:layout_constraintStart_toStartOf="@+id/field_view"
-        app:layout_constraintTop_toTopOf="@+id/field_view" />
-
-    <View
-        android:id="@+id/field_view2"
-        android:layout_width="320dp"
-        android:layout_height="40dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/button_grestroke_whiteback"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/guideline_mid" />
+        app:layout_constraintTop_toBottomOf="@+id/textView2" />
 
-    <EditText
-        android:id="@+id/password"
-        style="@style/NoUnderLineEditText"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/username_box"
         android:layout_width="320dp"
-        android:layout_height="wrap_content"
-        android:autofillHints=""
+        android:layout_height="50dp"
+        android:layout_marginBottom="10dp"
+        android:hint="@string/loginText"
+        app:boxStrokeColor="@color/white"
+        app:boxStrokeWidth="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/guideline_mid"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/button_beigestroke_whitefill" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/password_box"
+        android:layout_width="320dp"
+        android:layout_height="50dp"
         android:hint="@string/passwordText"
-        android:inputType="textPassword"
-        android:padding="12dp"
-        app:layout_constraintBottom_toBottomOf="@+id/field_view2"
-        app:layout_constraintStart_toStartOf="@+id/field_view2"
-        app:layout_constraintTop_toTopOf="@+id/field_view2" />
+        app:boxStrokeColor="@color/white"
+        app:boxStrokeWidth="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/guideline_mid">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/button_beigestroke_whitefill" />
+
+    </com.google.android.material.textfield.TextInputLayout>
 
 
     <Button
@@ -149,23 +143,21 @@
         android:id="@+id/line"
         android:layout_width="320dp"
         android:layout_height="10dp"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="20dp"
         android:background="@drawable/ic_line"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/field_view2" />
+        app:layout_constraintTop_toBottomOf="@+id/password_box" />
 
     <TextView
         android:id="@+id/error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
         android:gravity="center"
         android:text="@string/loginError"
         android:textSize="14sp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/field_view2" />
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file