diff --git a/Android/.idea/misc.xml b/Android/.idea/misc.xml
index 7448533..ff437c4 100644
--- a/Android/.idea/misc.xml
+++ b/Android/.idea/misc.xml
@@ -9,6 +9,7 @@
         <entry key="app/src/main/res/layout/fragment_edit_strings_list_item.xml" value="0.2210144927536232" />
         <entry key="app/src/main/res/layout/fragment_edit_traits_list.xml" value="0.2210144927536232" />
         <entry key="app/src/main/res/layout/fragment_edit_traits_list_item.xml" value="0.2210144927536232" />
+        <entry key="app/src/main/res/layout/fragment_search.xml" value="0.16875" />
         <entry key="app/src/main/res/layout/simple_list_item.xml" value="0.2210144927536232" />
       </map>
     </option>
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java
index 171cfb3..acc699a 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java
@@ -37,7 +37,7 @@ public class LibraryRecyclerViewAdapter extends ListAdapter<Monster, LibraryRecy
     @NonNull
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.monster_list_content, parent, false);
+                .inflate(R.layout.simple_list_item, parent, false);
         return new ViewHolder(view);
     }
 
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java
index d9b5dac..e8007ac 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java
@@ -55,7 +55,7 @@ public class SearchResultsRecyclerViewAdapter extends RecyclerView.Adapter<Searc
     @Override
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.monster_list_content, parent, false);
+                .inflate(R.layout.simple_list_item, parent, false);
         return new ViewHolder(view);
     }
 
diff --git a/Android/app/src/main/res/layout/activity_main.xml b/Android/app/src/main/res/layout/activity_main.xml
index eec5652..7e790f9 100644
--- a/Android/app/src/main/res/layout/activity_main.xml
+++ b/Android/app/src/main/res/layout/activity_main.xml
@@ -31,5 +31,4 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
         app:navGraph="@navigation/mobile_navigation" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/card_ability_score.xml b/Android/app/src/main/res/layout/card_ability_score.xml
index 7dbba97..fa3a4ab 100644
--- a/Android/app/src/main/res/layout/card_ability_score.xml
+++ b/Android/app/src/main/res/layout/card_ability_score.xml
@@ -55,5 +55,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="+5" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/card_action.xml b/Android/app/src/main/res/layout/card_action.xml
index 2fe0f4b..7c1aafd 100644
--- a/Android/app/src/main/res/layout/card_action.xml
+++ b/Android/app/src/main/res/layout/card_action.xml
@@ -35,6 +35,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/name"
         tools:text="Melee Weapon Attack: +8 to hit, reach 10 ft., one target. Hit: 14 (2d8 + 5) bludgeoning damage." />
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/card_armor_class.xml b/Android/app/src/main/res/layout/card_armor_class.xml
index b9baf69..002588f 100644
--- a/Android/app/src/main/res/layout/card_armor_class.xml
+++ b/Android/app/src/main/res/layout/card_armor_class.xml
@@ -31,5 +31,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="17" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/card_challenge_rating.xml b/Android/app/src/main/res/layout/card_challenge_rating.xml
index a39efef..130aab9 100644
--- a/Android/app/src/main/res/layout/card_challenge_rating.xml
+++ b/Android/app/src/main/res/layout/card_challenge_rating.xml
@@ -31,5 +31,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="1/8" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/card_hit_points.xml b/Android/app/src/main/res/layout/card_hit_points.xml
index c7cc63d..1eb4661 100644
--- a/Android/app/src/main/res/layout/card_hit_points.xml
+++ b/Android/app/src/main/res/layout/card_hit_points.xml
@@ -31,5 +31,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="367" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/card_initiative.xml b/Android/app/src/main/res/layout/card_initiative.xml
index fce9841..f13ffd4 100644
--- a/Android/app/src/main/res/layout/card_initiative.xml
+++ b/Android/app/src/main/res/layout/card_initiative.xml
@@ -31,5 +31,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="+2" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/card_monster.xml b/Android/app/src/main/res/layout/card_monster.xml
index 3c5f7f4..a30fd51 100644
--- a/Android/app/src/main/res/layout/card_monster.xml
+++ b/Android/app/src/main/res/layout/card_monster.xml
@@ -169,6 +169,4 @@
             android:layout_marginHorizontal="@dimen/padding_small"
             android:layout_weight="1" />
     </LinearLayout>
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/component_advantage_picker2.xml b/Android/app/src/main/res/layout/component_advantage_picker2.xml
deleted file mode 100644
index 1715eaa..0000000
--- a/Android/app/src/main/res/layout/component_advantage_picker2.xml
+++ /dev/null
@@ -1,78 +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="wrap_content"
-    android:layout_margin="@dimen/text_margin"
-    tools:context=".ui.components.AdvantagePicker">
-    <!-- // TODO: style this control to look less awful by default -->
-
-    <TextView
-        android:id="@+id/label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/padding_normal"
-        android:layout_marginTop="@dimen/padding_small"
-        android:text="@string/label_advantage"
-        android:textAppearance="@android:style/TextAppearance.Material.Body1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <RadioGroup
-        android:id="@+id/group"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/label">
-
-        <com.google.android.material.radiobutton.MaterialRadioButton
-            android:id="@+id/hasNoAdvantage"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="4dp"
-            android:layout_marginVertical="8dp"
-            android:layout_weight="1"
-            android:background="@drawable/radio_button_selector"
-            android:button="@android:color/transparent"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/label_advantage_none"
-            android:textAppearance="@android:style/TextAppearance.Material.Button"
-            android:textColor="@color/radio_button_text"
-            tools:checked="true" />
-
-        <com.google.android.material.radiobutton.MaterialRadioButton
-            android:id="@+id/hasAdvantage"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="4dp"
-            android:layout_marginVertical="8dp"
-            android:layout_weight="1"
-            android:background="@drawable/radio_button_selector"
-            android:button="@android:color/transparent"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/label_advantage_advantage"
-            android:textAppearance="@android:style/TextAppearance.Material.Button"
-            android:textColor="@color/radio_button_text"
-            tools:checked="false" />
-
-        <com.google.android.material.radiobutton.MaterialRadioButton
-            android:id="@+id/hasDisadvantage"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="4dp"
-            android:layout_marginVertical="8dp"
-            android:layout_weight="1"
-            android:background="@drawable/radio_button_selector"
-            android:button="@android:color/transparent"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/label_advantage_disadvantage"
-            android:textAppearance="@android:style/TextAppearance.Material.Button"
-            android:textColor="@color/radio_button_text"
-            tools:checked="false" />
-    </RadioGroup>
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/fragment_edit_monster.xml b/Android/app/src/main/res/layout/fragment_edit_monster.xml
index 0e1177c..fbb5ed0 100644
--- a/Android/app/src/main/res/layout/fragment_edit_monster.xml
+++ b/Android/app/src/main/res/layout/fragment_edit_monster.xml
@@ -184,6 +184,5 @@
             android:text="@string/label_regional_effects"
             android:textSize="@dimen/text_h4_size"
             app:drawableEndCompat="@drawable/ic_chevron_right_24" />
-
     </LinearLayout>
 </ScrollView>
diff --git a/Android/app/src/main/res/layout/fragment_edit_saving_throws.xml b/Android/app/src/main/res/layout/fragment_edit_saving_throws.xml
index 7d9df22..db7553b 100644
--- a/Android/app/src/main/res/layout/fragment_edit_saving_throws.xml
+++ b/Android/app/src/main/res/layout/fragment_edit_saving_throws.xml
@@ -167,5 +167,4 @@
                 android:layout_height="wrap_content" />
         </LinearLayout>
     </LinearLayout>
-
 </ScrollView>
diff --git a/Android/app/src/main/res/layout/fragment_edit_strings_list_item.xml b/Android/app/src/main/res/layout/fragment_edit_strings_list_item.xml
deleted file mode 100644
index ea0dc65..0000000
--- a/Android/app/src/main/res/layout/fragment_edit_strings_list_item.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/text_margin"
-        android:textAppearance="?attr/textAppearanceListItem" />
-</LinearLayout>
diff --git a/Android/app/src/main/res/layout/fragment_library.xml b/Android/app/src/main/res/layout/fragment_library.xml
index 09c3ba1..9c30a98 100644
--- a/Android/app/src/main/res/layout/fragment_library.xml
+++ b/Android/app/src/main/res/layout/fragment_library.xml
@@ -17,7 +17,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:context=".MonsterListFragment"
-        tools:listitem="@layout/monster_list_content" />
+        tools:listitem="@layout/simple_list_item" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
diff --git a/Android/app/src/main/res/layout/fragment_search.xml b/Android/app/src/main/res/layout/fragment_search.xml
index 57c71f2..429ec32 100644
--- a/Android/app/src/main/res/layout/fragment_search.xml
+++ b/Android/app/src/main/res/layout/fragment_search.xml
@@ -34,7 +34,5 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/search_query"
         tools:context=".SearchResultsFragment"
-        tools:listitem="@layout/monster_list_content" />
-
-
+        tools:listitem="@layout/simple_list_item" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/monster_list_content.xml b/Android/app/src/main/res/layout/monster_list_content.xml
deleted file mode 100644
index b45ad3b..0000000
--- a/Android/app/src/main/res/layout/monster_list_content.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-    <!-- // TODO: combine all of these similar list layouts into a single one -->
-
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/text_margin"
-        android:textAppearance="?attr/textAppearanceListItem" />
-</LinearLayout>
diff --git a/Android/app/src/main/res/layout/tile_monster.xml b/Android/app/src/main/res/layout/tile_monster.xml
index 068f945..0fa39d7 100644
--- a/Android/app/src/main/res/layout/tile_monster.xml
+++ b/Android/app/src/main/res/layout/tile_monster.xml
@@ -97,5 +97,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/tile_monster_short.xml b/Android/app/src/main/res/layout/tile_monster_short.xml
index 575cef8..c044243 100644
--- a/Android/app/src/main/res/layout/tile_monster_short.xml
+++ b/Android/app/src/main/res/layout/tile_monster_short.xml
@@ -84,7 +84,5 @@
             layout="@layout/card_challenge_rating"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size" />
-
     </LinearLayout>
-
 </androidx.constraintlayout.widget.ConstraintLayout>