diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesAdapter.kt
index f54c1ab5..b06fb364 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesAdapter.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesAdapter.kt
@@ -57,7 +57,7 @@ class EntriesAdapter(private val clickListener: EntriesClickListener) :
         RecyclerView.ViewHolder(binding.root) {
 
         fun bind(item: SatItem, listener: EntriesClickListener) {
-            binding.entryName.text = item.name
+            binding.entryCheckbox.text = item.name
             binding.entryCheckbox.isChecked = item.isSelected
             itemView.setOnClickListener {
                 listener.updateSelection(listOf(item.catnum), item.isSelected.not())
diff --git a/app/src/main/res/drawable/rec_divider_light.xml b/app/src/main/res/drawable/rec_divider_light.xml
index d0f41380..f0bd72fb 100644
--- a/app/src/main/res/drawable/rec_divider_light.xml
+++ b/app/src/main/res/drawable/rec_divider_light.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:left="8dp"
-        android:right="8dp">
+    <item>
         <shape android:shape="rectangle">
             <size
                 android:width="1dp"
@@ -10,4 +8,4 @@
             <solid android:color="@color/greyDivider" />
         </shape>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/app/src/main/res/layout/item_entry.xml b/app/src/main/res/layout/item_entry.xml
index f2e5d0da..80a71875 100644
--- a/app/src/main/res/layout/item_entry.xml
+++ b/app/src/main/res/layout/item_entry.xml
@@ -1,48 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/entry_card"
+<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/entry_checkbox"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardBackgroundColor="@color/greyDark"
-    app:cardCornerRadius="8dp"
-    app:cardElevation="0dp">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/entry_root"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:id="@+id/entry_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="4dp"
-            android:layout_marginBottom="8dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@string/placeholder"
-            android:textColor="@color/greyLight"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@+id/entry_checkbox"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <CheckBox
-            android:id="@+id/entry_checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginStart="4dp"
-            android:clickable="false"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            app:layout_constraintBottom_toBottomOf="@+id/entry_name"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/entry_name" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.cardview.widget.CardView>
+    android:layout_height="36dp"
+    android:background="@null"
+    android:ellipsize="end"
+    android:lines="1"
+    android:text="@string/placeholder"
+    android:textColor="@color/greyLight"
+    android:textSize="16sp" />
diff --git a/build.gradle b/build.gradle
index a743e354..96361a30 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,10 @@
 buildscript {
     ext {
         gradle_version = '7.0.3'
-        kotlin_version = '1.5.31'
+        kotlin_version = '1.6.0'
         coroutines_version = '1.5.2-native-mt'
         splash_screen_version = '1.0.0-alpha01'
-        constraint_layout_version = '2.1.1'
+        constraint_layout_version = '2.1.2'
         lifecycle_version = '2.4.0'
         navigation_version = '2.3.5'
         preference_version = '1.1.1'
diff --git a/gradle.properties b/gradle.properties
index 462df245..ccfd5f7f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,3 +20,5 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 kapt.use.worker.api=true
+# Enable more aggressive optimizations
+android.enableR8.fullMode=true