diff --git a/src/frontend/src/Components/data/restStops.js b/src/frontend/src/Components/data/restStops.js
index bd0c7da9d..0545942da 100644
--- a/src/frontend/src/Components/data/restStops.js
+++ b/src/frontend/src/Components/data/restStops.js
@@ -7,26 +7,24 @@ export function getRestStops(routePoints) {
 }
 
 export function isRestStopClosed(restStopProperties) {
-  if(restStopProperties === undefined){
+  if (restStopProperties === undefined) {
     return false;
   }
-  const isOpenYearRound = restStopProperties.OPEN_YEAR_ROUND === "Yes"? true: false;
-  if(isOpenYearRound){
+  const isOpenYearRound = restStopProperties.OPEN_YEAR_ROUND === "Yes";
+  if (isOpenYearRound) {
     return false;
-  }
-  else{
+  } else {
     const today = new Date();
     const year = today.getFullYear();
     const openDate = restStopProperties.OPEN_DATE;
     const closeDate = restStopProperties.CLOSE_DATE;
-    if(openDate && closeDate){
+    if (openDate && closeDate) {
       const openDateY = new Date(year.toString() + "-"  + openDate.toString());
       const closeDateY =  new Date(year.toString() + "-" + closeDate.toString());
       const isInSeason = (today.getTime() > openDateY.getTime()) && (today.getTime() < closeDateY.getTime());
       const isClosed = isInSeason? false: true;
       return isClosed;
-    }
-    else{
+    } else {
       return true;
     }
   }
diff --git a/src/frontend/src/Components/map/panels/mapPopup.js b/src/frontend/src/Components/map/panels/mapPopup.js
index 9e6c4103a..cb7294976 100644
--- a/src/frontend/src/Components/map/panels/mapPopup.js
+++ b/src/frontend/src/Components/map/panels/mapPopup.js
@@ -332,7 +332,7 @@ export function getRegionalPopup(weatherFeature) {
                   </div>
                   <p className="label">Visibility</p>
                   <p className="data">
-                    {Math.round(conditions.visibility_value)}
+                    {Math.round(conditions.visibility_value)}&nbsp;
                     {conditions.visibility_units}
                   </p>
                 </div>
@@ -348,10 +348,10 @@ export function getRegionalPopup(weatherFeature) {
                     { conditions.wind_speed_value === "calm" ?
                       <span>calm</span> :
                       <span>
-                        { Math.round(conditions.wind_speed_value) }
+                        { Math.round(conditions.wind_speed_value) }&nbsp;
                         { conditions.wind_speed_units }
                         { conditions.wind_gust_value && (
-                          <span>&nbsp;gusts
+                          <span><br />&nbsp;gusts&nbsp;
                             {Math.round(conditions.wind_gust_value)}
                             &nbsp;{conditions.wind_gust_units}
                           </span>
diff --git a/src/frontend/src/Components/map/panels/mapPopup.scss b/src/frontend/src/Components/map/panels/mapPopup.scss
index 602836e73..34dcd06cf 100644
--- a/src/frontend/src/Components/map/panels/mapPopup.scss
+++ b/src/frontend/src/Components/map/panels/mapPopup.scss
@@ -460,6 +460,7 @@
         .friendly-time {
           margin: 0 auto 1rem;
           &-text {
+            text-align: center;
             color: $Type-Secondary;
             font-size: 0.875rem;
           }
@@ -598,7 +599,7 @@
 
       &:not(.group) {
         .data-icon {
-          align-self: center;
+          align-self: top;
         }
       }
 
@@ -646,7 +647,7 @@
       .name {
         color: #584215;
       }
-    }  
+    }
 
     .popup__content {
       ul.advisories-list {