diff --git a/frontend/src/app/_homeComponents/HistoricalSolarCycleData.tsx b/frontend/src/app/_homeComponents/HistoricalSolarCycleData.tsx
index 37ba821..b8b22fd 100644
--- a/frontend/src/app/_homeComponents/HistoricalSolarCycleData.tsx
+++ b/frontend/src/app/_homeComponents/HistoricalSolarCycleData.tsx
@@ -100,7 +100,7 @@ export default function HistoricalSolarCycleData() {
                 ): any {
                     const extremes = this.axis.getExtremes();
                     const zoomLevel = extremes.max - extremes.min; // Get the current zoom range
-                    if (zoomLevel <= 8 * 12 * 30 * 24 * 3600 * 1000) {
+                    if (zoomLevel <= 18 * 30 * 24 * 3600 * 1000) {
                         // If zoomed in to less than or equal to 1 month
                         return Highcharts.dateFormat(
                             "%b %Y",
diff --git a/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx b/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx
index fd335cc..affe3da 100644
--- a/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx
+++ b/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx
@@ -84,20 +84,15 @@ const OrbitDataGraph: React.FC<OrbitDataProps> = ({
             if (periodType === "m") {
                 scrollBarTimeFrame.current = number;
                 SBThumbWidth =
-                    months >= number
-                        ? Math.round(
-                              (svgSize.width * 0.8 * number * 10) / months,
-                          ) / 10
-                        : svgSize.width * 0.8 - 40.5;
+                    Math.round((svgSize.width * 0.8 * number * 10) / months) /
+                    10;
                 setSBThumbWidth(SBThumbWidth);
             } else if (periodType === "y") {
                 scrollBarTimeFrame.current = number * 12;
                 SBThumbWidth =
-                    months >= 12 * number
-                        ? Math.round(
-                              (svgSize.width * 0.8 * number * 12 * 10) / months,
-                          ) / 10
-                        : svgSize.width * 0.8 - 40.5;
+                    Math.round(
+                        (svgSize.width * 0.8 * number * 12 * 10) / months,
+                    ) / 10;
                 setSBThumbWidth(SBThumbWidth);
             }
         }