diff --git a/MobileAuthApp/app/src/main/res/layout/fragment_pin.xml b/MobileAuthApp/app/src/main/res/layout/fragment_pin.xml
index b8019fe..250b816 100644
--- a/MobileAuthApp/app/src/main/res/layout/fragment_pin.xml
+++ b/MobileAuthApp/app/src/main/res/layout/fragment_pin.xml
@@ -7,24 +7,36 @@
     android:padding="24dp"
     tools:context=".PinFragment">
 
-    <TextView
-        android:id="@+id/pin_fragment_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/pin_fragment"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-    <EditText
-        android:id="@+id/pin_edit_text"
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/enter_pin"
-        android:inputType="numberPassword"
+        android:layout_margin="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/pin_fragment_text"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/pin_fragment_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/pin_fragment" />
+
+            <EditText
+                android:id="@+id/pin_edit_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/enter_pin"
+                android:inputType="numberPassword" />
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
 
     <Button
         android:id="@+id/next_button"
@@ -32,7 +44,7 @@
         android:layout_height="wrap_content"
         android:text="@string/next_text"
         android:layout_marginTop="24dp"
-        app:layout_constraintTop_toBottomOf="@id/pin_edit_text"
+        app:layout_constraintTop_toBottomOf="@id/card_view"
         app:layout_constraintStart_toEndOf="@id/cancel_button"
         app:layout_constraintEnd_toEndOf="parent"/>
 
@@ -42,7 +54,7 @@
         android:layout_height="wrap_content"
         android:text="@string/cancel_text"
         android:layout_marginTop="24dp"
-        app:layout_constraintTop_toBottomOf="@id/pin_edit_text"
+        app:layout_constraintTop_toBottomOf="@id/card_view"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toStartOf="@id/next_button"/>
 
diff --git a/MobileAuthApp/app/src/main/res/values/strings.xml b/MobileAuthApp/app/src/main/res/values/strings.xml
index 8bd3167..ac03c59 100644
--- a/MobileAuthApp/app/src/main/res/values/strings.xml
+++ b/MobileAuthApp/app/src/main/res/values/strings.xml
@@ -1,15 +1,16 @@
 <resources>
     <string name="app_name">Mobile Authenticator</string>
     <string name="home_fragment">This is home fragment</string>
-    <string name="pin_fragment">This is pin fragment</string>
-    <string name="can_fragment">This is can fragment</string>
 
     <string name="begin_text">ALUSTA</string>
     <string name="next_text">EDASI</string>
     <string name="cancel_text">KATKESTA</string>
-    <string name="enter_pin">Sisesta PIN</string>
 
-    <!-- string resource sfor CanFragment -->
+    <!-- string resources for PinFragment -->
+    <string name="pin_fragment">Palun sisesta PIN1</string>
+    <string name="enter_pin">PIN1</string>
+
+    <!-- string resources for CanFragment -->
     <string name="example_can">Näide. 123456</string>
     <string name="text_can">CAN</string>
     <string name="enter_can">Sisesta ID kaardi CAN (Card Access Number)</string>