diff --git a/src/components/Header/index.jsx b/src/components/Header/index.jsx
index b3d3a33752a..c5017425e25 100644
--- a/src/components/Header/index.jsx
+++ b/src/components/Header/index.jsx
@@ -6,7 +6,7 @@ const Header = () => {
   const { logo, siteUrl, navLinks } = useSiteMetadata();
 
   return (
-    <div>
+    <>
       <nav
         className="db flex justify-between w-100 ph5-l"
         style={{ marginTop: '3rem' }}
@@ -30,7 +30,7 @@ const Header = () => {
           ))}
         </div>
       </nav>
-    </div>
+    </>
   );
 };
 
diff --git a/src/components/Layout/index.jsx b/src/components/Layout/index.jsx
index 434998d2c51..345a1e94ab5 100644
--- a/src/components/Layout/index.jsx
+++ b/src/components/Layout/index.jsx
@@ -10,7 +10,7 @@ const Layout = ({ children }) => {
   const { siteTitle, description } = useSiteMetadata();
 
   return (
-    <div>
+    <>
       <Helmet bodyAttributes={{ class: styles.body }}>
         <html lang="en" />
         <title>{siteTitle}</title>
@@ -22,8 +22,8 @@ const Layout = ({ children }) => {
         />
       </Helmet>
       <Header />
-      <div className="pa3 pa5-l">{children}</div>
-    </div>
+      <div className="pa3 pa5-l mb5 cf">{children}</div>
+    </>
   );
 };
 
diff --git a/src/components/LocationStat/index.jsx b/src/components/LocationStat/index.jsx
index f98ed9b297f..54b4501ecb5 100644
--- a/src/components/LocationStat/index.jsx
+++ b/src/components/LocationStat/index.jsx
@@ -9,7 +9,7 @@ import LocationSummary from './LocationSummary';
 import PeriodStat from './PeriodStat';
 
 const LocationStat = ({ changeYear, changeCity, changeTitle }) => (
-  <div className="fl w-100 w-100-l pb5 pr5-l">
+  <div className="w-100 w-100-l pb5 pr5-l">
     <section className="pb4" style={{ paddingBottom: '0rem' }}>
       <p style={{ lineHeight: 1.8 }}>
         {CHINESE_LOCATION_INFO_MESSAGE_FIRST}
diff --git a/src/components/RunMap/RunMaker.jsx b/src/components/RunMap/RunMaker.jsx
index 6398ad81a01..86b024537f2 100644
--- a/src/components/RunMap/RunMaker.jsx
+++ b/src/components/RunMap/RunMaker.jsx
@@ -7,7 +7,7 @@ import styles from './style.module.scss';
 const RunMarker = ({ startLon, startLat, endLon, endLat }) => {
   const size = 20;
   return (
-    <div>
+    <>
       <Marker key="maker_start" longitude={startLon} latitude={startLat}>
         <div
           style={{
@@ -28,7 +28,7 @@ const RunMarker = ({ startLon, startLat, endLon, endLat }) => {
           <EndSvg className={styles.locationSVG} />
         </div>
       </Marker>
-    </div>
+    </>
   );
 };
 
diff --git a/src/components/RunMap/RunMapButtons.jsx b/src/components/RunMap/RunMapButtons.jsx
index c5f06f2f544..279c4ed2a84 100644
--- a/src/components/RunMap/RunMapButtons.jsx
+++ b/src/components/RunMap/RunMapButtons.jsx
@@ -8,21 +8,19 @@ const RunMapButtons = ({ changeYear, thisYear }) => {
   yearsButtons.push('Total');
 
   return (
-    <div>
-      <ul className={styles.buttons}>
-        {yearsButtons.map((year) => (
-          <li
-            key={`${year}button`}
-            className={styles.button + ` ${year === thisYear ? styles.selected : ''}`}
-            onClick={() => {
-              changeYear(year);
-            }}
-          >
-            {year}
-          </li>
-        ))}
-      </ul>
-    </div>
+    <ul className={styles.buttons}>
+      {yearsButtons.map((year) => (
+        <li
+          key={`${year}button`}
+          className={styles.button + ` ${year === thisYear ? styles.selected : ''}`}
+          onClick={() => {
+            changeYear(year);
+          }}
+        >
+          {year}
+        </li>
+      ))}
+    </ul>
   );
 };
 
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 7f3161c72d1..ce9568dd299 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -142,42 +142,40 @@ const Index = () => {
 
   return (
     <Layout>
-      <div className="mb5">
-        <div className="fl w-30-l">
-          <h1 className="f1 fw9 i">
-            <a href="/">{siteTitle}</a>
-          </h1>
-          {viewport.zoom <= 3 && IS_CHINESE ? (
-            <LocationStat
-              changeYear={changeYear}
-              changeCity={changeCity}
-              changeTitle={changeTitle}
-            />
-          ) : (
-            <YearsStat year={year} onClick={changeYear} />
-          )}
-        </div>
-        <div className="fl w-100 w-70-l">
-          <RunMap
-            title={title}
-            viewport={viewport}
-            geoData={geoData}
-            setViewport={setViewport}
+      <div className="fl w-30-l">
+        <h1 className="f1 fw9 i">
+          <a href="/">{siteTitle}</a>
+        </h1>
+        {viewport.zoom <= 3 && IS_CHINESE ? (
+          <LocationStat
             changeYear={changeYear}
-            thisYear={year}
+            changeCity={changeCity}
+            changeTitle={changeTitle}
           />
-          {year === 'Total' ? (
-            <SVGStat />
-          ) : (
-            <RunTable
-              runs={runs}
-              locateActivity={locateActivity}
-              setActivity={setActivity}
-              runIndex={runIndex}
-              setRunIndex={setRunIndex}
-            />
-          )}
-        </div>
+        ) : (
+          <YearsStat year={year} onClick={changeYear} />
+        )}
+      </div>
+      <div className="fl w-100 w-70-l">
+        <RunMap
+          title={title}
+          viewport={viewport}
+          geoData={geoData}
+          setViewport={setViewport}
+          changeYear={changeYear}
+          thisYear={year}
+        />
+        {year === 'Total' ? (
+          <SVGStat />
+        ) : (
+          <RunTable
+            runs={runs}
+            locateActivity={locateActivity}
+            setActivity={setActivity}
+            runIndex={runIndex}
+            setRunIndex={setRunIndex}
+          />
+        )}
       </div>
       {/* Enable Audiences in Vercel Analytics: https://vercel.com/docs/concepts/analytics/audiences/quickstart */}
       <Analytics />
