diff --git a/src/main/kotlin/com/looker/droidify/screen/RepositoriesAdapter.kt b/src/main/kotlin/com/looker/droidify/screen/RepositoriesAdapter.kt
index 66663d44..7d662837 100644
--- a/src/main/kotlin/com/looker/droidify/screen/RepositoriesAdapter.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/RepositoriesAdapter.kt
@@ -4,7 +4,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.switchmaterial.SwitchMaterial
-import com.google.android.material.textview.MaterialTextView
 import com.looker.droidify.R
 import com.looker.droidify.database.Database
 import com.looker.droidify.entity.Repository
@@ -19,8 +18,7 @@ class RepositoriesAdapter(
     enum class ViewType { REPOSITORY }
 
     private class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val name = itemView.findViewById<MaterialTextView>(R.id.name)!!
-        val enabled = itemView.findViewById<SwitchMaterial>(R.id.enabled)!!
+        val switch = itemView.findViewById<SwitchMaterial>(R.id.repository_switch)!!
 
         var listenSwitch = true
     }
@@ -42,11 +40,11 @@ class RepositoriesAdapter(
     ): RecyclerView.ViewHolder {
         return ViewHolder(parent.inflate(R.layout.repository_item)).apply {
             itemView.setOnClickListener { onClick(getRepository(adapterPosition)) }
-            enabled.setOnCheckedChangeListener { _, isChecked ->
+            switch.setOnCheckedChangeListener { _, isChecked ->
                 if (listenSwitch) {
                     if (!onSwitch(getRepository(adapterPosition), isChecked)) {
                         listenSwitch = false
-                        enabled.isChecked = !isChecked
+                        switch.isChecked = !isChecked
                         listenSwitch = true
                     }
                 }
@@ -59,8 +57,8 @@ class RepositoriesAdapter(
         val repository = getRepository(position)
         val lastListenSwitch = holder.listenSwitch
         holder.listenSwitch = false
-        holder.enabled.isChecked = repository.enabled
+        holder.switch.isChecked = repository.enabled
         holder.listenSwitch = lastListenSwitch
-        holder.name.text = repository.name
+        holder.switch.text = repository.name
     }
 }
diff --git a/src/main/res/layout/repository_item.xml b/src/main/res/layout/repository_item.xml
index 9625f8cb..847bf7ab 100644
--- a/src/main/res/layout/repository_item.xml
+++ b/src/main/res/layout/repository_item.xml
@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.switchmaterial.SwitchMaterial xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="54dp"
+    android:id="@+id/repository_switch"
     android:background="?android:attr/selectableItemBackground"
+    android:paddingStart="12dp"
+    android:paddingEnd="12dp"
     android:gravity="center_vertical"
-    android:orientation="horizontal">
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/name"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_weight="1"
-        android:singleLine="true"
-        android:textSize="16sp" />
-
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/enabled"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp" />
-
-</androidx.appcompat.widget.LinearLayoutCompat>
+    android:orientation="horizontal"/>