diff --git a/app/src/main/java/com/geeksville/mesh/ui/MapStyleAdapter.kt b/app/src/main/java/com/geeksville/mesh/ui/MapStyleAdapter.kt
index a4131ed38..912b433c8 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MapStyleAdapter.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MapStyleAdapter.kt
@@ -1,39 +1,43 @@
 package com.geeksville.mesh.ui
 
-import android.R
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.geeksville.mesh.databinding.AdapterMapStyleMenuBinding
+import com.geeksville.mesh.databinding.AdapterMapMenuSelectionBinding
 
+class MapStyleAdapter(itemView: AdapterMapMenuSelectionBinding) :
+    RecyclerView.ViewHolder(itemView.root) {
+    val card = itemView.cardview
+    val text = itemView.textview1
+}
 
-class MapStyleAdapter(itemView: AdapterMapStyleMenuBinding) {
-    var list = mutableListOf<String>()
-
-    inner class MyView(view: View) : RecyclerView.ViewHolder(view) {
-        var textView: TextView
-
-        init {
-            textView = view.findViewById<View>(R.id.text1) as TextView
-        }
-    }
-
-    fun onCreateViewHolder(
-        parent: ViewGroup,
-        viewType: Int
-    ): MapStyleAdapter {
+private val mapStyleAdapater = object : RecyclerView.Adapter<MapStyleAdapter>() {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MapStyleAdapter {
         val inflater = LayoutInflater.from(parent.context)
-        val mapStyleMenuBinding = AdapterMapStyleMenuBinding.inflate(inflater, parent, false)
-        return MapStyleAdapter(mapStyleMenuBinding)
+        val mapMenuBinding = AdapterMapMenuSelectionBinding.inflate(inflater, parent, false)
+        return MapStyleAdapter(mapMenuBinding)
     }
 
-    fun onBindViewHolder(holder: MyView, position: Int) {
-        holder.textView.text = list[position]
+    override fun onBindViewHolder(holder: MapStyleAdapter, position: Int) {
+        TODO("Not yet implemented")
     }
 
-    fun getItemCount(): Int {
-        return list.size
+    val list = listOf<String>()
+    override fun getItemCount() = list.size
+
+}
+
+private val mapLayerAdapater = object : RecyclerView.Adapter<MapStyleAdapter>() {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MapStyleAdapter {
+        val inflater = LayoutInflater.from(parent.context)
+        val mapMenuBinding = AdapterMapMenuSelectionBinding.inflate(inflater, parent, false)
+        return MapStyleAdapter(mapMenuBinding)
     }
+
+    override fun onBindViewHolder(holder: MapStyleAdapter, position: Int) {
+        TODO("Not yet implemented")
+    }
+
+    val list = listOf<String>()
+    override fun getItemCount() = list.size
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/horizontal_item.xml b/app/src/main/res/layout/adapter_map_menu_selection.xml
similarity index 100%
rename from app/src/main/res/layout/horizontal_item.xml
rename to app/src/main/res/layout/adapter_map_menu_selection.xml
diff --git a/app/src/main/res/layout/adapter_map_style_menu.xml b/app/src/main/res/layout/adapter_map_style_menu.xml
deleted file mode 100644
index 7067e9317..000000000
--- a/app/src/main/res/layout/adapter_map_style_menu.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        app:layout_constraintBaseline_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="Map Type"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="@color/colourGrey" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/mapTypeRecyclerView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:scrollbars="horizontal" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="Map Layer"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="@color/colourGrey" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/mapLayerRecyclerView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" />
-
-    </LinearLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/map_menu.xml b/app/src/main/res/layout/map_menu.xml
new file mode 100644
index 000000000..90f2a662e
--- /dev/null
+++ b/app/src/main/res/layout/map_menu.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    app:layout_constraintBaseline_toTopOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="Map Type"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="@color/colourGrey" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/mapTypeRecyclerView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scrollbars="horizontal" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="Map Layer"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="@color/colourGrey" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/mapLayerRecyclerView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" />
+
+</LinearLayout>