diff --git a/app/src/main/res/layout/card_view.xml b/app/src/main/res/layout/card_view.xml
index 6dcc1bc..98d699c 100644
--- a/app/src/main/res/layout/card_view.xml
+++ b/app/src/main/res/layout/card_view.xml
@@ -4,10 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="5dp"
-    app:cardBackgroundColor="@color/white"
     app:cardCornerRadius="8dp"
-    app:cardElevation="8dp"
-    app:cardMaxElevation="10dp"
+    app:cardElevation="0dp"
+    style="@style/Theme.UiTemplate.CardView"
     app:cardPreventCornerOverlap="true"
     app:cardUseCompatPadding="true">
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_entry_list.xml b/app/src/main/res/layout/fragment_entry_list.xml
index 8cd7d6c..3416edb 100644
--- a/app/src/main/res/layout/fragment_entry_list.xml
+++ b/app/src/main/res/layout/fragment_entry_list.xml
@@ -13,6 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:clickable="true"
+        style="@style/Theme.UiTemplate.FAB.AccentColor"
         android:src="@drawable/ic_close"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -21,7 +22,8 @@
         android:id="@+id/textView5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="TextView"
+        android:text="Entry History"
+        style="@style/Theme.UiTemplate.TextH2"
         app:layout_constraintBottom_toBottomOf="@+id/floatingActionButton2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/floatingActionButton2"
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 0a4589a..ab71a9b 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -34,14 +34,14 @@
             android:id="@+id/text_welcome"
             style="@style/Theme.UiTemplate.TextH4"
             android:layout_width="wrap_content"
-            android:layout_marginBottom="10dp"
+            android:layout_marginBottom="2dp"
             android:layout_height="wrap_content"
             android:text="@string/login_welcome" />
         <TextView
             android:id="@+id/text_login_small"
             style="@style/Theme.UiTemplate.TextH4"
             android:layout_width="wrap_content"
-            android:layout_marginBottom="50dp"
+            android:layout_marginBottom="30dp"
             android:layout_height="wrap_content"
             android:text="@string/login_text" />
     <com.google.android.material.textfield.TextInputLayout
@@ -71,6 +71,7 @@
         app:layout_constraintWidth_max="400dp"
         app:layout_constraintWidth_percent="0.8"
         android:layout_height="58dp"
+        app:passwordToggleEnabled="true"
         tools:ignore="MissingConstraints">
 
         <com.google.android.material.textfield.TextInputEditText
@@ -78,7 +79,7 @@
             style="@style/Theme.UiTemplate.Input.Text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="text"
+            android:inputType="textPassword"
             android:maxLines="1"
             android:hint="@string/login_password_hint">
         </com.google.android.material.textfield.TextInputEditText>
diff --git a/app/src/main/res/values/card_view_style.xml b/app/src/main/res/values/card_view_style.xml
index 11b0eb8..dfede2d 100644
--- a/app/src/main/res/values/card_view_style.xml
+++ b/app/src/main/res/values/card_view_style.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="Theme.UiTemplate.CardView" parent="Widget.MaterialComponents.CardView">
-        <item name="cardBackgroundColor">@color/BackgroundGray</item>
         <item name="cardElevation">0dp</item>
         <item name="cardCornerRadius">120dp</item>
+        <item name="cornerSize">10dp</item>
     </style>
 </resources>
\ No newline at end of file