diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
new file mode 100644
index 0000000..b907b13
--- /dev/null
+++ b/.idea/androidTestResultsUserPreferences.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidTestResultsUserPreferences">
+    <option name="androidTestResultsTableState">
+      <map>
+        <entry key="-1913441622">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="OBHI9LPNDIOBBYT8" value="120" />
+                  <entry key="Realme&#10; RMX1831" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c1c688a..90709f0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -10,7 +10,7 @@
     </option>
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 70b24c2..d4ed722 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"  >
+    android:layout_height="match_parent">
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/nav_host_fragment"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:defaultNavHost="true"
         android:layout_alignParentStart="true"
+        app:defaultNavHost="true"
         app:navGraph="@navigation/mobile_navigation" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index a467bc9..701959d 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -34,6 +34,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="16dp"
+                android:baselineAligned="false"
                 android:orientation="horizontal">
 
                 <LinearLayout
@@ -45,7 +46,7 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="Height"
+                        android:text="@string/height"
                         android:textSize="16sp" />
 
 
@@ -68,7 +69,7 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="Weight"
+                        android:text="@string/weight"
                         android:textSize="16sp" />
 
 
@@ -76,9 +77,9 @@
                         android:id="@+id/textViewWeight"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="15.2 lbs (6.9kg)"
                         android:textColor="@color/black"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"
+                        tools:text="15.2 lbs (6.9kg)" />
 
                 </LinearLayout>
             </LinearLayout>
@@ -89,7 +90,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:text="Breeding"
+            android:text="@string/breeding"
             android:textColor="@color/black"
             android:textSize="18sp"
             android:textStyle="bold" />
@@ -104,7 +105,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Gender"
+                android:text="@string/gender"
                 android:textSize="16sp" />
 
 
@@ -113,9 +114,9 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
-                android:text="\u2641 87.5%  \u2640 12.5%"
                 android:textColor="@color/black"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                tools:text="\u2641 87.5%  \u2640 12.5%" />
 
         </LinearLayout>
 
@@ -129,7 +130,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Egg Groups"
+                android:text="@string/egg_groups"
                 android:textSize="16sp" />
 
 
@@ -154,7 +155,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Egg Cycle"
+                android:text="@string/egg_cycle"
                 android:textSize="16sp" />
 
 
@@ -173,7 +174,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:text="Location"
+            android:text="@string/location"
             android:textColor="@color/black"
             android:textSize="18sp"
             android:textStyle="bold" />
@@ -190,7 +191,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:text="Training"
+            android:text="@string/training"
             android:textColor="@color/black"
             android:textSize="18sp"
             android:textStyle="bold" />
@@ -206,7 +207,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Base EXP"
+                android:text="@string/base_exp"
                 android:textSize="16sp" />
 
 
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index df93a37..d827cbb 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -30,7 +30,8 @@
                 android:id="@+id/imageView"
                 android:layout_width="160dp"
                 android:layout_height="160dp"
-                android:layout_gravity="center" />
+                android:layout_gravity="center"
+                android:contentDescription="@string/pokemon_image" />
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/fragment_generation.xml b/app/src/main/res/layout/fragment_generation.xml
index c3c9267..92a7cb5 100644
--- a/app/src/main/res/layout/fragment_generation.xml
+++ b/app/src/main/res/layout/fragment_generation.xml
@@ -34,10 +34,10 @@
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/backgroundLight"
         android:overScrollMode="never"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
-        android:background="@color/backgroundLight"
         app:layoutManager="GridLayoutManager"
         tools:itemCount="8"
         tools:listitem="@layout/item_generation"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 61eee2c..c81e068 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -25,7 +25,8 @@
             android:adjustViewBounds="true"
             android:alpha="0.10"
             android:background="@drawable/pokeball"
-            android:tint="@color/white" />
+            android:contentDescription="@string/pokeball_background_image"
+            app:tint="@color/white" />
 
         <View
             android:layout_width="match_parent"
@@ -83,15 +84,16 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
-                        android:gravity="center"
                         android:layout_marginBottom="16dp"
                         android:background="@drawable/background_search_bar"
+                        android:gravity="center"
                         android:orientation="horizontal">
 
                         <ImageView
                             android:layout_width="24dp"
                             android:layout_height="24dp"
                             android:layout_marginStart="16dp"
+                            android:contentDescription="@string/search_icon"
                             android:src="@drawable/search" />
 
                         <TextView
@@ -99,8 +101,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_margin="16dp"
-                            android:textSize="16sp"
-                            android:text="@string/main_search" />
+                            android:text="@string/main_search"
+                            android:textSize="16sp" />
 
                     </LinearLayout>
                 </androidx.appcompat.widget.Toolbar>
@@ -119,10 +121,10 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
-            android:paddingTop="8dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingTop="8dp">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerViewMenu"
diff --git a/app/src/main/res/layout/fragment_news_detail.xml b/app/src/main/res/layout/fragment_news_detail.xml
index c7a611a..f1b15b7 100644
--- a/app/src/main/res/layout/fragment_news_detail.xml
+++ b/app/src/main/res/layout/fragment_news_detail.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout 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"
     android:background="@color/backgroundLight"
@@ -40,7 +39,8 @@
                     android:layout_marginEnd="16dp"
                     android:adjustViewBounds="true"
                     android:background="@drawable/news1"
-                    android:tint="@color/white" />
+                    android:contentDescription="@string/news_image"
+                    app:tint="@color/white" />
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
@@ -86,17 +86,17 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="end"
-                android:textStyle="bold"
                 android:text="@string/news_date"
-                android:textSize="18sp" />
+                android:textSize="18sp"
+                android:textStyle="bold" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/lorem_small"
-                android:textStyle="italic"
-                android:textSize="18sp" />
+                android:textSize="18sp"
+                android:textStyle="italic" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -110,6 +110,7 @@
                     android:layout_marginEnd="8dp"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
+                    android:contentDescription="@string/news_image"
                     android:scaleType="fitXY"
                     android:src="@drawable/news2" />
 
@@ -125,6 +126,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="8dp"
                         android:adjustViewBounds="true"
+                        android:contentDescription="@string/news_image"
                         android:src="@drawable/news3" />
 
 
@@ -133,6 +135,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:adjustViewBounds="true"
+                        android:contentDescription="@string/news_image"
                         android:src="@drawable/news4" />
 
                 </LinearLayout>
@@ -158,6 +161,7 @@
                     android:layout_marginEnd="8dp"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
+                    android:contentDescription="@string/news_image"
                     android:scaleType="fitXY"
                     android:src="@drawable/news4" />
 
@@ -167,6 +171,7 @@
                     android:layout_marginEnd="8dp"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
+                    android:contentDescription="@string/news_image"
                     android:scaleType="fitXY"
                     android:src="@drawable/news3" />
             </LinearLayout>
@@ -178,7 +183,6 @@
                 android:text="@string/lorem_large"
                 android:textSize="18sp" />
 
-
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_pokedex.xml b/app/src/main/res/layout/fragment_pokedex.xml
index 76ffc09..eb67354 100644
--- a/app/src/main/res/layout/fragment_pokedex.xml
+++ b/app/src/main/res/layout/fragment_pokedex.xml
@@ -18,7 +18,8 @@
         android:adjustViewBounds="true"
         android:alpha="0.10"
         android:background="@drawable/pokeball"
-        android:tint="@color/white" />
+        app:tint="@color/white"
+        android:contentDescription="@string/pokeball_background_image" />
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index aa467b4..159d7ba 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -1,7 +1,5 @@
 <?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"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
@@ -25,22 +23,23 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
-            android:gravity="center"
             android:background="@drawable/background_search_bar"
+            android:gravity="center"
             android:orientation="horizontal">
 
             <ImageView
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginStart="16dp"
+                android:contentDescription="@string/search_icon"
                 android:src="@drawable/search" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="16dp"
-                android:textSize="16sp"
-                android:text="@string/main_search" />
+                android:text="@string/main_search"
+                android:textSize="16sp" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_stats.xml b/app/src/main/res/layout/fragment_stats.xml
index be45e50..660e715 100644
--- a/app/src/main/res/layout/fragment_stats.xml
+++ b/app/src/main/res/layout/fragment_stats.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView 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"
@@ -25,7 +24,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="HP"
+                android:text="@string/hp"
                 android:textSize="16sp" />
 
             <TextView
@@ -61,7 +60,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Attack"
+                android:text="@string/attack"
                 android:textSize="16sp" />
 
             <TextView
@@ -97,7 +96,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Defense"
+                android:text="@string/defense"
                 android:textSize="16sp" />
 
             <TextView
@@ -133,7 +132,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Sp. Atk"
+                android:text="@string/sp_atk"
                 android:textSize="16sp" />
 
             <TextView
@@ -169,7 +168,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Sp. Def"
+                android:text="@string/sp_def"
                 android:textSize="16sp" />
 
             <TextView
@@ -205,7 +204,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Speed"
+                android:text="@string/speed"
                 android:textSize="16sp" />
 
             <TextView
@@ -241,7 +240,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Total"
+                android:text="@string/total"
                 android:textSize="16sp" />
 
             <TextView
@@ -271,7 +270,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:text="Type defenses"
+            android:text="@string/type_defenses"
             android:textColor="@color/black"
             android:textSize="18sp"
             android:textStyle="bold" />
diff --git a/app/src/main/res/layout/item_generation.xml b/app/src/main/res/layout/item_generation.xml
index f8929ef..f0ecb99 100644
--- a/app/src/main/res/layout/item_generation.xml
+++ b/app/src/main/res/layout/item_generation.xml
@@ -36,8 +36,9 @@
         android:layout_marginBottom="-24dp"
         android:adjustViewBounds="true"
         android:alpha="0.95"
+        android:contentDescription="@string/pokeball_background_image"
         android:src="@drawable/pokeball"
-        android:tint="@color/white" />
+        app:tint="@color/white" />
 
     <ImageView
         android:id="@+id/imageView"
@@ -47,7 +48,7 @@
         android:layout_alignParentBottom="true"
         android:layout_centerInParent="true"
         android:adjustViewBounds="true"
+        android:contentDescription="@string/pokemon_image"
         android:src="@drawable/gen1" />
 
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_menu.xml b/app/src/main/res/layout/item_menu.xml
index aceeefa..18a8109 100644
--- a/app/src/main/res/layout/item_menu.xml
+++ b/app/src/main/res/layout/item_menu.xml
@@ -36,6 +36,7 @@
         android:adjustViewBounds="true"
         android:alpha="0.25"
         android:src="@drawable/pokeball"
-        android:tint="@color/white" />
+        app:tint="@color/white"
+        android:contentDescription="@string/pokeball_background_image" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_news.xml b/app/src/main/res/layout/item_news.xml
index 0d26e25..464074a 100644
--- a/app/src/main/res/layout/item_news.xml
+++ b/app/src/main/res/layout/item_news.xml
@@ -46,7 +46,8 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:adjustViewBounds="true"
-        android:src="@drawable/news1" />
+        android:src="@drawable/news1"
+        android:contentDescription="@string/news_image" />
 
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_pokemon.xml b/app/src/main/res/layout/item_pokemon.xml
index 20801dc..92bc04f 100644
--- a/app/src/main/res/layout/item_pokemon.xml
+++ b/app/src/main/res/layout/item_pokemon.xml
@@ -34,7 +34,6 @@
         android:layout_alignParentEnd="true"
         android:alpha="0.25"
         android:gravity="top"
-        android:text="#001"
         android:textSize="18sp"
         android:textStyle="bold"
         tools:text="#001" />
@@ -50,9 +49,9 @@
         android:background="@drawable/background_item_pokemon_span"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
-        android:text="Grass"
         android:textColor="@color/white"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        tools:text="Grass" />
 
     <TextView
         android:id="@+id/textViewType2"
@@ -64,9 +63,9 @@
         android:background="@drawable/background_item_pokemon_span"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
-        android:text="Grass"
         android:textColor="@color/white"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        tools:text="Grass" />
 
     <TextView
         android:id="@+id/textViewType3"
@@ -77,9 +76,9 @@
         android:background="@drawable/background_item_pokemon_span"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
-        android:text="Grass"
         android:textColor="@color/white"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        tools:text="Grass" />
 
     <ImageView
         android:layout_width="96dp"
@@ -90,8 +89,9 @@
         android:layout_marginBottom="-24dp"
         android:adjustViewBounds="true"
         android:alpha="0.25"
+        android:contentDescription="@string/pokeball_background_image"
         android:src="@drawable/pokeball"
-        android:tint="@color/white" />
+        app:tint="@color/white" />
 
     <ImageView
         android:id="@+id/imageView"
@@ -100,7 +100,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:adjustViewBounds="true"
+        android:contentDescription="@string/pokemon_image"
         android:src="@drawable/poke001" />
 
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3fc4d89..6ee9ddb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,4 +31,25 @@
     <string name="dashboard_tab_2">Base Stats</string>
     <string name="dashboard_tab_3">Evolution</string>
     <string name="dashboard_tab_4">Moves</string>
+    <string name="pokeball_background_image">Pokeball Background Image</string>
+    <string name="search_icon">Search Icon</string>
+    <string name="height">Height</string>
+    <string name="weight">Weight</string>
+    <string name="breeding">Breeding</string>
+    <string name="gender">Gender</string>
+    <string name="egg_groups">Egg Groups</string>
+    <string name="egg_cycle">Egg Cycle</string>
+    <string name="location">Location</string>
+    <string name="training">Training</string>
+    <string name="base_exp">Base EXP</string>
+    <string name="pokemon_image">Pokemon Image</string>
+    <string name="news_image">News Image</string>
+    <string name="hp">HP</string>
+    <string name="sp_atk">Sp. Atk</string>
+    <string name="defense">Defense</string>
+    <string name="attack">Attack</string>
+    <string name="sp_def">Sp. Def</string>
+    <string name="speed">Speed</string>
+    <string name="total">Total</string>
+    <string name="type_defenses">Type defenses</string>
 </resources>