diff --git a/.gradle/5.6.4/executionHistory/executionHistory.bin b/.gradle/5.6.4/executionHistory/executionHistory.bin
index 6ccfb65..5a2eebc 100644
Binary files a/.gradle/5.6.4/executionHistory/executionHistory.bin and b/.gradle/5.6.4/executionHistory/executionHistory.bin differ
diff --git a/.gradle/5.6.4/executionHistory/executionHistory.lock b/.gradle/5.6.4/executionHistory/executionHistory.lock
index 83e3b3a..43d463a 100644
Binary files a/.gradle/5.6.4/executionHistory/executionHistory.lock and b/.gradle/5.6.4/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.6.4/fileHashes/fileHashes.bin b/.gradle/5.6.4/fileHashes/fileHashes.bin
index 4f638c2..7ddd75d 100644
Binary files a/.gradle/5.6.4/fileHashes/fileHashes.bin and b/.gradle/5.6.4/fileHashes/fileHashes.bin differ
diff --git a/.gradle/5.6.4/fileHashes/fileHashes.lock b/.gradle/5.6.4/fileHashes/fileHashes.lock
index b430fc5..714d5b0 100644
Binary files a/.gradle/5.6.4/fileHashes/fileHashes.lock and b/.gradle/5.6.4/fileHashes/fileHashes.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index d59e9dd..fc5fc6e 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldFragment.java b/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldFragment.java
index 28a8a22..e71ecfd 100755
--- a/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldFragment.java
+++ b/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldFragment.java
@@ -51,7 +51,8 @@ public class YourworldFragment extends Fragment {
                 Log.v("REFRESHING", "************** APP - SWIPE REFRESH EVENT TRIGGERED!!!!!");
                 postRequest();
                 new Handler().postDelayed(new Runnable() {
-                    @Override public void run() {
+                    @Override
+                    public void run() {
                         // Stop animation (This will be after 3 seconds)
                         mSwipeRefreshLayout.setRefreshing(false);
                     }
@@ -110,17 +111,17 @@ public class YourworldFragment extends Fragment {
                 textView3.setText(Html.fromHtml("<b>" + recoveredWithCommas + "</b>"));
                 textView5.setText(Html.fromHtml("<b>" + activeCasesWithCommas + "</b>"));
                 textView6.setText(Html.fromHtml("<b><sup>" + affectedCountriesData + "</sup>" + "/<sub>251</sub></b>"));
-                textView4.setText(Html.fromHtml("Updated on "+ date));
+                textView4.setText(Html.fromHtml("Updated on " + date));
                 ImageView img1 = view.findViewById(R.id.image_level);
                 double recov = world.recovered;
                 double tcases = world.cases;
-                double percent = (recov/tcases)*100;
+                double percent = (recov / tcases) * 100;
                 String percentlegible = df.format(percent);
                 textView123.setText(Html.fromHtml("<b><i>" + percentlegible + "%</i></b>"));
                 Log.d("dfdF", String.valueOf(world.recovered));
                 Log.d("dfdF", String.valueOf(world.cases));
                 Log.d("dfdF", String.valueOf(percent));
-                int x= (int)percent;
+                int x = (int) percent;
                 ClipDrawable drawable = (ClipDrawable) img1.getDrawable();
                 drawable.setLevel(100 * x);
             }
@@ -146,41 +147,36 @@ public class YourworldFragment extends Fragment {
                     String dailyRecoveredWithCommas = numberFormat.format(recovered[0] - yRecovered[0]);
                     Log.d("foo", "I got here");
 
-                    if ((cases[0] - ycases[0]) >= 0){
-                        Spanned text = Html.fromHtml("<i>Daily Increment: " + "<b>"  + "+" + dailyIncWithCommas + "</i></b>");
+                    if ((cases[0] - ycases[0]) >= 0) {
+                        Spanned text = Html.fromHtml("<i>Daily Increment: " + "<b>" + "+" + dailyIncWithCommas + "</i></b>");
+                        SpannableString ss = new SpannableString(text);
+                        ForegroundColorSpan fcsWhite = new ForegroundColorSpan(Color.WHITE);
+                        @SuppressLint("ResourceAsColor") ForegroundColorSpan fcsGreen = new ForegroundColorSpan(R.color.just_cuz);
+                        ss.setSpan(fcsWhite, 0, 16, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                        textView8.setText(ss);
+                    } else {
+                        Spanned text = Html.fromHtml("<i>Daily Increment: " + "<b>" + "-" + dailyIncWithCommas + "</i></b>");
                         SpannableString ss = new SpannableString(text);
                         ForegroundColorSpan fcsWhite = new ForegroundColorSpan(Color.WHITE);
                         @SuppressLint("ResourceAsColor") ForegroundColorSpan fcsGreen = new ForegroundColorSpan(R.color.just_cuz);
                         ss.setSpan(fcsWhite, 0, 16, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                         textView8.setText(ss);
                     }
-                    else {
-                        Spanned text = Html.fromHtml("<i>Daily Increment: " + "<b>"  + "-" + dailyIncWithCommas + "</i></b>");                        SpannableString ss = new SpannableString(text);
-                        ForegroundColorSpan fcsWhite = new ForegroundColorSpan(Color.WHITE);
-                        @SuppressLint("ResourceAsColor") ForegroundColorSpan fcsGreen = new ForegroundColorSpan(R.color.just_cuz);
-                        ss.setSpan(fcsWhite, 0, 16, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-                        textView8.setText(ss);
+                    if ((ACases[0] - yACases[0]) >= 0) {
+                        textView9.setText(Html.fromHtml("<b><i>" + "+" + dailyActWithCommas + "</i></b>"));
+                    } else {
+                        textView9.setText(Html.fromHtml("<b><i>" + "-" + dailyActWithCommas + "</i></b>"));
                     }
-                    if((ACases[0] - yACases[0]) >= 0){
-                        textView9.setText(Html.fromHtml("<b><i>"  + "+" + dailyActWithCommas + "</i></b>"));
+                    if ((recovered[0] - yRecovered[0]) >= 0) {
+                        textView10.setText(Html.fromHtml("<b><i>" + "+" + dailyRecoveredWithCommas + "</i></b>"));
+                    } else {
+                        textView10.setText(Html.fromHtml("<b><i>" + "-" + dailyRecoveredWithCommas + "</i></b>"));
                     }
-                    else {
-                        textView9.setText(Html.fromHtml("<b><i>"  + "-" + dailyActWithCommas + "</i></b>"));
+                    if ((Toddeaths[0] - yDeaths[0]) >= 0) {
+                        textView11.setText(Html.fromHtml("<b><i>" + "+" + dailyDeathWithCommas + "</i></b>"));
+                    } else {
+                        textView11.setText(Html.fromHtml("<b><i>" + "-" + dailyDeathWithCommas + "</i></b>"));
                     }
-                    if((recovered[0] - yRecovered[0]) >= 0){
-                        textView10.setText(Html.fromHtml("<b><i>"  + "+" + dailyRecoveredWithCommas + "</i></b>"));
-                    }
-                    else {
-                        textView10.setText(Html.fromHtml("<b><i>"  + "-" + dailyRecoveredWithCommas + "</i></b>"));
-                    }
-                    if((Toddeaths[0] - yDeaths[0]) >= 0){
-                        textView11.setText(Html.fromHtml("<b><i>"  + "+" + dailyDeathWithCommas + "</i></b>"));
-                    }
-                    else {
-                        textView11.setText(Html.fromHtml("<b><i>"  + "-" + dailyDeathWithCommas + "</i></b>"));
-                    }
-
-
 
 
                     //setData(vYourworldViewModel,world);
@@ -209,12 +205,13 @@ public class YourworldFragment extends Fragment {
         vYourworldViewModel.postRequest(serviceRequest);
 
     }
+
     @SuppressWarnings("deprecation")
-    public static Spanned fromHtml(String html){
-        if(html == null){
+    public static Spanned fromHtml(String html) {
+        if (html == null) {
             // return an empty spannable if the html is null
             return new SpannableString("");
-        }else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             // FROM_HTML_MODE_LEGACY is the behaviour that was used for versions below android N
             // we are using this flag to give a consistent behaviour
             return Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY);
@@ -222,24 +219,4 @@ public class YourworldFragment extends Fragment {
             return Html.fromHtml(html);
         }
     }
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 403ff10..4f8559b 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -34,7 +34,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="#423E3E"
-                android:textSize="13sp"
+                android:textSize="13dp"
                 android:gravity="center"
                 android:text="Sources: JHU, WHO, corona.lmao.ninja" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_yourrealcountry.xml b/app/src/main/res/layout/fragment_yourrealcountry.xml
index 50df985..76379d0 100644
--- a/app/src/main/res/layout/fragment_yourrealcountry.xml
+++ b/app/src/main/res/layout/fragment_yourrealcountry.xml
@@ -22,7 +22,7 @@
             app:layout_constraintWidth_percent=".45"
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintEnd_toEndOf="@+id/text_affectedCountries"
             app:layout_constraintTop_toTopOf="@+id/text_totalTests" />
         <TextView
@@ -32,7 +32,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#FFEB3B"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_testsPerOneMillion"
             app:layout_constraintEnd_toEndOf="@+id/text_testsPerOneMillion"
             app:layout_constraintHorizontal_bias="0.734"
@@ -54,7 +54,7 @@
             app:layout_constraintWidth_percent=".45"
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintEnd_toEndOf="@+id/text_deaths"
             app:layout_constraintTop_toBottomOf="@+id/text_deaths" />
 
@@ -66,7 +66,7 @@
             android:text="Total Tests"
             android:textAlignment="gravity"
             android:textColor="#2196F3"
-            android:textSize="17sp"
+            android:textSize="17dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_totalTests"
             app:layout_constraintStart_toStartOf="@+id/text_activeCasesName6"
             app:layout_constraintTop_toTopOf="@+id/text_totalTests"
@@ -104,7 +104,7 @@
             android:gravity="center"
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -125,7 +125,7 @@
 
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintTop_toTopOf="@+id/text_activeCases"
             app:layout_constraintWidth_percent=".45"
@@ -142,7 +142,7 @@
             android:gravity="center"
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="@+id/text_totalCases"
             app:layout_constraintTop_toBottomOf="@+id/text_totalCases"
@@ -162,7 +162,7 @@
 
             android:textAlignment="center"
             android:textColor="@color/unselected_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintTop_toTopOf="@+id/text_deaths"
@@ -185,7 +185,7 @@
 
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="@+id/text_totalCases"
             app:layout_constraintTop_toBottomOf="@+id/text_activeCases"
@@ -214,7 +214,7 @@
             android:gravity="start"
             android:text="@string/active_cases"
             android:textColor="#FFEB3B"
-            android:textSize="17sp"
+            android:textSize="17dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_activeCases"
             app:layout_constraintStart_toStartOf="@+id/text_totalCasesName"
             app:layout_constraintTop_toTopOf="@+id/text_activeCases"
@@ -226,7 +226,7 @@
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
             android:textColor="#44E372"
-            android:textSize="30sp"
+            android:textSize="30dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_totalCases"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintHorizontal_bias="0.87"
@@ -241,7 +241,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#44E372"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_totalCases"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintHorizontal_bias="0.86"
@@ -257,7 +257,7 @@
             android:fontFamily="sans-serif-light"
             android:text="@string/total_confirmed_cases"
             android:textColor="#FFFFFF"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_totalCases"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintHorizontal_bias="0.2"
@@ -274,7 +274,7 @@
             android:text="@string/total_deceased"
             android:textAlignment="gravity"
             android:textColor="#ff0000"
-            android:textSize="17sp"
+            android:textSize="17dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_deaths"
             app:layout_constraintStart_toStartOf="@+id/text_activeCasesName"
             app:layout_constraintTop_toTopOf="@+id/text_deaths"
@@ -288,7 +288,7 @@
             android:text="Tests Per Million"
             android:textAlignment="gravity"
             android:textColor="#FFEB3B"
-            android:textSize="13sp"
+            android:textSize="13dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_testsPerOneMillion"
             app:layout_constraintStart_toStartOf="@+id/text_RecoveredName"
             app:layout_constraintTop_toTopOf="@+id/text_testsPerOneMillion"
@@ -302,7 +302,7 @@
             android:gravity="start"
             android:text="@string/recoveredName"
             android:textColor="#ffffff"
-            android:textSize="17sp"
+            android:textSize="17dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_affectedCountries"
             app:layout_constraintStart_toStartOf="@+id/text_CriticalName"
             app:layout_constraintTop_toTopOf="@+id/text_affectedCountries"
@@ -315,7 +315,7 @@
             android:layout_marginTop="10dp"
             android:gravity="center"
             android:textColor="#000000"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
@@ -330,7 +330,7 @@
             android:gravity="end"
             android:textAlignment="center"
             android:textColor="#4CAF50"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_recovered"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCasesData"
             app:layout_constraintTop_toTopOf="@+id/text_recovered"
@@ -346,7 +346,7 @@
             android:text="@string/critical"
             android:textAlignment="center"
             android:textColor="#4CAF50"
-            android:textSize="17sp"
+            android:textSize="17dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_recovered"
             app:layout_constraintEnd_toEndOf="@+id/text_recovered"
             app:layout_constraintHorizontal_bias="0.2"
@@ -362,7 +362,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#ff0000"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_deaths"
             app:layout_constraintEnd_toEndOf="@+id/text_deaths"
             app:layout_constraintHorizontal_bias="0.734"
@@ -377,7 +377,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#FFEB3B"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_activeCases"
             app:layout_constraintEnd_toEndOf="@+id/text_activeCases"
             app:layout_constraintHorizontal_bias="0.8"
@@ -392,7 +392,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#ff0000"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_deaths"
             app:layout_constraintEnd_toEndOf="@+id/text_deaths"
             app:layout_constraintHorizontal_bias="0.8"
@@ -407,7 +407,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#2196F3"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_totalTests"
             app:layout_constraintEnd_toEndOf="@+id/text_totalTests"
             app:layout_constraintHorizontal_bias="0.734"
@@ -421,7 +421,7 @@
             android:layout_height="wrap_content"
             android:gravity="end"
             android:textColor="#4CAF50"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_recovered"
             app:layout_constraintEnd_toEndOf="@+id/text_recovered"
             app:layout_constraintHorizontal_bias=".8"
@@ -437,7 +437,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#FFEB3B"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_activeCases"
             app:layout_constraintEnd_toEndOf="@+id/text_activeCases"
             app:layout_constraintHorizontal_bias="0.734"
@@ -450,7 +450,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@android:color/white"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_affectedCountries"
             app:layout_constraintEnd_toEndOf="@+id/text_CriticalData"
             app:layout_constraintTop_toTopOf="@+id/text_affectedCountries"
@@ -463,7 +463,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="start"
             android:textColor="#ffffff"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_affectedCountries"
             app:layout_constraintEnd_toEndOf="@+id/text_affectedCountries"
             app:layout_constraintHorizontal_bias="0.8"
@@ -477,7 +477,7 @@
             android:layout_marginBottom="10dp"
             android:gravity="center"
             android:textAlignment="center"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/fragment_yourstate.xml b/app/src/main/res/layout/fragment_yourstate.xml
index 89abd25..c0f6fcb 100755
--- a/app/src/main/res/layout/fragment_yourstate.xml
+++ b/app/src/main/res/layout/fragment_yourstate.xml
@@ -22,7 +22,7 @@
             android:src="@drawable/round_rect_shape"
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintHeight_percent=".2"
             app:layout_constraintTop_toTopOf="@+id/text_activeCases"
@@ -39,7 +39,7 @@
             android:src="@drawable/round_rect_shape"
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintEnd_toEndOf="@+id/text_totalTests"
             app:layout_constraintHeight_percent=".2"
             app:layout_constraintTop_toTopOf="@+id/text_deaths"
@@ -52,7 +52,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#FFEB3B"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_testsPerOneMillion"
             app:layout_constraintEnd_toEndOf="@+id/text_testsPerOneMillion"
             app:layout_constraintHorizontal_bias="0.734"
@@ -69,7 +69,7 @@
             android:text="Total Tests"
             android:textAlignment="gravity"
             android:textColor="#2196F3"
-            android:textSize="17sp"
+            android:textSize="17dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_totalTests"
             app:layout_constraintEnd_toEndOf="@+id/text_totalTests"
             app:layout_constraintHorizontal_bias="0.22"
@@ -107,7 +107,7 @@
             android:src="@drawable/round_rect_shape"
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHeight_percent=".165"
@@ -127,7 +127,7 @@
             android:src="@drawable/round_rect_shape"
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintHeight_percent=".2"
             app:layout_constraintStart_toStartOf="@+id/text_totalCases"
@@ -148,7 +148,7 @@
             android:textAlignment="center"
 
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintHeight_percent=".2"
             app:layout_constraintStart_toStartOf="@+id/text_totalCases"
@@ -164,7 +164,7 @@
             android:gravity="start"
             android:text="@string/active_cases"
             android:textColor="#FFEB3B"
-            android:textSize="17sp"
+            android:textSize="17dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_activeCases"
             app:layout_constraintStart_toStartOf="@+id/text_totalCasesName"
             app:layout_constraintTop_toTopOf="@+id/text_activeCases"
@@ -176,7 +176,7 @@
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
             android:textColor="#44E372"
-            android:textSize="30sp"
+            android:textSize="30dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_totalCases"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintHorizontal_bias="0.5"
@@ -191,7 +191,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#44E372"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_totalCases"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintHorizontal_bias="0.5"
@@ -207,7 +207,7 @@
             android:fontFamily="sans-serif-light"
             android:text="@string/total_confirmed_cases"
             android:textColor="#FFFFFF"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_totalCases"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintHorizontal_bias="0.2"
@@ -224,7 +224,7 @@
             android:text="@string/total_deceased"
             android:textAlignment="gravity"
             android:textColor="#ff0000"
-            android:textSize="17sp"
+            android:textSize="17dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_deaths"
             app:layout_constraintStart_toStartOf="@+id/text_activeCasesName"
             app:layout_constraintTop_toTopOf="@+id/text_deaths"
@@ -240,7 +240,7 @@
             android:text="Tests Per Million"
             android:textAlignment="gravity"
             android:textColor="#FFEB3B"
-            android:textSize="13sp"
+            android:textSize="13dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_testsPerOneMillion"
             app:layout_constraintVertical_bias="0.115"
             app:layout_constraintStart_toStartOf="@+id/text_activeCasesName3"
@@ -253,7 +253,7 @@
             android:layout_marginTop="15dp"
             android:gravity="center"
             android:textColor="#000000"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
@@ -268,7 +268,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#ff0000"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_deaths"
             app:layout_constraintEnd_toEndOf="@+id/text_deaths"
             app:layout_constraintHorizontal_bias="0.734"
@@ -283,7 +283,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#FFEB3B"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_activeCases"
             app:layout_constraintEnd_toEndOf="@+id/text_activeCases"
             app:layout_constraintHorizontal_bias="0.8"
@@ -298,7 +298,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#ff0000"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_deaths"
             app:layout_constraintEnd_toEndOf="@+id/text_deaths"
             app:layout_constraintHorizontal_bias="0.8"
@@ -313,7 +313,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#2196F3"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_totalTests"
             app:layout_constraintEnd_toEndOf="@+id/text_totalTests"
             app:layout_constraintHorizontal_bias="0.734"
@@ -329,7 +329,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="end"
             android:textColor="#FFEB3B"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_activeCases"
             app:layout_constraintEnd_toEndOf="@+id/text_activeCases"
             app:layout_constraintHorizontal_bias="0.734"
@@ -344,7 +344,7 @@
             android:layout_marginBottom="10dp"
             android:gravity="center"
             android:textAlignment="center"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/fragment_yourworld.xml b/app/src/main/res/layout/fragment_yourworld.xml
index 4b54509..fe9ac66 100755
--- a/app/src/main/res/layout/fragment_yourworld.xml
+++ b/app/src/main/res/layout/fragment_yourworld.xml
@@ -24,7 +24,7 @@
             android:gravity="center"
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintTop_toTopOf="@+id/text_activeCases"
             app:layout_constraintWidth_percent=".45"/>
@@ -41,7 +41,7 @@
             android:gravity="center"
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="@+id/text_totalCases"
             app:layout_constraintTop_toBottomOf="@+id/text_totalCases"
@@ -57,7 +57,7 @@
             android:gravity="left"
             android:text="@string/active_cases"
             android:textColor="#FFEB3B"
-            android:textSize="17sp"
+            android:textSize="17dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_activeCases"
             app:layout_constraintStart_toStartOf="@+id/text_totalCasesName"
             app:layout_constraintTop_toTopOf="@+id/text_activeCases"
@@ -74,7 +74,7 @@
             android:gravity="center"
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
@@ -104,7 +104,7 @@
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
             android:textColor="#44E372"
-            android:textSize="40sp"
+            android:textSize="40dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_totalCases"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintHorizontal_bias="0.87"
@@ -119,7 +119,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="right"
             android:textColor="#44E372"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_totalCases"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintHorizontal_bias="0.86"
@@ -135,7 +135,7 @@
             android:fontFamily="sans-serif-light"
             android:text="Total Confirmed Cases"
             android:textColor="#FFFFFF"
-            android:textSize="25sp"
+            android:textSize="25dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_totalCases"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintHorizontal_bias="0.200"
@@ -151,7 +151,7 @@
             android:layout_marginTop="5dp"
             android:gravity="center"
             android:textAlignment="center"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
@@ -171,7 +171,7 @@
             android:scaleType="fitXY"
             android:textAlignment="center"
             android:textColor="@color/unselected_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCases"
             app:layout_constraintTop_toBottomOf="@+id/text_recovered"
@@ -191,7 +191,7 @@
             android:gravity="center"
             android:textAlignment="center"
             android:textColor="@color/unselected_header_background_color"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="@+id/text_totalCases"
             app:layout_constraintTop_toBottomOf="@+id/text_activeCases"
@@ -244,7 +244,7 @@
             android:layout_marginTop="10dp"
             android:fontFamily="@font/cutive"
             android:gravity="center"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.500"
             app:layout_constraintStart_toStartOf="parent"
@@ -259,7 +259,7 @@
             android:gravity="right"
             android:textAlignment="center"
             android:textColor="#1B96F8"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_recovered"
             app:layout_constraintEnd_toEndOf="@+id/text_totalCasesData"
             app:layout_constraintTop_toTopOf="@+id/text_recovered"
@@ -275,7 +275,7 @@
             android:text="@string/recoveredName"
             android:textAlignment="center"
             android:textColor="#1B96F8"
-            android:textSize="17sp"
+            android:textSize="17dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_recovered"
             app:layout_constraintEnd_toEndOf="@+id/text_recovered"
             app:layout_constraintHorizontal_bias="0.22"
@@ -291,7 +291,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="center"
             android:textColor="#ffffff"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_affectedCountries"
             app:layout_constraintEnd_toEndOf="@+id/text_affectedCountries"
             app:layout_constraintHorizontal_bias="0.8"
@@ -306,7 +306,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="right"
             android:textColor="#ff0000"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_deaths"
             app:layout_constraintEnd_toEndOf="@+id/text_deaths"
             app:layout_constraintHorizontal_bias="0.734"
@@ -321,7 +321,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="right"
             android:textColor="#FFEB3B"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_activeCases"
             app:layout_constraintEnd_toEndOf="@+id/text_activeCases"
             app:layout_constraintHorizontal_bias="0.8"
@@ -336,7 +336,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="right"
             android:textColor="#ff0000"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_deaths"
             app:layout_constraintEnd_toEndOf="@+id/text_deaths"
             app:layout_constraintHorizontal_bias="0.8"
@@ -350,7 +350,7 @@
             android:layout_height="wrap_content"
             android:gravity="right"
             android:textColor="#1B96F8"
-            android:textSize="15sp"
+            android:textSize="15dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_recovered"
             app:layout_constraintEnd_toEndOf="@+id/text_recovered"
             app:layout_constraintHorizontal_bias=".8"
@@ -366,7 +366,7 @@
             android:fontFamily="sans-serif-light"
             android:gravity="right"
             android:textColor="#FFEB3B"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/text_activeCases"
             app:layout_constraintEnd_toEndOf="@+id/text_activeCases"
             app:layout_constraintHorizontal_bias="0.734"
diff --git a/app/src/main/res/layout/my_spinner_style.xml b/app/src/main/res/layout/my_spinner_style.xml
index e8df39c..c111d3a 100644
--- a/app/src/main/res/layout/my_spinner_style.xml
+++ b/app/src/main/res/layout/my_spinner_style.xml
@@ -3,7 +3,7 @@
     android:layout_height="fill_parent"
     android:layout_width="fill_parent"
     android:gravity="center"
-    android:textSize="18sp"
+    android:textSize="18dp"
     android:scaleType="fitXY"
     android:textColor="#000000"
     android:textStyle="bold"
diff --git a/app/src/main/res/res/values/dimens.xml b/app/src/main/res/res/values/dimens.xml
index 03fd783..ba65f0e 100755
--- a/app/src/main/res/res/values/dimens.xml
+++ b/app/src/main/res/res/values/dimens.xml
@@ -2,5 +2,5 @@
 <resources>
     <dimen name="table_view_cell_height">28dp</dimen>
     <dimen name="table_view_row_header_width">28dp</dimen>
-    <dimen name="table_view_default_text_size">11sp</dimen>
+    <dimen name="table_view_default_text_size">11dp</dimen>
 </resources>
diff --git a/app/src/main/res/res/values/styles.xml b/app/src/main/res/res/values/styles.xml
index 82dc0d1..a7cc09a 100755
--- a/app/src/main/res/res/values/styles.xml
+++ b/app/src/main/res/res/values/styles.xml
@@ -17,6 +17,6 @@
 
     <style name="itemTextStyle.AppTheme" parent="@android:style/TextAppearance.Widget.IconMenu.Item">
         <item name="android:textColor">@drawable/color_item_popup</item>
-        <item name="android:textSize">11sp</item>
+        <item name="android:textSize">11dp</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2f9d2c8..67c143b 100755
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,5 +8,5 @@
 
     <dimen name="table_view_cell_height">28dp</dimen>
     <dimen name="table_view_row_header_width">28dp</dimen>
-    <dimen name="table_view_default_text_size">11sp</dimen>z
+    <dimen name="table_view_default_text_size">11dp</dimen>z
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9c78559..5cd1456 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,7 +16,7 @@
 
     <style name="itemTextStyle.AppTheme" parent="@android:style/TextAppearance.Widget.IconMenu.Item">
         <item name="android:textColor">@drawable/color_item_popup</item>
-        <item name="android:textSize">11sp</item>
+        <item name="android:textSize">11dp</item>
     </style>
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>