diff --git a/app/build.gradle b/app/build.gradle
index 9f2c42e9..5f212a79 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,7 +41,6 @@ dependencies {
     def room_version = "2.3.0"
     def jellyfin_version = "1.0.0-beta.7"
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.5.0'
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.3.0'
diff --git a/app/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt
index 3ea9037a..a2b0a820 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt
@@ -32,7 +32,7 @@ class AddServerFragment : Fragment() {
                 viewModel.checkServer(serverAddress)
                 binding.progressCircular.visibility = View.VISIBLE
             } else {
-                binding.editTextServerAddress.error = "Empty server address"
+                binding.editTextServerAddressLayout.error = "Empty server address"
             }
         }
 
@@ -45,7 +45,7 @@ class AddServerFragment : Fragment() {
         })
 
         viewModel.error.observe(viewLifecycleOwner, {
-            binding.editTextServerAddress.error = it
+            binding.editTextServerAddressLayout.error = it
         })
 
         return binding.root
diff --git a/app/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt
index 0c95e310..3633ea6b 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt
@@ -32,7 +32,7 @@ class LoginFragment : Fragment() {
 
         viewModel.error.observe(viewLifecycleOwner, {
             binding.progressCircular.visibility = View.GONE
-            binding.editTextUsername.error = it
+            binding.editTextUsernameLayout.error = it
         })
 
         return binding.root
diff --git a/app/src/main/res/layout/fragment_add_server.xml b/app/src/main/res/layout/fragment_add_server.xml
index 994891e7..957cebdd 100644
--- a/app/src/main/res/layout/fragment_add_server.xml
+++ b/app/src/main/res/layout/fragment_add_server.xml
@@ -51,18 +51,23 @@
                 android:text="@string/add_server"
                 android:textColor="?android:textColorPrimary" />
 
-            <EditText
-                android:id="@+id/edit_text_server_address"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/edit_text_server_address_layout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="24dp"
-                android:autofillHints="no"
-                android:background="@drawable/edit_text_background"
+                android:layout_marginBottom="8dp"
                 android:hint="@string/edit_text_server_address_hint"
-                android:inputType="text"
-                android:padding="10dp"
-                android:textAppearance="@style/text_subtitle"
-                android:textColorHint="@color/neutral_400" />
+                app:errorEnabled="true">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/edit_text_server_address"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textUri"
+                    android:singleLine="true" />
+
+            </com.google.android.material.textfield.TextInputLayout>
 
             <RelativeLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index a43d4700..382d95c7 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -49,32 +49,40 @@
                 android:text="@string/login"
                 android:textColor="?android:textColorPrimary" />
 
-            <EditText
-                android:id="@+id/edit_text_username"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/edit_text_username_layout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="12dp"
-                android:autofillHints="username"
-                android:background="@drawable/edit_text_background"
-                android:hint="@string/edit_text_username_hint"
-                android:inputType="text"
-                android:padding="10dp"
-                android:textAppearance="@style/text_subtitle"
-                android:textColorHint="@color/neutral_400" />
+                android:hint="@string/edit_text_username_hint">
 
-            <EditText
-                android:id="@+id/edit_text_password"
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/edit_text_username"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"
+                    android:autofillHints="username"/>
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/edit_text_password_layout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="24dp"
-                android:autofillHints="password"
-                android:background="@drawable/edit_text_background"
                 android:hint="@string/edit_text_password_hint"
-                android:inputType="textPassword"
-                android:padding="10dp"
-                android:textAppearance="@style/text_subtitle"
-                android:textColorHint="@color/neutral_400" />
+                app:passwordToggleEnabled="true">
 
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/edit_text_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textPassword"
+                    android:autofillHints="password"/>
+
+            </com.google.android.material.textfield.TextInputLayout>
 
             <RelativeLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
index 1a1c21b2..c2c31d23 100644
--- a/app/src/main/res/navigation/navigation.xml
+++ b/app/src/main/res/navigation/navigation.xml
@@ -25,7 +25,8 @@
     <fragment
         android:id="@+id/serverSelectFragment"
         android:name="dev.jdtech.jellyfin.fragments.ServerSelectFragment"
-        android:label="ServerSelectFragment" >
+        android:label="ServerSelectFragment"
+        tools:layout="@layout/fragment_server_select">
         <action
             android:id="@+id/action_serverSelectFragment_to_addServerFragment"
             app:destination="@id/addServerFragment"