diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java
new file mode 100644
index 0000000..3d97750
--- /dev/null
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java
@@ -0,0 +1,35 @@
+package com.majinnaibu.monstercards.ui.monster;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+
+import com.majinnaibu.monstercards.R;
+
+public class MonsterFragment extends Fragment {
+
+    private MonsterViewModel monsterViewModel;
+
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             ViewGroup container, Bundle savedInstanceState) {
+        monsterViewModel =
+                ViewModelProviders.of(this).get(MonsterViewModel.class);
+        View root = inflater.inflate(R.layout.fragment_monster, container, false);
+        final TextView textView = root.findViewById(R.id.text_monster);
+        monsterViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
+            @Override
+            public void onChanged(@Nullable String s) {
+                textView.setText(s);
+            }
+        });
+        return root;
+    }
+}
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java
new file mode 100644
index 0000000..b4c14c3
--- /dev/null
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java
@@ -0,0 +1,19 @@
+package com.majinnaibu.monstercards.ui.monster;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+
+public class MonsterViewModel extends ViewModel {
+
+    private MutableLiveData<String> mText;
+
+    public MonsterViewModel() {
+        mText = new MutableLiveData<>();
+        mText.setValue("This is monster fragment");
+    }
+
+    public LiveData<String> getText() {
+        return mText;
+    }
+}
\ No newline at end of file
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchFragment.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchFragment.java
index 0f61fb6..ce42921 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchFragment.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchFragment.java
@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -11,6 +12,8 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
+import androidx.navigation.NavDirections;
+import androidx.navigation.Navigation;
 
 import com.majinnaibu.monstercards.R;
 
@@ -23,13 +26,22 @@ public class SearchFragment extends Fragment {
         searchViewModel =
                 ViewModelProviders.of(this).get(SearchViewModel.class);
         View root = inflater.inflate(R.layout.fragment_search, container, false);
-        final TextView textView = root.findViewById(R.id.text_search);
-        searchViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
+        final TextView textView = root.findViewById(R.id.search_query);
+        searchViewModel.getSearchQuery().observe(getViewLifecycleOwner(), new Observer<String>() {
             @Override
             public void onChanged(@Nullable String s) {
                 textView.setText(s);
             }
         });
+
+        final Button btnSearch = root.findViewById(R.id.button_search);
+        btnSearch.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                NavDirections action = SearchFragmentDirections.actionNavigationSearchToNavigationMonster();
+                Navigation.findNavController(view).navigate(action);
+            }
+        });
         return root;
     }
 }
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchViewModel.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchViewModel.java
index 6e3a48b..e8fc25d 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchViewModel.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchViewModel.java
@@ -6,14 +6,14 @@ import androidx.lifecycle.ViewModel;
 
 public class SearchViewModel extends ViewModel {
 
-    private MutableLiveData<String> mText;
+    private MutableLiveData<String> mSearchQuery;
 
     public SearchViewModel() {
-        mText = new MutableLiveData<>();
-        mText.setValue("This is search fragment");
+        mSearchQuery = new MutableLiveData<>();
+        mSearchQuery.setValue("");
     }
 
-    public LiveData<String> getText() {
-        return mText;
+    public LiveData<String> getSearchQuery() {
+        return mSearchQuery;
     }
 }
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/fragment_monster.xml b/Android/app/src/main/res/layout/fragment_monster.xml
index fdde335..9400058 100644
--- a/Android/app/src/main/res/layout/fragment_monster.xml
+++ b/Android/app/src/main/res/layout/fragment_monster.xml
@@ -1,664 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
-    tools:context=".ui.monster.MonsterDetailFragment">
+    tools:context=".ui.monster.MonsterFragment">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <TextView
+        android:id="@+id/text_monster"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:fontFamily="sans-serif"
-            android:textColor="#9B2818"
-            android:textSize="34sp"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="Pixie" />
-
-        <TextView
-            android:id="@+id/meta"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:textSize="15sp"
-            android:textStyle="italic"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/name"
-            tools:text="Tiny fey, neutral good" />
-
-        <ImageView
-            android:id="@+id/divider1"
-            android:layout_width="0dp"
-            android:layout_height="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:contentDescription="@string/section_divider"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_section_divider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/meta" />
-
-        <TextView
-            android:id="@+id/armorClass"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/divider1"
-            tools:text="Armor Class 15" />
-
-        <TextView
-            android:id="@+id/hitPoints"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/armorClass"
-            tools:text="Hit Points 1 (1d4 - 1)" />
-
-        <TextView
-            android:id="@+id/speed"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/hitPoints"
-            tools:text="10 ft., fly 30 ft." />
-
-        <ImageView
-            android:id="@+id/divider2"
-            android:layout_width="0dp"
-            android:layout_height="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:contentDescription="@string/section_divider"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_section_divider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/speed" />
-
-        <!-- Strength -->
-        <TextView
-            android:id="@+id/strength_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:text="@string/strength_abbreviation"
-            android:textAlignment="center"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toStartOf="@+id/dexterity_label"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/divider2" />
-
-        <TextView
-            android:id="@+id/strength"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:textAlignment="center"
-            app:layout_constraintEnd_toEndOf="@+id/strength_label"
-            app:layout_constraintStart_toStartOf="@+id/strength_label"
-            app:layout_constraintTop_toBottomOf="@+id/strength_label"
-            tools:text="2 (-4)" />
-
-        <!-- Dexterity -->
-        <TextView
-            android:id="@+id/dexterity_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:text="@string/dexterity_abbreviation"
-            android:textAlignment="center"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toStartOf="@+id/constitution_label"
-            app:layout_constraintStart_toEndOf="@+id/strength_label"
-            app:layout_constraintTop_toBottomOf="@+id/divider2" />
-
-        <TextView
-            android:id="@+id/dexterity"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:textAlignment="center"
-            app:layout_constraintEnd_toEndOf="@+id/dexterity_label"
-            app:layout_constraintStart_toStartOf="@+id/dexterity_label"
-            app:layout_constraintTop_toBottomOf="@+id/dexterity_label"
-            tools:text="20 (+5)" />
-
-        <!-- Constitution -->
-        <TextView
-            android:id="@+id/constitution_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:text="@string/constitution_abbreviation"
-            android:textAlignment="center"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toStartOf="@+id/intelligence_label"
-            app:layout_constraintStart_toEndOf="@+id/dexterity_label"
-            app:layout_constraintTop_toBottomOf="@+id/divider2" />
-
-        <TextView
-            android:id="@+id/constitution"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:textAlignment="center"
-            app:layout_constraintEnd_toEndOf="@+id/constitution_label"
-            app:layout_constraintStart_toStartOf="@+id/constitution_label"
-            app:layout_constraintTop_toBottomOf="@+id/constitution_label"
-            tools:text="8 (-1)" />
-
-        <!-- Intelligence -->
-        <TextView
-            android:id="@+id/intelligence_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:text="@string/intelligence_abbreviation"
-            android:textAlignment="center"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toStartOf="@+id/wisdom_label"
-            app:layout_constraintStart_toEndOf="@+id/constitution_label"
-            app:layout_constraintTop_toBottomOf="@+id/divider2" />
-
-        <TextView
-            android:id="@+id/intelligence"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:textAlignment="center"
-            app:layout_constraintEnd_toEndOf="@+id/intelligence_label"
-            app:layout_constraintStart_toStartOf="@+id/intelligence_label"
-            app:layout_constraintTop_toBottomOf="@+id/intelligence_label"
-            tools:text="10 (+0)" />
-
-        <!-- Wisdom -->
-        <TextView
-            android:id="@+id/wisdom_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:text="@string/wisdom_abbreviation"
-            android:textAlignment="center"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toStartOf="@+id/charisma_label"
-            app:layout_constraintStart_toEndOf="@+id/intelligence_label"
-            app:layout_constraintTop_toBottomOf="@+id/divider2" />
-
-        <TextView
-            android:id="@+id/wisdom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:textAlignment="center"
-            app:layout_constraintEnd_toEndOf="@+id/wisdom_label"
-            app:layout_constraintStart_toStartOf="@+id/wisdom_label"
-            app:layout_constraintTop_toBottomOf="@+id/wisdom_label"
-            tools:text="14 (+2)" />
-
-        <!-- Charisma -->
-        <TextView
-            android:id="@+id/charisma_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:text="@string/charisma_abbreviation"
-            android:textAlignment="center"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/wisdom_label"
-            app:layout_constraintTop_toBottomOf="@+id/divider2" />
-
-        <TextView
-            android:id="@+id/charisma"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:textAlignment="center"
-            app:layout_constraintEnd_toEndOf="@+id/charisma_label"
-            app:layout_constraintStart_toStartOf="@+id/charisma_label"
-            app:layout_constraintTop_toBottomOf="@+id/charisma_label"
-            tools:text="15 (+2)" />
-
-        <ImageView
-            android:id="@+id/divider3"
-            android:layout_width="0dp"
-            android:layout_height="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:contentDescription="@string/section_divider"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_section_divider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/strength" />
-
-        <TextView
-            android:id="@+id/savingThrows"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/divider3"
-            tools:text="Saving Throws" />
-
-        <TextView
-            android:id="@+id/skills"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/savingThrows"
-            tools:text="Skills" />
-
-        <TextView
-            android:id="@+id/damageVulnerabilities"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/skills"
-            tools:text="Damage Vulnerabilities" />
-
-        <TextView
-            android:id="@+id/damageResistances"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/damageVulnerabilities"
-            tools:text="Damage Resistances" />
-
-        <TextView
-            android:id="@+id/damageImmunities"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/damageResistances"
-            tools:text="Damage Immunities" />
-
-        <TextView
-            android:id="@+id/conditionImmunities"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/damageImmunities"
-            tools:text="Condition Immunities" />
-
-        <TextView
-            android:id="@+id/senses"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/conditionImmunities"
-            tools:text="Senses" />
-
-        <TextView
-            android:id="@+id/languages"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/senses"
-            tools:text="Languages" />
-
-        <TextView
-            android:id="@+id/challenge"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/languages"
-            tools:text="Challenge" />
-
-        <!-- Abilities -->
-        <LinearLayout
-            android:id="@+id/abilities"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="0dp"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/challenge"
-            tools:text="Damage Vulnerabilities" />
-
-        <TextView
-            android:id="@+id/actions_label"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:text="@string/label_actions"
-            android:textAppearance="@android:style/TextAppearance.Material.Title"
-            android:textColor="@color/colorPrimaryDark"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/abilities" />
-
-        <ImageView
-            android:id="@+id/actions_divider"
-            android:layout_width="0dp"
-            android:layout_height="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:contentDescription="@string/section_divider"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_section_divider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/actions_label" />
-
-        <!-- Actions -->
-        <LinearLayout
-            android:id="@+id/actions"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="0dp"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/actions_divider"
-            tools:text="Damage Vulnerabilities" />
-
-        <TextView
-            android:id="@+id/reactions_label"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:text="@string/label_reactions"
-            android:textAppearance="@android:style/TextAppearance.Material.Title"
-            android:textColor="@color/colorPrimaryDark"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/actions" />
-
-        <ImageView
-            android:id="@+id/reactions_divider"
-            android:layout_width="0dp"
-            android:layout_height="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:contentDescription="@string/section_divider"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_section_divider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/reactions_label" />
-
-        <!-- Reactions -->
-        <LinearLayout
-            android:id="@+id/reactions"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="0dp"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/reactions_divider"
-            tools:text="Damage Vulnerabilities" />
-
-        <TextView
-            android:id="@+id/legendaryActions_label"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:text="@string/label_legendary_actions"
-            android:textAppearance="@android:style/TextAppearance.Material.Title"
-            android:textColor="@color/colorPrimaryDark"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/reactions" />
-
-        <ImageView
-            android:id="@+id/legendaryActions_divider"
-            android:layout_width="0dp"
-            android:layout_height="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:contentDescription="@string/section_divider"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_section_divider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/legendaryActions_label" />
-
-        <!-- Legendary Actions -->
-        <LinearLayout
-            android:id="@+id/legendaryActions"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="0dp"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/legendaryActions_divider"
-            tools:text="Damage Vulnerabilities" />
-
-        <TextView
-            android:id="@+id/lairActions_label"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:text="@string/label_lair_actions"
-            android:textAppearance="@android:style/TextAppearance.Material.Title"
-            android:textColor="@color/colorPrimaryDark"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/legendaryActions" />
-
-        <ImageView
-            android:id="@+id/lairActions_divider"
-            android:layout_width="0dp"
-            android:layout_height="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:contentDescription="@string/section_divider"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_section_divider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/lairActions_label" />
-
-        <!-- Lair Actions -->
-        <LinearLayout
-            android:id="@+id/lairActions"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="0dp"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/lairActions_divider"
-            tools:text="Damage Vulnerabilities" />
-
-        <TextView
-            android:id="@+id/regionalEffects_label"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:text="@string/label_regional_effects"
-            android:textAppearance="@android:style/TextAppearance.Material.Title"
-            android:textColor="@color/colorPrimaryDark"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/lairActions" />
-
-        <ImageView
-            android:id="@+id/regionalEffects_divider"
-            android:layout_width="0dp"
-            android:layout_height="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:contentDescription="@string/section_divider"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_section_divider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/regionalEffects_label" />
-
-        <!-- Regional Effects -->
-        <LinearLayout
-            android:id="@+id/regionalEffects"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="0dp"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/regionalEffects_divider"
-            tools:text="Damage Vulnerabilities" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:textAlignment="center"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/fragment_search.xml b/Android/app/src/main/res/layout/fragment_search.xml
index e6e5fe6..0eb1ff6 100644
--- a/Android/app/src/main/res/layout/fragment_search.xml
+++ b/Android/app/src/main/res/layout/fragment_search.xml
@@ -4,20 +4,30 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.search.SearchFragment">
+    tools:context=".ui.search.SearchFragment"
+    tools:targetApi="o">
 
-    <TextView
-        android:id="@+id/text_search"
-        android:layout_width="match_parent"
+    <Button
+        android:id="@+id/button_search"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginEnd="8dp"
+        android:text="@string/action_search"
+        app:layout_constraintBaseline_toBaselineOf="@+id/search_query"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <EditText
+        android:id="@+id/search_query"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:textAlignment="center"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:importantForAutofill="no"
+        android:ems="10"
+        android:inputType="textPersonName"
+        android:hint="@string/label_search_query"
+        app:layout_constraintEnd_toStartOf="@+id/button_search"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Android/app/src/main/res/values/strings.xml b/Android/app/src/main/res/values/strings.xml
index b171c0f..232856a 100644
--- a/Android/app/src/main/res/values/strings.xml
+++ b/Android/app/src/main/res/values/strings.xml
@@ -4,4 +4,6 @@
     <string name="title_search">Search</string>
     <string name="title_collections">Collections</string>
     <string name="title_library">Library</string>
+    <string name="action_search">Search</string>
+    <string name="label_search_query">Query</string>
 </resources>
\ No newline at end of file
diff --git a/Android/build.gradle b/Android/build.gradle
index 6754c23..ff5deb3 100644
--- a/Android/build.gradle
+++ b/Android/build.gradle
@@ -7,6 +7,9 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:4.0.1"
 
+        def nav_version = "2.3.0"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }