diff --git a/graphics/pokedex/HGSS_tilemap_stats_screen.bin b/graphics/pokedex/HGSS_tilemap_stats_screen.bin
index a6eb2fd162..d6d4fb9463 100644
Binary files a/graphics/pokedex/HGSS_tilemap_stats_screen.bin and b/graphics/pokedex/HGSS_tilemap_stats_screen.bin differ
diff --git a/graphics/pokedex/HGSS_tileset_menu1.png b/graphics/pokedex/HGSS_tileset_menu1.png
index e9bcae9a1f..5e305a0171 100644
Binary files a/graphics/pokedex/HGSS_tileset_menu1.png and b/graphics/pokedex/HGSS_tileset_menu1.png differ
diff --git a/src/pokedex.c b/src/pokedex.c
index 4a88db6767..d12f53fda8 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -6958,50 +6958,12 @@ static void PrintMonStatsToggle(u8 taskId)
                 column++;
             }
         }
-
+        base_i++;
     }
 
-
-    base_y = 86;
-    base_i = 0;
-
+    //TOGGLE--------------------------------------
     if (gTasks[taskId].data[5] == 0)
     {
-        //Exp Yield
-        PrintInfoScreenTextSmall(gText_Stats_ExpYield, base_x, base_y + base_y_offset*base_i);
-        ConvertIntToDecimalStringN(gStringVar1, gBaseStats[species].expYield, STR_CONV_MODE_RIGHT_ALIGN, 3);
-        PrintInfoScreenTextSmall(gStringVar1, base_x + base_x_offset, base_y + base_y_offset*base_i);
-        base_i++;
-
-        //friendship
-        PrintInfoScreenTextSmall(gText_Stats_Friendship, base_x, base_y + base_y_offset*base_i);
-        switch (gBaseStats[species].friendship)
-        {
-        case 35:
-            StringCopy(strEV, gText_Stats_Friendship_BigAnger);
-            break;
-        case 70:
-            StringCopy(strEV, gText_Stats_Friendship_Neutral);
-            break;
-        case 90:
-            StringCopy(strEV, gText_Stats_Friendship_Happy);
-            break;
-        case 100:
-            StringCopy(strEV, gText_Stats_Friendship_Happy);
-            break;
-        case 140:
-            StringCopy(strEV, gText_Stats_Friendship_BigSmile);
-            break;
-        default:
-            ConvertIntToDecimalStringN(strEV, gBaseStats[species].friendship, STR_CONV_MODE_RIGHT_ALIGN, 3);
-            break;
-        }
-        // ConvertIntToDecimalStringN(strEV, gBaseStats[species].friendship, STR_CONV_MODE_RIGHT_ALIGN, 3);
-        align_x = GetStringRightAlignXOffset(0, strEV, total_x);
-        PrintInfoScreenTextSmall(strEV, align_x, base_y + base_y_offset*base_i);
-        base_i++;
-
-
         //Catch rate
         PrintInfoScreenTextSmall(gText_Stats_Catch, base_x, base_y + base_y_offset*base_i);
         ConvertIntToDecimalStringN(gStringVar1, gBaseStats[species].catchRate, STR_CONV_MODE_RIGHT_ALIGN, 3);
@@ -7038,7 +7000,72 @@ static void PrintMonStatsToggle(u8 taskId)
     }
     else
     {
-        base_i = 0;
+        //Exp Yield
+        PrintInfoScreenTextSmall(gText_Stats_ExpYield, base_x, base_y + base_y_offset*base_i);
+        ConvertIntToDecimalStringN(gStringVar1, gBaseStats[species].expYield, STR_CONV_MODE_RIGHT_ALIGN, 3);
+        PrintInfoScreenTextSmall(gStringVar1, base_x + base_x_offset, base_y + base_y_offset*base_i);
+        base_i++;
+
+        //Friendship
+        PrintInfoScreenTextSmall(gText_Stats_Friendship, base_x, base_y + base_y_offset*base_i);
+        switch (gBaseStats[species].friendship)
+        {
+        case 35:
+            StringCopy(strEV, gText_Stats_Friendship_BigAnger);
+            break;
+        case 70:
+            StringCopy(strEV, gText_Stats_Friendship_Neutral);
+            break;
+        case 90:
+            StringCopy(strEV, gText_Stats_Friendship_Happy);
+            break;
+        case 100:
+            StringCopy(strEV, gText_Stats_Friendship_Happy);
+            break;
+        case 140:
+            StringCopy(strEV, gText_Stats_Friendship_BigSmile);
+            break;
+        default:
+            ConvertIntToDecimalStringN(strEV, gBaseStats[species].friendship, STR_CONV_MODE_RIGHT_ALIGN, 3);
+            break;
+        }
+        align_x = GetStringRightAlignXOffset(0, strEV, total_x);
+        PrintInfoScreenTextSmall(strEV, align_x, base_y + base_y_offset*base_i);
+        base_i++;
+
+        //Egg cycles
+        if (gBaseStats[species].eggGroup1 == EGG_GROUP_UNDISCOVERED || gBaseStats[species].eggGroup2 == EGG_GROUP_UNDISCOVERED) //Species without eggs (legendaries etc)
+        {
+            PrintInfoScreenTextSmall(gText_Stats_EggCycles, base_x, base_y + base_y_offset*base_i);
+            PrintInfoScreenTextSmall(gText_ThreeDashes, 78, base_y + base_y_offset*base_i);
+        }
+        else
+        {
+            PrintInfoScreenTextSmall(gText_Stats_EggCycles, base_x, base_y + base_y_offset*base_i);
+            if (gBaseStats[species].eggCycles <= 10)
+            {
+                StringCopy(strEV, gText_Stats_EggCycles_VeryFast);
+                align_x = 76;
+            }
+            else if (gBaseStats[species].eggCycles <= 20)
+            {
+                StringCopy(strEV, gText_Stats_EggCycles_Fast);
+                align_x = 85;
+            }
+            else if (gBaseStats[species].eggCycles <= 30)
+            {
+                StringCopy(strEV, gText_Stats_EggCycles_Normal);
+                align_x = 76;
+            }
+            else
+            {
+                StringCopy(strEV, gText_Stats_EggCycles_Slow);
+                align_x = 67;
+            }
+            PrintInfoScreenTextSmall(strEV, align_x, base_y + base_y_offset*base_i);
+        }
+        base_i++;
+
         //Egg group 1
         switch (gBaseStats[species].eggGroup1)
         {
@@ -7088,7 +7115,6 @@ static void PrintMonStatsToggle(u8 taskId)
             StringCopy(gStringVar1, gText_Stats_eggGroup_UNDISCOVERED);
             break;
         }
-
         //Egg group 2
         if (gBaseStats[species].eggGroup1 != gBaseStats[species].eggGroup2)
         {
@@ -7150,38 +7176,6 @@ static void PrintMonStatsToggle(u8 taskId)
             PrintInfoScreenTextSmall(gStringVar1, base_x, base_y + base_y_offset*base_i);
         }
         base_i++;
-
-        //Egg cycles
-        if (gBaseStats[species].eggGroup1 == EGG_GROUP_UNDISCOVERED || gBaseStats[species].eggGroup2 == EGG_GROUP_UNDISCOVERED) //Species without eggs (legendaries etc)
-        {
-            PrintInfoScreenTextSmall(gText_Stats_EggCycles, base_x, base_y + base_y_offset*base_i);
-            PrintInfoScreenTextSmall(gText_ThreeDashes, 78, base_y + base_y_offset*base_i);
-        }
-        else
-        {
-            PrintInfoScreenTextSmall(gText_Stats_EggCycles, base_x, base_y + base_y_offset*base_i);
-            if (gBaseStats[species].eggCycles <= 10)
-            {
-                StringCopy(strEV, gText_Stats_EggCycles_VeryFast);
-                align_x = 76;
-            }
-            else if (gBaseStats[species].eggCycles <= 20)
-            {
-                StringCopy(strEV, gText_Stats_EggCycles_Fast);
-                align_x = 85;
-            }
-            else if (gBaseStats[species].eggCycles <= 30)
-            {
-                StringCopy(strEV, gText_Stats_EggCycles_Normal);
-                align_x = 76;
-            }
-            else
-            {
-                StringCopy(strEV, gText_Stats_EggCycles_Slow);
-                align_x = 67;
-            }
-            PrintInfoScreenTextSmall(strEV, align_x, base_y + base_y_offset*base_i);
-        }
     }
 
 
diff --git a/src/strings.c b/src/strings.c
index a65bae0b2a..848db7e13c 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1846,7 +1846,7 @@ const u8 gText_Stats_EggCycles_Fast[]       = _("{EMOJI_DIZZYEGG}");
 const u8 gText_Stats_EggCycles_Normal[]     = _("{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}");
 const u8 gText_Stats_EggCycles_Slow[]       = _("{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}");
 const u8 gText_Stats_Growthrate[]    = _("GROW: ");
-const u8 gText_Stats_Friendship[]    = _("FRIENDSHIP:" );
+const u8 gText_Stats_Friendship[]    = _("FRIENDSHIP:");
 const u8 gText_Stats_Friendship_BigAnger[]      = _("{EMOJI_BIGANGER}");
 const u8 gText_Stats_Friendship_Neutral[]       = _("{EMOJI_NEUTRAL}");
 const u8 gText_Stats_Friendship_Happy[]         = _("{EMOJI_HAPPY}");