From e1f4df8e510f1531c41f1bc48c27fe8757fd47ac Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 13 Jul 2022 23:04:48 -0700
Subject: [PATCH 001/130] Add Geolocation from behind feature flag

---
 .../src/components/AreaDetail/AreaDetail.tsx  |  2 +-
 client/src/components/J40Map.module.scss      | 85 ++++++++++++++-----
 client/src/components/J40Map.module.scss.d.ts | 21 +++--
 client/src/components/J40Map.tsx              | 57 ++++++++-----
 .../MapSearch/MapSearch.module.scss           | 22 ++---
 5 files changed, 122 insertions(+), 65 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 82bacb05f..6230de484 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -267,7 +267,7 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
   //   description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.MED_HOME_VAL),
   //   value: properties[constants.MEDIAN_HOME_VALUE_PERCENTILE] ?
   //   properties[constants.MEDIAN_HOME_VALUE_PERCENTILE] : null,
-  //   isDisadvagtaged: false, // TODO
+  //   isDisadvagtaged: false,
   // };
 
   const proxHaz: indicatorInfo = {
diff --git a/client/src/components/J40Map.module.scss b/client/src/components/J40Map.module.scss
index 926f2f58c..0cc4e3cba 100644
--- a/client/src/components/J40Map.module.scss
+++ b/client/src/components/J40Map.module.scss
@@ -1,24 +1,71 @@
 @use '../styles/design-system.scss' as *;
 @import "./utils.scss";
 
-.j40Popup {
-  width: 375px;
-}
 
-.navigationControl {
-  left: .75em;
-  top: units(15);
-  // width: 2.5em;
-}
+.j40Map {
+  @include at-media-max("desktop") {
+    // < 1024
+    height: 55vh;
+  }
 
-.fullscreenControl {
-  right: 1.25em;
-  top: 2.5em;
-}
+  .mapHeaderRow{
+    @include u-display("flex");
+    @include u-padding-left(1.5);
+    
+    justify-content: space-between;
+
+    /* 
+      This width is set to prevent this row from 
+      overflowing. Using justify-content: space-between
+      will allow the geolocation button to be right 
+      ajusted. Without the width property constraint
+      of 98%, the space-between property forces the
+      geolocation icon out of the parent container.
+      
+      Since the geolocation control is absolutely
+      positioned, attempts were made to set the 
+      parent to be relative to avoid this, however
+      it seems that we haven't found a cleaner
+      solution (yet).
+    */
+    width: 98%;
+
+    
+    .geolocateBox {
+      @include u-margin-top(3);
+      
+      .geolocateIcon{
+        align-self: flex-end;
+        @include u-margin-right(4);
+        @include u-margin-top(.5);
+        
+        @include at-media-max("tablet") {
+          // < 640
+          @include u-margin-top(3);
+        }
+        
+        @media (max-width: 362px){
+          @include u-margin-top(5);
+
+        }
+      }
+    }
+  }
+
+  .navigationControl {
+    left: .75em;
+    top: units(15);
+  }
+  
+  //These classes are behind feature flags:
+  .fullscreenControl {
+    right: 1.25em;
+    top: 2.5em;
+  }
+  .j40Popup {
+    width: 375px;
+  }
 
-.geolocateControl {
-  right: 1.25em;
-  top: 5em;
 }
 
 .mapInfoPanel {
@@ -26,11 +73,3 @@
   overflow-y: auto;
   height: 90vh;
 }
-
-// This will control the height of the map when the device 
-// width is less than desktop (1024px)
-.j40Map {
-  @include at-media-max("desktop") {
-    height: 55vh;
-  }
-}
\ No newline at end of file
diff --git a/client/src/components/J40Map.module.scss.d.ts b/client/src/components/J40Map.module.scss.d.ts
index 502b1205a..60fea2cc2 100644
--- a/client/src/components/J40Map.module.scss.d.ts
+++ b/client/src/components/J40Map.module.scss.d.ts
@@ -1,14 +1,23 @@
 declare namespace J40MapModuleScssNamespace {
   export interface IJ40MapModuleScss {
-    j40Popup: string;
-    territoryFocusButton: string;
-    territoryFocusContainer: string;
+    // main J40 map style
+    j40Map: string;
+
+    // map header row
+    mapHeaderRow: string;
+    geolocateBox: string;
+    geolocateMessage: string;
+    geolocateMessageHide: string;
+    geolocateIcon: string;
+
+    // nav control
     navigationControl: string;
+
+    // feature flags
     fullscreenControl: string;
-    geolocateControl: string;
-    detailView: string;
+    j40Popup: string;
+
     mapInfoPanel: string;
-    j40Map: string;
   }
 }
 
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index c0f10ba3c..e4fba0dd1 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -98,7 +98,12 @@ export const featureURLForTilesetName = (tilesetName: string): string => {
   }
 };
 
-
+/**
+ * This the main map component
+ *
+ * @param {IJ40Interface} location
+ * @returns {ReactElement}
+ */
 const J40Map = ({location}: IJ40Interface) => {
   /**
    * Initializes the zoom, and the map's center point (lat, lng) via the URL hash #{z}/{lat}/{long}
@@ -329,12 +334,12 @@ const J40Map = ({location}: IJ40Interface) => {
   return (
     <>
       <Grid desktop={{col: 9}} className={styles.j40Map}>
-
         {/**
-         * This will render the MapSearch component
-         *
          * Note:
-         * The MapSearch component is no longer wrapped in a div in order to allow this feature
+         * The MapSearch component is no longer used in this location. It has been moved inside the
+         * <ReactMapGL> component itself.
+         *
+         * It was originally wrapped in a div in order to allow this feature
          * to be behind a feature flag. This was causing a bug for MapSearch to render
          * correctly in a production build. Leaving this comment here in case future flags are
          * needed in this component.
@@ -346,9 +351,10 @@ const J40Map = ({location}: IJ40Interface) => {
          *   - npm run clean && npm run build && npm run serve
          *
          * to ensure the production build works and that MapSearch and the map (ReactMapGL) render correctly.
+         *
+         * Any component declrations outside the <ReactMapGL> component may be susceptible to this bug.
          */}
-        <MapSearch goToPlace={goToPlace}/>
-
+        {/* <MapSearch goToPlace={goToPlace}/> */}
 
         {/**
          * The ReactMapGL component's props are grouped by the API's documentation. The component also has
@@ -393,7 +399,9 @@ const J40Map = ({location}: IJ40Interface) => {
           data-cy={'reactMapGL'}
         >
           {/**
-           * The low zoom source
+           * Load all data sources and layers
+           *
+           * First the low zoom:
            */}
           <Source
             id={constants.LOW_ZOOM_SOURCE_NAME}
@@ -483,25 +491,34 @@ const J40Map = ({location}: IJ40Interface) => {
             />
           </Source>
 
-          {/* This will add the navigation controls of the zoom in and zoom out buttons */}
+          {/* This is the first overlayed row on the map: Search and Geolocation */}
+          <div className={styles.mapHeaderRow}>
+            <MapSearch goToPlace={goToPlace}/>
+
+            <div className={styles.geolocateBox}>
+              <div className={styles.geolocateIcon}>
+                <GeolocateControl
+                  positionOptions={{enableHighAccuracy: true}}
+                  onGeolocate={onGeolocate}
+                  onClick={onClickGeolocate}
+                  trackUserLocation={true}
+                />
+              </div>
+            </div>
+
+          </div>
+
+          {/* This is the second row overlayed on the map, it will add the navigation controls
+          of the zoom in and zoom out buttons */}
           { windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG && <NavigationControl
             showCompass={false}
             className={styles.navigationControl}
           /> }
 
-          {/* This will show shortcut buttons to pan/zoom to US territories */}
+          {/* This is the third row overlayed on the map, it will show shortcut buttons to
+          pan/zoom to US territories */}
           <TerritoryFocusControl onClick={onClick}/>
 
-          {/* This places Geolocation behind a feature flag */}
-          {'gl' in flags ? <GeolocateControl
-            className={styles.geolocateControl}
-            positionOptions={{enableHighAccuracy: true}}
-            onGeolocate={onGeolocate}
-            // @ts-ignore
-            onClick={onClickGeolocate}
-          /> : ''}
-          {geolocationInProgress ? <div>Geolocation in progress...</div> : ''}
-
           {/* Enable fullscreen pop-up behind a feature flag */}
           {('fs' in flags && detailViewData && !transitionInProgress) && (
             <Popup
diff --git a/client/src/components/MapSearch/MapSearch.module.scss b/client/src/components/MapSearch/MapSearch.module.scss
index a2abacceb..3010fa31f 100644
--- a/client/src/components/MapSearch/MapSearch.module.scss
+++ b/client/src/components/MapSearch/MapSearch.module.scss
@@ -1,20 +1,12 @@
 @use '../../styles/design-system.scss' as *;
 
 .mapSearchContainer {
-
-    // styles for mobile-lg (480px) and greater widths,
-    @include at-media('mobile-lg') {
-        position: absolute;
-        // top: units(4);
-        left: units(1.5);
-        width: 50%;
-        z-index: 1;
-    }
-    
-    // styles for less than mobile-lg (480px)
-    position: absolute;
-    left: units(1.5);
-    width: 90%;
-    z-index: 1;
+    /*
+      The width of the container is being limited so that 
+      as the device width decreases, the geolocation 
+      button has enough space between the Search
+      component
+    */
+    width: 71%;
 }
 

From 125a66a90dd0a2e54f0a6e28e21ca541d889be0f Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Thu, 14 Jul 2022 16:21:41 -0700
Subject: [PATCH 002/130] Comment updates from PR feedback

---
 client/src/components/J40Map.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index e4fba0dd1..17480924a 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -352,9 +352,8 @@ const J40Map = ({location}: IJ40Interface) => {
          *
          * to ensure the production build works and that MapSearch and the map (ReactMapGL) render correctly.
          *
-         * Any component declrations outside the <ReactMapGL> component may be susceptible to this bug.
+         * Any component declarations outside the <ReactMapGL> component may be susceptible to this bug.
          */}
-        {/* <MapSearch goToPlace={goToPlace}/> */}
 
         {/**
          * The ReactMapGL component's props are grouped by the API's documentation. The component also has

From 8d2f3d26b1222adb42faacaa2a45f167da097d64 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 18 Jul 2022 11:38:59 -0700
Subject: [PATCH 003/130] Modify geolocate icon and beacon to be black

---
 client/src/components/J40Map.module.scss | 32 +++++++++++-------
 client/src/components/J40Map.tsx         | 26 +++++++++++++--
 client/src/data/copy/explore.tsx         | 15 +++++++++
 client/src/intl/en.json                  |  4 +++
 client/src/styles/global.scss            | 41 +++++++++++++++++++++++-
 5 files changed, 103 insertions(+), 15 deletions(-)

diff --git a/client/src/components/J40Map.module.scss b/client/src/components/J40Map.module.scss
index 0cc4e3cba..01827a3ca 100644
--- a/client/src/components/J40Map.module.scss
+++ b/client/src/components/J40Map.module.scss
@@ -32,22 +32,32 @@
 
     
     .geolocateBox {
-      @include u-margin-top(3);
+      margin-top: 6px;
+
+      .geolocateMessage {
+        visibility: visible;
+        background-color: white;
+        margin-bottom: 3px;
+      }
+      
+      .geolocateMessageHide {
+        visibility: hidden;
+        margin-bottom: 3px;
+      }
+      
+      @include at-media-max("tablet") {
+        // < 640
+        margin-top: 28px;
+      }
       
+      @media (max-width: 365px){
+        margin-top: 46px;
+
+      }
       .geolocateIcon{
         align-self: flex-end;
         @include u-margin-right(4);
-        @include u-margin-top(.5);
         
-        @include at-media-max("tablet") {
-          // < 640
-          @include u-margin-top(3);
-        }
-        
-        @media (max-width: 362px){
-          @include u-margin-top(5);
-
-        }
       }
     }
   }
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index 17480924a..3009d1391 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -13,6 +13,7 @@ import ReactMapGL, {
   FlyToInterpolator,
   FullscreenControl,
   MapRef, Source, Layer} from 'react-map-gl';
+import {useIntl} from 'gatsby-plugin-intl';
 import bbox from '@turf/bbox';
 import * as d3 from 'd3-ease';
 import {isMobile} from 'react-device-detect';
@@ -34,6 +35,7 @@ import 'maplibre-gl/dist/maplibre-gl.css';
 import * as constants from '../data/constants';
 import * as styles from './J40Map.module.scss';
 import * as COMMON_COPY from '../data/copy/common';
+import * as EXPLORE_COPY from '../data/copy/explore';
 
 
 declare global {
@@ -55,6 +57,11 @@ export interface IDetailViewInterface {
   properties: constants.J40Properties,
 };
 
+export const GEOLOCATION_STATES = {
+  OFF: 'OFF',
+  LOCATING: 'LOCATING',
+  LOCKED: 'LOCKED',
+};
 /**
  * This function will determine the URL for the map tiles. It will read in a string that will designate either
  * high or low tiles. It will allow to overide the URL to the pipeline staging tile URL via feature flag.
@@ -130,12 +137,13 @@ const J40Map = ({location}: IJ40Interface) => {
   const [selectedFeature, setSelectedFeature] = useState<MapboxGeoJSONFeature>();
   const [detailViewData, setDetailViewData] = useState<IDetailViewInterface>();
   const [transitionInProgress, setTransitionInProgress] = useState<boolean>(false);
-  const [geolocationInProgress, setGeolocationInProgress] = useState<boolean>(false);
+  const [geolocationState, setGeolocationState] = useState(GEOLOCATION_STATES.OFF);
   const [isMobileMapState, setIsMobileMapState] = useState<boolean>(false);
   const {width: windowWidth} = useWindowSize();
 
   const mapRef = useRef<MapRef>(null);
   const flags = useFlags();
+  const intl = useIntl();
 
   const selectedFeatureId = (selectedFeature && selectedFeature.id) || '';
   const filter = useMemo(() => ['in', constants.GEOID_PROPERTY, selectedFeatureId], [selectedFeature]);
@@ -322,11 +330,17 @@ const J40Map = ({location}: IJ40Interface) => {
   };
 
   const onGeolocate = () => {
-    setGeolocationInProgress(false);
+    setGeolocationState(GEOLOCATION_STATES.LOCKED);
   };
 
   const onClickGeolocate = () => {
-    setGeolocationInProgress(true);
+    if (geolocationState === GEOLOCATION_STATES.LOCKED) {
+      setGeolocationState(GEOLOCATION_STATES.OFF);
+    }
+
+    if (geolocationState === GEOLOCATION_STATES.OFF) {
+      setGeolocationState(GEOLOCATION_STATES.LOCATING);
+    }
   };
 
   const mapBoxBaseLayer = 'tl' in flags ? `mapbox://styles/justice40/cl2qimpi2000014qeb1egpox8` : `mapbox://styles/mapbox/streets-v11`;
@@ -495,6 +509,12 @@ const J40Map = ({location}: IJ40Interface) => {
             <MapSearch goToPlace={goToPlace}/>
 
             <div className={styles.geolocateBox}>
+              <div
+                className={
+                  geolocationState === GEOLOCATION_STATES.LOCATING ?
+                  styles.geolocateMessage : styles.geolocateMessageHide}>
+                {intl.formatMessage(EXPLORE_COPY.MAP.GEOLOC_MSG_LOCATING)}
+              </div>
               <div className={styles.geolocateIcon}>
                 <GeolocateControl
                   positionOptions={{enableHighAccuracy: true}}
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 00c6f52cb..e98634532 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -158,6 +158,21 @@ export const MAP = defineMessages({
     defaultMessage: 'US Virgin Islands',
     description: 'On the explore the map page, on the map, the full name indicating the bounds of US Virgin Islands',
   },
+  GEOLOC_MSG_LOCATING: {
+    id: 'explore.map.page.map.geolocation.locating',
+    defaultMessage: 'Geolocating...',
+    description: 'On the explore the map page, on the map, this is the message above the gelocation icon that geolocation is locating.',
+  },
+  // GEOLOC_MSG_OFF: {
+  //   id: 'explore.map.page.map.geolocation.off',
+  //   defaultMessage: 'Geolocation off',
+  //   description: 'On the explore the map page, on the map, this is the message above the gelocation icon that geolocation is off.',
+  // },
+  // GEOLOC_MSG_LOCKED: {
+  //   id: 'explore.map.page.map.geolocation.locked',
+  //   defaultMessage: 'Geolocation locked',
+  //   description: 'On the explore the map page, on the map, this is the message above the gelocation icon that geolocation is locked.',
+  // },
 });
 
 
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index ebe6156f2..cf14693e1 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -343,6 +343,10 @@
     "defaultMessage": "Communities identified as disadvantaged by the map are those that are marginalized, underserved, and overburdened by pollution. These communities are at or above the thresholds in one or more of eight categories of criteria.",
     "description": "On the explore the map page, the description of the legend"
   },
+  "explore.map.page.map.geolocation.locating": {
+    "defaultMessage": "Geolocating...",
+    "description": "On the explore the map page, on the map, this is the message above the gelocation icon that geolocation is locating."
+  },
   "explore.map.page.map.search.placeholder.mobile.text": {
     "defaultMessage": "Search locations",
     "description": "On the explore the map page, on the map, the placeholder text for search"
diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss
index ff981976b..666b2c99e 100644
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@@ -184,12 +184,51 @@ This section will outline styles that are component specific
 // Maplibre overrides
 // Note that these need to be here to properly override defaults
 
+
+/**
+Geolocate Icon Styling: 
+The icon as 4 states; off, geolocating, locked and off-center. The icon is an SVG made of an 'active' layer and a 'background' layer. The standard styling allows for a clear distinction between the 4 states:
+  - off = black active and black for background
+  - geolocating = blue for active and blue for background (with circular animation)
+  - locked = blue for active and blue for background (no animation)
+  - off-center = blue for background only
+  
+  These states were changed to the following:
+  - off = black active and black for background
+  - geolocating = black for active and black for background (with circular animation)
+  - locked = black for active and black for background
+  - off-center = black for background only
+  
+  The reason the Icon was changed was to match the other overlayed icons - such as territory shortcuts. These other icons don't have multiple states embedded in them. This new color scheme creates ambiguity among two states, namely (off and locked) as they have the same exact style.
+*/
+.mapboxgl-ctrl {
+  button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-active { 
+    .mapboxgl-ctrl-icon {
+      background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%23333'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3Ccircle cx='10' cy='10' r='2'/%3E%3C/svg%3E") !important;
+    }
+  }
+}
+.mapboxgl-ctrl {
+  button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-background {
+    .mapboxgl-ctrl-icon {
+      background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%2333'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3C/svg%3E") !important;
+    }
+  }
+}
+
+/**
+Beacon - the beacon's color (*-location-dot) and proximity animation (::before) was changed to black. The reason the beacon was changed was to increase the contrast between the beacon and the census tract layers
+*/
+.mapboxgl-user-location-dot, .mapboxgl-user-location-dot::before  {
+  background-color: #000 !important;  
+}
+
+// Overide mapbox popup styles
 .mapboxgl-popup-close-button {
   font-size: 3em;
   margin-right: 12px;
   margin-top: 15px;
 }
-
 .mapboxgl-popup-content {
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5) !important;
   border-radius: 8px !important;

From 49df74a28eb20c2a550e8c438f980ef700f186e5 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 19 Jul 2022 09:29:30 -0700
Subject: [PATCH 004/130] Upgrade lb dependencies

- upgrade uswds to 2.13.3
- upgrade trussworks to 3.1.0
- fix breaking changes on Accordion, Search, SummaryBox, Collections,
---
 client/README.md                              |   4 +-
 client/package-lock.json                      | 142 +++++-------------
 client/package.json                           |   4 +-
 .../src/components/AreaDetail/AreaDetail.tsx  |   9 ++
 .../__snapshots__/MapSearch.test.tsx.snap     |  10 +-
 .../components/PublicEvent/PublicEvent.tsx    |   2 +-
 .../PublicVideoBox/PublicVideoBox.tsx         |  92 ++++++------
 .../RequestForInfo/RequestForInfo.tsx         |  14 +-
 8 files changed, 113 insertions(+), 164 deletions(-)

diff --git a/client/README.md b/client/README.md
index 42b468cd5..78fe76fdb 100644
--- a/client/README.md
+++ b/client/README.md
@@ -222,5 +222,5 @@ The following attemps to explain why certain packages versions have been chosen
 | gatsby     | 3.14.6          | 4.14.2         | No            | when attempting to update - breaks all unit tests. Compatibility warning come up with all plugins but this doesn't seems to effect functionality. This is the latest version we can release without investigating unit tests. |    
 | gatsby-cli | 3.14.2          | 4.15.2         | No            | when attempting to update - breaks all unit tests. Compatibility warning come up with all plugins but this doesn't seems to effect functionality. This is the latest version we can release without investigating unit tests.|  
 | sass       | 1.32.12         | 1.52.3         | No            | This version is needed to surpress the dart warnings on / as division for each component. See [here](https://github.com/twbs/bootstrap/issues/34051#issuecomment-845884423) for more information |
-| uswds      | 2.11.2          | 3.0.2          | No            | Needs to stay at 2.11 for peer dependency on trussworks|   
-| trussworks | 2.9.0           | 3.0.2          | No            | Needs to stay at 2.9 as 3.0 is breaking change |
\ No newline at end of file
+| uswds      | 2.13.3          | 3.0.2          | No            | Needs to stay at 2.13.3 for peer dependency on trussworks|   
+| trussworks | 3.1.0           | 3.1.0          | No            | latest! |
\ No newline at end of file
diff --git a/client/package-lock.json b/client/package-lock.json
index 98a13bc74..f4a654cb4 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "-": "^0.0.1",
         "@sentry/gatsby": "^7.7.0",
-        "@trussworks/react-uswds": "^2.9.0",
+        "@trussworks/react-uswds": "^3.1.0",
         "@turf/bbox": "^6.5.0",
         "d3-ease": "^3.0.1",
         "gatsby-plugin-env-variables": "^2.2.0",
@@ -27,7 +27,7 @@
         "react-intl": "^5.24.7",
         "react-map-gl": "^6.1.19",
         "react-use": "^17.3.2",
-        "uswds": "^2.11.2"
+        "uswds": "^2.13.3"
       },
       "devDependencies": {
         "@formatjs/cli": "^4.8.2",
@@ -3579,16 +3579,16 @@
       }
     },
     "node_modules/@trussworks/react-uswds": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/@trussworks/react-uswds/-/react-uswds-2.9.0.tgz",
-      "integrity": "sha512-qv5twPgzLJulWsZew3No3W45FTp3WrYGwG/3B+w/mPFuAMHmAX7VAiigmg+k2kHFvrpjyAiKZHREpHyhkZIbig==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@trussworks/react-uswds/-/react-uswds-3.1.0.tgz",
+      "integrity": "sha512-4krdLn8LGgr3EwOsizUF6cBLnwDS6x0WgJjjGk59kNBpgH4qiv8YGzic3HYaVr8xWBq36VpEEfGeQZnjYGMegw==",
       "engines": {
-        "node": "10.x - 16.x"
+        "node": "10.x - 18.x"
       },
       "peerDependencies": {
         "react": "^16.x || ^17.x",
         "react-dom": "^16.x || ^17.x",
-        "uswds": "2.11.2"
+        "uswds": "2.13.3"
       }
     },
     "node_modules/@trysound/sax": {
@@ -6622,9 +6622,9 @@
       }
     },
     "node_modules/classlist-polyfill": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz",
-      "integrity": "sha1-k1vC39lFiodrJ5YXUUY4vKqWSi4="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.0.3.tgz",
+      "integrity": "sha512-bDLDUsSg5LYFWsc2hphtG6ulyaCFSupdEBU3wxNECKWHnyPVvY8EB9Wbt9DzWkstWclFZhDaZK/VnEK/DmqE/Q=="
     },
     "node_modules/clean-stack": {
       "version": "2.2.0",
@@ -8877,11 +8877,6 @@
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.89.tgz",
       "integrity": "sha512-z1Axg0Fu54fse8wN4fd+GAINdU5mJmLtcl6bqIcYyzNVGONcfHAeeJi88KYMQVKalhXlYuVPzKkFIU5VD0raUw=="
     },
-    "node_modules/elem-dataset": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/elem-dataset/-/elem-dataset-2.0.0.tgz",
-      "integrity": "sha512-e7gieGopWw5dMdEgythH3lUS7nMizutPDTtkzfQW/q2gCvFnACyNnK3ytCncAXKxdBXQWcXeKaYTTODiMnp8mw=="
-    },
     "node_modules/element-closest": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/element-closest/-/element-closest-2.0.2.tgz",
@@ -25238,55 +25233,18 @@
       }
     },
     "node_modules/uswds": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/uswds/-/uswds-2.11.2.tgz",
-      "integrity": "sha512-JISTXCjPIlrufbObIifjrMDn5jF9bbLu7UYhGWmEs9iqB6Z2KDCXHVoBUyzMmIrIjW/UWWYHZzPqOOHO6/IMCQ==",
-      "dependencies": {
-        "classlist-polyfill": "^1.0.3",
-        "del": "^6.0.0",
-        "domready": "^1.0.8",
-        "elem-dataset": "^2.0.0",
-        "object-assign": "^4.1.1",
-        "receptor": "^1.0.0",
-        "resolve-id-refs": "^0.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/uswds/node_modules/del": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
-      "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/uswds/-/uswds-2.13.3.tgz",
+      "integrity": "sha512-qCblljeaRvS3+PrSxoHqQwmMnp746+Y1YZA34BkTzJknvo2bhhdzGE21yJaInumzIqV3glLD13TFdRwrwikMMQ==",
       "dependencies": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
+        "classlist-polyfill": "1.0.3",
+        "domready": "1.0.8",
+        "object-assign": "4.1.1",
+        "receptor": "1.0.0",
+        "resolve-id-refs": "0.1.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/uswds/node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 4"
       }
     },
     "node_modules/util": {
@@ -29128,9 +29086,9 @@
       "dev": true
     },
     "@trussworks/react-uswds": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/@trussworks/react-uswds/-/react-uswds-2.9.0.tgz",
-      "integrity": "sha512-qv5twPgzLJulWsZew3No3W45FTp3WrYGwG/3B+w/mPFuAMHmAX7VAiigmg+k2kHFvrpjyAiKZHREpHyhkZIbig==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@trussworks/react-uswds/-/react-uswds-3.1.0.tgz",
+      "integrity": "sha512-4krdLn8LGgr3EwOsizUF6cBLnwDS6x0WgJjjGk59kNBpgH4qiv8YGzic3HYaVr8xWBq36VpEEfGeQZnjYGMegw==",
       "requires": {}
     },
     "@trysound/sax": {
@@ -31616,9 +31574,9 @@
       }
     },
     "classlist-polyfill": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz",
-      "integrity": "sha1-k1vC39lFiodrJ5YXUUY4vKqWSi4="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.0.3.tgz",
+      "integrity": "sha512-bDLDUsSg5LYFWsc2hphtG6ulyaCFSupdEBU3wxNECKWHnyPVvY8EB9Wbt9DzWkstWclFZhDaZK/VnEK/DmqE/Q=="
     },
     "clean-stack": {
       "version": "2.2.0",
@@ -33405,11 +33363,6 @@
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.89.tgz",
       "integrity": "sha512-z1Axg0Fu54fse8wN4fd+GAINdU5mJmLtcl6bqIcYyzNVGONcfHAeeJi88KYMQVKalhXlYuVPzKkFIU5VD0raUw=="
     },
-    "elem-dataset": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/elem-dataset/-/elem-dataset-2.0.0.tgz",
-      "integrity": "sha512-e7gieGopWw5dMdEgythH3lUS7nMizutPDTtkzfQW/q2gCvFnACyNnK3ytCncAXKxdBXQWcXeKaYTTODiMnp8mw=="
-    },
     "element-closest": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/element-closest/-/element-closest-2.0.2.tgz",
@@ -45704,42 +45657,15 @@
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
     "uswds": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/uswds/-/uswds-2.11.2.tgz",
-      "integrity": "sha512-JISTXCjPIlrufbObIifjrMDn5jF9bbLu7UYhGWmEs9iqB6Z2KDCXHVoBUyzMmIrIjW/UWWYHZzPqOOHO6/IMCQ==",
-      "requires": {
-        "classlist-polyfill": "^1.0.3",
-        "del": "^6.0.0",
-        "domready": "^1.0.8",
-        "elem-dataset": "^2.0.0",
-        "object-assign": "^4.1.1",
-        "receptor": "^1.0.0",
-        "resolve-id-refs": "^0.1.0"
-      },
-      "dependencies": {
-        "del": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
-          "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
-          "requires": {
-            "globby": "^11.0.1",
-            "graceful-fs": "^4.2.4",
-            "is-glob": "^4.0.1",
-            "is-path-cwd": "^2.2.0",
-            "is-path-inside": "^3.0.2",
-            "p-map": "^4.0.0",
-            "rimraf": "^3.0.2",
-            "slash": "^3.0.0"
-          }
-        },
-        "p-map": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-          "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-          "requires": {
-            "aggregate-error": "^3.0.0"
-          }
-        }
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/uswds/-/uswds-2.13.3.tgz",
+      "integrity": "sha512-qCblljeaRvS3+PrSxoHqQwmMnp746+Y1YZA34BkTzJknvo2bhhdzGE21yJaInumzIqV3glLD13TFdRwrwikMMQ==",
+      "requires": {
+        "classlist-polyfill": "1.0.3",
+        "domready": "1.0.8",
+        "object-assign": "4.1.1",
+        "receptor": "1.0.0",
+        "resolve-id-refs": "0.1.0"
       }
     },
     "util": {
diff --git a/client/package.json b/client/package.json
index b4de4d1ae..7b643cbb8 100644
--- a/client/package.json
+++ b/client/package.json
@@ -77,7 +77,7 @@
   "dependencies": {
     "-": "^0.0.1",
     "@sentry/gatsby": "^7.7.0",
-    "@trussworks/react-uswds": "^2.9.0",
+    "@trussworks/react-uswds": "^3.1.0",
     "@turf/bbox": "^6.5.0",
     "d3-ease": "^3.0.1",
     "gatsby-plugin-env-variables": "^2.2.0",
@@ -93,7 +93,7 @@
     "react-intl": "^5.24.7",
     "react-map-gl": "^6.1.19",
     "react-use": "^17.3.2",
-    "uswds": "^2.11.2"
+    "uswds": "^2.13.3"
   },
   "cypress-cucumber-preprocessor": {
     "nonGlobalStepDefinitions": false
diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 6230de484..2cfc0f556 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -500,6 +500,15 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
   // component to render the actual Indicator
   const categoryItems = categories.map((category) => ({
     id: category.id,
+
+    /*
+    As of trussworks 3.0.0, there were some breaking changes. This new prop of headingLevel
+    is required, however, the title prop is already defining the category styling, so this
+    is placed here to satisfy the requirement of the AccordionItems API, however it's not
+    being used.
+    */
+    headingLevel: 'h4',
+
     title: <Category name={category.titleText} isDisadvantaged={category.isDisadvagtaged} />,
     content: (
       <>
diff --git a/client/src/components/MapSearch/__snapshots__/MapSearch.test.tsx.snap b/client/src/components/MapSearch/__snapshots__/MapSearch.test.tsx.snap
index 6a56e2de1..9d1c383c7 100644
--- a/client/src/components/MapSearch/__snapshots__/MapSearch.test.tsx.snap
+++ b/client/src/components/MapSearch/__snapshots__/MapSearch.test.tsx.snap
@@ -31,11 +31,11 @@ exports[`rendering of the MapSearch checks if component renders 1`] = `
         data-testid="button"
         type="submit"
       >
-        <span
-          class="usa-sr-only"
-        >
-          Search
-        </span>
+        <img
+          alt="Search"
+          class="usa-search__submit-icon"
+          src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0Ij48cGF0aCBkPSJNMCAwaDI0djI0SDB6IiBmaWxsPSJub25lIi8+PHBhdGggZmlsbD0iI2ZmZmZmZiIgZD0iTTE1LjUgMTRoLS43OWwtLjI4LS4yN0MxNS40MSAxMi41OSAxNiAxMS4xMSAxNiA5LjUgMTYgNS45MSAxMy4wOSAzIDkuNSAzUzMgNS45MSAzIDkuNSA1LjkxIDE2IDkuNSAxNmMxLjYxIDAgMy4wOS0uNTkgNC4yMy0xLjU3bC4yNy4yOHYuNzlsNSA0Ljk5TDIwLjQ5IDE5bC00Ljk5LTV6bS02IDBDNy4wMSAxNCA1IDExLjk5IDUgOS41UzcuMDEgNSA5LjUgNSAxNCA3LjAxIDE0IDkuNSAxMS45OSAxNCA5LjUgMTR6Ii8+PC9zdmc+"
+        />
       </button>
     </form>
   </div>
diff --git a/client/src/components/PublicEvent/PublicEvent.tsx b/client/src/components/PublicEvent/PublicEvent.tsx
index 6a9c8b65f..39408b3ce 100644
--- a/client/src/components/PublicEvent/PublicEvent.tsx
+++ b/client/src/components/PublicEvent/PublicEvent.tsx
@@ -43,7 +43,7 @@ const PublicEvent = ({event}:IPublicEvent) => {
       }>
 
       {/* Heading */}
-      <CollectionHeading>
+      <CollectionHeading headingLevel='h3'>
         {isEventExpired ? eventName : <LinkTypeWrapper
           linkText={eventName}
           internal={false}
diff --git a/client/src/components/PublicVideoBox/PublicVideoBox.tsx b/client/src/components/PublicVideoBox/PublicVideoBox.tsx
index ac43a1e69..a0f82bf80 100644
--- a/client/src/components/PublicVideoBox/PublicVideoBox.tsx
+++ b/client/src/components/PublicVideoBox/PublicVideoBox.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {Button, SummaryBox} from '@trussworks/react-uswds';
+import {Button, SummaryBox, SummaryBoxContent, SummaryBoxHeading} from '@trussworks/react-uswds';
 import {useIntl} from 'gatsby-plugin-intl';
 
 import * as PUBLIC_COPY from '../../data/copy/publicEngage';
@@ -15,52 +15,58 @@ const PublicVideoBox = () => {
 
   return (
     <SummaryBox
-      className={styles.publicVideoContainer}
-      heading={intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.TITLE)}>
-      {intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BODY)}
-      <a
-        className={styles.publicVideoLink}
-        href={`https://www.youtube.com/watch?v=QwHWcXbhw28`}
-        target={'_blank'}
-        rel="noreferrer"
-      >
-        <Button
-          type="button"
-          className={styles.youTubeBtn}
+      className={styles.publicVideoContainer}>
+
+      <SummaryBoxHeading headingLevel='h3'>
+        {intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.TITLE)}
+      </SummaryBoxHeading>
+
+      <SummaryBoxContent>
+        {intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BODY)}
+        <a
+          className={styles.publicVideoLink}
+          href={`https://www.youtube.com/watch?v=QwHWcXbhw28`}
+          target={'_blank'}
+          rel="noreferrer"
         >
-          <div className={styles.buttonContainer}>
-            <div className={styles.buttonText}>
-              {intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON1_TEXT)}
+          <Button
+            type="button"
+            className={styles.youTubeBtn}
+          >
+            <div className={styles.buttonContainer}>
+              <div className={styles.buttonText}>
+                {intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON1_TEXT)}
+              </div>
+              <img
+                className={styles.buttonImage}
+                src={launchIcon}
+                alt={intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.IMG_ALT_TEXT1)}
+              />
             </div>
-            <img
-              className={styles.buttonImage}
-              src={launchIcon}
-              alt={intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.IMG_ALT_TEXT1)}
-            />
-          </div>
-        </Button>
-      </a>
-      <a
-        className={styles.publicVideoLink}
-        href={`https://static-data-screeningtool.geoplatform.gov/data-pipeline/data/score/downloadable/technical-training-slides.pptx`}
-        download
-      >
-        <Button
-          type="button"
-          className={styles.youTubeBtn}
+          </Button>
+        </a>
+        <a
+          className={styles.publicVideoLink}
+          href={`https://static-data-screeningtool.geoplatform.gov/data-pipeline/data/score/downloadable/technical-training-slides.pptx`}
+          download
         >
-          <div className={styles.buttonContainer}>
-            <div className={styles.buttonText}>
-              {intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON2_TEXT)}
+          <Button
+            type="button"
+            className={styles.youTubeBtn}
+          >
+            <div className={styles.buttonContainer}>
+              <div className={styles.buttonText}>
+                {intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON2_TEXT)}
+              </div>
+              <img
+                className={styles.buttonImage}
+                src={fileDownloadIcon}
+                alt={intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.IMG_ALT_TEXT2)}
+              />
             </div>
-            <img
-              className={styles.buttonImage}
-              src={fileDownloadIcon}
-              alt={intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.IMG_ALT_TEXT2)}
-            />
-          </div>
-        </Button>
-      </a>
+          </Button>
+        </a>
+      </SummaryBoxContent>
     </SummaryBox>
   );
 };
diff --git a/client/src/components/RequestForInfo/RequestForInfo.tsx b/client/src/components/RequestForInfo/RequestForInfo.tsx
index bb8324b86..9ef6a7b84 100644
--- a/client/src/components/RequestForInfo/RequestForInfo.tsx
+++ b/client/src/components/RequestForInfo/RequestForInfo.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {SummaryBox} from '@trussworks/react-uswds';
+import {SummaryBox, SummaryBoxContent, SummaryBoxHeading} from '@trussworks/react-uswds';
 import {useIntl} from 'gatsby-plugin-intl';
 
 import * as CONTACT_COPY from '../../data/copy/contact';
@@ -9,8 +9,16 @@ const RequestForInfo = () => {
   const intl = useIntl();
 
   return (
-    <SummaryBox className={styles.rfiBox} heading={intl.formatMessage(CONTACT_COPY.RFI_BOX.TITLE)}>
-      <p>{CONTACT_COPY.RFI_BOX_BODY}</p>
+    <SummaryBox className={styles.rfiBox}>
+
+      <SummaryBoxHeading headingLevel='h3'>
+        {intl.formatMessage(CONTACT_COPY.RFI_BOX.TITLE)}
+      </SummaryBoxHeading>
+
+      <SummaryBoxContent>
+        <p>{CONTACT_COPY.RFI_BOX_BODY}</p>
+      </SummaryBoxContent>
+
     </SummaryBox>
   );
 };

From 6b37e5dc491a4d9214223ef7ffe64ea7e724ec86 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 25 Jul 2022 12:05:50 -0700
Subject: [PATCH 005/130] Fixes links that were off center

---
 client/src/components/AboutCard/AboutCard.tsx |  2 +-
 .../__snapshots__/AboutCard.test.tsx.snap     |  1 -
 client/src/data/copy/explore.tsx              | 16 +++++++++----
 client/src/intl/en.json                       |  2 +-
 .../tests/__snapshots__/about.test.tsx.snap   |  6 ++---
 client/src/styles/global.scss                 | 24 +++++++++++++++----
 6 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/client/src/components/AboutCard/AboutCard.tsx b/client/src/components/AboutCard/AboutCard.tsx
index 84b20742c..88aeb96a6 100644
--- a/client/src/components/AboutCard/AboutCard.tsx
+++ b/client/src/components/AboutCard/AboutCard.tsx
@@ -64,7 +64,7 @@ const AboutCard = (props: React.PropsWithChildren<AboutCardProps>) => {
                   internal={props.internal}
                   url={props.url ? props.url : ''}
                   openUrlNewTab={props.openUrlNewTab}
-                  className={'j40-aboutcard-link'}
+                  // className={'j40-aboutcard-link'}
                 />
               </div>
             </Grid>
diff --git a/client/src/components/AboutCard/__snapshots__/AboutCard.test.tsx.snap b/client/src/components/AboutCard/__snapshots__/AboutCard.test.tsx.snap
index 27af5591c..d2101d46e 100644
--- a/client/src/components/AboutCard/__snapshots__/AboutCard.test.tsx.snap
+++ b/client/src/components/AboutCard/__snapshots__/AboutCard.test.tsx.snap
@@ -77,7 +77,6 @@ exports[`rendering of the AboutCard checks if small cards component renders 1`]
             class="j40-aboutcard-sm-link"
           >
             <a
-              class="j40-aboutcard-link"
               data-cy=""
               href="#"
             >
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index e98634532..eec9c5f6d 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -9,6 +9,12 @@ import * as DOWNLOADS_COPY from './downloads';
 import * as METHODOLOGY_COPY from './methodology';
 import {PAGES_ENDPOINTS} from '../constants';
 
+export const EXPLORE_PAGE_LINKS = {
+  TRIBAL_ACTION_PLAN: `https://www.whitehouse.gov/wp-content/uploads/2022/01/CEQ-Tribal-Consultation-Plan-04.26.2021.pdf`,
+  TRIBAL_WHITEHOUSE: `https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/26/memorandum-on-tribal-consultation-and-strengthening-nation-to-nation-relationships/`,
+  TRIBAL_FED_REGISTER: `https://www.federalregister.gov/documents/2000/11/09/00-29003/consultation-and-coordination-with-indian-tribal-governments`,
+};
+
 export const PAGE_INTRO = defineMessages({
   PAGE_TILE: {
     id: 'explore.map.page.title.text',
@@ -878,16 +884,16 @@ export const NOTE_ON_TRIBAL_NATIONS = {
       is engaging in consultation and coordination with Tribal Nations on the beta version of the map 
       to provide Tribal Nations with meaningful opportunities for input, consistent with CEQ’s <link2>
       Action Plan for Consultation and Coordination with Tribal Nations</link2>,
-      <link3>President Biden’s Memorandum on Tribal Consultation and Strengthening 
-      Nation-to-Nation Consultation</link3>, and Executive Order 13175 on <link4>Consultation and 
+      President Biden’s <link3>Memorandum on Tribal Consultation and Strengthening 
+      Nation-to-Nation Consultation</link3>, and <link4>Executive Order 13175 on Consultation and 
       Coordination With Indian Tribal Governments</link4>.
     `}
     description={`Navigate to the explore the map page. Under the map, you will see tribal nations paragraph 1`}
     values={{
       link1: COMMON_COPY.linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
-      link2: COMMON_COPY.linkFn(`https://www.whitehouse.gov/wp-content/uploads/2022/01/CEQ-Tribal-Consultation-Plan-04.26.2021.pdf`, false, true),
-      link3: COMMON_COPY.linkFn(`https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/26/memorandum-on-tribal-consultation-and-strengthening-nation-to-nation-relationships/`, false, true),
-      link4: COMMON_COPY.linkFn(`https://www.federalregister.gov/documents/2000/11/09/00-29003/consultation-and-coordination-with-indian-tribal-governments`, false, true),
+      link2: COMMON_COPY.linkFn(EXPLORE_PAGE_LINKS.TRIBAL_ACTION_PLAN, false, true),
+      link3: COMMON_COPY.linkFn(EXPLORE_PAGE_LINKS.TRIBAL_WHITEHOUSE, false, true),
+      link4: COMMON_COPY.linkFn(EXPLORE_PAGE_LINKS.TRIBAL_FED_REGISTER, false, true),
     }}
   />,
 };
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index cf14693e1..755b36310 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -868,7 +868,7 @@
     "description": "Navigate to the explore the map page. Under the map, you will see tribal nations intro text"
   },
   "explore.map.page.under.map.note.on.tribal.nations.para.1": {
-    "defaultMessage": "The map covers all U.S. census tracts, including those located within Tribal Nations, to the extent that data is available (see our <link1>Methodology & data</link1> page for more information). CEQ is engaging in consultation and coordination with Tribal Nations on the beta version of the map to provide Tribal Nations with meaningful opportunities for input, consistent with CEQ’s <link2> Action Plan for Consultation and Coordination with Tribal Nations</link2>, <link3>President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation</link3>, and Executive Order 13175 on <link4>Consultation and Coordination With Indian Tribal Governments</link4>.",
+    "defaultMessage": "The map covers all U.S. census tracts, including those located within Tribal Nations, to the extent that data is available (see our <link1>Methodology & data</link1> page for more information). CEQ is engaging in consultation and coordination with Tribal Nations on the beta version of the map to provide Tribal Nations with meaningful opportunities for input, consistent with CEQ’s <link2> Action Plan for Consultation and Coordination with Tribal Nations</link2>, President Biden’s <link3>Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation</link3>, and <link4>Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments</link4>.",
     "description": "Navigate to the explore the map page. Under the map, you will see tribal nations paragraph 1"
   },
   "fab.survey.text": {
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index e028de3ec..0734b65a6 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -607,7 +607,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     class="j40-aboutcard-sm-link"
                   >
                     <a
-                      class="j40-aboutcard-link"
                       href="/en/methodology"
                     >
                       Methodology & data
@@ -662,7 +661,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     class="j40-aboutcard-sm-link"
                   >
                     <a
-                      class="j40-aboutcard-link"
                       href="/en/"
                     >
                       Explore the map
@@ -731,7 +729,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="j40-aboutcard-sm-link"
                 >
                   <a
-                    class="usa-link usa-link--external j40-aboutcard-link"
+                    class="usa-link usa-link--external"
                     data-cy=""
                     href="mailto:Screeningtool-Support@omb.eop.gov"
                     rel="noreferrer"
@@ -791,7 +789,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="j40-aboutcard-sm-link"
                 >
                   <a
-                    class="usa-link usa-link--external j40-aboutcard-link"
+                    class="usa-link usa-link--external"
                     data-cy=""
                     href="https://github.com/usds/justice40-tool"
                     rel="noreferrer"
diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss
index 666b2c99e..56bff45b3 100644
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@@ -139,6 +139,18 @@ components include:
   }
 }
 
+// all external links
+.usa-link--external::after {
+  margin-top: .5ex !important;
+}
+
+// external links in the dataset Cards
+li[class*='datasetCard-module'] .usa-link--external::after {
+  margin-top: .2ex !important;
+}
+
+
+
 /* 
 ******************************
 *      FOOTER STYLES
@@ -163,8 +175,12 @@ components include:
     @include u-display('inline-block');
     @include u-margin-top(1.5)
   }
-}
 
+  // external links in the footer only
+  .usa-link--external::after {
+    margin-top: .2ex !important;
+  }
+}
 
 
 
@@ -386,9 +402,9 @@ a.mapboxgl-ctrl-logo {
       @include u-margin-top(5);
     }
 
-    .j40-aboutcard-link {
-      font-weight: bold;
-    }
+    // .j40-aboutcard-link {
+    //   font-weight: bold;
+    // }
   }
 
   .j40-aboutcard-sm-card {

From ccc1ca1475e3bda0c4deeab28f878f550cc89e17 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 25 Jul 2022 16:19:27 -0700
Subject: [PATCH 006/130] Modify styling for geolocation

---
 client/src/intl/en.json       |  2 +-
 client/src/styles/global.scss | 33 ++++++++++++++++-----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 755b36310..e4c97f99a 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -344,7 +344,7 @@
     "description": "On the explore the map page, the description of the legend"
   },
   "explore.map.page.map.geolocation.locating": {
-    "defaultMessage": "Geolocating...",
+    "defaultMessage": "Finding location...",
     "description": "On the explore the map page, on the map, this is the message above the gelocation icon that geolocation is locating."
   },
   "explore.map.page.map.search.placeholder.mobile.text": {
diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss
index 56bff45b3..db8456c23 100644
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@@ -203,42 +203,41 @@ This section will outline styles that are component specific
 
 /**
 Geolocate Icon Styling: 
-The icon as 4 states; off, geolocating, locked and off-center. The icon is an SVG made of an 'active' layer and a 'background' layer. The standard styling allows for a clear distinction between the 4 states:
-  - off = black active and black for background
-  - geolocating = blue for active and blue for background (with circular animation)
-  - locked = blue for active and blue for background (no animation)
-  - off-center = blue for background only
-  
-  These states were changed to the following:
-  - off = black active and black for background
-  - geolocating = black for active and black for background (with circular animation)
-  - locked = black for active and black for background
-  - off-center = black for background only
-  
-  The reason the Icon was changed was to match the other overlayed icons - such as territory shortcuts. These other icons don't have multiple states embedded in them. This new color scheme creates ambiguity among two states, namely (off and locked) as they have the same exact style.
+In mobile, the icon has 4 states; default, locating (class = *-waiting), locked (class = *-active) and panning (class = *-background).
+
+These overides change the active and background classes
+
+We are using #0076d6 or hsl(207, 100%, 42%) for all colors in relation to Geolocation.
+
+The reason the Icon was changed was to match the other overlayed icons - such as territory shortcuts. These other icons don't have multiple states embedded in them. This new color scheme creates ambiguity among two states, namely (off and locked) as they have the same exact style.
 */
 .mapboxgl-ctrl {
   button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-active { 
     .mapboxgl-ctrl-icon {
-      background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%23333'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3Ccircle cx='10' cy='10' r='2'/%3E%3C/svg%3E") !important;
+      background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='hsl(207, 100%, 42%)'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3Ccircle cx='10' cy='10' r='2'/%3E%3C/svg%3E") !important;
     }
   }
 }
 .mapboxgl-ctrl {
   button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-background {
     .mapboxgl-ctrl-icon {
-      background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%2333'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3C/svg%3E") !important;
+      background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='hsl(207, 100%, 42%)'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3C/svg%3E") !important;
     }
   }
 }
 
 /**
-Beacon - the beacon's color (*-location-dot) and proximity animation (::before) was changed to black. The reason the beacon was changed was to increase the contrast between the beacon and the census tract layers
+Beacon - the beacon's color (*-location-dot) and proximity animation (::before), inner radius (::after) was changed and . The reason the beacon was changed was to increase the contrast between the beacon and the census tract layers
 */
 .mapboxgl-user-location-dot, .mapboxgl-user-location-dot::before  {
-  background-color: #000 !important;  
+  background-color: #0076d6 !important;  
+}
+
+.mapboxgl-user-location-dot::after  {
+  border: 4px solid #FFF !important;
 }
 
+
 // Overide mapbox popup styles
 .mapboxgl-popup-close-button {
   font-size: 3em;

From afc399c80be5108ed8ff4ae593fad750698ac095 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 25 Jul 2022 16:19:47 -0700
Subject: [PATCH 007/130] Modify geolocation message

---
 client/src/data/copy/explore.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index eec9c5f6d..129bd7b4e 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -166,7 +166,7 @@ export const MAP = defineMessages({
   },
   GEOLOC_MSG_LOCATING: {
     id: 'explore.map.page.map.geolocation.locating',
-    defaultMessage: 'Geolocating...',
+    defaultMessage: 'Finding location...',
     description: 'On the explore the map page, on the map, this is the message above the gelocation icon that geolocation is locating.',
   },
   // GEOLOC_MSG_OFF: {

From 2282620bc73751effb291b04675d8934ac9d95ab Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 25 Jul 2022 16:20:12 -0700
Subject: [PATCH 008/130] Add mobile and desktop geolocating

---
 client/src/components/J40Map.tsx | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index 3009d1391..9aa8b24b5 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -57,11 +57,6 @@ export interface IDetailViewInterface {
   properties: constants.J40Properties,
 };
 
-export const GEOLOCATION_STATES = {
-  OFF: 'OFF',
-  LOCATING: 'LOCATING',
-  LOCKED: 'LOCKED',
-};
 /**
  * This function will determine the URL for the map tiles. It will read in a string that will designate either
  * high or low tiles. It will allow to overide the URL to the pipeline staging tile URL via feature flag.
@@ -137,7 +132,7 @@ const J40Map = ({location}: IJ40Interface) => {
   const [selectedFeature, setSelectedFeature] = useState<MapboxGeoJSONFeature>();
   const [detailViewData, setDetailViewData] = useState<IDetailViewInterface>();
   const [transitionInProgress, setTransitionInProgress] = useState<boolean>(false);
-  const [geolocationState, setGeolocationState] = useState(GEOLOCATION_STATES.OFF);
+  const [geolocationInProgress, setGeolocationInProgress] = useState<boolean>(false);
   const [isMobileMapState, setIsMobileMapState] = useState<boolean>(false);
   const {width: windowWidth} = useWindowSize();
 
@@ -330,17 +325,11 @@ const J40Map = ({location}: IJ40Interface) => {
   };
 
   const onGeolocate = () => {
-    setGeolocationState(GEOLOCATION_STATES.LOCKED);
+    setGeolocationInProgress(false);
   };
 
   const onClickGeolocate = () => {
-    if (geolocationState === GEOLOCATION_STATES.LOCKED) {
-      setGeolocationState(GEOLOCATION_STATES.OFF);
-    }
-
-    if (geolocationState === GEOLOCATION_STATES.OFF) {
-      setGeolocationState(GEOLOCATION_STATES.LOCATING);
-    }
+    setGeolocationInProgress(true);
   };
 
   const mapBoxBaseLayer = 'tl' in flags ? `mapbox://styles/justice40/cl2qimpi2000014qeb1egpox8` : `mapbox://styles/mapbox/streets-v11`;
@@ -511,8 +500,7 @@ const J40Map = ({location}: IJ40Interface) => {
             <div className={styles.geolocateBox}>
               <div
                 className={
-                  geolocationState === GEOLOCATION_STATES.LOCATING ?
-                  styles.geolocateMessage : styles.geolocateMessageHide}>
+                  geolocationInProgress ? styles.geolocateMessage : styles.geolocateMessageHide}>
                 {intl.formatMessage(EXPLORE_COPY.MAP.GEOLOC_MSG_LOCATING)}
               </div>
               <div className={styles.geolocateIcon}>
@@ -520,7 +508,8 @@ const J40Map = ({location}: IJ40Interface) => {
                   positionOptions={{enableHighAccuracy: true}}
                   onGeolocate={onGeolocate}
                   onClick={onClickGeolocate}
-                  trackUserLocation={true}
+                  trackUserLocation={windowWidth < constants.USWDS_BREAKPOINTS.MOBILE_LG}
+                  showUserHeading={windowWidth < constants.USWDS_BREAKPOINTS.MOBILE_LG}
                 />
               </div>
             </div>

From 32814a71e36817a69b8a78a6ed2e25936e4cdc56 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 26 Jul 2022 11:03:36 -0700
Subject: [PATCH 009/130] Modify disabled label tooltip message

---
 client/src/components/J40Map.tsx | 1 +
 client/src/data/copy/explore.tsx | 5 +++++
 client/src/intl/en.json          | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index 9aa8b24b5..d639efbc7 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -510,6 +510,7 @@ const J40Map = ({location}: IJ40Interface) => {
                   onClick={onClickGeolocate}
                   trackUserLocation={windowWidth < constants.USWDS_BREAKPOINTS.MOBILE_LG}
                   showUserHeading={windowWidth < constants.USWDS_BREAKPOINTS.MOBILE_LG}
+                  disabledLabel={intl.formatMessage(EXPLORE_COPY.MAP.GEOLOC_MSG_DISABLED)}
                 />
               </div>
             </div>
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 129bd7b4e..a22a868c4 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -169,6 +169,11 @@ export const MAP = defineMessages({
     defaultMessage: 'Finding location...',
     description: 'On the explore the map page, on the map, this is the message above the gelocation icon that geolocation is locating.',
   },
+  GEOLOC_MSG_DISABLED: {
+    id: 'explore.map.page.map.geolocation.disabled',
+    defaultMessage: 'Geolocation disabled',
+    description: 'On the explore the map page, on the map, this is the message above the gelocation icon that geolocation is disabled.',
+  },
   // GEOLOC_MSG_OFF: {
   //   id: 'explore.map.page.map.geolocation.off',
   //   defaultMessage: 'Geolocation off',
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index e4c97f99a..792f0db3a 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -343,6 +343,10 @@
     "defaultMessage": "Communities identified as disadvantaged by the map are those that are marginalized, underserved, and overburdened by pollution. These communities are at or above the thresholds in one or more of eight categories of criteria.",
     "description": "On the explore the map page, the description of the legend"
   },
+  "explore.map.page.map.geolocation.disabled": {
+    "defaultMessage": "Geolocation disabled",
+    "description": "On the explore the map page, on the map, this is the message above the gelocation icon that geolocation is disabled."
+  },
   "explore.map.page.map.geolocation.locating": {
     "defaultMessage": "Finding location...",
     "description": "On the explore the map page, on the map, this is the message above the gelocation icon that geolocation is locating."

From 3c7c23e0837ba4f318724d03962af601c98cb7ef Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 12 Jul 2022 11:55:22 -0700
Subject: [PATCH 010/130] Add indicators to Puerto Rico (to release branch)
 (#1688)

* Add indicators to Puerto Rico

* Remove linguistic iso in Puerto Rico only
---
 .../src/components/AreaDetail/AreaDetail.tsx  |  39 +-
 .../__snapshots__/areaDetail.test.tsx.snap    | 525 +++++++++++++++++-
 client/src/components/Category/Category.tsx   |   2 +-
 .../DisadvantageDot/DisadvantageDot.tsx       |   2 +-
 .../components/ExceedBurden/ExceedBurden.tsx  |   2 +-
 5 files changed, 554 insertions(+), 16 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 82bacb05f..1fdb081c0 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -41,6 +41,25 @@ export interface indicatorInfo {
   threshold?: number,
 }
 
+/**
+ * This interface is used as define the various fields for category in the side panel
+ * id: distict id
+ * titleText: display text for the category title
+ * indicators: an array of indicators
+ * socioEcIndicators: an array of socio-economic indicators
+ * isDisadvagtaged: boolean to indicate if the category is disadvantaged
+ * isExceed1MoreBurden: boolean to indicate if the category exceeds more than one burden
+ * isExceedBothSocioBurdens: boolean to indicate if the category exceeds both socio-eco burdens
+ *  */
+export interface ICategory {
+  id: string,
+  titleText: string,
+  indicators: indicatorInfo[],
+  socioEcIndicators: indicatorInfo[],
+  isDisadvagtaged: boolean | null,
+  isExceed1MoreBurden: boolean | null,
+  isExceedBothSocioBurdens: boolean | null,
+}
 const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
   const intl = useIntl();
 
@@ -378,7 +397,7 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
    * The indicators property must be an array with last two elements being the
    * socioeconomic burdens.
    */
-  let categories = [
+  let categories:ICategory[] = [
     {
       id: 'climate-change',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLIMATE),
@@ -466,7 +485,7 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
     {
       id: 'work-dev',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.WORK_DEV),
-      indicators: [lingIso, lowMedInc, , unemploy, poverty],
+      indicators: [lingIso, lowMedInc, unemploy, poverty],
       socioEcIndicators: [highSchool, higherEd],
       isDisadvagtaged: properties[constants.IS_WORKFORCE_FACTOR_DISADVANTAGED_M] ?
         properties[constants.IS_WORKFORCE_FACTOR_DISADVANTAGED_M] : null,
@@ -484,9 +503,19 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
    * This sidePanelState has 3 values; namely, Nation, Puerto Rico and Island Areas.
    */
   if (sidePanelState === constants.SIDE_PANEL_STATE_VALUES.PUERTO_RICO) {
-    // For Puerto Rico - only show the workforce development category
-    categories = categories.filter((category) => category.id === 'work-dev');
-  };
+    /* For Puerto Rico - only show the following indicators:
+        clean energy (index 1): show all
+        sustainable housing (index 2): only housing cost burden
+        legacy pollution (index 3): show all
+        workforce dev (index 4): remove linguistic iso
+    */
+
+    // eslint-disable-next-line max-len
+    categories = categories.filter((category) => category.id === 'work-dev' || category.id === 'clean-energy' || category.id === 'leg-pollute' || category.id === 'sustain-house');
+    categories[1].indicators = [houseBurden];
+    categories[3].indicators = [lowMedInc, unemploy, poverty];
+  }
+
   if (sidePanelState === constants.SIDE_PANEL_STATE_VALUES.ISLAND_AREAS) {
     // For Island Areas - only show workforce dev category
     categories = categories.filter((category) => category.id === 'work-dev');
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index 6d67a4e40..d714f6b1f 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -2188,15 +2188,15 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         class="usa-accordion__heading"
       >
         <button
-          aria-controls="work-dev"
+          aria-controls="clean-energy"
           aria-expanded="false"
           class="usa-accordion__button"
-          data-testid="accordionButton_work-dev"
+          data-testid="accordionButton_clean-energy"
           type="button"
         >
           <div>
             <div>
-              Workforce development
+              Clean energy and energy efficiency
             </div>
             <div
               class=""
@@ -2206,9 +2206,9 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
       </h4>
       <div
         class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_work-dev"
+        data-testid="accordionItem_clean-energy"
         hidden=""
-        id="work-dev"
+        id="clean-energy"
       >
         <div>
           <div>
@@ -2224,17 +2224,195 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         >
           <div>
             <div>
-              Linguistic isolation
+              Energy burden
+              <div>
+                Average annual energy costs divided by household income
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              PM2.5 in the air
+              <div>
+                Fine inhalable particles, 2.5 micrometers or smaller
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <div>
+          AND
+        </div>
+        <div>
+          <div>
+            At or above both associated thresholds?
+          </div>
+          <div>
+            No
+          </div>
+        </div>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Low income
               <div>
                 
-      Percent of households where no one over the age 14 speaks English well
+      Household income is less than or equal to twice the federal poverty level 
     
               </div>
             </div>
             <div>
               <div>
                 <div>
-                  97
+                  19
+                  <sup
+                    style="top: -0.2em;"
+                  >
+                    th
+                  </sup>
+                </div>
+                <div>
+                  <img
+                    alt="an icon for the down arrow"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  below 65
+                  <sup
+                    style="top: -0.2em;"
+                  >
+                    th
+                  </sup>
+                   percentile
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Higher education non-enrollment
+              <div>
+                
+      Percent of the census tract's population 15 or older not enrolled in college, university, or 
+      graduate school 
+    
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+      </div>
+      <h4
+        class="usa-accordion__heading"
+      >
+        <button
+          aria-controls="sustain-house"
+          aria-expanded="false"
+          class="usa-accordion__button"
+          data-testid="accordionButton_sustain-house"
+          type="button"
+        >
+          <div>
+            <div>
+              Sustainable housing
+            </div>
+            <div
+              class=""
+            />
+          </div>
+        </button>
+      </h4>
+      <div
+        class="usa-accordion__content usa-prose"
+        data-testid="accordionItem_sustain-house"
+        hidden=""
+        id="sustain-house"
+      >
+        <div>
+          <div>
+            At or above at least one threshold?
+          </div>
+          <div>
+            No
+          </div>
+        </div>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Housing cost burden
+              <div>
+                Low income households spending more than 30% of income on housing
+              </div>
+            </div>
+            <div>
+              <div>
+                <div>
+                  95
                   <sup
                     style="top: -0.2em;"
                   >
@@ -2262,6 +2440,337 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             </div>
           </div>
         </li>
+        <div>
+          AND
+        </div>
+        <div>
+          <div>
+            At or above both associated thresholds?
+          </div>
+          <div>
+            No
+          </div>
+        </div>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Low income
+              <div>
+                
+      Household income is less than or equal to twice the federal poverty level 
+    
+              </div>
+            </div>
+            <div>
+              <div>
+                <div>
+                  19
+                  <sup
+                    style="top: -0.2em;"
+                  >
+                    th
+                  </sup>
+                </div>
+                <div>
+                  <img
+                    alt="an icon for the down arrow"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  below 65
+                  <sup
+                    style="top: -0.2em;"
+                  >
+                    th
+                  </sup>
+                   percentile
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Higher education non-enrollment
+              <div>
+                
+      Percent of the census tract's population 15 or older not enrolled in college, university, or 
+      graduate school 
+    
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+      </div>
+      <h4
+        class="usa-accordion__heading"
+      >
+        <button
+          aria-controls="leg-pollute"
+          aria-expanded="false"
+          class="usa-accordion__button"
+          data-testid="accordionButton_leg-pollute"
+          type="button"
+        >
+          <div>
+            <div>
+              Legacy pollution
+            </div>
+            <div
+              class=""
+            />
+          </div>
+        </button>
+      </h4>
+      <div
+        class="usa-accordion__content usa-prose"
+        data-testid="accordionItem_leg-pollute"
+        hidden=""
+        id="leg-pollute"
+      >
+        <div>
+          <div>
+            At or above at least one threshold?
+          </div>
+          <div>
+            No
+          </div>
+        </div>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Proximity to hazardous waste facilities
+              <div>
+                Count of hazardous waste facilities within 5 kilometers
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Proximity to National Priorities List (NPL) sites
+              <div>
+                Proposed or listed NPL (Superfund) sites within 5 kilometers
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Proximity to Risk Management Plan (RMP) facilities
+              <div>
+                RMP facilities within 5 kilometers
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <div>
+          AND
+        </div>
+        <div>
+          <div>
+            At or above both associated thresholds?
+          </div>
+          <div>
+            No
+          </div>
+        </div>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Low income
+              <div>
+                
+      Household income is less than or equal to twice the federal poverty level 
+    
+              </div>
+            </div>
+            <div>
+              <div>
+                <div>
+                  19
+                  <sup
+                    style="top: -0.2em;"
+                  >
+                    th
+                  </sup>
+                </div>
+                <div>
+                  <img
+                    alt="an icon for the down arrow"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  below 65
+                  <sup
+                    style="top: -0.2em;"
+                  >
+                    th
+                  </sup>
+                   percentile
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Higher education non-enrollment
+              <div>
+                
+      Percent of the census tract's population 15 or older not enrolled in college, university, or 
+      graduate school 
+    
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+      </div>
+      <h4
+        class="usa-accordion__heading"
+      >
+        <button
+          aria-controls="work-dev"
+          aria-expanded="false"
+          class="usa-accordion__button"
+          data-testid="accordionButton_work-dev"
+          type="button"
+        >
+          <div>
+            <div>
+              Workforce development
+            </div>
+            <div
+              class=""
+            />
+          </div>
+        </button>
+      </h4>
+      <div
+        class="usa-accordion__content usa-prose"
+        data-testid="accordionItem_work-dev"
+        hidden=""
+        id="work-dev"
+      >
+        <div>
+          <div>
+            At or above at least one threshold?
+          </div>
+          <div>
+            No
+          </div>
+        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
diff --git a/client/src/components/Category/Category.tsx b/client/src/components/Category/Category.tsx
index fd07427cd..9200088dd 100644
--- a/client/src/components/Category/Category.tsx
+++ b/client/src/components/Category/Category.tsx
@@ -5,7 +5,7 @@ import * as styles from './Category.module.scss';
 
 interface ICategory {
     name: string;
-    isDisadvantaged: boolean;
+    isDisadvantaged: boolean | null;
 }
 
 const Category = ({name, isDisadvantaged}:ICategory) => {
diff --git a/client/src/components/DisadvantageDot/DisadvantageDot.tsx b/client/src/components/DisadvantageDot/DisadvantageDot.tsx
index 970811d08..88549276b 100644
--- a/client/src/components/DisadvantageDot/DisadvantageDot.tsx
+++ b/client/src/components/DisadvantageDot/DisadvantageDot.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import * as styles from './DisadvantageDot.module.scss';
 
 interface IDisadvantageDot {
-  isDisadvantaged?: boolean;
+  isDisadvantaged?: boolean | null;
   isBig?: boolean;
 }
 const DisadvantageDot = ({isDisadvantaged = false, isBig}:IDisadvantageDot) => {
diff --git a/client/src/components/ExceedBurden/ExceedBurden.tsx b/client/src/components/ExceedBurden/ExceedBurden.tsx
index 408f7b22d..17aa53296 100644
--- a/client/src/components/ExceedBurden/ExceedBurden.tsx
+++ b/client/src/components/ExceedBurden/ExceedBurden.tsx
@@ -5,7 +5,7 @@ import * as EXPLORE_COPY from '../../data/copy/explore';
 
 interface IExceedBurden {
     text: React.ReactElement;
-    isBurdened: boolean;
+    isBurdened: boolean | null;
 }
 const ExceedBurden = ({text, isBurdened}:IExceedBurden) => {
   return (

From 4a2bc42e272c88f4005bb4232bf47723dbce0e29 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 26 Jul 2022 20:37:54 -0700
Subject: [PATCH 011/130] Adds demographics v1

- This uses the built-in accordion component
---
 .../src/components/AreaDetail/AreaDetail.tsx  |   4 +
 .../Demographics/Demographics.module.scss     |  15 ++
 .../Demographics.module.scss.d.ts             |  13 ++
 .../Demographics/Demographics.test.tsx        |  15 ++
 .../components/Demographics/Demographics.tsx  |  70 ++++++++
 .../__snapshots__/Demographics.test.tsx.snap  | 153 ++++++++++++++++++
 client/src/components/Demographics/index.ts   |   2 +
 client/src/styles/global.scss                 |  24 +++
 8 files changed, 296 insertions(+)
 create mode 100644 client/src/components/Demographics/Demographics.module.scss
 create mode 100644 client/src/components/Demographics/Demographics.module.scss.d.ts
 create mode 100644 client/src/components/Demographics/Demographics.test.tsx
 create mode 100644 client/src/components/Demographics/Demographics.tsx
 create mode 100644 client/src/components/Demographics/__snapshots__/Demographics.test.tsx.snap
 create mode 100644 client/src/components/Demographics/index.ts

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 1fdb081c0..00334cc57 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -6,6 +6,7 @@ import {Accordion, Button} from '@trussworks/react-uswds';
 
 // Components:
 import Category from '../Category';
+import Demographics from '../Demographics';
 import DisadvantageDot from '../DisadvantageDot';
 import ExceedBurden from '../ExceedBurden';
 import Indicator from '../Indicator';
@@ -603,6 +604,9 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
         </li>
       </ul>
 
+      {/* Demographics */}
+      <Demographics />
+
       {/* Disadvantaged? */}
       <div className={styles.categorization}>
 
diff --git a/client/src/components/Demographics/Demographics.module.scss b/client/src/components/Demographics/Demographics.module.scss
new file mode 100644
index 000000000..4e79c5e13
--- /dev/null
+++ b/client/src/components/Demographics/Demographics.module.scss
@@ -0,0 +1,15 @@
+@use '../../styles/design-system.scss' as *;
+
+.demographicsContainer{
+    @include u-padding(2);
+
+    .demographicItem {
+        display: flex;
+        justify-content: space-between;
+        
+        span {
+            font-size: .8rem;
+            margin-top: 0;
+        }
+    }
+}
diff --git a/client/src/components/Demographics/Demographics.module.scss.d.ts b/client/src/components/Demographics/Demographics.module.scss.d.ts
new file mode 100644
index 000000000..f8ea85527
--- /dev/null
+++ b/client/src/components/Demographics/Demographics.module.scss.d.ts
@@ -0,0 +1,13 @@
+declare namespace DemographicsNamespace {
+    export interface IDemographicsScss {
+      demographicsContainer: string;
+      demographicItem: string;
+    }
+  }
+
+declare const DemographicsScssModule: DemographicsNamespace.IDemographicsScss & {
+    /** WARNING: Only available when "css-loader" is used without "style-loader" or "mini-css-extract-plugin" */
+    locals: DemographicsNamespace.IDemographicsScss;
+  };
+
+  export = DemographicsScssModule;
diff --git a/client/src/components/Demographics/Demographics.test.tsx b/client/src/components/Demographics/Demographics.test.tsx
new file mode 100644
index 000000000..d0522a259
--- /dev/null
+++ b/client/src/components/Demographics/Demographics.test.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import {render} from '@testing-library/react';
+import {LocalizedComponent} from '../../test/testHelpers';
+import Demographics from './Demographics';
+
+describe('rendering of Demographics Component', () => {
+  const {asFragment} = render(
+      <LocalizedComponent>
+        <Demographics />
+      </LocalizedComponent>,
+  );
+  it('checks if component renders', () => {
+    expect(asFragment()).toMatchSnapshot();
+  });
+});
diff --git a/client/src/components/Demographics/Demographics.tsx b/client/src/components/Demographics/Demographics.tsx
new file mode 100644
index 000000000..1c7e9b95b
--- /dev/null
+++ b/client/src/components/Demographics/Demographics.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import {Accordion} from '@trussworks/react-uswds';
+
+import * as styles from './Demographics.module.scss';
+
+// export interface IDemographicsProps {}
+
+type IDemographicsData = {
+  racial: [string, number][],
+  age: [string, number][]
+}
+
+// Temporary while backend is developed
+const demographicsData:IDemographicsData = {
+  racial: [
+    ['White', 61.4],
+    ['Black or African Americon', 10.3],
+    ['American Indian and Alaska Native', 10.3],
+    ['American Indian and Alaska Native', 0.3],
+    ['Asian', 7.2],
+    ['Native Hawiian or Pacific Islander', 4.2],
+    ['Other', 2.5],
+    ['Two or more races', 6.7],
+    ['Hispanic or Latino', 10.4],
+  ],
+  age: [
+    ['Children under 10', 1.4],
+    ['Ages 10 - 64', 80.3],
+    ['Elderly over 65', 7.2],
+  ],
+};
+
+const demographicItemGen = (demographicData: any[]) => {
+  return demographicData.map((el, index) => {
+    return (
+      <div key={index} className={styles.demographicItem}>
+        <span>{ el[0] }</span>
+        <span>{`${el[1]}%`}</span>
+      </div>
+    );
+  });
+};
+
+const Demographics = () => {
+  const demographicSections = [
+    {
+      title: `Racial Ethnographic`,
+      content: demographicItemGen(demographicsData.racial),
+      expanded: false,
+      id: '123',
+      headingLevel: 'h4',
+    },
+    {
+      title: `Age`,
+      content: demographicItemGen(demographicsData.age),
+      expanded: false,
+      id: 'abc',
+      headingLevel: 'h4',
+    },
+  ];
+
+  return (
+    <div className={styles.demographicsContainer}>
+      <div>Tract demographics</div>
+      <Accordion items={demographicSections} multiselectable={true}/>
+    </div>
+  );
+};
+
+export default Demographics;
diff --git a/client/src/components/Demographics/__snapshots__/Demographics.test.tsx.snap b/client/src/components/Demographics/__snapshots__/Demographics.test.tsx.snap
new file mode 100644
index 000000000..0a23dbafa
--- /dev/null
+++ b/client/src/components/Demographics/__snapshots__/Demographics.test.tsx.snap
@@ -0,0 +1,153 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`rendering of Demographics Component checks if component renders 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      Tract demographics
+    </div>
+    <div
+      aria-multiselectable="true"
+      class="usa-accordion"
+      data-testid="accordion"
+    >
+      <h4
+        class="usa-accordion__heading"
+      >
+        <button
+          aria-controls="123"
+          aria-expanded="false"
+          class="usa-accordion__button"
+          data-testid="accordionButton_123"
+          type="button"
+        >
+          Racial Ethnographic
+        </button>
+      </h4>
+      <div
+        class="usa-accordion__content usa-prose"
+        data-testid="accordionItem_123"
+        hidden=""
+        id="123"
+      >
+        <div>
+          <span>
+            White
+          </span>
+          <span>
+            61.4%
+          </span>
+        </div>
+        <div>
+          <span>
+            Black or African Americon
+          </span>
+          <span>
+            10.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            American Indian and Alaska Native
+          </span>
+          <span>
+            10.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            American Indian and Alaska Native
+          </span>
+          <span>
+            0.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            Asian
+          </span>
+          <span>
+            7.2%
+          </span>
+        </div>
+        <div>
+          <span>
+            Native Hawiian or Pacific Islander
+          </span>
+          <span>
+            4.2%
+          </span>
+        </div>
+        <div>
+          <span>
+            Other
+          </span>
+          <span>
+            2.5%
+          </span>
+        </div>
+        <div>
+          <span>
+            Two or more races
+          </span>
+          <span>
+            6.7%
+          </span>
+        </div>
+        <div>
+          <span>
+            Hispanic or Latino
+          </span>
+          <span>
+            10.4%
+          </span>
+        </div>
+      </div>
+      <h4
+        class="usa-accordion__heading"
+      >
+        <button
+          aria-controls="abc"
+          aria-expanded="false"
+          class="usa-accordion__button"
+          data-testid="accordionButton_abc"
+          type="button"
+        >
+          Age
+        </button>
+      </h4>
+      <div
+        class="usa-accordion__content usa-prose"
+        data-testid="accordionItem_abc"
+        hidden=""
+        id="abc"
+      >
+        <div>
+          <span>
+            Children under 10
+          </span>
+          <span>
+            1.4%
+          </span>
+        </div>
+        <div>
+          <span>
+            Ages 10 - 64
+          </span>
+          <span>
+            80.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            Elderly over 65
+          </span>
+          <span>
+            7.2%
+          </span>
+        </div>
+      </div>
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/client/src/components/Demographics/index.ts b/client/src/components/Demographics/index.ts
new file mode 100644
index 000000000..4761fb15e
--- /dev/null
+++ b/client/src/components/Demographics/index.ts
@@ -0,0 +1,2 @@
+import Demographics from './Demographics';
+export default Demographics;
diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss
index ff981976b..d623800d4 100644
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@@ -24,6 +24,7 @@ There are 3 things that should be included in this file:
     -- Footer styles
   - Component styles
     -- Map styles
+    -- Demographics styles
     -- Public Event styles
     -- About styles
     -- Summary box
@@ -313,6 +314,29 @@ a.mapboxgl-ctrl-logo {
   background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='88' height='23' viewBox='0 0 88 23' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' fill-rule='evenodd'%3E %3Cdefs%3E %3Cpath id='logo' d='M11.5 2.25c5.105 0 9.25 4.145 9.25 9.25s-4.145 9.25-9.25 9.25-9.25-4.145-9.25-9.25 4.145-9.25 9.25-9.25zM6.997 15.983c-.051-.338-.828-5.802 2.233-8.873a4.395 4.395 0 013.13-1.28c1.27 0 2.49.51 3.39 1.42.91.9 1.42 2.12 1.42 3.39 0 1.18-.449 2.301-1.28 3.13C12.72 16.93 7 16 7 16l-.003-.017zM15.3 10.5l-2 .8-.8 2-.8-2-2-.8 2-.8.8-2 .8 2 2 .8z'/%3E %3Cpath id='text' d='M50.63 8c.13 0 .23.1.23.23V9c.7-.76 1.7-1.18 2.73-1.18 2.17 0 3.95 1.85 3.95 4.17s-1.77 4.19-3.94 4.19c-1.04 0-2.03-.43-2.74-1.18v3.77c0 .13-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V8.23c0-.12.1-.23.23-.23h1.4zm-3.86.01c.01 0 .01 0 .01-.01.13 0 .22.1.22.22v7.55c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V15c-.7.76-1.69 1.19-2.73 1.19-2.17 0-3.94-1.87-3.94-4.19 0-2.32 1.77-4.19 3.94-4.19 1.03 0 2.02.43 2.73 1.18v-.75c0-.12.1-.23.23-.23h1.4zm26.375-.19a4.24 4.24 0 00-4.16 3.29c-.13.59-.13 1.19 0 1.77a4.233 4.233 0 004.17 3.3c2.35 0 4.26-1.87 4.26-4.19 0-2.32-1.9-4.17-4.27-4.17zM60.63 5c.13 0 .23.1.23.23v3.76c.7-.76 1.7-1.18 2.73-1.18 1.88 0 3.45 1.4 3.84 3.28.13.59.13 1.2 0 1.8-.39 1.88-1.96 3.29-3.84 3.29-1.03 0-2.02-.43-2.73-1.18v.77c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V5.23c0-.12.1-.23.23-.23h1.4zm-34 11h-1.4c-.13 0-.23-.11-.23-.23V8.22c.01-.13.1-.22.23-.22h1.4c.13 0 .22.11.23.22v.68c.5-.68 1.3-1.09 2.16-1.1h.03c1.09 0 2.09.6 2.6 1.55.45-.95 1.4-1.55 2.44-1.56 1.62 0 2.93 1.25 2.9 2.78l.03 5.2c0 .13-.1.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.8 0-1.46.7-1.59 1.62l.01 4.68c0 .13-.11.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.85 0-1.54.79-1.6 1.8v4.5c0 .13-.1.23-.23.23zm53.615 0h-1.61c-.04 0-.08-.01-.12-.03-.09-.06-.13-.19-.06-.28l2.43-3.71-2.39-3.65a.213.213 0 01-.03-.12c0-.12.09-.21.21-.21h1.61c.13 0 .24.06.3.17l1.41 2.37 1.4-2.37a.34.34 0 01.3-.17h1.6c.04 0 .08.01.12.03.09.06.13.19.06.28l-2.37 3.65 2.43 3.7c0 .05.01.09.01.13 0 .12-.09.21-.21.21h-1.61c-.13 0-.24-.06-.3-.17l-1.44-2.42-1.44 2.42a.34.34 0 01-.3.17zm-7.12-1.49c-1.33 0-2.42-1.12-2.42-2.51 0-1.39 1.08-2.52 2.42-2.52 1.33 0 2.42 1.12 2.42 2.51 0 1.39-1.08 2.51-2.42 2.52zm-19.865 0c-1.32 0-2.39-1.11-2.42-2.48v-.07c.02-1.38 1.09-2.49 2.4-2.49 1.32 0 2.41 1.12 2.41 2.51 0 1.39-1.07 2.52-2.39 2.53zm-8.11-2.48c-.01 1.37-1.09 2.47-2.41 2.47s-2.42-1.12-2.42-2.51c0-1.39 1.08-2.52 2.4-2.52 1.33 0 2.39 1.11 2.41 2.48l.02.08zm18.12 2.47c-1.32 0-2.39-1.11-2.41-2.48v-.06c.02-1.38 1.09-2.48 2.41-2.48s2.42 1.12 2.42 2.51c0 1.39-1.09 2.51-2.42 2.51z'/%3E %3C/defs%3E %3Cmask id='clip'%3E %3Crect x='0' y='0' width='100%25' height='100%25' fill='white'/%3E %3Cuse xlink:href='%23logo'/%3E %3Cuse xlink:href='%23text'/%3E %3C/mask%3E %3Cg id='outline' opacity='0.3' stroke='%23000' stroke-width='3'%3E %3Ccircle mask='url(/studio-manual/assets/%23clip)' cx='11.5' cy='11.5' r='9.25'/%3E %3Cuse xlink:href='%23text' mask='url(/studio-manual/assets/%23clip)'/%3E %3C/g%3E %3Cg id='fill' opacity='0.9' fill='%23fff'%3E %3Cuse xlink:href='%23logo'/%3E %3Cuse xlink:href='%23text'/%3E %3C/g%3E %3C/svg%3E") !important;
 };
 
+
+/* 
+******************************
+*      DEMOGRAPHICS STYLES
+****************************** 
+*/
+
+[class*="demographicsContainer"]{
+
+  .usa-accordion__heading {
+      font-size: .8rem;
+
+      .usa-accordion__button{
+        background-color: white;
+        padding: .6rem;
+      }
+  }
+
+  .usa-accordion__content {
+    padding-top: 0;
+  }
+}
+
 /* 
 ***************************************
 *      PUBLIC EVENT STYLES

From f7d2e27a976907bacd75559710858844fbdaca77 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 26 Jul 2022 20:38:34 -0700
Subject: [PATCH 012/130] Add custom Accordion component to match designs

---
 .../Demographics/Demographics.module.scss     | 17 +++++-
 .../Demographics.module.scss.d.ts             |  2 +
 .../components/Demographics/Demographics.tsx  | 60 +++++++++++++++++--
 3 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/client/src/components/Demographics/Demographics.module.scss b/client/src/components/Demographics/Demographics.module.scss
index 4e79c5e13..6ac6ad4f4 100644
--- a/client/src/components/Demographics/Demographics.module.scss
+++ b/client/src/components/Demographics/Demographics.module.scss
@@ -6,10 +6,25 @@
     .demographicItem {
         display: flex;
         justify-content: space-between;
-        
+
         span {
             font-size: .8rem;
             margin-top: 0;
         }
     }
+    .customDemographicHeading {
+        @include u-margin(1);
+    }
+    .customDemographicItemToggle {
+        //remove styling of button
+        border: none;
+        background-color: white;
+
+        //emulate a link
+        cursor:pointer;
+        color:blue;
+        text-decoration:underline;
+
+        min-width: 45px;
+    }
 }
diff --git a/client/src/components/Demographics/Demographics.module.scss.d.ts b/client/src/components/Demographics/Demographics.module.scss.d.ts
index f8ea85527..b29cdfa4a 100644
--- a/client/src/components/Demographics/Demographics.module.scss.d.ts
+++ b/client/src/components/Demographics/Demographics.module.scss.d.ts
@@ -2,6 +2,8 @@ declare namespace DemographicsNamespace {
     export interface IDemographicsScss {
       demographicsContainer: string;
       demographicItem: string;
+      customDemographicItemToggle: string;
+      customDemographicHeading: string;
     }
   }
 
diff --git a/client/src/components/Demographics/Demographics.tsx b/client/src/components/Demographics/Demographics.tsx
index 1c7e9b95b..c98042f64 100644
--- a/client/src/components/Demographics/Demographics.tsx
+++ b/client/src/components/Demographics/Demographics.tsx
@@ -1,16 +1,15 @@
-import React from 'react';
+import React, {useState} from 'react';
 import {Accordion} from '@trussworks/react-uswds';
 
 import * as styles from './Demographics.module.scss';
-
-// export interface IDemographicsProps {}
+import {useFlags} from '../../contexts/FlagContext';
 
 type IDemographicsData = {
   racial: [string, number][],
   age: [string, number][]
 }
 
-// Temporary while backend is developed
+// Mock backend data
 const demographicsData:IDemographicsData = {
   racial: [
     ['White', 61.4],
@@ -30,6 +29,10 @@ const demographicsData:IDemographicsData = {
   ],
 };
 
+/*
+ * Generate the demographic item based the input
+ * TODO: Update after actual data is created
+ */
 const demographicItemGen = (demographicData: any[]) => {
   return demographicData.map((el, index) => {
     return (
@@ -41,7 +44,45 @@ const demographicItemGen = (demographicData: any[]) => {
   });
 };
 
+interface IJ40AccordionItem {
+  id: string,
+  title: string,
+  children: React.ElementType
+}
+
+const J40AccordionItem = ({id, title, children}:IJ40AccordionItem) => {
+  const [isExpanded, setIsExpanded] = useState(false);
+  return (
+    <>
+      <h6 className={styles.customDemographicHeading}>
+        {title}
+        {' ( '}
+        <button
+          className={styles.customDemographicItemToggle}
+          id={`${id}-header`}
+          aria-controls={`${id}-panel`}
+          aria-expanded={isExpanded}
+          onClick={() => setIsExpanded(!isExpanded)}
+          tabIndex={0}
+        >
+          {isExpanded ? 'hide' : 'show'}
+        </button>
+        { isExpanded ? <span>&#9650;</span> : <span>&#9660;</span>}
+        {' )'}
+      </h6>
+
+      <section
+        id={`${id}-panel`}
+        aria-labelledby={`${id}-header`}
+        hidden={!isExpanded}
+      >{children}</section>
+    </>
+  );
+};
+
 const Demographics = () => {
+  const flags = useFlags();
+
   const demographicSections = [
     {
       title: `Racial Ethnographic`,
@@ -62,7 +103,18 @@ const Demographics = () => {
   return (
     <div className={styles.demographicsContainer}>
       <div>Tract demographics</div>
+      {'cdc' in flags ? (
+        <>
+          <J40AccordionItem id={'race'} title={`Racial Ethnographic`}>
+            {demographicItemGen(demographicsData.racial)}
+          </J40AccordionItem>
+          <J40AccordionItem id={'age'} title={`Age`}>
+            {demographicItemGen(demographicsData.age)}
+          </J40AccordionItem>
+        </>
+      ) :
       <Accordion items={demographicSections} multiselectable={true}/>
+      }
     </div>
   );
 };

From c53b2c1d4488e793207a4dda5b6b055c457cd783 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 26 Jul 2022 20:38:52 -0700
Subject: [PATCH 013/130] Update AreaDetail snapshots

---
 .../__snapshots__/areaDetail.test.tsx.snap    | 441 ++++++++++++++++++
 1 file changed, 441 insertions(+)

diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index d714f6b1f..41609c30e 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -42,6 +42,153 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
         </span>
       </li>
     </ul>
+    <div>
+      <div>
+        Tract demographics
+      </div>
+      <div
+        aria-multiselectable="true"
+        class="usa-accordion"
+        data-testid="accordion"
+      >
+        <h4
+          class="usa-accordion__heading"
+        >
+          <button
+            aria-controls="123"
+            aria-expanded="false"
+            class="usa-accordion__button"
+            data-testid="accordionButton_123"
+            type="button"
+          >
+            Racial Ethnographic
+          </button>
+        </h4>
+        <div
+          class="usa-accordion__content usa-prose"
+          data-testid="accordionItem_123"
+          hidden=""
+          id="123"
+        >
+          <div>
+            <span>
+              White
+            </span>
+            <span>
+              61.4%
+            </span>
+          </div>
+          <div>
+            <span>
+              Black or African Americon
+            </span>
+            <span>
+              10.3%
+            </span>
+          </div>
+          <div>
+            <span>
+              American Indian and Alaska Native
+            </span>
+            <span>
+              10.3%
+            </span>
+          </div>
+          <div>
+            <span>
+              American Indian and Alaska Native
+            </span>
+            <span>
+              0.3%
+            </span>
+          </div>
+          <div>
+            <span>
+              Asian
+            </span>
+            <span>
+              7.2%
+            </span>
+          </div>
+          <div>
+            <span>
+              Native Hawiian or Pacific Islander
+            </span>
+            <span>
+              4.2%
+            </span>
+          </div>
+          <div>
+            <span>
+              Other
+            </span>
+            <span>
+              2.5%
+            </span>
+          </div>
+          <div>
+            <span>
+              Two or more races
+            </span>
+            <span>
+              6.7%
+            </span>
+          </div>
+          <div>
+            <span>
+              Hispanic or Latino
+            </span>
+            <span>
+              10.4%
+            </span>
+          </div>
+        </div>
+        <h4
+          class="usa-accordion__heading"
+        >
+          <button
+            aria-controls="abc"
+            aria-expanded="false"
+            class="usa-accordion__button"
+            data-testid="accordionButton_abc"
+            type="button"
+          >
+            Age
+          </button>
+        </h4>
+        <div
+          class="usa-accordion__content usa-prose"
+          data-testid="accordionItem_abc"
+          hidden=""
+          id="abc"
+        >
+          <div>
+            <span>
+              Children under 10
+            </span>
+            <span>
+              1.4%
+            </span>
+          </div>
+          <div>
+            <span>
+              Ages 10 - 64
+            </span>
+            <span>
+              80.3%
+            </span>
+          </div>
+          <div>
+            <span>
+              Elderly over 65
+            </span>
+            <span>
+              7.2%
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
     <div>
       <div>
         Identified as disadvantaged?
@@ -403,6 +550,153 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         </span>
       </li>
     </ul>
+    <div>
+      <div>
+        Tract demographics
+      </div>
+      <div
+        aria-multiselectable="true"
+        class="usa-accordion"
+        data-testid="accordion"
+      >
+        <h4
+          class="usa-accordion__heading"
+        >
+          <button
+            aria-controls="123"
+            aria-expanded="false"
+            class="usa-accordion__button"
+            data-testid="accordionButton_123"
+            type="button"
+          >
+            Racial Ethnographic
+          </button>
+        </h4>
+        <div
+          class="usa-accordion__content usa-prose"
+          data-testid="accordionItem_123"
+          hidden=""
+          id="123"
+        >
+          <div>
+            <span>
+              White
+            </span>
+            <span>
+              61.4%
+            </span>
+          </div>
+          <div>
+            <span>
+              Black or African Americon
+            </span>
+            <span>
+              10.3%
+            </span>
+          </div>
+          <div>
+            <span>
+              American Indian and Alaska Native
+            </span>
+            <span>
+              10.3%
+            </span>
+          </div>
+          <div>
+            <span>
+              American Indian and Alaska Native
+            </span>
+            <span>
+              0.3%
+            </span>
+          </div>
+          <div>
+            <span>
+              Asian
+            </span>
+            <span>
+              7.2%
+            </span>
+          </div>
+          <div>
+            <span>
+              Native Hawiian or Pacific Islander
+            </span>
+            <span>
+              4.2%
+            </span>
+          </div>
+          <div>
+            <span>
+              Other
+            </span>
+            <span>
+              2.5%
+            </span>
+          </div>
+          <div>
+            <span>
+              Two or more races
+            </span>
+            <span>
+              6.7%
+            </span>
+          </div>
+          <div>
+            <span>
+              Hispanic or Latino
+            </span>
+            <span>
+              10.4%
+            </span>
+          </div>
+        </div>
+        <h4
+          class="usa-accordion__heading"
+        >
+          <button
+            aria-controls="abc"
+            aria-expanded="false"
+            class="usa-accordion__button"
+            data-testid="accordionButton_abc"
+            type="button"
+          >
+            Age
+          </button>
+        </h4>
+        <div
+          class="usa-accordion__content usa-prose"
+          data-testid="accordionItem_abc"
+          hidden=""
+          id="abc"
+        >
+          <div>
+            <span>
+              Children under 10
+            </span>
+            <span>
+              1.4%
+            </span>
+          </div>
+          <div>
+            <span>
+              Ages 10 - 64
+            </span>
+            <span>
+              80.3%
+            </span>
+          </div>
+          <div>
+            <span>
+              Elderly over 65
+            </span>
+            <span>
+              7.2%
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
     <div>
       <div>
         Identified as disadvantaged?
@@ -2139,6 +2433,153 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         </span>
       </li>
     </ul>
+    <div>
+      <div>
+        Tract demographics
+      </div>
+      <div
+        aria-multiselectable="true"
+        class="usa-accordion"
+        data-testid="accordion"
+      >
+        <h4
+          class="usa-accordion__heading"
+        >
+          <button
+            aria-controls="123"
+            aria-expanded="false"
+            class="usa-accordion__button"
+            data-testid="accordionButton_123"
+            type="button"
+          >
+            Racial Ethnographic
+          </button>
+        </h4>
+        <div
+          class="usa-accordion__content usa-prose"
+          data-testid="accordionItem_123"
+          hidden=""
+          id="123"
+        >
+          <div>
+            <span>
+              White
+            </span>
+            <span>
+              61.4%
+            </span>
+          </div>
+          <div>
+            <span>
+              Black or African Americon
+            </span>
+            <span>
+              10.3%
+            </span>
+          </div>
+          <div>
+            <span>
+              American Indian and Alaska Native
+            </span>
+            <span>
+              10.3%
+            </span>
+          </div>
+          <div>
+            <span>
+              American Indian and Alaska Native
+            </span>
+            <span>
+              0.3%
+            </span>
+          </div>
+          <div>
+            <span>
+              Asian
+            </span>
+            <span>
+              7.2%
+            </span>
+          </div>
+          <div>
+            <span>
+              Native Hawiian or Pacific Islander
+            </span>
+            <span>
+              4.2%
+            </span>
+          </div>
+          <div>
+            <span>
+              Other
+            </span>
+            <span>
+              2.5%
+            </span>
+          </div>
+          <div>
+            <span>
+              Two or more races
+            </span>
+            <span>
+              6.7%
+            </span>
+          </div>
+          <div>
+            <span>
+              Hispanic or Latino
+            </span>
+            <span>
+              10.4%
+            </span>
+          </div>
+        </div>
+        <h4
+          class="usa-accordion__heading"
+        >
+          <button
+            aria-controls="abc"
+            aria-expanded="false"
+            class="usa-accordion__button"
+            data-testid="accordionButton_abc"
+            type="button"
+          >
+            Age
+          </button>
+        </h4>
+        <div
+          class="usa-accordion__content usa-prose"
+          data-testid="accordionItem_abc"
+          hidden=""
+          id="abc"
+        >
+          <div>
+            <span>
+              Children under 10
+            </span>
+            <span>
+              1.4%
+            </span>
+          </div>
+          <div>
+            <span>
+              Ages 10 - 64
+            </span>
+            <span>
+              80.3%
+            </span>
+          </div>
+          <div>
+            <span>
+              Elderly over 65
+            </span>
+            <span>
+              7.2%
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
     <div>
       <div>
         Identified as disadvantaged?

From 96f6536b244713a6f33264cc97f2ed4c5c30da07 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 27 Jul 2022 16:45:15 -0700
Subject: [PATCH 014/130] Adding some better comments

---
 client/src/components/Demographics/Demographics.tsx | 3 ++-
 client/src/components/J40Map.tsx                    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/components/Demographics/Demographics.tsx b/client/src/components/Demographics/Demographics.tsx
index c98042f64..d2ae18dad 100644
--- a/client/src/components/Demographics/Demographics.tsx
+++ b/client/src/components/Demographics/Demographics.tsx
@@ -31,7 +31,8 @@ const demographicsData:IDemographicsData = {
 
 /*
  * Generate the demographic item based the input
- * TODO: Update after actual data is created
+ * // TODO: Update after actual data is created
+ *
  */
 const demographicItemGen = (demographicData: any[]) => {
   return demographicData.map((el, index) => {
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index c0f10ba3c..814c9dd41 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -331,7 +331,7 @@ const J40Map = ({location}: IJ40Interface) => {
       <Grid desktop={{col: 9}} className={styles.j40Map}>
 
         {/**
-         * This will render the MapSearch component
+         * // * This will render the MapSearch component
          *
          * Note:
          * The MapSearch component is no longer wrapped in a div in order to allow this feature

From 504181d809e43c3465ebe77c9de8b88a067cbba6 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 29 Jul 2022 15:18:38 -0700
Subject: [PATCH 015/130] Add USWDS expand to demographics side panel

---
 .../Demographics/Demographics.module.scss     | 16 +----
 .../components/Demographics/Demographics.tsx  | 66 ++++++-------------
 .../TractDemographics.module.scss             |  5 ++
 .../TractDemographics.module.scss.d.ts        | 12 ++++
 .../TractDemographics.test.tsx                | 15 +++++
 .../TractDemographics/TractDemographics.tsx   | 15 +++++
 .../src/components/TractDemographics/index.ts |  2 +
 .../TractInfo/TractInfo.module.scss           |  5 ++
 .../TractInfo/TractInfo.module.scss.d.ts      | 12 ++++
 .../components/TractInfo/TractInfo.test.tsx   | 15 +++++
 client/src/components/TractInfo/TractInfo.tsx | 15 +++++
 client/src/components/TractInfo/index.ts      |  2 +
 12 files changed, 121 insertions(+), 59 deletions(-)
 create mode 100644 client/src/components/TractDemographics/TractDemographics.module.scss
 create mode 100644 client/src/components/TractDemographics/TractDemographics.module.scss.d.ts
 create mode 100644 client/src/components/TractDemographics/TractDemographics.test.tsx
 create mode 100644 client/src/components/TractDemographics/TractDemographics.tsx
 create mode 100644 client/src/components/TractDemographics/index.ts
 create mode 100644 client/src/components/TractInfo/TractInfo.module.scss
 create mode 100644 client/src/components/TractInfo/TractInfo.module.scss.d.ts
 create mode 100644 client/src/components/TractInfo/TractInfo.test.tsx
 create mode 100644 client/src/components/TractInfo/TractInfo.tsx
 create mode 100644 client/src/components/TractInfo/index.ts

diff --git a/client/src/components/Demographics/Demographics.module.scss b/client/src/components/Demographics/Demographics.module.scss
index 6ac6ad4f4..d05dfe140 100644
--- a/client/src/components/Demographics/Demographics.module.scss
+++ b/client/src/components/Demographics/Demographics.module.scss
@@ -1,7 +1,7 @@
 @use '../../styles/design-system.scss' as *;
 
 .demographicsContainer{
-    @include u-padding(2);
+    padding: 1.2rem 1rem 0 1.2rem;
 
     .demographicItem {
         display: flex;
@@ -13,18 +13,6 @@
         }
     }
     .customDemographicHeading {
-        @include u-margin(1);
-    }
-    .customDemographicItemToggle {
-        //remove styling of button
-        border: none;
-        background-color: white;
-
-        //emulate a link
-        cursor:pointer;
-        color:blue;
-        text-decoration:underline;
-
-        min-width: 45px;
+        @include u-margin(1.5);
     }
 }
diff --git a/client/src/components/Demographics/Demographics.tsx b/client/src/components/Demographics/Demographics.tsx
index d2ae18dad..d5b1a37ff 100644
--- a/client/src/components/Demographics/Demographics.tsx
+++ b/client/src/components/Demographics/Demographics.tsx
@@ -1,8 +1,6 @@
 import React, {useState} from 'react';
-import {Accordion} from '@trussworks/react-uswds';
 
 import * as styles from './Demographics.module.scss';
-import {useFlags} from '../../contexts/FlagContext';
 
 type IDemographicsData = {
   racial: [string, number][],
@@ -54,68 +52,46 @@ interface IJ40AccordionItem {
 const J40AccordionItem = ({id, title, children}:IJ40AccordionItem) => {
   const [isExpanded, setIsExpanded] = useState(false);
   return (
+
     <>
       <h6 className={styles.customDemographicHeading}>
         {title}
-        {' ( '}
         <button
-          className={styles.customDemographicItemToggle}
-          id={`${id}-header`}
-          aria-controls={`${id}-panel`}
+          id={`${id}-expand-control`}
+          type="button"
+          className="usa-accordion__button usa-banner__button"
           aria-expanded={isExpanded}
+          aria-controls={`${id}-expand-content`}
           onClick={() => setIsExpanded(!isExpanded)}
-          tabIndex={0}
         >
-          {isExpanded ? 'hide' : 'show'}
+          <span className="usa-banner__button-text">{isExpanded ? `hide` : 'show'}</span>
         </button>
-        { isExpanded ? <span>&#9650;</span> : <span>&#9660;</span>}
-        {' )'}
       </h6>
 
-      <section
-        id={`${id}-panel`}
-        aria-labelledby={`${id}-header`}
+      <div
+        id={`${id}-expand-content`}
+        className="usa-banner__content usa-accordion__content"
+        aria-labelledby={`${id}-expand-control`}
         hidden={!isExpanded}
-      >{children}</section>
+      >
+        {children}
+      </div>
     </>
   );
 };
 
 const Demographics = () => {
-  const flags = useFlags();
-
-  const demographicSections = [
-    {
-      title: `Racial Ethnographic`,
-      content: demographicItemGen(demographicsData.racial),
-      expanded: false,
-      id: '123',
-      headingLevel: 'h4',
-    },
-    {
-      title: `Age`,
-      content: demographicItemGen(demographicsData.age),
-      expanded: false,
-      id: 'abc',
-      headingLevel: 'h4',
-    },
-  ];
-
   return (
     <div className={styles.demographicsContainer}>
       <div>Tract demographics</div>
-      {'cdc' in flags ? (
-        <>
-          <J40AccordionItem id={'race'} title={`Racial Ethnographic`}>
-            {demographicItemGen(demographicsData.racial)}
-          </J40AccordionItem>
-          <J40AccordionItem id={'age'} title={`Age`}>
-            {demographicItemGen(demographicsData.age)}
-          </J40AccordionItem>
-        </>
-      ) :
-      <Accordion items={demographicSections} multiselectable={true}/>
-      }
+      <>
+        <J40AccordionItem id={'race'} title={`Racial Ethnographic`}>
+          {demographicItemGen(demographicsData.racial)}
+        </J40AccordionItem>
+        <J40AccordionItem id={'age'} title={`Age`}>
+          {demographicItemGen(demographicsData.age)}
+        </J40AccordionItem>
+      </>
     </div>
   );
 };
diff --git a/client/src/components/TractDemographics/TractDemographics.module.scss b/client/src/components/TractDemographics/TractDemographics.module.scss
new file mode 100644
index 000000000..72844c054
--- /dev/null
+++ b/client/src/components/TractDemographics/TractDemographics.module.scss
@@ -0,0 +1,5 @@
+@use '../../styles/design-system.scss' as *;
+
+.tractDemographicsContainer{
+
+}
diff --git a/client/src/components/TractDemographics/TractDemographics.module.scss.d.ts b/client/src/components/TractDemographics/TractDemographics.module.scss.d.ts
new file mode 100644
index 000000000..e2112d043
--- /dev/null
+++ b/client/src/components/TractDemographics/TractDemographics.module.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace TractDemographicsNamespace {
+    export interface ITractDemographicsScss {
+      tractDemographicsContainer: string;
+    }
+  }
+
+declare const TractDemographicsScssModule: TractDemographicsNamespace.ITractDemographicsScss & {
+    /** WARNING: Only available when "css-loader" is used without "style-loader" or "mini-css-extract-plugin" */
+    locals: TractDemographicsNamespace.ITractDemographicsScss;
+  };
+
+  export = TractDemographicsScssModule;
diff --git a/client/src/components/TractDemographics/TractDemographics.test.tsx b/client/src/components/TractDemographics/TractDemographics.test.tsx
new file mode 100644
index 000000000..4b18c5027
--- /dev/null
+++ b/client/src/components/TractDemographics/TractDemographics.test.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import {LocalizedComponent} from '../../test/testHelpers';
+import TractDemographics from './TractDemographics';
+
+describe('rendering of TractDemographics Component', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <TractDemographics />
+        </LocalizedComponent>,
+    );
+    it('checks if component renders', () => {
+      expect(asFragment()).toMatchSnapshot();
+    });
+});
diff --git a/client/src/components/TractDemographics/TractDemographics.tsx b/client/src/components/TractDemographics/TractDemographics.tsx
new file mode 100644
index 000000000..22779c6ea
--- /dev/null
+++ b/client/src/components/TractDemographics/TractDemographics.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+import * as styles from './TractDemographics.module.scss';
+
+export interface ITractDemographicsProps {}
+
+const TractDemographics = ({}: ITractDemographicsProps) => {
+  return (
+    <div className={styles.tractDemographicsContainer}>
+      Hello 👋, I am a TractDemographics component.
+    </div>
+  );
+};
+
+export default TractDemographics;
diff --git a/client/src/components/TractDemographics/index.ts b/client/src/components/TractDemographics/index.ts
new file mode 100644
index 000000000..ddb3f8634
--- /dev/null
+++ b/client/src/components/TractDemographics/index.ts
@@ -0,0 +1,2 @@
+import TractDemographics from './TractDemographics';
+export default TractDemographics;
diff --git a/client/src/components/TractInfo/TractInfo.module.scss b/client/src/components/TractInfo/TractInfo.module.scss
new file mode 100644
index 000000000..97d32002f
--- /dev/null
+++ b/client/src/components/TractInfo/TractInfo.module.scss
@@ -0,0 +1,5 @@
+@use '../../styles/design-system.scss' as *;
+
+.tractInfoContainer{
+
+}
diff --git a/client/src/components/TractInfo/TractInfo.module.scss.d.ts b/client/src/components/TractInfo/TractInfo.module.scss.d.ts
new file mode 100644
index 000000000..581cdf088
--- /dev/null
+++ b/client/src/components/TractInfo/TractInfo.module.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace TractInfoNamespace {
+    export interface ITractInfoScss {
+      tractInfoContainer: string;
+    }
+  }
+
+declare const TractInfoScssModule: TractInfoNamespace.ITractInfoScss & {
+    /** WARNING: Only available when "css-loader" is used without "style-loader" or "mini-css-extract-plugin" */
+    locals: TractInfoNamespace.ITractInfoScss;
+  };
+
+  export = TractInfoScssModule;
diff --git a/client/src/components/TractInfo/TractInfo.test.tsx b/client/src/components/TractInfo/TractInfo.test.tsx
new file mode 100644
index 000000000..34a02c718
--- /dev/null
+++ b/client/src/components/TractInfo/TractInfo.test.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import {LocalizedComponent} from '../../test/testHelpers';
+import TractInfo from './TractInfo';
+
+describe('rendering of TractInfo Component', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <TractInfo />
+        </LocalizedComponent>,
+    );
+    it('checks if component renders', () => {
+      expect(asFragment()).toMatchSnapshot();
+    });
+});
diff --git a/client/src/components/TractInfo/TractInfo.tsx b/client/src/components/TractInfo/TractInfo.tsx
new file mode 100644
index 000000000..ce86f1c2d
--- /dev/null
+++ b/client/src/components/TractInfo/TractInfo.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+import * as styles from './TractInfo.module.scss';
+
+export interface ITractInfoProps {}
+
+const TractInfo = ({}: ITractInfoProps) => {
+  return (
+    <div className={styles.tractInfoContainer}>
+      Hello 👋, I am a TractInfo component.
+    </div>
+  );
+};
+
+export default TractInfo;
diff --git a/client/src/components/TractInfo/index.ts b/client/src/components/TractInfo/index.ts
new file mode 100644
index 000000000..8da04a6f1
--- /dev/null
+++ b/client/src/components/TractInfo/index.ts
@@ -0,0 +1,2 @@
+import TractInfo from './TractInfo';
+export default TractInfo;

From b69959867a568e743f6250bf913fb27f56521e03 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 29 Jul 2022 15:20:23 -0700
Subject: [PATCH 016/130] Remove justice40-tool from prefix-path

---
 .github/workflows/deploy_fe_staging.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy_fe_staging.yml b/.github/workflows/deploy_fe_staging.yml
index 58d8ea9d7..efd4877cc 100644
--- a/.github/workflows/deploy_fe_staging.yml
+++ b/.github/workflows/deploy_fe_staging.yml
@@ -36,7 +36,7 @@ jobs:
           # https://github.com/usds/justice40-tool/blob/main/client/README.md
           DATA_SOURCE: cdn
           SITE_URL: "${{ secrets.STAGE_SITE_URL }}"
-          PATH_PREFIX: "/justice40-tool/${{env.DESTINATION_FOLDER}}"
+          PATH_PREFIX: "/${{env.DESTINATION_FOLDER}}"
           MAPBOX_STYLES_READ_TOKEN: "${{ secrets.MAPBOX_STYLES_READ_TOKEN }}"
       - name: Get directory contents
         run: ls -la public

From 73f502452de217508fd193f01b5c04c556b8013b Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 29 Jul 2022 15:21:41 -0700
Subject: [PATCH 017/130] Update staging link to new CDN link

---
 .github/workflows/deploy_fe_staging.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy_fe_staging.yml b/.github/workflows/deploy_fe_staging.yml
index efd4877cc..5a42c1709 100644
--- a/.github/workflows/deploy_fe_staging.yml
+++ b/.github/workflows/deploy_fe_staging.yml
@@ -94,7 +94,7 @@ jobs:
           # Deploy to S3 for the staging URL
           message: |
             **🚢  Here is the frontend staging link: 🚢**   
-            Find it here: http://usds-geoplatform-justice40-website.s3-website-us-east-1.amazonaws.com/justice40-tool/${{env.DESTINATION_FOLDER}}/en/ !
+            Find it here: https://screeningtool-staging.geoplatform.gov/${{env.DESTINATION_FOLDER}}/en/ !
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           repo-token-user-login: "github-actions[bot]" # The user.login for temporary GitHub tokens
           allow-repeats: false # This is the default

From 9f2fe1a81044bac1bbdb9746ade9d42084ccaaeb Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 29 Jul 2022 16:09:55 -0700
Subject: [PATCH 018/130] Remove messaging on mobile

---
 client/src/components/J40Map.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index d639efbc7..f4e57fc37 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -498,11 +498,11 @@ const J40Map = ({location}: IJ40Interface) => {
             <MapSearch goToPlace={goToPlace}/>
 
             <div className={styles.geolocateBox}>
-              <div
+              {windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG && <div
                 className={
                   geolocationInProgress ? styles.geolocateMessage : styles.geolocateMessageHide}>
                 {intl.formatMessage(EXPLORE_COPY.MAP.GEOLOC_MSG_LOCATING)}
-              </div>
+              </div>}
               <div className={styles.geolocateIcon}>
                 <GeolocateControl
                   positionOptions={{enableHighAccuracy: true}}

From 3a31f2b82148e417d5df4702212abbcecd95f6ad Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 29 Jul 2022 17:16:23 -0700
Subject: [PATCH 019/130] Prettify test file

---
 .../TractDemographics.test.tsx                 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/src/components/TractDemographics/TractDemographics.test.tsx b/client/src/components/TractDemographics/TractDemographics.test.tsx
index 4b18c5027..60cd1c9a1 100644
--- a/client/src/components/TractDemographics/TractDemographics.test.tsx
+++ b/client/src/components/TractDemographics/TractDemographics.test.tsx
@@ -1,15 +1,15 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import {render} from '@testing-library/react';
 import {LocalizedComponent} from '../../test/testHelpers';
 import TractDemographics from './TractDemographics';
 
 describe('rendering of TractDemographics Component', () => {
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <TractDemographics />
-        </LocalizedComponent>,
-    );
-    it('checks if component renders', () => {
-      expect(asFragment()).toMatchSnapshot();
-    });
+  const {asFragment} = render(
+      <LocalizedComponent>
+        <TractDemographics />
+      </LocalizedComponent>,
+  );
+  it('checks if component renders', () => {
+    expect(asFragment()).toMatchSnapshot();
+  });
 });

From d0ff171ee6b7563a9afd5dfe4b22545efe02f812 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 29 Jul 2022 20:02:55 -0700
Subject: [PATCH 020/130] Add TractInfo component

---
 .../src/components/AreaDetail/AreaDetail.tsx  |  39 +-
 .../__snapshots__/areaDetail.test.tsx.snap    | 843 +++++++++---------
 .../__snapshots__/Demographics.test.tsx.snap  | 270 +++---
 .../TractInfo/TractInfo.module.scss           |  23 +-
 .../TractInfo/TractInfo.module.scss.d.ts      |   2 +
 .../components/TractInfo/TractInfo.test.tsx   |  40 +-
 client/src/components/TractInfo/TractInfo.tsx |  52 +-
 .../__snapshots__/TractInfo.test.tsx.snap     |  89 ++
 client/src/data/copy/explore.tsx              |   7 +-
 client/src/intl/en.json                       |   6 +-
 10 files changed, 778 insertions(+), 593 deletions(-)
 create mode 100644 client/src/components/TractInfo/__snapshots__/TractInfo.test.tsx.snap

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 00334cc57..53083f313 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -10,6 +10,7 @@ import Demographics from '../Demographics';
 import DisadvantageDot from '../DisadvantageDot';
 import ExceedBurden from '../ExceedBurden';
 import Indicator from '../Indicator';
+import TractInfo from '../TractInfo';
 
 // Styles and constants
 import * as styles from './areaDetail.module.scss';
@@ -573,36 +574,14 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
         {EXPLORE_COPY.SIDE_PANEL_VERION.TITLE}
       </div>
 
-      {/* Census Info */}
-      <ul className={styles.censusRow}>
-        <li>
-          <span className={styles.censusLabel}>
-            {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.CENSUS_BLOCK_GROUP)}
-          </span>
-          <span className={styles.censusText}>{` ${blockGroup}`}</span>
-        </li>
-        <li>
-          <span className={styles.censusLabel}>
-            {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.COUNTY)}
-          </span>
-          <span className={styles.censusText}>{` ${countyName}`}</span>
-        </li>
-        <li>
-          <span className={styles.censusLabel}>
-            {properties[constants.SIDE_PANEL_STATE] !== constants.SIDE_PANEL_STATE_VALUES.NATION ?
-              intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.TERRITORY) :
-              intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.STATE)
-            }
-          </span>
-          <span className={styles.censusText}>{` ${stateName}`}</span>
-        </li>
-        <li>
-          <span className={styles.censusLabel}>
-            {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.POPULATION)}
-          </span>
-          <span className={styles.censusText}>{` ${population.toLocaleString()}`}</span>
-        </li>
-      </ul>
+      {/* Tract Info */}
+      <TractInfo
+        blockGroup={blockGroup}
+        countyName={countyName}
+        stateName={stateName}
+        population={population}
+        sidePanelState={properties[constants.SIDE_PANEL_STATE]}
+      />
 
       {/* Demographics */}
       <Demographics />
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index 41609c30e..505aa43ae 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -11,7 +11,12 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
     <ul>
       <li>
         <span>
-          Census tract:
+          Tract information
+        </span>
+      </li>
+      <li>
+        <span>
+          Number:
         </span>
         <span>
            98729374234
@@ -46,146 +51,146 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
       <div>
         Tract demographics
       </div>
+      <h6>
+        Racial Ethnographic
+        <button
+          aria-controls="race-expand-content"
+          aria-expanded="false"
+          class="usa-accordion__button usa-banner__button"
+          id="race-expand-control"
+          type="button"
+        >
+          <span
+            class="usa-banner__button-text"
+          >
+            show
+          </span>
+        </button>
+      </h6>
       <div
-        aria-multiselectable="true"
-        class="usa-accordion"
-        data-testid="accordion"
+        aria-labelledby="race-expand-control"
+        class="usa-banner__content usa-accordion__content"
+        hidden=""
+        id="race-expand-content"
       >
-        <h4
-          class="usa-accordion__heading"
-        >
-          <button
-            aria-controls="123"
-            aria-expanded="false"
-            class="usa-accordion__button"
-            data-testid="accordionButton_123"
-            type="button"
-          >
-            Racial Ethnographic
-          </button>
-        </h4>
-        <div
-          class="usa-accordion__content usa-prose"
-          data-testid="accordionItem_123"
-          hidden=""
-          id="123"
-        >
-          <div>
-            <span>
-              White
-            </span>
-            <span>
-              61.4%
-            </span>
-          </div>
-          <div>
-            <span>
-              Black or African Americon
-            </span>
-            <span>
-              10.3%
-            </span>
-          </div>
-          <div>
-            <span>
-              American Indian and Alaska Native
-            </span>
-            <span>
-              10.3%
-            </span>
-          </div>
-          <div>
-            <span>
-              American Indian and Alaska Native
-            </span>
-            <span>
-              0.3%
-            </span>
-          </div>
-          <div>
-            <span>
-              Asian
-            </span>
-            <span>
-              7.2%
-            </span>
-          </div>
-          <div>
-            <span>
-              Native Hawiian or Pacific Islander
-            </span>
-            <span>
-              4.2%
-            </span>
-          </div>
-          <div>
-            <span>
-              Other
-            </span>
-            <span>
-              2.5%
-            </span>
-          </div>
-          <div>
-            <span>
-              Two or more races
-            </span>
-            <span>
-              6.7%
-            </span>
-          </div>
-          <div>
-            <span>
-              Hispanic or Latino
-            </span>
-            <span>
-              10.4%
-            </span>
-          </div>
-        </div>
-        <h4
-          class="usa-accordion__heading"
-        >
-          <button
-            aria-controls="abc"
-            aria-expanded="false"
-            class="usa-accordion__button"
-            data-testid="accordionButton_abc"
-            type="button"
-          >
-            Age
-          </button>
-        </h4>
-        <div
-          class="usa-accordion__content usa-prose"
-          data-testid="accordionItem_abc"
-          hidden=""
-          id="abc"
+        <div>
+          <span>
+            White
+          </span>
+          <span>
+            61.4%
+          </span>
+        </div>
+        <div>
+          <span>
+            Black or African Americon
+          </span>
+          <span>
+            10.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            American Indian and Alaska Native
+          </span>
+          <span>
+            10.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            American Indian and Alaska Native
+          </span>
+          <span>
+            0.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            Asian
+          </span>
+          <span>
+            7.2%
+          </span>
+        </div>
+        <div>
+          <span>
+            Native Hawiian or Pacific Islander
+          </span>
+          <span>
+            4.2%
+          </span>
+        </div>
+        <div>
+          <span>
+            Other
+          </span>
+          <span>
+            2.5%
+          </span>
+        </div>
+        <div>
+          <span>
+            Two or more races
+          </span>
+          <span>
+            6.7%
+          </span>
+        </div>
+        <div>
+          <span>
+            Hispanic or Latino
+          </span>
+          <span>
+            10.4%
+          </span>
+        </div>
+      </div>
+      <h6>
+        Age
+        <button
+          aria-controls="age-expand-content"
+          aria-expanded="false"
+          class="usa-accordion__button usa-banner__button"
+          id="age-expand-control"
+          type="button"
         >
-          <div>
-            <span>
-              Children under 10
-            </span>
-            <span>
-              1.4%
-            </span>
-          </div>
-          <div>
-            <span>
-              Ages 10 - 64
-            </span>
-            <span>
-              80.3%
-            </span>
-          </div>
-          <div>
-            <span>
-              Elderly over 65
-            </span>
-            <span>
-              7.2%
-            </span>
-          </div>
+          <span
+            class="usa-banner__button-text"
+          >
+            show
+          </span>
+        </button>
+      </h6>
+      <div
+        aria-labelledby="age-expand-control"
+        class="usa-banner__content usa-accordion__content"
+        hidden=""
+        id="age-expand-content"
+      >
+        <div>
+          <span>
+            Children under 10
+          </span>
+          <span>
+            1.4%
+          </span>
+        </div>
+        <div>
+          <span>
+            Ages 10 - 64
+          </span>
+          <span>
+            80.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            Elderly over 65
+          </span>
+          <span>
+            7.2%
+          </span>
         </div>
       </div>
     </div>
@@ -519,7 +524,12 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
     <ul>
       <li>
         <span>
-          Census tract:
+          Tract information
+        </span>
+      </li>
+      <li>
+        <span>
+          Number:
         </span>
         <span>
            98729374234
@@ -554,146 +564,146 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
       <div>
         Tract demographics
       </div>
+      <h6>
+        Racial Ethnographic
+        <button
+          aria-controls="race-expand-content"
+          aria-expanded="false"
+          class="usa-accordion__button usa-banner__button"
+          id="race-expand-control"
+          type="button"
+        >
+          <span
+            class="usa-banner__button-text"
+          >
+            show
+          </span>
+        </button>
+      </h6>
       <div
-        aria-multiselectable="true"
-        class="usa-accordion"
-        data-testid="accordion"
+        aria-labelledby="race-expand-control"
+        class="usa-banner__content usa-accordion__content"
+        hidden=""
+        id="race-expand-content"
       >
-        <h4
-          class="usa-accordion__heading"
-        >
-          <button
-            aria-controls="123"
-            aria-expanded="false"
-            class="usa-accordion__button"
-            data-testid="accordionButton_123"
-            type="button"
-          >
-            Racial Ethnographic
-          </button>
-        </h4>
-        <div
-          class="usa-accordion__content usa-prose"
-          data-testid="accordionItem_123"
-          hidden=""
-          id="123"
-        >
-          <div>
-            <span>
-              White
-            </span>
-            <span>
-              61.4%
-            </span>
-          </div>
-          <div>
-            <span>
-              Black or African Americon
-            </span>
-            <span>
-              10.3%
-            </span>
-          </div>
-          <div>
-            <span>
-              American Indian and Alaska Native
-            </span>
-            <span>
-              10.3%
-            </span>
-          </div>
-          <div>
-            <span>
-              American Indian and Alaska Native
-            </span>
-            <span>
-              0.3%
-            </span>
-          </div>
-          <div>
-            <span>
-              Asian
-            </span>
-            <span>
-              7.2%
-            </span>
-          </div>
-          <div>
-            <span>
-              Native Hawiian or Pacific Islander
-            </span>
-            <span>
-              4.2%
-            </span>
-          </div>
-          <div>
-            <span>
-              Other
-            </span>
-            <span>
-              2.5%
-            </span>
-          </div>
-          <div>
-            <span>
-              Two or more races
-            </span>
-            <span>
-              6.7%
-            </span>
-          </div>
-          <div>
-            <span>
-              Hispanic or Latino
-            </span>
-            <span>
-              10.4%
-            </span>
-          </div>
-        </div>
-        <h4
-          class="usa-accordion__heading"
-        >
-          <button
-            aria-controls="abc"
-            aria-expanded="false"
-            class="usa-accordion__button"
-            data-testid="accordionButton_abc"
-            type="button"
-          >
-            Age
-          </button>
-        </h4>
-        <div
-          class="usa-accordion__content usa-prose"
-          data-testid="accordionItem_abc"
-          hidden=""
-          id="abc"
+        <div>
+          <span>
+            White
+          </span>
+          <span>
+            61.4%
+          </span>
+        </div>
+        <div>
+          <span>
+            Black or African Americon
+          </span>
+          <span>
+            10.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            American Indian and Alaska Native
+          </span>
+          <span>
+            10.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            American Indian and Alaska Native
+          </span>
+          <span>
+            0.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            Asian
+          </span>
+          <span>
+            7.2%
+          </span>
+        </div>
+        <div>
+          <span>
+            Native Hawiian or Pacific Islander
+          </span>
+          <span>
+            4.2%
+          </span>
+        </div>
+        <div>
+          <span>
+            Other
+          </span>
+          <span>
+            2.5%
+          </span>
+        </div>
+        <div>
+          <span>
+            Two or more races
+          </span>
+          <span>
+            6.7%
+          </span>
+        </div>
+        <div>
+          <span>
+            Hispanic or Latino
+          </span>
+          <span>
+            10.4%
+          </span>
+        </div>
+      </div>
+      <h6>
+        Age
+        <button
+          aria-controls="age-expand-content"
+          aria-expanded="false"
+          class="usa-accordion__button usa-banner__button"
+          id="age-expand-control"
+          type="button"
         >
-          <div>
-            <span>
-              Children under 10
-            </span>
-            <span>
-              1.4%
-            </span>
-          </div>
-          <div>
-            <span>
-              Ages 10 - 64
-            </span>
-            <span>
-              80.3%
-            </span>
-          </div>
-          <div>
-            <span>
-              Elderly over 65
-            </span>
-            <span>
-              7.2%
-            </span>
-          </div>
+          <span
+            class="usa-banner__button-text"
+          >
+            show
+          </span>
+        </button>
+      </h6>
+      <div
+        aria-labelledby="age-expand-control"
+        class="usa-banner__content usa-accordion__content"
+        hidden=""
+        id="age-expand-content"
+      >
+        <div>
+          <span>
+            Children under 10
+          </span>
+          <span>
+            1.4%
+          </span>
+        </div>
+        <div>
+          <span>
+            Ages 10 - 64
+          </span>
+          <span>
+            80.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            Elderly over 65
+          </span>
+          <span>
+            7.2%
+          </span>
         </div>
       </div>
     </div>
@@ -2402,7 +2412,12 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
     <ul>
       <li>
         <span>
-          Census tract:
+          Tract information
+        </span>
+      </li>
+      <li>
+        <span>
+          Number:
         </span>
         <span>
            98729374234
@@ -2437,146 +2452,146 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
       <div>
         Tract demographics
       </div>
+      <h6>
+        Racial Ethnographic
+        <button
+          aria-controls="race-expand-content"
+          aria-expanded="false"
+          class="usa-accordion__button usa-banner__button"
+          id="race-expand-control"
+          type="button"
+        >
+          <span
+            class="usa-banner__button-text"
+          >
+            show
+          </span>
+        </button>
+      </h6>
       <div
-        aria-multiselectable="true"
-        class="usa-accordion"
-        data-testid="accordion"
+        aria-labelledby="race-expand-control"
+        class="usa-banner__content usa-accordion__content"
+        hidden=""
+        id="race-expand-content"
       >
-        <h4
-          class="usa-accordion__heading"
-        >
-          <button
-            aria-controls="123"
-            aria-expanded="false"
-            class="usa-accordion__button"
-            data-testid="accordionButton_123"
-            type="button"
-          >
-            Racial Ethnographic
-          </button>
-        </h4>
-        <div
-          class="usa-accordion__content usa-prose"
-          data-testid="accordionItem_123"
-          hidden=""
-          id="123"
-        >
-          <div>
-            <span>
-              White
-            </span>
-            <span>
-              61.4%
-            </span>
-          </div>
-          <div>
-            <span>
-              Black or African Americon
-            </span>
-            <span>
-              10.3%
-            </span>
-          </div>
-          <div>
-            <span>
-              American Indian and Alaska Native
-            </span>
-            <span>
-              10.3%
-            </span>
-          </div>
-          <div>
-            <span>
-              American Indian and Alaska Native
-            </span>
-            <span>
-              0.3%
-            </span>
-          </div>
-          <div>
-            <span>
-              Asian
-            </span>
-            <span>
-              7.2%
-            </span>
-          </div>
-          <div>
-            <span>
-              Native Hawiian or Pacific Islander
-            </span>
-            <span>
-              4.2%
-            </span>
-          </div>
-          <div>
-            <span>
-              Other
-            </span>
-            <span>
-              2.5%
-            </span>
-          </div>
-          <div>
-            <span>
-              Two or more races
-            </span>
-            <span>
-              6.7%
-            </span>
-          </div>
-          <div>
-            <span>
-              Hispanic or Latino
-            </span>
-            <span>
-              10.4%
-            </span>
-          </div>
-        </div>
-        <h4
-          class="usa-accordion__heading"
-        >
-          <button
-            aria-controls="abc"
-            aria-expanded="false"
-            class="usa-accordion__button"
-            data-testid="accordionButton_abc"
-            type="button"
+        <div>
+          <span>
+            White
+          </span>
+          <span>
+            61.4%
+          </span>
+        </div>
+        <div>
+          <span>
+            Black or African Americon
+          </span>
+          <span>
+            10.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            American Indian and Alaska Native
+          </span>
+          <span>
+            10.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            American Indian and Alaska Native
+          </span>
+          <span>
+            0.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            Asian
+          </span>
+          <span>
+            7.2%
+          </span>
+        </div>
+        <div>
+          <span>
+            Native Hawiian or Pacific Islander
+          </span>
+          <span>
+            4.2%
+          </span>
+        </div>
+        <div>
+          <span>
+            Other
+          </span>
+          <span>
+            2.5%
+          </span>
+        </div>
+        <div>
+          <span>
+            Two or more races
+          </span>
+          <span>
+            6.7%
+          </span>
+        </div>
+        <div>
+          <span>
+            Hispanic or Latino
+          </span>
+          <span>
+            10.4%
+          </span>
+        </div>
+      </div>
+      <h6>
+        Age
+        <button
+          aria-controls="age-expand-content"
+          aria-expanded="false"
+          class="usa-accordion__button usa-banner__button"
+          id="age-expand-control"
+          type="button"
+        >
+          <span
+            class="usa-banner__button-text"
           >
-            Age
-          </button>
-        </h4>
-        <div
-          class="usa-accordion__content usa-prose"
-          data-testid="accordionItem_abc"
-          hidden=""
-          id="abc"
-        >
-          <div>
-            <span>
-              Children under 10
-            </span>
-            <span>
-              1.4%
-            </span>
-          </div>
-          <div>
-            <span>
-              Ages 10 - 64
-            </span>
-            <span>
-              80.3%
-            </span>
-          </div>
-          <div>
-            <span>
-              Elderly over 65
-            </span>
-            <span>
-              7.2%
-            </span>
-          </div>
+            show
+          </span>
+        </button>
+      </h6>
+      <div
+        aria-labelledby="age-expand-control"
+        class="usa-banner__content usa-accordion__content"
+        hidden=""
+        id="age-expand-content"
+      >
+        <div>
+          <span>
+            Children under 10
+          </span>
+          <span>
+            1.4%
+          </span>
+        </div>
+        <div>
+          <span>
+            Ages 10 - 64
+          </span>
+          <span>
+            80.3%
+          </span>
+        </div>
+        <div>
+          <span>
+            Elderly over 65
+          </span>
+          <span>
+            7.2%
+          </span>
         </div>
       </div>
     </div>
diff --git a/client/src/components/Demographics/__snapshots__/Demographics.test.tsx.snap b/client/src/components/Demographics/__snapshots__/Demographics.test.tsx.snap
index 0a23dbafa..f9ef4b9fa 100644
--- a/client/src/components/Demographics/__snapshots__/Demographics.test.tsx.snap
+++ b/client/src/components/Demographics/__snapshots__/Demographics.test.tsx.snap
@@ -6,146 +6,146 @@ exports[`rendering of Demographics Component checks if component renders 1`] = `
     <div>
       Tract demographics
     </div>
-    <div
-      aria-multiselectable="true"
-      class="usa-accordion"
-      data-testid="accordion"
-    >
-      <h4
-        class="usa-accordion__heading"
+    <h6>
+      Racial Ethnographic
+      <button
+        aria-controls="race-expand-content"
+        aria-expanded="false"
+        class="usa-accordion__button usa-banner__button"
+        id="race-expand-control"
+        type="button"
       >
-        <button
-          aria-controls="123"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_123"
-          type="button"
+        <span
+          class="usa-banner__button-text"
         >
-          Racial Ethnographic
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_123"
-        hidden=""
-        id="123"
-      >
-        <div>
-          <span>
-            White
-          </span>
-          <span>
-            61.4%
-          </span>
-        </div>
-        <div>
-          <span>
-            Black or African Americon
-          </span>
-          <span>
-            10.3%
-          </span>
-        </div>
-        <div>
-          <span>
-            American Indian and Alaska Native
-          </span>
-          <span>
-            10.3%
-          </span>
-        </div>
-        <div>
-          <span>
-            American Indian and Alaska Native
-          </span>
-          <span>
-            0.3%
-          </span>
-        </div>
-        <div>
-          <span>
-            Asian
-          </span>
-          <span>
-            7.2%
-          </span>
-        </div>
-        <div>
-          <span>
-            Native Hawiian or Pacific Islander
-          </span>
-          <span>
-            4.2%
-          </span>
-        </div>
-        <div>
-          <span>
-            Other
-          </span>
-          <span>
-            2.5%
-          </span>
-        </div>
-        <div>
-          <span>
-            Two or more races
-          </span>
-          <span>
-            6.7%
-          </span>
-        </div>
-        <div>
-          <span>
-            Hispanic or Latino
-          </span>
-          <span>
-            10.4%
-          </span>
-        </div>
+          show
+        </span>
+      </button>
+    </h6>
+    <div
+      aria-labelledby="race-expand-control"
+      class="usa-banner__content usa-accordion__content"
+      hidden=""
+      id="race-expand-content"
+    >
+      <div>
+        <span>
+          White
+        </span>
+        <span>
+          61.4%
+        </span>
+      </div>
+      <div>
+        <span>
+          Black or African Americon
+        </span>
+        <span>
+          10.3%
+        </span>
+      </div>
+      <div>
+        <span>
+          American Indian and Alaska Native
+        </span>
+        <span>
+          10.3%
+        </span>
+      </div>
+      <div>
+        <span>
+          American Indian and Alaska Native
+        </span>
+        <span>
+          0.3%
+        </span>
+      </div>
+      <div>
+        <span>
+          Asian
+        </span>
+        <span>
+          7.2%
+        </span>
+      </div>
+      <div>
+        <span>
+          Native Hawiian or Pacific Islander
+        </span>
+        <span>
+          4.2%
+        </span>
       </div>
-      <h4
-        class="usa-accordion__heading"
+      <div>
+        <span>
+          Other
+        </span>
+        <span>
+          2.5%
+        </span>
+      </div>
+      <div>
+        <span>
+          Two or more races
+        </span>
+        <span>
+          6.7%
+        </span>
+      </div>
+      <div>
+        <span>
+          Hispanic or Latino
+        </span>
+        <span>
+          10.4%
+        </span>
+      </div>
+    </div>
+    <h6>
+      Age
+      <button
+        aria-controls="age-expand-content"
+        aria-expanded="false"
+        class="usa-accordion__button usa-banner__button"
+        id="age-expand-control"
+        type="button"
       >
-        <button
-          aria-controls="abc"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_abc"
-          type="button"
+        <span
+          class="usa-banner__button-text"
         >
-          Age
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_abc"
-        hidden=""
-        id="abc"
-      >
-        <div>
-          <span>
-            Children under 10
-          </span>
-          <span>
-            1.4%
-          </span>
-        </div>
-        <div>
-          <span>
-            Ages 10 - 64
-          </span>
-          <span>
-            80.3%
-          </span>
-        </div>
-        <div>
-          <span>
-            Elderly over 65
-          </span>
-          <span>
-            7.2%
-          </span>
-        </div>
+          show
+        </span>
+      </button>
+    </h6>
+    <div
+      aria-labelledby="age-expand-control"
+      class="usa-banner__content usa-accordion__content"
+      hidden=""
+      id="age-expand-content"
+    >
+      <div>
+        <span>
+          Children under 10
+        </span>
+        <span>
+          1.4%
+        </span>
+      </div>
+      <div>
+        <span>
+          Ages 10 - 64
+        </span>
+        <span>
+          80.3%
+        </span>
+      </div>
+      <div>
+        <span>
+          Elderly over 65
+        </span>
+        <span>
+          7.2%
+        </span>
       </div>
     </div>
   </div>
diff --git a/client/src/components/TractInfo/TractInfo.module.scss b/client/src/components/TractInfo/TractInfo.module.scss
index 97d32002f..99e18a446 100644
--- a/client/src/components/TractInfo/TractInfo.module.scss
+++ b/client/src/components/TractInfo/TractInfo.module.scss
@@ -1,5 +1,24 @@
-@use '../../styles/design-system.scss' as *;
+@use "../../styles/design-system.scss" as *;
+@import "../utils.scss";
 
-.tractInfoContainer{
+$sidePanelLabelFontColor: #171716;
+
+@mixin sidePanelLabelStyle {
+  font-size: medium;
+  color: $sidePanelLabelFontColor;
+  font-weight: 600;
+}
+
+.tractInfoContainer {
+  display: flex;
+  flex-direction: column;
+  list-style: none;
+  margin: 0;
+  padding: 1.2rem 1rem 0 1.2rem;
+  font-size: medium;
+
+  .tractInfoLabel {
+    @include sidePanelLabelStyle;
+  }
 
 }
diff --git a/client/src/components/TractInfo/TractInfo.module.scss.d.ts b/client/src/components/TractInfo/TractInfo.module.scss.d.ts
index 581cdf088..5c5a9d50c 100644
--- a/client/src/components/TractInfo/TractInfo.module.scss.d.ts
+++ b/client/src/components/TractInfo/TractInfo.module.scss.d.ts
@@ -1,6 +1,8 @@
 declare namespace TractInfoNamespace {
     export interface ITractInfoScss {
       tractInfoContainer: string;
+      tractInfoLabel: string;
+      tractInfoText: string;
     }
   }
 
diff --git a/client/src/components/TractInfo/TractInfo.test.tsx b/client/src/components/TractInfo/TractInfo.test.tsx
index 34a02c718..81d8b48ce 100644
--- a/client/src/components/TractInfo/TractInfo.test.tsx
+++ b/client/src/components/TractInfo/TractInfo.test.tsx
@@ -1,15 +1,45 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import {render} from '@testing-library/react';
 import {LocalizedComponent} from '../../test/testHelpers';
 import TractInfo from './TractInfo';
 
 describe('rendering of TractInfo Component', () => {
+  it('checks if tract info renders correctly for national tracts', () => {
+    const blockGroup = '21183920100';
+    const countyName = 'Ohio County';
+    const stateName = 'Kentucky';
+    const population = 3103;
+    const sidePanelState = 'Nation';
     const {asFragment} = render(
         <LocalizedComponent>
-          <TractInfo />
+          <TractInfo
+            blockGroup={blockGroup}
+            countyName ={countyName}
+            stateName ={stateName}
+            population ={population}
+            sidePanelState ={sidePanelState}
+          />
         </LocalizedComponent>,
     );
-    it('checks if component renders', () => {
-      expect(asFragment()).toMatchSnapshot();
-    });
+    expect(asFragment()).toMatchSnapshot();
+  });
+  it('checks if tract info renders correctly for non-national tracts', () => {
+    const blockGroup = '72107954901';
+    const countyName = 'Orocovis Municipio';
+    const stateName = 'Puerto Rico';
+    const population = 3103;
+    const sidePanelState = 'Puerto Rico';
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <TractInfo
+            blockGroup={blockGroup}
+            countyName ={countyName}
+            stateName ={stateName}
+            population ={population}
+            sidePanelState ={sidePanelState}
+          />
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
 });
diff --git a/client/src/components/TractInfo/TractInfo.tsx b/client/src/components/TractInfo/TractInfo.tsx
index ce86f1c2d..148675097 100644
--- a/client/src/components/TractInfo/TractInfo.tsx
+++ b/client/src/components/TractInfo/TractInfo.tsx
@@ -1,14 +1,56 @@
 import React from 'react';
+import {useIntl} from 'gatsby-plugin-intl';
 
 import * as styles from './TractInfo.module.scss';
+import * as EXPLORE_COPY from '../../data/copy/explore';
+import * as constants from '../../data/constants';
 
-export interface ITractInfoProps {}
+export interface ITractInfoProps {
+  blockGroup: string,
+  countyName: string,
+  stateName: string,
+  population: number,
+  sidePanelState: string,
+}
+
+const TractInfo = ({blockGroup, countyName, stateName, population, sidePanelState}: ITractInfoProps) => {
+  const intl = useIntl();
 
-const TractInfo = ({}: ITractInfoProps) => {
   return (
-    <div className={styles.tractInfoContainer}>
-      Hello 👋, I am a TractInfo component.
-    </div>
+    <ul className={styles.tractInfoContainer}>
+      <li>
+        <span className={styles.tractInfoLabel}>
+          {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.CENSUS_INFO_TITLE)}
+        </span>
+      </li>
+      <li>
+        <span>
+          {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.CENSUS_BLOCK_GROUP)}
+        </span>
+        <span>{` ${blockGroup}`}</span>
+      </li>
+      <li>
+        <span>
+          {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.COUNTY)}
+        </span>
+        <span>{` ${countyName}`}</span>
+      </li>
+      <li>
+        <span>
+          {sidePanelState !== constants.SIDE_PANEL_STATE_VALUES.NATION ?
+              intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.TERRITORY) :
+              intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.STATE)
+          }
+        </span>
+        <span>{` ${stateName}`}</span>
+      </li>
+      <li>
+        <span>
+          {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.POPULATION)}
+        </span>
+        <span>{` ${population.toLocaleString()}`}</span>
+      </li>
+    </ul>
   );
 };
 
diff --git a/client/src/components/TractInfo/__snapshots__/TractInfo.test.tsx.snap b/client/src/components/TractInfo/__snapshots__/TractInfo.test.tsx.snap
new file mode 100644
index 000000000..bc626bc29
--- /dev/null
+++ b/client/src/components/TractInfo/__snapshots__/TractInfo.test.tsx.snap
@@ -0,0 +1,89 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`rendering of TractInfo Component checks if tract info renders correctly for national tracts 1`] = `
+<DocumentFragment>
+  <ul>
+    <li>
+      <span>
+        Tract information
+      </span>
+    </li>
+    <li>
+      <span>
+        Number:
+      </span>
+      <span>
+         21183920100
+      </span>
+    </li>
+    <li>
+      <span>
+        County:
+      </span>
+      <span>
+         Ohio County
+      </span>
+    </li>
+    <li>
+      <span>
+        State: 
+      </span>
+      <span>
+         Kentucky
+      </span>
+    </li>
+    <li>
+      <span>
+        Population:
+      </span>
+      <span>
+         3,103
+      </span>
+    </li>
+  </ul>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractInfo Component checks if tract info renders correctly for non-national tracts 1`] = `
+<DocumentFragment>
+  <ul>
+    <li>
+      <span>
+        Tract information
+      </span>
+    </li>
+    <li>
+      <span>
+        Number:
+      </span>
+      <span>
+         72107954901
+      </span>
+    </li>
+    <li>
+      <span>
+        County:
+      </span>
+      <span>
+         Orocovis Municipio
+      </span>
+    </li>
+    <li>
+      <span>
+        Territory: 
+      </span>
+      <span>
+         Puerto Rico
+      </span>
+    </li>
+    <li>
+      <span>
+        Population:
+      </span>
+      <span>
+         3,103
+      </span>
+    </li>
+  </ul>
+</DocumentFragment>
+`;
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 00c6f52cb..33029c9b5 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -253,9 +253,14 @@ export const SIDE_PANEL_VERION = {
 };
 
 export const SIDE_PANEL_CBG_INFO = defineMessages({
+  CENSUS_INFO_TITLE: {
+    id: 'explore.map.page.side.panel.geographicInfo.title',
+    defaultMessage: 'Tract information',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the census tract info title`,
+  },
   CENSUS_BLOCK_GROUP: {
     id: 'explore.map.page.side.panel.geographicInfo.censusBlockGroup',
-    defaultMessage: 'Census tract:',
+    defaultMessage: 'Number:',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the census tract id number of the feature selected`,
   },
   COUNTY: {
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index ebe6156f2..af1164bee 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -452,7 +452,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. This will display YES if the census tract is disadvantaged"
   },
   "explore.map.page.side.panel.geographicInfo.censusBlockGroup": {
-    "defaultMessage": "Census tract:",
+    "defaultMessage": "Number:",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the census tract id number of the feature selected"
   },
   "explore.map.page.side.panel.geographicInfo.county": {
@@ -471,6 +471,10 @@
     "defaultMessage": "Territory:",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the territory of the feature selected"
   },
+  "explore.map.page.side.panel.geographicInfo.title": {
+    "defaultMessage": "Tract information",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the census tract info title"
+  },
   "explore.map.page.side.panel.indicator.asthma": {
     "defaultMessage": "Asthma",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Asthma"

From 432bb65cae8c7dd10c7ecf007e9213588983e435 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 29 Jul 2022 20:43:40 -0700
Subject: [PATCH 021/130] Style TractDemo component

---
 .../src/components/AreaDetail/AreaDetail.tsx  |  4 +-
 .../Demographics/Demographics.module.scss     | 18 ----
 .../Demographics.module.scss.d.ts             | 15 ---
 .../Demographics/Demographics.test.tsx        | 15 ---
 .../components/Demographics/Demographics.tsx  | 99 -------------------
 client/src/components/Demographics/index.ts   |  2 -
 .../TractDemographics.module.scss             | 27 ++++-
 .../TractDemographics.module.scss.d.ts        |  6 +-
 .../TractDemographics/TractDemographics.tsx   | 92 ++++++++++++++++-
 .../TractDemographics.test.tsx.snap}          |  2 +-
 .../TractInfo/TractInfo.module.scss           |  7 --
 client/src/components/utils.scss              |  8 ++
 12 files changed, 130 insertions(+), 165 deletions(-)
 delete mode 100644 client/src/components/Demographics/Demographics.module.scss
 delete mode 100644 client/src/components/Demographics/Demographics.module.scss.d.ts
 delete mode 100644 client/src/components/Demographics/Demographics.test.tsx
 delete mode 100644 client/src/components/Demographics/Demographics.tsx
 delete mode 100644 client/src/components/Demographics/index.ts
 rename client/src/components/{Demographics/__snapshots__/Demographics.test.tsx.snap => TractDemographics/__snapshots__/TractDemographics.test.tsx.snap} (97%)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 53083f313..0c0399156 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -6,7 +6,7 @@ import {Accordion, Button} from '@trussworks/react-uswds';
 
 // Components:
 import Category from '../Category';
-import Demographics from '../Demographics';
+import TractDemographics from '../TractDemographics';
 import DisadvantageDot from '../DisadvantageDot';
 import ExceedBurden from '../ExceedBurden';
 import Indicator from '../Indicator';
@@ -584,7 +584,7 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
       />
 
       {/* Demographics */}
-      <Demographics />
+      <TractDemographics />
 
       {/* Disadvantaged? */}
       <div className={styles.categorization}>
diff --git a/client/src/components/Demographics/Demographics.module.scss b/client/src/components/Demographics/Demographics.module.scss
deleted file mode 100644
index d05dfe140..000000000
--- a/client/src/components/Demographics/Demographics.module.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-@use '../../styles/design-system.scss' as *;
-
-.demographicsContainer{
-    padding: 1.2rem 1rem 0 1.2rem;
-
-    .demographicItem {
-        display: flex;
-        justify-content: space-between;
-
-        span {
-            font-size: .8rem;
-            margin-top: 0;
-        }
-    }
-    .customDemographicHeading {
-        @include u-margin(1.5);
-    }
-}
diff --git a/client/src/components/Demographics/Demographics.module.scss.d.ts b/client/src/components/Demographics/Demographics.module.scss.d.ts
deleted file mode 100644
index b29cdfa4a..000000000
--- a/client/src/components/Demographics/Demographics.module.scss.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-declare namespace DemographicsNamespace {
-    export interface IDemographicsScss {
-      demographicsContainer: string;
-      demographicItem: string;
-      customDemographicItemToggle: string;
-      customDemographicHeading: string;
-    }
-  }
-
-declare const DemographicsScssModule: DemographicsNamespace.IDemographicsScss & {
-    /** WARNING: Only available when "css-loader" is used without "style-loader" or "mini-css-extract-plugin" */
-    locals: DemographicsNamespace.IDemographicsScss;
-  };
-
-  export = DemographicsScssModule;
diff --git a/client/src/components/Demographics/Demographics.test.tsx b/client/src/components/Demographics/Demographics.test.tsx
deleted file mode 100644
index d0522a259..000000000
--- a/client/src/components/Demographics/Demographics.test.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import {render} from '@testing-library/react';
-import {LocalizedComponent} from '../../test/testHelpers';
-import Demographics from './Demographics';
-
-describe('rendering of Demographics Component', () => {
-  const {asFragment} = render(
-      <LocalizedComponent>
-        <Demographics />
-      </LocalizedComponent>,
-  );
-  it('checks if component renders', () => {
-    expect(asFragment()).toMatchSnapshot();
-  });
-});
diff --git a/client/src/components/Demographics/Demographics.tsx b/client/src/components/Demographics/Demographics.tsx
deleted file mode 100644
index d5b1a37ff..000000000
--- a/client/src/components/Demographics/Demographics.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import React, {useState} from 'react';
-
-import * as styles from './Demographics.module.scss';
-
-type IDemographicsData = {
-  racial: [string, number][],
-  age: [string, number][]
-}
-
-// Mock backend data
-const demographicsData:IDemographicsData = {
-  racial: [
-    ['White', 61.4],
-    ['Black or African Americon', 10.3],
-    ['American Indian and Alaska Native', 10.3],
-    ['American Indian and Alaska Native', 0.3],
-    ['Asian', 7.2],
-    ['Native Hawiian or Pacific Islander', 4.2],
-    ['Other', 2.5],
-    ['Two or more races', 6.7],
-    ['Hispanic or Latino', 10.4],
-  ],
-  age: [
-    ['Children under 10', 1.4],
-    ['Ages 10 - 64', 80.3],
-    ['Elderly over 65', 7.2],
-  ],
-};
-
-/*
- * Generate the demographic item based the input
- * // TODO: Update after actual data is created
- *
- */
-const demographicItemGen = (demographicData: any[]) => {
-  return demographicData.map((el, index) => {
-    return (
-      <div key={index} className={styles.demographicItem}>
-        <span>{ el[0] }</span>
-        <span>{`${el[1]}%`}</span>
-      </div>
-    );
-  });
-};
-
-interface IJ40AccordionItem {
-  id: string,
-  title: string,
-  children: React.ElementType
-}
-
-const J40AccordionItem = ({id, title, children}:IJ40AccordionItem) => {
-  const [isExpanded, setIsExpanded] = useState(false);
-  return (
-
-    <>
-      <h6 className={styles.customDemographicHeading}>
-        {title}
-        <button
-          id={`${id}-expand-control`}
-          type="button"
-          className="usa-accordion__button usa-banner__button"
-          aria-expanded={isExpanded}
-          aria-controls={`${id}-expand-content`}
-          onClick={() => setIsExpanded(!isExpanded)}
-        >
-          <span className="usa-banner__button-text">{isExpanded ? `hide` : 'show'}</span>
-        </button>
-      </h6>
-
-      <div
-        id={`${id}-expand-content`}
-        className="usa-banner__content usa-accordion__content"
-        aria-labelledby={`${id}-expand-control`}
-        hidden={!isExpanded}
-      >
-        {children}
-      </div>
-    </>
-  );
-};
-
-const Demographics = () => {
-  return (
-    <div className={styles.demographicsContainer}>
-      <div>Tract demographics</div>
-      <>
-        <J40AccordionItem id={'race'} title={`Racial Ethnographic`}>
-          {demographicItemGen(demographicsData.racial)}
-        </J40AccordionItem>
-        <J40AccordionItem id={'age'} title={`Age`}>
-          {demographicItemGen(demographicsData.age)}
-        </J40AccordionItem>
-      </>
-    </div>
-  );
-};
-
-export default Demographics;
diff --git a/client/src/components/Demographics/index.ts b/client/src/components/Demographics/index.ts
deleted file mode 100644
index 4761fb15e..000000000
--- a/client/src/components/Demographics/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import Demographics from './Demographics';
-export default Demographics;
diff --git a/client/src/components/TractDemographics/TractDemographics.module.scss b/client/src/components/TractDemographics/TractDemographics.module.scss
index 72844c054..f9f3a0dd2 100644
--- a/client/src/components/TractDemographics/TractDemographics.module.scss
+++ b/client/src/components/TractDemographics/TractDemographics.module.scss
@@ -1,5 +1,30 @@
 @use '../../styles/design-system.scss' as *;
+@import "../utils.scss";
 
-.tractDemographicsContainer{
+.demographicsContainer{
+    padding: 1.2rem 1rem 0 1.2rem;
+    
+    .demographicsLabel {
+        @include sidePanelLabelStyle;
+    }
 
+    [id*='expand-content']{
+        padding: .5rem 0;
+        
+    }
+
+    .demographicItem {
+        display: flex;
+        justify-content: space-between;
+        padding-bottom: .5rem;
+    
+        span {
+            font-size: .8rem;
+            margin-top: 0;
+        }
+    }
+    .customDemographicHeading {
+        @include u-margin-top(.5);
+        font-size: medium;
+    }
 }
diff --git a/client/src/components/TractDemographics/TractDemographics.module.scss.d.ts b/client/src/components/TractDemographics/TractDemographics.module.scss.d.ts
index e2112d043..72240dc18 100644
--- a/client/src/components/TractDemographics/TractDemographics.module.scss.d.ts
+++ b/client/src/components/TractDemographics/TractDemographics.module.scss.d.ts
@@ -1,6 +1,10 @@
 declare namespace TractDemographicsNamespace {
     export interface ITractDemographicsScss {
-      tractDemographicsContainer: string;
+      demographicsContainer: string;
+      demographicItem: string;
+      demographicsLabel: strring;
+      customDemographicItemToggle: string;
+      customDemographicHeading: string;
     }
   }
 
diff --git a/client/src/components/TractDemographics/TractDemographics.tsx b/client/src/components/TractDemographics/TractDemographics.tsx
index 22779c6ea..b14bc0351 100644
--- a/client/src/components/TractDemographics/TractDemographics.tsx
+++ b/client/src/components/TractDemographics/TractDemographics.tsx
@@ -1,13 +1,97 @@
-import React from 'react';
+import React, {useState} from 'react';
 
 import * as styles from './TractDemographics.module.scss';
 
-export interface ITractDemographicsProps {}
+export interface ITractDemographicsProps {
+  racial: [string, number][],
+  age: [string, number][]
+}
+
+// Mock backend data
+const demographicsData:ITractDemographicsProps = {
+  racial: [
+    ['White', 61.4],
+    ['Black or African Americon', 10.3],
+    ['American Indian and Alaska Native', 10.3],
+    ['American Indian and Alaska Native', 0.3],
+    ['Asian', 7.2],
+    ['Native Hawiian or Pacific Islander', 4.2],
+    ['Other', 2.5],
+    ['Two or more races', 6.7],
+    ['Hispanic or Latino', 10.4],
+  ],
+  age: [
+    ['Children under 10', 1.4],
+    ['Ages 10 - 64', 80.3],
+    ['Elderly over 65', 7.2],
+  ],
+};
+
+/*
+ * Generate the demographic item based the input
+ * // TODO: Update after actual data is created
+ *
+ */
+const demographicItemGen = (demographicData: any[]) => {
+  return demographicData.map((el, index) => {
+    return (
+      <div key={index} className={styles.demographicItem}>
+        <span>{ el[0] }</span>
+        <span>{`${el[1]}%`}</span>
+      </div>
+    );
+  });
+};
+
+interface IJ40AccordionItem {
+  id: string,
+  title: string,
+  children: React.ElementType
+}
+
+const J40AccordionItem = ({id, title, children}:IJ40AccordionItem) => {
+  const [isExpanded, setIsExpanded] = useState(false);
+  return (
+
+    <>
+      <h6 className={styles.customDemographicHeading}>
+        {title}
+        <button
+          id={`${id}-expand-control`}
+          type="button"
+          className="usa-accordion__button usa-banner__button"
+          aria-expanded={isExpanded}
+          aria-controls={`${id}-expand-content`}
+          onClick={() => setIsExpanded(!isExpanded)}
+        >
+          <span className="usa-banner__button-text">{isExpanded ? `hide` : 'show'}</span>
+        </button>
+      </h6>
+
+      <div
+        id={`${id}-expand-content`}
+        className="usa-banner__content usa-accordion__content"
+        aria-labelledby={`${id}-expand-control`}
+        hidden={!isExpanded}
+      >
+        {children}
+      </div>
+    </>
+  );
+};
 
 const TractDemographics = ({}: ITractDemographicsProps) => {
   return (
-    <div className={styles.tractDemographicsContainer}>
-      Hello 👋, I am a TractDemographics component.
+    <div className={styles.demographicsContainer}>
+      <div className={styles.demographicsLabel}>Tract demographics</div>
+      <>
+        <J40AccordionItem id={'race'} title={`Racial Ethnographic`}>
+          {demographicItemGen(demographicsData.racial)}
+        </J40AccordionItem>
+        <J40AccordionItem id={'age'} title={`Age`}>
+          {demographicItemGen(demographicsData.age)}
+        </J40AccordionItem>
+      </>
     </div>
   );
 };
diff --git a/client/src/components/Demographics/__snapshots__/Demographics.test.tsx.snap b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
similarity index 97%
rename from client/src/components/Demographics/__snapshots__/Demographics.test.tsx.snap
rename to client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
index f9ef4b9fa..68e2ccefa 100644
--- a/client/src/components/Demographics/__snapshots__/Demographics.test.tsx.snap
+++ b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`rendering of Demographics Component checks if component renders 1`] = `
+exports[`rendering of TractDemographics Component checks if component renders 1`] = `
 <DocumentFragment>
   <div>
     <div>
diff --git a/client/src/components/TractInfo/TractInfo.module.scss b/client/src/components/TractInfo/TractInfo.module.scss
index 99e18a446..abf9c784c 100644
--- a/client/src/components/TractInfo/TractInfo.module.scss
+++ b/client/src/components/TractInfo/TractInfo.module.scss
@@ -1,13 +1,6 @@
 @use "../../styles/design-system.scss" as *;
 @import "../utils.scss";
 
-$sidePanelLabelFontColor: #171716;
-
-@mixin sidePanelLabelStyle {
-  font-size: medium;
-  color: $sidePanelLabelFontColor;
-  font-weight: 600;
-}
 
 .tractInfoContainer {
   display: flex;
diff --git a/client/src/components/utils.scss b/client/src/components/utils.scss
index df2da95cf..ee393ff2d 100644
--- a/client/src/components/utils.scss
+++ b/client/src/components/utils.scss
@@ -11,6 +11,14 @@ $sidePanelBorder: 2px solid $sidePanelBorderColor;
 $mobileBreakpoint: 400px;
 $featureSelectBorderColor: #00bde3;
 $additionalCardsBGColor: #FAFAFA;
+$sidePanelLabelFontColor: #171716;
+
+@mixin sidePanelLabelStyle {
+    font-size: medium;
+    color: $sidePanelLabelFontColor;
+    font-weight: 600;
+  }
+  
 
 //Styles with Dataset container
 $datasetContainerColor: #eef6fb;

From 0dbc550f854e22daca81f3b84c1fda57b5df2391 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 29 Jul 2022 20:58:12 -0700
Subject: [PATCH 022/130] Move Methodology version to bottom of sidepanel

---
 .../src/components/AreaDetail/AreaDetail.tsx   |  9 ++++-----
 .../AreaDetail/areaDetail.module.scss          |  3 ++-
 .../__snapshots__/areaDetail.test.tsx.snap     | 18 +++++++++---------
 .../TractDemographics/TractDemographics.tsx    |  3 ++-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 0c0399156..4f19f9687 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -569,11 +569,6 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
   return (
     <aside className={styles.areaDetailContainer} data-cy={'aside'}>
 
-      {/* Methodology version */}
-      <div className={styles.versionInfo}>
-        {EXPLORE_COPY.SIDE_PANEL_VERION.TITLE}
-      </div>
-
       {/* Tract Info */}
       <TractInfo
         blockGroup={blockGroup}
@@ -646,6 +641,10 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
       {/* All category accordions in this component */}
       <Accordion multiselectable={true} items={categoryItems} />
 
+      {/* Methodology version */}
+      <div className={styles.versionInfo}>
+        {EXPLORE_COPY.SIDE_PANEL_VERION.TITLE}
+      </div>
     </aside>
   );
 };
diff --git a/client/src/components/AreaDetail/areaDetail.module.scss b/client/src/components/AreaDetail/areaDetail.module.scss
index ec54a155e..5906a67a0 100644
--- a/client/src/components/AreaDetail/areaDetail.module.scss
+++ b/client/src/components/AreaDetail/areaDetail.module.scss
@@ -11,8 +11,9 @@ $sidePanelLabelFontColor: #171716;
 
 .versionInfo {
   padding: .5rem 1rem .5rem 1.2rem;
+  text-align: center;
   font-size: medium;
-  border-bottom: 1px solid $sidePanelBorderColor; 
+  color: #A0A3A3;
 }
 
 .areaDetailContainer {
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index 505aa43ae..0e4d11098 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -5,9 +5,6 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
   <aside
     data-cy="aside"
   >
-    <div>
-      Methodology version 0.1
-    </div>
     <ul>
       <li>
         <span>
@@ -509,6 +506,9 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
         </li>
       </div>
     </div>
+    <div>
+      Methodology version 0.1
+    </div>
   </aside>
 </DocumentFragment>
 `;
@@ -518,9 +518,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
   <aside
     data-cy="aside"
   >
-    <div>
-      Methodology version 0.1
-    </div>
     <ul>
       <li>
         <span>
@@ -2397,6 +2394,9 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         </li>
       </div>
     </div>
+    <div>
+      Methodology version 0.1
+    </div>
   </aside>
 </DocumentFragment>
 `;
@@ -2406,9 +2406,6 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
   <aside
     data-cy="aside"
   >
-    <div>
-      Methodology version 0.1
-    </div>
     <ul>
       <li>
         <span>
@@ -3427,6 +3424,9 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         </li>
       </div>
     </div>
+    <div>
+      Methodology version 0.1
+    </div>
   </aside>
 </DocumentFragment>
 `;
diff --git a/client/src/components/TractDemographics/TractDemographics.tsx b/client/src/components/TractDemographics/TractDemographics.tsx
index b14bc0351..baa541102 100644
--- a/client/src/components/TractDemographics/TractDemographics.tsx
+++ b/client/src/components/TractDemographics/TractDemographics.tsx
@@ -2,6 +2,7 @@ import React, {useState} from 'react';
 
 import * as styles from './TractDemographics.module.scss';
 
+// Mock interface
 export interface ITractDemographicsProps {
   racial: [string, number][],
   age: [string, number][]
@@ -80,7 +81,7 @@ const J40AccordionItem = ({id, title, children}:IJ40AccordionItem) => {
   );
 };
 
-const TractDemographics = ({}: ITractDemographicsProps) => {
+const TractDemographics = () => {
   return (
     <div className={styles.demographicsContainer}>
       <div className={styles.demographicsLabel}>Tract demographics</div>

From 7817d41a59de71ad94e6c2ee206117ec5bbdbf5e Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 1 Aug 2022 14:56:48 -0700
Subject: [PATCH 023/130] Add custom expand / collapse component - adds a11y -
 adds chevron from USWDS icons

---
 .../__snapshots__/areaDetail.test.tsx.snap    | 156 ++++++++----------
 .../TractDemographics.module.scss             |  44 ++++-
 .../TractDemographics.module.scss.d.ts        |   7 +-
 .../TractDemographics/TractDemographics.tsx   |  46 ++++--
 .../TractDemographics.test.tsx.snap           |  52 +++---
 5 files changed, 167 insertions(+), 138 deletions(-)

diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index 0e4d11098..4e95a612d 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -51,24 +51,22 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
       <h6>
         Racial Ethnographic
         <button
-          aria-controls="race-expand-content"
+          aria-controls="race-panel"
           aria-expanded="false"
-          class="usa-accordion__button usa-banner__button"
-          id="race-expand-control"
-          type="button"
+          id="race-header"
+          tabindex="0"
         >
-          <span
-            class="usa-banner__button-text"
-          >
-            show
-          </span>
+          show
         </button>
+        <img
+          alt="collapse icon"
+          src="test-file-stub"
+        />
       </h6>
-      <div
-        aria-labelledby="race-expand-control"
-        class="usa-banner__content usa-accordion__content"
+      <section
+        aria-labelledby="race-header"
         hidden=""
-        id="race-expand-content"
+        id="race-panel"
       >
         <div>
           <span>
@@ -142,28 +140,26 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
             10.4%
           </span>
         </div>
-      </div>
+      </section>
       <h6>
         Age
         <button
-          aria-controls="age-expand-content"
+          aria-controls="age-panel"
           aria-expanded="false"
-          class="usa-accordion__button usa-banner__button"
-          id="age-expand-control"
-          type="button"
+          id="age-header"
+          tabindex="0"
         >
-          <span
-            class="usa-banner__button-text"
-          >
-            show
-          </span>
+          show
         </button>
+        <img
+          alt="collapse icon"
+          src="test-file-stub"
+        />
       </h6>
-      <div
-        aria-labelledby="age-expand-control"
-        class="usa-banner__content usa-accordion__content"
+      <section
+        aria-labelledby="age-header"
         hidden=""
-        id="age-expand-content"
+        id="age-panel"
       >
         <div>
           <span>
@@ -189,7 +185,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
             7.2%
           </span>
         </div>
-      </div>
+      </section>
     </div>
     <div>
       <div>
@@ -564,24 +560,22 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
       <h6>
         Racial Ethnographic
         <button
-          aria-controls="race-expand-content"
+          aria-controls="race-panel"
           aria-expanded="false"
-          class="usa-accordion__button usa-banner__button"
-          id="race-expand-control"
-          type="button"
+          id="race-header"
+          tabindex="0"
         >
-          <span
-            class="usa-banner__button-text"
-          >
-            show
-          </span>
+          show
         </button>
+        <img
+          alt="collapse icon"
+          src="test-file-stub"
+        />
       </h6>
-      <div
-        aria-labelledby="race-expand-control"
-        class="usa-banner__content usa-accordion__content"
+      <section
+        aria-labelledby="race-header"
         hidden=""
-        id="race-expand-content"
+        id="race-panel"
       >
         <div>
           <span>
@@ -655,28 +649,26 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             10.4%
           </span>
         </div>
-      </div>
+      </section>
       <h6>
         Age
         <button
-          aria-controls="age-expand-content"
+          aria-controls="age-panel"
           aria-expanded="false"
-          class="usa-accordion__button usa-banner__button"
-          id="age-expand-control"
-          type="button"
+          id="age-header"
+          tabindex="0"
         >
-          <span
-            class="usa-banner__button-text"
-          >
-            show
-          </span>
+          show
         </button>
+        <img
+          alt="collapse icon"
+          src="test-file-stub"
+        />
       </h6>
-      <div
-        aria-labelledby="age-expand-control"
-        class="usa-banner__content usa-accordion__content"
+      <section
+        aria-labelledby="age-header"
         hidden=""
-        id="age-expand-content"
+        id="age-panel"
       >
         <div>
           <span>
@@ -702,7 +694,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             7.2%
           </span>
         </div>
-      </div>
+      </section>
     </div>
     <div>
       <div>
@@ -2452,24 +2444,22 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
       <h6>
         Racial Ethnographic
         <button
-          aria-controls="race-expand-content"
+          aria-controls="race-panel"
           aria-expanded="false"
-          class="usa-accordion__button usa-banner__button"
-          id="race-expand-control"
-          type="button"
+          id="race-header"
+          tabindex="0"
         >
-          <span
-            class="usa-banner__button-text"
-          >
-            show
-          </span>
+          show
         </button>
+        <img
+          alt="collapse icon"
+          src="test-file-stub"
+        />
       </h6>
-      <div
-        aria-labelledby="race-expand-control"
-        class="usa-banner__content usa-accordion__content"
+      <section
+        aria-labelledby="race-header"
         hidden=""
-        id="race-expand-content"
+        id="race-panel"
       >
         <div>
           <span>
@@ -2543,28 +2533,26 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             10.4%
           </span>
         </div>
-      </div>
+      </section>
       <h6>
         Age
         <button
-          aria-controls="age-expand-content"
+          aria-controls="age-panel"
           aria-expanded="false"
-          class="usa-accordion__button usa-banner__button"
-          id="age-expand-control"
-          type="button"
+          id="age-header"
+          tabindex="0"
         >
-          <span
-            class="usa-banner__button-text"
-          >
-            show
-          </span>
+          show
         </button>
+        <img
+          alt="collapse icon"
+          src="test-file-stub"
+        />
       </h6>
-      <div
-        aria-labelledby="age-expand-control"
-        class="usa-banner__content usa-accordion__content"
+      <section
+        aria-labelledby="age-header"
         hidden=""
-        id="age-expand-content"
+        id="age-panel"
       >
         <div>
           <span>
@@ -2590,7 +2578,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             7.2%
           </span>
         </div>
-      </div>
+      </section>
     </div>
     <div>
       <div>
diff --git a/client/src/components/TractDemographics/TractDemographics.module.scss b/client/src/components/TractDemographics/TractDemographics.module.scss
index f9f3a0dd2..c5cafb72e 100644
--- a/client/src/components/TractDemographics/TractDemographics.module.scss
+++ b/client/src/components/TractDemographics/TractDemographics.module.scss
@@ -4,15 +4,10 @@
 .demographicsContainer{
     padding: 1.2rem 1rem 0 1.2rem;
     
-    .demographicsLabel {
+    .demographicsTitle {
         @include sidePanelLabelStyle;
     }
 
-    [id*='expand-content']{
-        padding: .5rem 0;
-        
-    }
-
     .demographicItem {
         display: flex;
         justify-content: space-between;
@@ -23,8 +18,41 @@
             margin-top: 0;
         }
     }
-    .customDemographicHeading {
+
+    .demographicItem:first-child {
+        @include u-margin-top(.5);
+    }
+    .demographicHeading {
         @include u-margin-top(.5);
-        font-size: medium;
+        font-size: .875rem;
+        
+        .showHideText {
+            //remove styling of button
+            border: none;
+            background-color: white;
+    
+            //emulate a link
+            cursor:pointer;
+            color:blue;
+            text-decoration:underline;
+    
+            min-width: 45px;
+
+            padding-left: 0;
+            padding-right: 0;
+            margin-left: 6px;
+        }
+
+        .showHideIcon{
+            vertical-align: middle;
+            height: 1rem;
+            margin-left: -8px;
+            filter: invert(8%) sepia(90%) saturate(7490%) hue-rotate(247deg) brightness(105%) contrast(143%);
+
+            &:hover{
+                cursor: pointer;
+            }
+        }
+
     }
 }
diff --git a/client/src/components/TractDemographics/TractDemographics.module.scss.d.ts b/client/src/components/TractDemographics/TractDemographics.module.scss.d.ts
index 72240dc18..041264f83 100644
--- a/client/src/components/TractDemographics/TractDemographics.module.scss.d.ts
+++ b/client/src/components/TractDemographics/TractDemographics.module.scss.d.ts
@@ -1,10 +1,11 @@
 declare namespace TractDemographicsNamespace {
     export interface ITractDemographicsScss {
       demographicsContainer: string;
+      demographicsTitle: string;
+      demographicHeading: string;
+      showHideText: string;
+      showHideIcon: string;
       demographicItem: string;
-      demographicsLabel: strring;
-      customDemographicItemToggle: string;
-      customDemographicHeading: string;
     }
   }
 
diff --git a/client/src/components/TractDemographics/TractDemographics.tsx b/client/src/components/TractDemographics/TractDemographics.tsx
index baa541102..90d5ba2a3 100644
--- a/client/src/components/TractDemographics/TractDemographics.tsx
+++ b/client/src/components/TractDemographics/TractDemographics.tsx
@@ -1,5 +1,10 @@
 import React, {useState} from 'react';
 
+// @ts-ignore
+import expandIcon from '/node_modules/uswds/dist/img/usa-icons/expand_more.svg';
+// @ts-ignore
+import collapseIcon from '/node_modules/uswds/dist/img/usa-icons/expand_less.svg';
+
 import * as styles from './TractDemographics.module.scss';
 
 // Mock interface
@@ -53,30 +58,39 @@ interface IJ40AccordionItem {
 const J40AccordionItem = ({id, title, children}:IJ40AccordionItem) => {
   const [isExpanded, setIsExpanded] = useState(false);
   return (
-
     <>
-      <h6 className={styles.customDemographicHeading}>
+      <h6 className={styles.demographicHeading}>
         {title}
         <button
-          id={`${id}-expand-control`}
-          type="button"
-          className="usa-accordion__button usa-banner__button"
+          className={styles.showHideText}
+          id={`${id}-header`}
+          aria-controls={`${id}-panel`}
           aria-expanded={isExpanded}
-          aria-controls={`${id}-expand-content`}
           onClick={() => setIsExpanded(!isExpanded)}
+          tabIndex={0}
         >
-          <span className="usa-banner__button-text">{isExpanded ? `hide` : 'show'}</span>
+          {isExpanded ? 'hide' : 'show'}
         </button>
+        { isExpanded ?
+        <img
+          className={styles.showHideIcon}
+          src={expandIcon}
+          alt={'expand icon'}
+          onClick={() => setIsExpanded(!isExpanded)}
+        /> :
+        <img
+          className={styles.showHideIcon}
+          src={collapseIcon}
+          alt={'collapse icon'}
+          onClick={() => setIsExpanded(!isExpanded)}
+        />}
       </h6>
 
-      <div
-        id={`${id}-expand-content`}
-        className="usa-banner__content usa-accordion__content"
-        aria-labelledby={`${id}-expand-control`}
+      <section
+        id={`${id}-panel`}
+        aria-labelledby={`${id}-header`}
         hidden={!isExpanded}
-      >
-        {children}
-      </div>
+      >{children}</section>
     </>
   );
 };
@@ -84,7 +98,9 @@ const J40AccordionItem = ({id, title, children}:IJ40AccordionItem) => {
 const TractDemographics = () => {
   return (
     <div className={styles.demographicsContainer}>
-      <div className={styles.demographicsLabel}>Tract demographics</div>
+      <div className={styles.demographicsTitle}>
+        Tract demographics
+      </div>
       <>
         <J40AccordionItem id={'race'} title={`Racial Ethnographic`}>
           {demographicItemGen(demographicsData.racial)}
diff --git a/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
index 68e2ccefa..7c3b4c8c6 100644
--- a/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
+++ b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
@@ -9,24 +9,22 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
     <h6>
       Racial Ethnographic
       <button
-        aria-controls="race-expand-content"
+        aria-controls="race-panel"
         aria-expanded="false"
-        class="usa-accordion__button usa-banner__button"
-        id="race-expand-control"
-        type="button"
+        id="race-header"
+        tabindex="0"
       >
-        <span
-          class="usa-banner__button-text"
-        >
-          show
-        </span>
+        show
       </button>
+      <img
+        alt="collapse icon"
+        src="test-file-stub"
+      />
     </h6>
-    <div
-      aria-labelledby="race-expand-control"
-      class="usa-banner__content usa-accordion__content"
+    <section
+      aria-labelledby="race-header"
       hidden=""
-      id="race-expand-content"
+      id="race-panel"
     >
       <div>
         <span>
@@ -100,28 +98,26 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
           10.4%
         </span>
       </div>
-    </div>
+    </section>
     <h6>
       Age
       <button
-        aria-controls="age-expand-content"
+        aria-controls="age-panel"
         aria-expanded="false"
-        class="usa-accordion__button usa-banner__button"
-        id="age-expand-control"
-        type="button"
+        id="age-header"
+        tabindex="0"
       >
-        <span
-          class="usa-banner__button-text"
-        >
-          show
-        </span>
+        show
       </button>
+      <img
+        alt="collapse icon"
+        src="test-file-stub"
+      />
     </h6>
-    <div
-      aria-labelledby="age-expand-control"
-      class="usa-banner__content usa-accordion__content"
+    <section
+      aria-labelledby="age-header"
       hidden=""
-      id="age-expand-content"
+      id="age-panel"
     >
       <div>
         <span>
@@ -147,7 +143,7 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
           7.2%
         </span>
       </div>
-    </div>
+    </section>
   </div>
 </DocumentFragment>
 `;

From 40e7b80f27e41e97a12396730daa421b7135b008 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 1 Aug 2022 23:40:59 -0700
Subject: [PATCH 024/130] Align Geolocate icon and Search

- align geolocate and search according to mock for desktop and mobile
---
 client/src/components/J40Map.module.scss      | 38 ++++---------------
 .../MapSearch/MapSearch.module.scss           | 29 ++++++++++----
 .../MapSearchMessage.module.scss              |  1 +
 3 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/client/src/components/J40Map.module.scss b/client/src/components/J40Map.module.scss
index 01827a3ca..f1d833333 100644
--- a/client/src/components/J40Map.module.scss
+++ b/client/src/components/J40Map.module.scss
@@ -3,61 +3,37 @@
 
 
 .j40Map {
+  // width < 1024
   @include at-media-max("desktop") {
-    // < 1024
     height: 55vh;
   }
 
   .mapHeaderRow{
     @include u-display("flex");
     @include u-padding-left(1.5);
+    justify-content: flex-start;
     
-    justify-content: space-between;
 
-    /* 
-      This width is set to prevent this row from 
-      overflowing. Using justify-content: space-between
-      will allow the geolocation button to be right 
-      ajusted. Without the width property constraint
-      of 98%, the space-between property forces the
-      geolocation icon out of the parent container.
-      
-      Since the geolocation control is absolutely
-      positioned, attempts were made to set the 
-      parent to be relative to avoid this, however
-      it seems that we haven't found a cleaner
-      solution (yet).
-    */
-    width: 98%;
-
-    
     .geolocateBox {
-      margin-top: 6px;
+      flex: 1 2 47%;
+      align-self: flex-end;
+      margin-bottom: 30px;
+      margin-left: 1rem;
 
       .geolocateMessage {
         visibility: visible;
         background-color: white;
         margin-bottom: 3px;
+        max-width: fit-content;
       }
       
       .geolocateMessageHide {
         visibility: hidden;
         margin-bottom: 3px;
       }
-      
-      @include at-media-max("tablet") {
-        // < 640
-        margin-top: 28px;
-      }
-      
-      @media (max-width: 365px){
-        margin-top: 46px;
 
-      }
       .geolocateIcon{
         align-self: flex-end;
-        @include u-margin-right(4);
-        
       }
     }
   }
diff --git a/client/src/components/MapSearch/MapSearch.module.scss b/client/src/components/MapSearch/MapSearch.module.scss
index 3010fa31f..ea9f6e731 100644
--- a/client/src/components/MapSearch/MapSearch.module.scss
+++ b/client/src/components/MapSearch/MapSearch.module.scss
@@ -1,12 +1,27 @@
 @use '../../styles/design-system.scss' as *;
 
 .mapSearchContainer {
-    /*
-      The width of the container is being limited so that 
-      as the device width decreases, the geolocation 
-      button has enough space between the Search
-      component
-    */
-    width: 71%;
+  /**
+  Various breakpoint are being used to allow a consistent ratio 
+  of screen width between the search component and the geolocation 
+  component across all device sizes.
+  */
+
+  // width < 660
+  @include at-media-max("tablet") {
+    flex: 1 1 100%;
+  }
+
+  //  660 < width < 1024
+  @include at-media-max("desktop") {
+    @include at-media("tablet"){
+      flex: 1 1 56%;
+    }
+  }
+
+  // > 1024
+  @include at-media("desktop") {
+    flex: 1 1 72%;
+  }
 }
 
diff --git a/client/src/components/MapSearchMessage/MapSearchMessage.module.scss b/client/src/components/MapSearchMessage/MapSearchMessage.module.scss
index 646b8116f..6d0e6e234 100644
--- a/client/src/components/MapSearchMessage/MapSearchMessage.module.scss
+++ b/client/src/components/MapSearchMessage/MapSearchMessage.module.scss
@@ -11,6 +11,7 @@
 .showMessage {
     @include searchMessageLayout;
     display: block;
+    width: fit-content;
 }
 
 .hideMessage {

From 70b9072559ed9c04872e990129815d84816d0249 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 12 Jul 2022 10:05:36 -0700
Subject: [PATCH 025/130] Add tribal toggle (UI only)

---
 client/.env.development                       |  3 +-
 client/src/components/J40Map.module.scss      |  2 +
 client/src/components/J40Map.tsx              |  4 ++
 .../LayerSelector/LayerSelector.module.scss   | 30 +++++++++
 .../LayerSelector.module.scss.d.ts            | 12 ++++
 .../LayerSelector/LayerSelector.test.tsx      | 16 +++++
 .../LayerSelector/LayerSelector.tsx           | 61 +++++++++++++++++++
 .../__snapshots__/LayerSelector.test.tsx.snap | 42 +++++++++++++
 client/src/components/LayerSelector/index.tsx |  3 +
 client/src/data/copy/explore.tsx              | 20 ++++++
 client/src/intl/en.json                       | 12 ++++
 11 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 client/src/components/LayerSelector/LayerSelector.module.scss
 create mode 100644 client/src/components/LayerSelector/LayerSelector.module.scss.d.ts
 create mode 100644 client/src/components/LayerSelector/LayerSelector.test.tsx
 create mode 100644 client/src/components/LayerSelector/LayerSelector.tsx
 create mode 100644 client/src/components/LayerSelector/__snapshots__/LayerSelector.test.tsx.snap
 create mode 100644 client/src/components/LayerSelector/index.tsx

diff --git a/client/.env.development b/client/.env.development
index 677079739..2ebda307f 100644
--- a/client/.env.development
+++ b/client/.env.development
@@ -8,6 +8,7 @@ GATSBY_LOCAL_TILES_BASE_URL=http://localhost:5000/data/data-pipeline
 
 GATSBY_DATA_PIPELINE_SCORE_PATH_LOCAL=data_pipeline/data/score
 GATSBY_DATA_PIPELINE_SCORE_PATH=data-pipeline/data/score
+GATSBY_DATA_PIPELINE_TRIBAL_PATH=data-pipeline/data/tribal
 
 GATSBY_FILE_DL_PATH_SCREENING_TOOL_DATA_ZIP=downloadable/Screening_Tool_Data.zip
 GATSBY_FILE_DL_PATH_SHAPE_FILE_ZIP=shapefile/usa.zip
@@ -22,4 +23,4 @@ GATSBY_MAP_TILES_PATH=tiles
 # If you want the map to render a MapBox base map (as opposed to the
 # open source one from CartoDB), please create your own API TOKEN from
 # your MapBox account and add the token here:
-# MAPBOX_STYLES_READ_TOKEN=''
+MAPBOX_STYLES_READ_TOKEN=''
\ No newline at end of file
diff --git a/client/src/components/J40Map.module.scss b/client/src/components/J40Map.module.scss
index 926f2f58c..835d188ab 100644
--- a/client/src/components/J40Map.module.scss
+++ b/client/src/components/J40Map.module.scss
@@ -32,5 +32,7 @@
 .j40Map {
   @include at-media-max("desktop") {
     height: 55vh;
+    @include u-margin-top(7); // Allow for tribal toggle to appear above map on screens < 1024
   }
+
 }
\ No newline at end of file
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index c0f10ba3c..f56c7f6c4 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -26,6 +26,7 @@ import {useFlags} from '../contexts/FlagContext';
 import AreaDetail from './AreaDetail';
 import MapInfoPanel from './mapInfoPanel';
 import MapSearch from './MapSearch';
+import LayerSelector from './LayerSelector';
 import TerritoryFocusControl from './territoryFocusControl';
 import {getOSBaseMap} from '../data/getOSBaseMap';
 
@@ -350,6 +351,9 @@ const J40Map = ({location}: IJ40Interface) => {
         <MapSearch goToPlace={goToPlace}/>
 
 
+        {/* This will allow to select between the census tract layer and the tribal lands layer */}
+        <LayerSelector />
+
         {/**
          * The ReactMapGL component's props are grouped by the API's documentation. The component also has
          * some children.
diff --git a/client/src/components/LayerSelector/LayerSelector.module.scss b/client/src/components/LayerSelector/LayerSelector.module.scss
new file mode 100644
index 000000000..bb4916381
--- /dev/null
+++ b/client/src/components/LayerSelector/LayerSelector.module.scss
@@ -0,0 +1,30 @@
+@use '../../styles/design-system.scss' as *;
+
+.layerSelectorContainer {
+    background-color: white;
+    @include u-padding-left(1);
+    @include u-padding-right(1);
+    @include u-padding-top(1);
+    @include u-padding-bottom(1);
+    width: fit-content;
+    z-index: 1;
+    
+    // styles for mobile-lg (480px) and greater widths,
+    @include at-media('mobile-lg') {
+        position: absolute;
+        top: units(2.5);
+        left: 62%;
+    }
+
+    // styles for less than mobile-lg (480px)
+    position: absolute;
+    top: -5.2rem;
+    
+}
+  
+  
+  
+  
+  
+  
+  
\ No newline at end of file
diff --git a/client/src/components/LayerSelector/LayerSelector.module.scss.d.ts b/client/src/components/LayerSelector/LayerSelector.module.scss.d.ts
new file mode 100644
index 000000000..f8c32767e
--- /dev/null
+++ b/client/src/components/LayerSelector/LayerSelector.module.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace LayerSelectorNamespace {
+    export interface ILayerSelectorScss {
+        layerSelectorContainer: string;
+    }
+  }
+
+declare const LayerSelectorScssModule: LayerSelectorNamespace.ILayerSelectorScss & {
+    /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+    locals: LayerSelectorNamespace.ILayerSelectorScss;
+  };
+
+  export = LayerSelectorScssModule;
diff --git a/client/src/components/LayerSelector/LayerSelector.test.tsx b/client/src/components/LayerSelector/LayerSelector.test.tsx
new file mode 100644
index 000000000..cfd8ccdfe
--- /dev/null
+++ b/client/src/components/LayerSelector/LayerSelector.test.tsx
@@ -0,0 +1,16 @@
+import * as React from 'react';
+import {render} from '@testing-library/react';
+import {LocalizedComponent} from '../../test/testHelpers';
+import LayerSelector from './LayerSelector';
+
+describe('rendering of the LayerSelector', () => {
+  const {asFragment} = render(
+      <LocalizedComponent>
+        <LayerSelector />
+      </LocalizedComponent>,
+  );
+
+  it('checks if component renders', () => {
+    expect(asFragment()).toMatchSnapshot();
+  });
+});
diff --git a/client/src/components/LayerSelector/LayerSelector.tsx b/client/src/components/LayerSelector/LayerSelector.tsx
new file mode 100644
index 000000000..92ee25d46
--- /dev/null
+++ b/client/src/components/LayerSelector/LayerSelector.tsx
@@ -0,0 +1,61 @@
+import React, {useEffect, useState} from 'react';
+import {useIntl} from 'gatsby-plugin-intl';
+import {Button, ButtonGroup} from '@trussworks/react-uswds';
+import {useWindowSize} from 'react-use';
+
+
+import * as styles from './LayerSelector.module.scss';
+import * as EXPLORE_COPY from '../../data/copy/explore';
+
+const LayerSelector = () => {
+  const intl = useIntl();
+  const [censusSelected, setCensusSelected] = useState(true);
+
+  /**
+     * At compile-time, the width/height returned by useWindowSize will be X. When the client requests the
+     * app on run-time from CDN, and the app hydrates, reconcilation no longer occurs and the client is forced
+     * to use X.
+     *
+     * To avoid this, we set the text as a state variable. We also create a useEffect that updates
+     * that state whenenver the width changes.
+     *
+     */
+  const {width, height} = useWindowSize();
+  const [censusText, setCensusText]= useState(EXPLORE_COPY.MAP.CENSUS_TRACT_LONG);
+  const [tribalText, setTribalText]= useState(EXPLORE_COPY.MAP.TRIBAL_LANDS_LONG);
+
+  useEffect( () => {
+    if (width > height) {
+      setCensusText(EXPLORE_COPY.MAP.CENSUS_TRACT_LONG);
+      setTribalText(EXPLORE_COPY.MAP.TRIBAL_LANDS_LONG);
+    } else {
+      setCensusText(EXPLORE_COPY.MAP.CENSUS_TRACT_SHORT);
+      setTribalText(EXPLORE_COPY.MAP.TRIBAL_LANDS_SHORT);
+    }
+  }, [width]);
+
+  //   Handles toggle of tracts and tribal layer selection
+  const buttonClickHandler = (event) => {
+    if (event.target.id === 'census' && !censusSelected) {
+      setCensusSelected(true);
+    } else if (event.target.id === 'tribal' && censusSelected) {
+      setCensusSelected(false);
+    }
+  };
+
+  return (
+    <div className={styles.layerSelectorContainer}>
+      <label htmlFor="layer-group">Select layer</label>
+      <ButtonGroup id="layer-group" type="segmented">
+        <Button id="census" type="button" outline={!censusSelected} onClick={(e) => buttonClickHandler(e)}>
+          {intl.formatMessage(censusText)}
+        </Button>
+        <Button id="tribal" type="button" outline={censusSelected} onClick={(e) => buttonClickHandler(e)}>
+          {intl.formatMessage(tribalText)}
+        </Button>
+      </ButtonGroup>
+    </div>
+  );
+};
+
+export default LayerSelector;
diff --git a/client/src/components/LayerSelector/__snapshots__/LayerSelector.test.tsx.snap b/client/src/components/LayerSelector/__snapshots__/LayerSelector.test.tsx.snap
new file mode 100644
index 000000000..c63b3081a
--- /dev/null
+++ b/client/src/components/LayerSelector/__snapshots__/LayerSelector.test.tsx.snap
@@ -0,0 +1,42 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`rendering of the LayerSelector checks if component renders 1`] = `
+<DocumentFragment>
+  <div>
+    <label
+      for="layer-group"
+    >
+      Select layer
+    </label>
+    <ul
+      class="usa-button-group usa-button-group--segmented"
+      id="layer-group"
+    >
+      <li
+        class="usa-button-group__item"
+      >
+        <button
+          class="usa-button"
+          data-testid="button"
+          id="census"
+          type="button"
+        >
+          Census Tracts
+        </button>
+      </li>
+      <li
+        class="usa-button-group__item"
+      >
+        <button
+          class="usa-button usa-button--outline"
+          data-testid="button"
+          id="tribal"
+          type="button"
+        >
+          Tribal Lands
+        </button>
+      </li>
+    </ul>
+  </div>
+</DocumentFragment>
+`;
diff --git a/client/src/components/LayerSelector/index.tsx b/client/src/components/LayerSelector/index.tsx
new file mode 100644
index 000000000..61f2645ce
--- /dev/null
+++ b/client/src/components/LayerSelector/index.tsx
@@ -0,0 +1,3 @@
+import LayerSelector from './LayerSelector';
+
+export default LayerSelector;
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 00c6f52cb..52439cf3a 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -158,6 +158,26 @@ export const MAP = defineMessages({
     defaultMessage: 'US Virgin Islands',
     description: 'On the explore the map page, on the map, the full name indicating the bounds of US Virgin Islands',
   },
+  CENSUS_TRACT_LONG: {
+    id: 'explore.map.page.map.layer.selector.tracts.long',
+    defaultMessage: 'Census Tracts',
+    description: 'On the explore the map page, on the map, the full name indicating Census Tracts',
+  },
+  CENSUS_TRACT_SHORT: {
+    id: 'explore.map.page.map.layer.selector.tracts.short',
+    defaultMessage: 'Tracts',
+    description: 'On the explore the map page, on the map, the short name indicating Census Tracts',
+  },
+  TRIBAL_LANDS_LONG: {
+    id: 'explore.map.page.map.layer.selector.tribal.long',
+    defaultMessage: 'Tribal Lands',
+    description: 'On the explore the map page, on the map, the full name indicating Tribal Lands',
+  },
+  TRIBAL_LANDS_SHORT: {
+    id: 'explore.map.page.map.layer.selector.tracts.short',
+    defaultMessage: 'Tribal',
+    description: 'On the explore the map page, on the map, the short name indicating Tribal Lands',
+  },
 });
 
 
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index ebe6156f2..7a3d1210a 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -343,6 +343,18 @@
     "defaultMessage": "Communities identified as disadvantaged by the map are those that are marginalized, underserved, and overburdened by pollution. These communities are at or above the thresholds in one or more of eight categories of criteria.",
     "description": "On the explore the map page, the description of the legend"
   },
+  "explore.map.page.map.layer.selector.tracts.long": {
+    "defaultMessage": "Census Tracts",
+    "description": "On the explore the map page, on the map, the full name indicating Census Tracts"
+  },
+  "explore.map.page.map.layer.selector.tracts.short": {
+    "defaultMessage": "Tribal",
+    "description": "On the explore the map page, on the map, the short name indicating Tribal Lands"
+  },
+  "explore.map.page.map.layer.selector.tribal.long": {
+    "defaultMessage": "Tribal Lands",
+    "description": "On the explore the map page, on the map, the full name indicating Tribal Lands"
+  },
   "explore.map.page.map.search.placeholder.mobile.text": {
     "defaultMessage": "Search locations",
     "description": "On the explore the map page, on the map, the placeholder text for search"

From d4aed789ccafdf1693aff33ce242d6cafb52e5ae Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Thu, 4 Aug 2022 00:29:22 -0700
Subject: [PATCH 026/130] Refactor Sources/Layers to allow for tribal switching

- Remove census tracts layers into it's own component
- Create a tribal layer component
- Update LayerSelector component tests
- update OS map to react to layer selector
-
---
 client/src/components/J40Map.tsx              | 158 ++----------------
 .../LayerSelector/LayerSelector.test.tsx      |  20 ++-
 .../LayerSelector/LayerSelector.tsx           |  11 +-
 .../__snapshots__/LayerSelector.test.tsx.snap |  43 ++++-
 .../MapTractLayers/MapTractLayers.tsx         | 155 +++++++++++++++++
 .../src/components/MapTractLayers/index.tsx   |   3 +
 .../MapTribalLayer/MapTribalLayer.tsx         |  75 +++++++++
 .../src/components/MapTribalLayer/index.tsx   |   3 +
 client/src/data/constants.tsx                 |  14 ++
 client/src/data/getOSBaseMap.tsx              |  73 +++++++-
 10 files changed, 400 insertions(+), 155 deletions(-)
 create mode 100644 client/src/components/MapTractLayers/MapTractLayers.tsx
 create mode 100644 client/src/components/MapTractLayers/index.tsx
 create mode 100644 client/src/components/MapTribalLayer/MapTribalLayer.tsx
 create mode 100644 client/src/components/MapTribalLayer/index.tsx

diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index f56c7f6c4..109684a3f 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable valid-jsdoc */
 /* eslint-disable no-unused-vars */
 // External Libs:
-import React, {useRef, useState, useMemo} from 'react';
+import React, {useRef, useState} from 'react';
 import {Map, MapboxGeoJSONFeature, LngLatBoundsLike} from 'maplibre-gl';
 import ReactMapGL, {
   MapEvent,
@@ -12,7 +12,7 @@ import ReactMapGL, {
   Popup,
   FlyToInterpolator,
   FullscreenControl,
-  MapRef, Source, Layer} from 'react-map-gl';
+  MapRef} from 'react-map-gl';
 import bbox from '@turf/bbox';
 import * as d3 from 'd3-ease';
 import {isMobile} from 'react-device-detect';
@@ -26,6 +26,7 @@ import {useFlags} from '../contexts/FlagContext';
 import AreaDetail from './AreaDetail';
 import MapInfoPanel from './mapInfoPanel';
 import MapSearch from './MapSearch';
+import MapTractLayers from './MapTractLayers/MapTractLayers';
 import LayerSelector from './LayerSelector';
 import TerritoryFocusControl from './territoryFocusControl';
 import {getOSBaseMap} from '../data/getOSBaseMap';
@@ -34,9 +35,7 @@ import {getOSBaseMap} from '../data/getOSBaseMap';
 import 'maplibre-gl/dist/maplibre-gl.css';
 import * as constants from '../data/constants';
 import * as styles from './J40Map.module.scss';
-import * as COMMON_COPY from '../data/copy/common';
-
-
+import MapTribalLayer from './MapTribalLayer/MapTribalLayer';
 declare global {
   interface Window {
     Cypress?: object;
@@ -56,49 +55,6 @@ export interface IDetailViewInterface {
   properties: constants.J40Properties,
 };
 
-/**
- * This function will determine the URL for the map tiles. It will read in a string that will designate either
- * high or low tiles. It will allow to overide the URL to the pipeline staging tile URL via feature flag.
- * Lastly, it allows to set the tiles to be local or via the CDN as well.
- *
- * @param {string} tilesetName
- * @returns {string}
- */
-export const featureURLForTilesetName = (tilesetName: string): string => {
-  const flags = useFlags();
-
-  const pipelineStagingBaseURL = `https://justice40-data.s3.amazonaws.com/data-pipeline-staging`;
-  const XYZ_SUFFIX = '{z}/{x}/{y}.pbf';
-
-  if ('stage_hash' in flags) {
-    // Check if the stage_hash is valid
-    const regex = /^[0-9]{4}\/[a-f0-9]{40}$/;
-    if (!regex.test(flags['stage_hash'])) {
-      console.error(COMMON_COPY.CONSOLE_ERROR.STAGE_URL);
-    }
-
-    return `${pipelineStagingBaseURL}/${flags['stage_hash']}/data/score/tiles/${tilesetName}/${XYZ_SUFFIX}`;
-  } else {
-    // The feature tile base URL and path can either point locally or the CDN.
-    // This is selected based on the DATA_SOURCE env variable.
-    const featureTileBaseURL = process.env.DATA_SOURCE === 'local' ?
-      process.env.GATSBY_LOCAL_TILES_BASE_URL :
-      process.env.GATSBY_CDN_TILES_BASE_URL;
-
-    const featureTilePath = process.env.DATA_SOURCE === 'local' ?
-    process.env.GATSBY_DATA_PIPELINE_SCORE_PATH_LOCAL :
-    process.env.GATSBY_DATA_PIPELINE_SCORE_PATH;
-
-    return [
-      featureTileBaseURL,
-      featureTilePath,
-      process.env.GATSBY_MAP_TILES_PATH,
-      tilesetName,
-      XYZ_SUFFIX,
-    ].join('/');
-  }
-};
-
 
 const J40Map = ({location}: IJ40Interface) => {
   /**
@@ -128,13 +84,13 @@ const J40Map = ({location}: IJ40Interface) => {
   const [transitionInProgress, setTransitionInProgress] = useState<boolean>(false);
   const [geolocationInProgress, setGeolocationInProgress] = useState<boolean>(false);
   const [isMobileMapState, setIsMobileMapState] = useState<boolean>(false);
+  const [censusSelected, setCensusSelected] = useState(true);
   const {width: windowWidth} = useWindowSize();
 
   const mapRef = useRef<MapRef>(null);
   const flags = useFlags();
 
   const selectedFeatureId = (selectedFeature && selectedFeature.id) || '';
-  const filter = useMemo(() => ['in', constants.GEOID_PROPERTY, selectedFeatureId], [selectedFeature]);
 
   const zoomLatLngHash = mapRef.current?.getMap()._hash._getCurrentHash();
 
@@ -352,7 +308,7 @@ const J40Map = ({location}: IJ40Interface) => {
 
 
         {/* This will allow to select between the census tract layer and the tribal lands layer */}
-        <LayerSelector />
+        <LayerSelector censusSelected={censusSelected} setCensusSelected={setCensusSelected}/>
 
         {/**
          * The ReactMapGL component's props are grouped by the API's documentation. The component also has
@@ -368,7 +324,7 @@ const J40Map = ({location}: IJ40Interface) => {
           // ****** Map state props: ******
           // http://visgl.github.io/react-map-gl/docs/api-reference/interactive-map#map-state
           {...viewport}
-          mapStyle={process.env.MAPBOX_STYLES_READ_TOKEN ? mapBoxBaseLayer : getOSBaseMap()}
+          mapStyle={process.env.MAPBOX_STYLES_READ_TOKEN ? mapBoxBaseLayer : getOSBaseMap(censusSelected)}
           width="100%"
           // Ajusting this height with a conditional statement will not render the map on staging.
           // The reason for this issue is unknown. Consider styling the parent container via SASS.
@@ -382,7 +338,8 @@ const J40Map = ({location}: IJ40Interface) => {
           minZoom={constants.GLOBAL_MIN_ZOOM}
           dragRotate={false}
           touchRotate={false}
-          interactiveLayerIds={[constants.HIGH_ZOOM_LAYER_ID, constants.PRIORITIZED_HIGH_ZOOM_LAYER_ID]}
+          // eslint-disable-next-line max-len
+          interactiveLayerIds={censusSelected ? [constants.HIGH_ZOOM_LAYER_ID, constants.PRIORITIZED_HIGH_ZOOM_LAYER_ID] : [constants.TRIBAL_LAYER_ID]}
 
 
           // ****** Callback props: ******
@@ -396,96 +353,13 @@ const J40Map = ({location}: IJ40Interface) => {
           ref={mapRef}
           data-cy={'reactMapGL'}
         >
-          {/**
-           * The low zoom source
-           */}
-          <Source
-            id={constants.LOW_ZOOM_SOURCE_NAME}
-            type="vector"
-            promoteId={constants.GEOID_PROPERTY}
-            tiles={[featureURLForTilesetName('low')]}
-            maxzoom={constants.GLOBAL_MAX_ZOOM_LOW}
-            minzoom={constants.GLOBAL_MIN_ZOOM_LOW}
-          >
-
-            {/* Low zoom layer - prioritized features only */}
-            <Layer
-              id={constants.LOW_ZOOM_LAYER_ID}
-              source-layer={constants.SCORE_SOURCE_LAYER}
-              filter={['>', constants.SCORE_PROPERTY_LOW, constants.SCORE_BOUNDARY_THRESHOLD]}
-              type='fill'
-              paint={{
-                'fill-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
-                'fill-opacity': constants.LOW_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY}}
-              maxzoom={constants.GLOBAL_MAX_ZOOM_LOW}
-              minzoom={constants.GLOBAL_MIN_ZOOM_LOW}
-            />
-          </Source>
-
-          {/**
-           * The high zoom source
-           */}
-          <Source
-            id={constants.HIGH_ZOOM_SOURCE_NAME}
-            type="vector"
-            promoteId={constants.GEOID_PROPERTY}
-            tiles={[featureURLForTilesetName('high')]}
-            maxzoom={constants.GLOBAL_MAX_ZOOM_HIGH}
-            minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
-          >
-
-            {/* High zoom layer - non-prioritized features only */}
-            <Layer
-              id={constants.HIGH_ZOOM_LAYER_ID}
-              source-layer={constants.SCORE_SOURCE_LAYER}
-              filter={['<', constants.SCORE_PROPERTY_HIGH, constants.SCORE_BOUNDARY_THRESHOLD]}
-              type='fill'
-              paint={{
-                'fill-opacity': constants.NON_PRIORITIZED_FEATURE_FILL_OPACITY,
-              }}
-              minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
-            />
-
-            {/* High zoom layer - prioritized features only */}
-            <Layer
-              id={constants.PRIORITIZED_HIGH_ZOOM_LAYER_ID}
-              source-layer={constants.SCORE_SOURCE_LAYER}
-              filter={['>', constants.SCORE_PROPERTY_HIGH, constants.SCORE_BOUNDARY_THRESHOLD]}
-              type='fill'
-              paint={{
-                'fill-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
-                'fill-opacity': constants.HIGH_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY,
-              }}
-              minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
-            />
-
-            {/* High zoom layer - controls the border between features */}
-            <Layer
-              id={constants.FEATURE_BORDER_LAYER_ID}
-              source-layer={constants.SCORE_SOURCE_LAYER}
-              type='line'
-              paint={{
-                'line-color': constants.FEATURE_BORDER_COLOR,
-                'line-width': constants.FEATURE_BORDER_WIDTH,
-                'line-opacity': constants.FEATURE_BORDER_OPACITY,
-              }}
-              maxzoom={constants.GLOBAL_MAX_ZOOM_FEATURE_BORDER}
-              minzoom={constants.GLOBAL_MIN_ZOOM_FEATURE_BORDER}
-            />
-
-            {/* High zoom layer - border styling around the selected feature */}
-            <Layer
-              id={constants.SELECTED_FEATURE_BORDER_LAYER_ID}
-              source-layer={constants.SCORE_SOURCE_LAYER}
-              filter={filter} // This filter filters out all other features except the selected feature.
-              type='line'
-              paint={{
-                'line-color': constants.SELECTED_FEATURE_BORDER_COLOR,
-                'line-width': constants.SELECTED_FEATURE_BORDER_WIDTH,
-              }}
-              minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
-            />
-          </Source>
+
+          {/* Load either the Tribal layer or census layer */}
+          {
+           censusSelected ?
+           <MapTractLayers selectedFeature={selectedFeature} selectedFeatureId={selectedFeatureId}/> :
+            <MapTribalLayer />
+          }
 
           {/* This will add the navigation controls of the zoom in and zoom out buttons */}
           { windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG && <NavigationControl
diff --git a/client/src/components/LayerSelector/LayerSelector.test.tsx b/client/src/components/LayerSelector/LayerSelector.test.tsx
index cfd8ccdfe..7b8dd240e 100644
--- a/client/src/components/LayerSelector/LayerSelector.test.tsx
+++ b/client/src/components/LayerSelector/LayerSelector.test.tsx
@@ -4,13 +4,21 @@ import {LocalizedComponent} from '../../test/testHelpers';
 import LayerSelector from './LayerSelector';
 
 describe('rendering of the LayerSelector', () => {
-  const {asFragment} = render(
-      <LocalizedComponent>
-        <LayerSelector />
-      </LocalizedComponent>,
-  );
+  it('checks if component renders census tracts selected', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <LayerSelector censusSelected={true} setCensusSelected={() => {}}/>
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
 
-  it('checks if component renders', () => {
+  it('checks if component renders tribal selected', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <LayerSelector censusSelected={false} setCensusSelected={() => {}}/>
+        </LocalizedComponent>,
+    );
     expect(asFragment()).toMatchSnapshot();
   });
 });
diff --git a/client/src/components/LayerSelector/LayerSelector.tsx b/client/src/components/LayerSelector/LayerSelector.tsx
index 92ee25d46..933133c8d 100644
--- a/client/src/components/LayerSelector/LayerSelector.tsx
+++ b/client/src/components/LayerSelector/LayerSelector.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect, useState} from 'react';
+import React, {useEffect, useState, Dispatch} from 'react';
 import {useIntl} from 'gatsby-plugin-intl';
 import {Button, ButtonGroup} from '@trussworks/react-uswds';
 import {useWindowSize} from 'react-use';
@@ -7,9 +7,13 @@ import {useWindowSize} from 'react-use';
 import * as styles from './LayerSelector.module.scss';
 import * as EXPLORE_COPY from '../../data/copy/explore';
 
-const LayerSelector = () => {
+interface ILayerSelector {
+  censusSelected: boolean,
+  setCensusSelected: Dispatch<boolean>,
+}
+
+const LayerSelector = ({censusSelected, setCensusSelected}:ILayerSelector) => {
   const intl = useIntl();
-  const [censusSelected, setCensusSelected] = useState(true);
 
   /**
      * At compile-time, the width/height returned by useWindowSize will be X. When the client requests the
@@ -45,6 +49,7 @@ const LayerSelector = () => {
 
   return (
     <div className={styles.layerSelectorContainer}>
+      {/* // Todo: set i18n here */}
       <label htmlFor="layer-group">Select layer</label>
       <ButtonGroup id="layer-group" type="segmented">
         <Button id="census" type="button" outline={!censusSelected} onClick={(e) => buttonClickHandler(e)}>
diff --git a/client/src/components/LayerSelector/__snapshots__/LayerSelector.test.tsx.snap b/client/src/components/LayerSelector/__snapshots__/LayerSelector.test.tsx.snap
index c63b3081a..55de09d01 100644
--- a/client/src/components/LayerSelector/__snapshots__/LayerSelector.test.tsx.snap
+++ b/client/src/components/LayerSelector/__snapshots__/LayerSelector.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`rendering of the LayerSelector checks if component renders 1`] = `
+exports[`rendering of the LayerSelector checks if component renders census tracts selected 1`] = `
 <DocumentFragment>
   <div>
     <label
@@ -40,3 +40,44 @@ exports[`rendering of the LayerSelector checks if component renders 1`] = `
   </div>
 </DocumentFragment>
 `;
+
+exports[`rendering of the LayerSelector checks if component renders tribal selected 1`] = `
+<DocumentFragment>
+  <div>
+    <label
+      for="layer-group"
+    >
+      Select layer
+    </label>
+    <ul
+      class="usa-button-group usa-button-group--segmented"
+      id="layer-group"
+    >
+      <li
+        class="usa-button-group__item"
+      >
+        <button
+          class="usa-button usa-button--outline"
+          data-testid="button"
+          id="census"
+          type="button"
+        >
+          Census Tracts
+        </button>
+      </li>
+      <li
+        class="usa-button-group__item"
+      >
+        <button
+          class="usa-button"
+          data-testid="button"
+          id="tribal"
+          type="button"
+        >
+          Tribal Lands
+        </button>
+      </li>
+    </ul>
+  </div>
+</DocumentFragment>
+`;
diff --git a/client/src/components/MapTractLayers/MapTractLayers.tsx b/client/src/components/MapTractLayers/MapTractLayers.tsx
new file mode 100644
index 000000000..601952934
--- /dev/null
+++ b/client/src/components/MapTractLayers/MapTractLayers.tsx
@@ -0,0 +1,155 @@
+import React, {useMemo} from 'react';
+import {Source, Layer} from 'react-map-gl';
+
+// Contexts:
+import {useFlags} from '../../contexts/FlagContext';
+
+import * as constants from '../../data/constants';
+import * as COMMON_COPY from '../../data/copy/common';
+
+// Todo: Update with real types if this works:
+interface IMapTractLayers {
+    selectedFeatureId: any,
+    selectedFeature: any
+}
+
+/**
+ * This function will determine the URL for the map tiles. It will read in a string that will designate either
+ * high or low tiles. It will allow to overide the URL to the pipeline staging tile URL via feature flag.
+ * Lastly, it allows to set the tiles to be local or via the CDN as well.
+ *
+ * @param {string} tilesetName
+ * @return {string}
+ */
+export const featureURLForTilesetName = (tilesetName: string): string => {
+  const flags = useFlags();
+
+  const pipelineStagingBaseURL = `https://justice40-data.s3.amazonaws.com/data-pipeline-staging`;
+  const XYZ_SUFFIX = '{z}/{x}/{y}.pbf';
+
+  if ('stage_hash' in flags) {
+    // Check if the stage_hash is valid
+    const regex = /^[0-9]{4}\/[a-f0-9]{40}$/;
+    if (!regex.test(flags['stage_hash'])) {
+      console.error(COMMON_COPY.CONSOLE_ERROR.STAGE_URL);
+    }
+
+    return `${pipelineStagingBaseURL}/${flags['stage_hash']}/data/score/tiles/${tilesetName}/${XYZ_SUFFIX}`;
+  } else {
+    // The feature tile base URL and path can either point locally or the CDN.
+    // This is selected based on the DATA_SOURCE env variable.
+    const featureTileBaseURL = process.env.DATA_SOURCE === 'local' ?
+        process.env.GATSBY_LOCAL_TILES_BASE_URL :
+        process.env.GATSBY_CDN_TILES_BASE_URL;
+
+    const featureTilePath = process.env.DATA_SOURCE === 'local' ?
+      process.env.GATSBY_DATA_PIPELINE_SCORE_PATH_LOCAL :
+      process.env.GATSBY_DATA_PIPELINE_SCORE_PATH;
+
+    return [
+      featureTileBaseURL,
+      featureTilePath,
+      process.env.GATSBY_MAP_TILES_PATH,
+      tilesetName,
+      XYZ_SUFFIX,
+    ].join('/');
+  }
+};
+
+const MapTractLayers = ({selectedFeatureId, selectedFeature}: IMapTractLayers) => {
+  const filter = useMemo(() => ['in', constants.GEOID_PROPERTY, selectedFeatureId], [selectedFeature]);
+
+  return (
+    <>
+      <Source
+        id={constants.LOW_ZOOM_SOURCE_NAME}
+        type="vector"
+        promoteId={constants.GEOID_PROPERTY}
+        tiles={[featureURLForTilesetName('low')]}
+        maxzoom={constants.GLOBAL_MAX_ZOOM_LOW}
+        minzoom={constants.GLOBAL_MIN_ZOOM_LOW}
+      >
+
+        {/* Low zoom layer - prioritized features only */}
+        <Layer
+          id={constants.LOW_ZOOM_LAYER_ID}
+          source-layer={constants.SCORE_SOURCE_LAYER}
+          filter={['>', constants.SCORE_PROPERTY_LOW, constants.SCORE_BOUNDARY_THRESHOLD]}
+          type='fill'
+          paint={{
+            'fill-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
+            'fill-opacity': constants.LOW_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY}}
+          maxzoom={constants.GLOBAL_MAX_ZOOM_LOW}
+          minzoom={constants.GLOBAL_MIN_ZOOM_LOW}
+        />
+      </Source>
+
+      {/**
+     * The high zoom source
+    */}
+      <Source
+        id={constants.HIGH_ZOOM_SOURCE_NAME}
+        type="vector"
+        promoteId={constants.GEOID_PROPERTY}
+        tiles={[featureURLForTilesetName('high')]}
+        maxzoom={constants.GLOBAL_MAX_ZOOM_HIGH}
+        minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
+      >
+
+        {/* High zoom layer - non-prioritized features only */}
+        <Layer
+          id={constants.HIGH_ZOOM_LAYER_ID}
+          source-layer={constants.SCORE_SOURCE_LAYER}
+          filter={['<', constants.SCORE_PROPERTY_HIGH, constants.SCORE_BOUNDARY_THRESHOLD]}
+          type='fill'
+          paint={{
+            'fill-opacity': constants.NON_PRIORITIZED_FEATURE_FILL_OPACITY,
+          }}
+          minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
+        />
+
+        {/* High zoom layer - prioritized features only */}
+        <Layer
+          id={constants.PRIORITIZED_HIGH_ZOOM_LAYER_ID}
+          source-layer={constants.SCORE_SOURCE_LAYER}
+          filter={['>', constants.SCORE_PROPERTY_HIGH, constants.SCORE_BOUNDARY_THRESHOLD]}
+          type='fill'
+          paint={{
+            'fill-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
+            'fill-opacity': constants.HIGH_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY,
+          }}
+          minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
+        />
+
+        {/* High zoom layer - controls the border between features */}
+        <Layer
+          id={constants.FEATURE_BORDER_LAYER_ID}
+          source-layer={constants.SCORE_SOURCE_LAYER}
+          type='line'
+          paint={{
+            'line-color': constants.FEATURE_BORDER_COLOR,
+            'line-width': constants.FEATURE_BORDER_WIDTH,
+            'line-opacity': constants.FEATURE_BORDER_OPACITY,
+          }}
+          maxzoom={constants.GLOBAL_MAX_ZOOM_FEATURE_BORDER}
+          minzoom={constants.GLOBAL_MIN_ZOOM_FEATURE_BORDER}
+        />
+
+        {/* High zoom layer - border styling around the selected feature */}
+        <Layer
+          id={constants.SELECTED_FEATURE_BORDER_LAYER_ID}
+          source-layer={constants.SCORE_SOURCE_LAYER}
+          filter={filter} // This filter filters out all other features except the selected feature.
+          type='line'
+          paint={{
+            'line-color': constants.SELECTED_FEATURE_BORDER_COLOR,
+            'line-width': constants.SELECTED_FEATURE_BORDER_WIDTH,
+          }}
+          minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
+        />
+      </Source>
+    </>
+  );
+};
+
+export default MapTractLayers;
diff --git a/client/src/components/MapTractLayers/index.tsx b/client/src/components/MapTractLayers/index.tsx
new file mode 100644
index 000000000..5721cd844
--- /dev/null
+++ b/client/src/components/MapTractLayers/index.tsx
@@ -0,0 +1,3 @@
+import MapTractLayers from './MapTractLayers';
+
+export default MapTractLayers;
diff --git a/client/src/components/MapTribalLayer/MapTribalLayer.tsx b/client/src/components/MapTribalLayer/MapTribalLayer.tsx
new file mode 100644
index 000000000..37baa07cc
--- /dev/null
+++ b/client/src/components/MapTribalLayer/MapTribalLayer.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import {Source, Layer} from 'react-map-gl';
+
+import * as constants from '../../data/constants';
+
+/**
+ * This function will determine the URL for the tribal tiles.
+ * @return {string}
+ */
+export const tribalURL = (): string => {
+  const XYZ_SUFFIX = '{z}/{x}/{y}.pbf';
+
+  return [
+    process.env.GATSBY_CDN_TILES_BASE_URL,
+    process.env.GATSBY_DATA_PIPELINE_TRIBAL_PATH,
+    process.env.GATSBY_MAP_TILES_PATH,
+    XYZ_SUFFIX,
+  ].join('/');
+};
+
+const MapTribalLayer = () => {
+  return (
+    <Source
+      id={constants.TRIBAL_SOURCE_NAME}
+      type="vector"
+      promoteId={constants.TRIBAL_ID}
+      tiles={[tribalURL()]}
+      minzoom={constants.TRIBAL_MIN_ZOOM}
+      maxzoom={constants.TRIBAL_MAX_ZOOM}
+    >
+
+      {/* Low zoom layer - prioritized features only */}
+      <Layer
+        id={constants.TRIBAL_LAYER_ID}
+        source-layer={constants.TRIBAL_SOURCE_LAYER}
+        //   filter={['>', constants.SCORE_PROPERTY_LOW, constants.SCORE_BOUNDARY_THRESHOLD]}
+        type='fill'
+        paint={{
+          'fill-color': constants.TRIBAL_FILL_COLOR,
+          'fill-opacity': constants.TRIBAL_FEATURE_FILL_OPACITY}}
+        minzoom={constants.TRIBAL_MIN_ZOOM}
+        maxzoom={constants.TRIBAL_MAX_ZOOM}
+      />
+
+      {/* Tribal layer - controls the border between features */}
+      <Layer
+        id={constants.FEATURE_BORDER_LAYER_ID}
+        source-layer={constants.SCORE_SOURCE_LAYER}
+        type='line'
+        paint={{
+          'line-color': constants.TRIBAL_BORDER_COLOR,
+          'line-width': constants.FEATURE_BORDER_WIDTH,
+          'line-opacity': constants.FEATURE_BORDER_OPACITY,
+        }}
+        minzoom={constants.TRIBAL_MIN_ZOOM}
+        maxzoom={constants.TRIBAL_MAX_ZOOM}
+      />
+
+      {/* Tribal layer - border styling around the selected feature */}
+      <Layer
+        id={constants.SELECTED_FEATURE_BORDER_LAYER_ID}
+        source-layer={constants.TRIBAL_SOURCE_NAME}
+        type='line'
+        paint={{
+          'line-color': constants.SELECTED_FEATURE_BORDER_COLOR,
+          'line-width': constants.SELECTED_FEATURE_BORDER_WIDTH,
+        }}
+        minzoom={constants.TRIBAL_MIN_ZOOM}
+      />
+    </Source>
+  );
+};
+
+export default MapTribalLayer;
+//
diff --git a/client/src/components/MapTribalLayer/index.tsx b/client/src/components/MapTribalLayer/index.tsx
new file mode 100644
index 000000000..204655893
--- /dev/null
+++ b/client/src/components/MapTribalLayer/index.tsx
@@ -0,0 +1,3 @@
+import MapTribalLayer from './MapTribalLayer';
+
+export default MapTribalLayer;
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index 09f38ba49..c30b4e287 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -25,6 +25,9 @@ export type J40Properties = { [key: string]: any };
 
 // ****** SIDE PANEL BACKEND SIGNALS ***********
 
+// Tribal signals
+export const TRIBAL_ID = 'tribalId';
+
 // Set the threshold percentile used by most indicators in the side panel
 export const DEFAULT_THRESHOLD_PERCENTILE = 90;
 
@@ -187,15 +190,18 @@ export const ISLAND_AREA_LOW_HS_EDU = 'IALHE';
 export const BASE_MAP_SOURCE_NAME = 'base-map-source-name';
 export const HIGH_ZOOM_SOURCE_NAME = 'high-zoom-source-name';
 export const LOW_ZOOM_SOURCE_NAME = 'low-zoom-source-name';
+export const TRIBAL_SOURCE_NAME = 'tribal-source-name';
 
 // Layer ID constants
 export const SCORE_SOURCE_LAYER = 'blocks'; // The name of the layer within the tiles that contains the score
+export const TRIBAL_SOURCE_LAYER = 'blocks';
 export const BASE_MAP_LAYER_ID = 'base-map-layer-id';
 export const HIGH_ZOOM_LAYER_ID = 'high-zoom-layer-id';
 export const PRIORITIZED_HIGH_ZOOM_LAYER_ID = 'prioritized-high-zoom-layer-id';
 export const LOW_ZOOM_LAYER_ID = 'low-zoom-layer-id';
 export const FEATURE_BORDER_LAYER_ID = 'feature-border-layer-id';
 export const SELECTED_FEATURE_BORDER_LAYER_ID = 'selected-feature-border-layer-id';
+export const TRIBAL_LAYER_ID = 'tribal-layer-id';
 
 // Used in layer filters:
 export const SCORE_PROPERTY_LOW = 'M_SCORE';
@@ -213,18 +219,26 @@ export const GLOBAL_MAX_ZOOM_HIGH = 11;
 
 export const GLOBAL_MIN_ZOOM_FEATURE_BORDER = 5;
 export const GLOBAL_MAX_ZOOM_FEATURE_BORDER = 22;
+export const TRIBAL_MIN_ZOOM = 3;
+export const TRIBAL_MAX_ZOOM = 22;
 
 // Opacity
 export const FEATURE_BORDER_OPACITY = 0.5;
 export const HIGH_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY = 0.3;
 export const LOW_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY = 0.6;
 export const NON_PRIORITIZED_FEATURE_FILL_OPACITY = 0;
+export const TRIBAL_FEATURE_FILL_OPACITY = 0.3;
 
 // Colors
 export const FEATURE_BORDER_COLOR = '#4EA5CF';
 export const SELECTED_FEATURE_BORDER_COLOR = '#1A4480';
 export const PRIORITIZED_FEATURE_FILL_COLOR = '#768FB3';
 
+export const TRIBAL_BORDER_COLOR = '#0000FF';
+export const SELECTED_TRIBAL_BORDER_COLOR = '#FF0000';
+export const TRIBAL_FILL_COLOR = '#00FF00';
+
+
 // Widths
 export const FEATURE_BORDER_WIDTH = 0.8;
 export const SELECTED_FEATURE_BORDER_WIDTH = 5.0;
diff --git a/client/src/data/getOSBaseMap.tsx b/client/src/data/getOSBaseMap.tsx
index 8e756dcec..ca2b38fc2 100644
--- a/client/src/data/getOSBaseMap.tsx
+++ b/client/src/data/getOSBaseMap.tsx
@@ -1,6 +1,7 @@
 import {Style} from 'maplibre-gl';
 import * as constants from '../data/constants';
-import {featureURLForTilesetName} from '../components/J40Map';
+import {featureURLForTilesetName} from '../components/MapTractLayers/MapTractLayers';
+import {tribalURL} from '../components/MapTribalLayer/MapTribalLayer';
 
 // *********** BASE MAP SOURCES  ***************
 const imageSuffix = constants.isMobile ? '' : '@2x';
@@ -25,8 +26,12 @@ const cartoLightBaseLayer = {
 
 // Utility function to get OpenSource base maps that are in accordance to JSON spec of MapBox
 // https://docs.mapbox.com/mapbox-gl-js/style-spec/
-export const getOSBaseMap = () : Style => {
-  return {
+export const getOSBaseMap = (censusSelected: boolean) : Style => {
+  return !censusSelected ? {
+
+    /**
+     * Tribal Source
+     */
     'version': 8,
 
     /**
@@ -44,6 +49,68 @@ export const getOSBaseMap = () : Style => {
         'maxzoom': constants.GLOBAL_MAX_ZOOM,
       },
 
+      /**
+       * Tribal source
+       */
+      [constants.TRIBAL_SOURCE_NAME]: {
+        'type': 'vector',
+        'promoteId': constants.TRIBAL_ID,
+        'tiles': [tribalURL()],
+        'minzoom': constants.TRIBAL_MIN_ZOOM,
+        'maxzoom': constants.TRIBAL_MAX_ZOOM,
+      },
+    },
+
+
+    /**
+     * Tribal Layers
+     */
+    'layers': [
+
+      // The baseMapLayer
+      {
+        'id': constants.BASE_MAP_LAYER_ID,
+        'source': constants.BASE_MAP_SOURCE_NAME,
+        'type': 'raster',
+        'minzoom': constants.GLOBAL_MIN_ZOOM,
+        'maxzoom': constants.GLOBAL_MAX_ZOOM,
+      },
+
+      /**
+      * Tribal layer
+      */
+      {
+        'id': constants.TRIBAL_LAYER_ID,
+        'source': constants.TRIBAL_SOURCE_NAME,
+        'source-layer': constants.TRIBAL_SOURCE_LAYER,
+        'type': 'fill',
+        'paint': {
+          'fill-color': constants.TRIBAL_FILL_COLOR,
+          'fill-opacity': constants.TRIBAL_FEATURE_FILL_OPACITY,
+        },
+        'minzoom': constants.TRIBAL_MIN_ZOOM,
+        'maxzoom': constants.TRIBAL_MAX_ZOOM,
+      },
+    ],
+  } :
+  {
+    'version': 8,
+
+    /**
+     * Census Tract Source
+     * */
+    'sources': {
+
+      /**
+       * The base map source source allows us to define where the tiles can be fetched from.
+       */
+      [constants.BASE_MAP_SOURCE_NAME]: {
+        'type': 'raster',
+        'tiles': cartoLightBaseLayer.noLabels,
+        'minzoom': constants.GLOBAL_MIN_ZOOM,
+        'maxzoom': constants.GLOBAL_MAX_ZOOM,
+      },
+
       // The High zoom source:
       [constants.HIGH_ZOOM_SOURCE_NAME]: {
       // It is only shown at high zoom levels to avoid performance issues at lower zooms

From 1d3af3023b396bf33a159582f5ac10b23e479806 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Sat, 6 Aug 2022 03:14:38 -0700
Subject: [PATCH 027/130] Add tribal info to side panel and feature selection

- create a state variable to keep track of weather or not the layer was toggled
- allow mapInfoPanel to reset on layer switch
- allow AreaDetail to show census and tribal info
- allow LayerSelector to set layer toggled
- Add selectedFeature to both MapTribal and MapTract components
- create various tribal constants for styling
- i18n constants
---
 .../src/components/AreaDetail/AreaDetail.tsx  | 187 ++++++++++--------
 .../AreaDetail/tests/areaDetail.test.tsx      |   7 +-
 client/src/components/J40Map.tsx              |  33 +++-
 .../LayerSelector/LayerSelector.test.tsx      |   4 +-
 .../LayerSelector/LayerSelector.tsx           |  10 +-
 .../MapTractLayers/MapTractLayers.tsx         |  11 +-
 .../MapTribalLayer/MapTribalLayer.tsx         |  41 +++-
 client/src/components/mapInfoPanel.tsx        |  26 ++-
 client/src/data/constants.tsx                 |   8 +-
 client/src/data/copy/explore.tsx              |   9 +
 client/src/intl/en.json                       |   4 +
 11 files changed, 228 insertions(+), 112 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 1fdb081c0..545239604 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -22,6 +22,7 @@ import mailIcon from '/node_modules/uswds/dist/img/usa-icons/mail_outline.svg';
 interface IAreaDetailProps {
   properties: constants.J40Properties,
   hash: string[],
+  isCensusLayerSelected: boolean,
 }
 
 /**
@@ -60,7 +61,8 @@ export interface ICategory {
   isExceed1MoreBurden: boolean | null,
   isExceedBothSocioBurdens: boolean | null,
 }
-const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
+
+const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps) => {
   const intl = useIntl();
 
   // console.log the properties of the census that is selected:
@@ -72,6 +74,7 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
   const countyName = properties[constants.COUNTY_NAME] ? properties[constants.COUNTY_NAME] : "N/A";
   const stateName = properties[constants.STATE_NAME] ? properties[constants.STATE_NAME] : "N/A";
   const sidePanelState = properties[constants.SIDE_PANEL_STATE];
+  const landAreaName = properties[constants.LAND_AREA_NAME];
 
   const isCommunityFocus = score >= constants.SCORE_BOUNDARY_THRESHOLD;
 
@@ -572,96 +575,110 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
         {EXPLORE_COPY.SIDE_PANEL_VERION.TITLE}
       </div>
 
-      {/* Census Info */}
-      <ul className={styles.censusRow}>
-        <li>
-          <span className={styles.censusLabel}>
-            {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.CENSUS_BLOCK_GROUP)}
-          </span>
-          <span className={styles.censusText}>{` ${blockGroup}`}</span>
-        </li>
-        <li>
-          <span className={styles.censusLabel}>
-            {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.COUNTY)}
-          </span>
-          <span className={styles.censusText}>{` ${countyName}`}</span>
-        </li>
-        <li>
-          <span className={styles.censusLabel}>
-            {properties[constants.SIDE_PANEL_STATE] !== constants.SIDE_PANEL_STATE_VALUES.NATION ?
-              intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.TERRITORY) :
-              intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.STATE)
-            }
-          </span>
-          <span className={styles.censusText}>{` ${stateName}`}</span>
-        </li>
-        <li>
-          <span className={styles.censusLabel}>
-            {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.POPULATION)}
-          </span>
-          <span className={styles.censusText}>{` ${population.toLocaleString()}`}</span>
-        </li>
-      </ul>
-
-      {/* Disadvantaged? */}
-      <div className={styles.categorization}>
-
-        {/* Questions asking if disadvantaged? */}
-        <div className={styles.isInFocus}>
-          {EXPLORE_COPY.COMMUNITY.IS_FOCUS}
-        </div>
-
-        {/* YES with Dot or NO with no Dot  */}
-        <div className={styles.communityOfFocus}>
-          {isCommunityFocus ?
-            <>
-              <h3>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>
-              <DisadvantageDot isDisadvantaged={isCommunityFocus} />
-            </> :
-            <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>
-          }
-        </div>
+      {
+      isCensusLayerSelected ? (
+        <>
+          {/* Census Info  */}
+          <ul className={styles.censusRow}>
+            <li>
+              <span className={styles.censusLabel}>
+                {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.CENSUS_BLOCK_GROUP)}
+              </span>
+              <span className={styles.censusText}>{` ${blockGroup}`}</span>
+            </li>
+            <li>
+              <span className={styles.censusLabel}>
+                {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.COUNTY)}
+              </span>
+              <span className={styles.censusText}>{` ${countyName}`}</span>
+            </li>
+            <li>
+              <span className={styles.censusLabel}>
+                {properties[constants.SIDE_PANEL_STATE] !== constants.SIDE_PANEL_STATE_VALUES.NATION ?
+                  intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.TERRITORY) :
+                  intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.STATE)
+                }
+              </span>
+              <span className={styles.censusText}>{` ${stateName}`}</span>
+            </li>
+            <li>
+              <span className={styles.censusLabel}>
+                {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.POPULATION)}
+              </span>
+              <span className={styles.censusText}>{` ${population.toLocaleString()}`}</span>
+            </li>
+          </ul>
+
+          {/* Disadvantaged? */}
+          <div className={styles.categorization}>
+
+            {/* Questions asking if disadvantaged? */}
+            <div className={styles.isInFocus}>
+              {EXPLORE_COPY.COMMUNITY.IS_FOCUS}
+            </div>
 
-        {/* Number of categories exceeded */}
-        <div className={styles.showCategoriesExceed}>
-          {EXPLORE_COPY.numberOfCategoriesExceeded(properties[constants.COUNT_OF_CATEGORIES_DISADV])}
-        </div>
+            {/* YES with Dot or NO with no Dot  */}
+            <div className={styles.communityOfFocus}>
+              {isCommunityFocus ?
+                <>
+                  <h3>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>
+                  <DisadvantageDot isDisadvantaged={isCommunityFocus} />
+                </> :
+                <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>
+              }
+            </div>
 
-        {/* Number of thresholds exceeded */}
-        {/* <div className={styles.showThresholdExceed}>
-          {EXPLORE_COPY.numberOfThresholdsExceeded(properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS])}
-        </div> */}
-        {/* Send Feedback button */}
-        <a
-          className={styles.sendFeedbackLink}
-          // The mailto string must be on a single line otherwise the email does not display subject and body
-          href={`
-            mailto:${COMMON_COPY.FEEDBACK_EMAIL}?subject=${feedbackEmailSubject}&body=${feedbackEmailBody}
-          `}
-          target={"_blank"}
-          rel="noreferrer"
-        >
-          <Button
-            type="button"
-            className={styles.sendFeedbackBtn}
-          >
-            <div className={styles.buttonContainer}>
-              <div className={styles.buttonText}>
-                {EXPLORE_COPY.COMMUNITY.SEND_FEEDBACK.TITLE}
-              </div>
-              <img
-                className={styles.buttonImage}
-                src={mailIcon}
-                alt={intl.formatMessage(EXPLORE_COPY.COMMUNITY.SEND_FEEDBACK.IMG_ICON.ALT_TAG)}
-              />
+            {/* Number of categories exceeded */}
+            <div className={styles.showCategoriesExceed}>
+              {EXPLORE_COPY.numberOfCategoriesExceeded(properties[constants.COUNT_OF_CATEGORIES_DISADV])}
             </div>
-          </Button>
-        </a>
 
-      </div>
+            {/* Number of thresholds exceeded */}
+            {/* <div className={styles.showThresholdExceed}>
+              {EXPLORE_COPY.numberOfThresholdsExceeded(properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS])}
+            </div> */}
+            {/* Send Feedback button */}
+            <a
+              className={styles.sendFeedbackLink}
+              // The mailto string must be on a single line otherwise the email does not display subject and body
+              href={`
+              mailto:${COMMON_COPY.FEEDBACK_EMAIL}?subject=${feedbackEmailSubject}&body=${feedbackEmailBody}
+              `}
+              target={"_blank"}
+              rel="noreferrer"
+            >
+              <Button
+                type="button"
+                className={styles.sendFeedbackBtn}
+              >
+                <div className={styles.buttonContainer}>
+                  <div className={styles.buttonText}>
+                    {EXPLORE_COPY.COMMUNITY.SEND_FEEDBACK.TITLE}
+                  </div>
+                  <img
+                    className={styles.buttonImage}
+                    src={mailIcon}
+                    alt={intl.formatMessage(EXPLORE_COPY.COMMUNITY.SEND_FEEDBACK.IMG_ICON.ALT_TAG)}
+                  />
+                </div>
+              </Button>
+            </a>
+          </div>
+        </>
+      ) : (
+        <ul className={styles.censusRow}>
+          <li>
+            <span className={styles.censusLabel}>
+              {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_TRIBAL_INFO.LAND_AREA_NAME)}
+            </span>
+            <span className={styles.censusText}>{` ${landAreaName}`}</span>
+          </li>
+        </ul>
+      )}
+
 
       {/* All category accordions in this component */}
-      <Accordion multiselectable={true} items={categoryItems} />
+      {isCensusLayerSelected && <Accordion multiselectable={true} items={categoryItems} />}
 
     </aside>
   );
diff --git a/client/src/components/AreaDetail/tests/areaDetail.test.tsx b/client/src/components/AreaDetail/tests/areaDetail.test.tsx
index 1ffff3863..232c8bf4f 100644
--- a/client/src/components/AreaDetail/tests/areaDetail.test.tsx
+++ b/client/src/components/AreaDetail/tests/areaDetail.test.tsx
@@ -5,6 +5,7 @@ import {LocalizedComponent} from '../../../test/testHelpers';
 
 import * as constants from '../../../data/constants';
 
+// Todo: Update tests to take into account tribal layer selected
 describe('rendering of the AreaDetail', () => {
   const properties = {
     [constants.POVERTY_BELOW_100_PERCENTILE]: .12,
@@ -27,7 +28,7 @@ describe('rendering of the AreaDetail', () => {
   it('checks if indicators for NATION is present', () => {
     const {asFragment} = render(
         <LocalizedComponent>
-          <AreaDetail properties={properties} hash={hash}/>
+          <AreaDetail properties={properties} hash={hash} isCensusLayerSelected={true}/>
         </LocalizedComponent>,
     );
     expect(asFragment()).toMatchSnapshot();
@@ -41,7 +42,7 @@ describe('rendering of the AreaDetail', () => {
 
     const {asFragment} = render(
         <LocalizedComponent>
-          <AreaDetail properties={propertiesPR} hash={hash}/>
+          <AreaDetail properties={propertiesPR} hash={hash} isCensusLayerSelected={true}/>
         </LocalizedComponent>,
     );
     expect(asFragment()).toMatchSnapshot();
@@ -59,7 +60,7 @@ describe('rendering of the AreaDetail', () => {
 
     const {asFragment} = render(
         <LocalizedComponent>
-          <AreaDetail properties={propertiesIA} hash={hash}/>
+          <AreaDetail properties={propertiesIA} hash={hash} isCensusLayerSelected={true}/>
         </LocalizedComponent>,
     );
     expect(asFragment()).toMatchSnapshot();
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index 109684a3f..d2be5e865 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -85,6 +85,10 @@ const J40Map = ({location}: IJ40Interface) => {
   const [geolocationInProgress, setGeolocationInProgress] = useState<boolean>(false);
   const [isMobileMapState, setIsMobileMapState] = useState<boolean>(false);
   const [censusSelected, setCensusSelected] = useState(true);
+
+  // In order to detect that the layer has been toggled (between census and tribal),
+  // this state variable will hold that information
+  const [layerToggled, setLayerToggled] = useState<boolean>(false);
   const {width: windowWidth} = useWindowSize();
 
   const mapRef = useRef<MapRef>(null);
@@ -156,6 +160,9 @@ const J40Map = ({location}: IJ40Interface) => {
       }
     } else {
       // This else clause will fire when the ID is null or empty. This is the case where the map is clicked
+
+      setLayerToggled(false);
+
       // @ts-ignore
       const feature = event.features && event.features[0];
 
@@ -308,7 +315,11 @@ const J40Map = ({location}: IJ40Interface) => {
 
 
         {/* This will allow to select between the census tract layer and the tribal lands layer */}
-        <LayerSelector censusSelected={censusSelected} setCensusSelected={setCensusSelected}/>
+        <LayerSelector
+          censusSelected={censusSelected}
+          setCensusSelected={setCensusSelected}
+          setLayerToggled={setLayerToggled}
+        />
 
         {/**
          * The ReactMapGL component's props are grouped by the API's documentation. The component also has
@@ -356,9 +367,15 @@ const J40Map = ({location}: IJ40Interface) => {
 
           {/* Load either the Tribal layer or census layer */}
           {
-           censusSelected ?
-           <MapTractLayers selectedFeature={selectedFeature} selectedFeatureId={selectedFeatureId}/> :
-            <MapTribalLayer />
+            censusSelected ?
+              <MapTractLayers
+                selectedFeature={selectedFeature}
+                selectedFeatureId={selectedFeatureId}
+              /> :
+                <MapTribalLayer
+                  selectedFeature={selectedFeature}
+                  selectedFeatureId={selectedFeatureId}
+                />
           }
 
           {/* This will add the navigation controls of the zoom in and zoom out buttons */}
@@ -392,7 +409,11 @@ const J40Map = ({location}: IJ40Interface) => {
               onClose={setDetailViewData}
               captureScroll={true}
             >
-              <AreaDetail properties={detailViewData.properties} hash={zoomLatLngHash}/>
+              <AreaDetail
+                properties={detailViewData.properties}
+                hash={zoomLatLngHash}
+                isCensusLayerSelected={censusSelected}
+              />
             </Popup>
           )}
           {'fs' in flags ? <FullscreenControl className={styles.fullscreenControl}/> :'' }
@@ -406,6 +427,8 @@ const J40Map = ({location}: IJ40Interface) => {
           featureProperties={detailViewData?.properties}
           selectedFeatureId={selectedFeature?.id}
           hash={zoomLatLngHash}
+          isCensusLayerSelected={censusSelected}
+          layerToggled={layerToggled}
         />
       </Grid>
     </>
diff --git a/client/src/components/LayerSelector/LayerSelector.test.tsx b/client/src/components/LayerSelector/LayerSelector.test.tsx
index 7b8dd240e..76667a90b 100644
--- a/client/src/components/LayerSelector/LayerSelector.test.tsx
+++ b/client/src/components/LayerSelector/LayerSelector.test.tsx
@@ -7,7 +7,7 @@ describe('rendering of the LayerSelector', () => {
   it('checks if component renders census tracts selected', () => {
     const {asFragment} = render(
         <LocalizedComponent>
-          <LayerSelector censusSelected={true} setCensusSelected={() => {}}/>
+          <LayerSelector censusSelected={true} setCensusSelected={() => {}} setLayerToggled={() =>{}}/>
         </LocalizedComponent>,
     );
     expect(asFragment()).toMatchSnapshot();
@@ -16,7 +16,7 @@ describe('rendering of the LayerSelector', () => {
   it('checks if component renders tribal selected', () => {
     const {asFragment} = render(
         <LocalizedComponent>
-          <LayerSelector censusSelected={false} setCensusSelected={() => {}}/>
+          <LayerSelector censusSelected={false} setCensusSelected={() => {}} setLayerToggled={()=> {}}/>
         </LocalizedComponent>,
     );
     expect(asFragment()).toMatchSnapshot();
diff --git a/client/src/components/LayerSelector/LayerSelector.tsx b/client/src/components/LayerSelector/LayerSelector.tsx
index 933133c8d..638fcacc2 100644
--- a/client/src/components/LayerSelector/LayerSelector.tsx
+++ b/client/src/components/LayerSelector/LayerSelector.tsx
@@ -10,9 +10,10 @@ import * as EXPLORE_COPY from '../../data/copy/explore';
 interface ILayerSelector {
   censusSelected: boolean,
   setCensusSelected: Dispatch<boolean>,
+  setLayerToggled: Dispatch<boolean>,
 }
 
-const LayerSelector = ({censusSelected, setCensusSelected}:ILayerSelector) => {
+const LayerSelector = ({censusSelected, setCensusSelected, setLayerToggled}:ILayerSelector) => {
   const intl = useIntl();
 
   /**
@@ -38,6 +39,13 @@ const LayerSelector = ({censusSelected, setCensusSelected}:ILayerSelector) => {
     }
   }, [width]);
 
+  // Anytime the censusSelected state variable changes, set the LayerToggled state
+  // variable
+  useEffect( () => {
+    setLayerToggled(true);
+  }, [censusSelected]);
+
+
   //   Handles toggle of tracts and tribal layer selection
   const buttonClickHandler = (event) => {
     if (event.target.id === 'census' && !censusSelected) {
diff --git a/client/src/components/MapTractLayers/MapTractLayers.tsx b/client/src/components/MapTractLayers/MapTractLayers.tsx
index 601952934..a8815dacc 100644
--- a/client/src/components/MapTractLayers/MapTractLayers.tsx
+++ b/client/src/components/MapTractLayers/MapTractLayers.tsx
@@ -1,5 +1,6 @@
 import React, {useMemo} from 'react';
 import {Source, Layer} from 'react-map-gl';
+import {AnyLayer} from 'mapbox-gl';
 
 // Contexts:
 import {useFlags} from '../../contexts/FlagContext';
@@ -7,10 +8,9 @@ import {useFlags} from '../../contexts/FlagContext';
 import * as constants from '../../data/constants';
 import * as COMMON_COPY from '../../data/copy/common';
 
-// Todo: Update with real types if this works:
 interface IMapTractLayers {
-    selectedFeatureId: any,
-    selectedFeature: any
+    selectedFeatureId: AnyLayer,
+    selectedFeature: AnyLayer,
 }
 
 /**
@@ -56,7 +56,10 @@ export const featureURLForTilesetName = (tilesetName: string): string => {
   }
 };
 
-const MapTractLayers = ({selectedFeatureId, selectedFeature}: IMapTractLayers) => {
+const MapTractLayers = ({
+  selectedFeatureId,
+  selectedFeature,
+}: IMapTractLayers) => {
   const filter = useMemo(() => ['in', constants.GEOID_PROPERTY, selectedFeatureId], [selectedFeature]);
 
   return (
diff --git a/client/src/components/MapTribalLayer/MapTribalLayer.tsx b/client/src/components/MapTribalLayer/MapTribalLayer.tsx
index 37baa07cc..e2519b53c 100644
--- a/client/src/components/MapTribalLayer/MapTribalLayer.tsx
+++ b/client/src/components/MapTribalLayer/MapTribalLayer.tsx
@@ -1,8 +1,14 @@
-import React from 'react';
+import React, {useMemo} from 'react';
 import {Source, Layer} from 'react-map-gl';
+import {AnyLayer} from 'mapbox-gl';
 
 import * as constants from '../../data/constants';
 
+interface IMapTribalLayers {
+  selectedFeatureId: AnyLayer,
+  selectedFeature: AnyLayer,
+}
+
 /**
  * This function will determine the URL for the tribal tiles.
  * @return {string}
@@ -18,7 +24,12 @@ export const tribalURL = (): string => {
   ].join('/');
 };
 
-const MapTribalLayer = () => {
+const MapTribalLayer = ({
+  selectedFeatureId,
+  selectedFeature,
+}: IMapTribalLayers) => {
+  const tribalSelectionFilter = useMemo(() => ['in', constants.TRIBAL_ID, selectedFeatureId], [selectedFeature]);
+
   return (
     <Source
       id={constants.TRIBAL_SOURCE_NAME}
@@ -29,7 +40,7 @@ const MapTribalLayer = () => {
       maxzoom={constants.TRIBAL_MAX_ZOOM}
     >
 
-      {/* Low zoom layer - prioritized features only */}
+      {/* Tribal layer */}
       <Layer
         id={constants.TRIBAL_LAYER_ID}
         source-layer={constants.TRIBAL_SOURCE_LAYER}
@@ -48,7 +59,7 @@ const MapTribalLayer = () => {
         source-layer={constants.SCORE_SOURCE_LAYER}
         type='line'
         paint={{
-          'line-color': constants.TRIBAL_BORDER_COLOR,
+          'line-color': constants.FEATURE_BORDER_COLOR,
           'line-width': constants.FEATURE_BORDER_WIDTH,
           'line-opacity': constants.FEATURE_BORDER_OPACITY,
         }}
@@ -58,8 +69,9 @@ const MapTribalLayer = () => {
 
       {/* Tribal layer - border styling around the selected feature */}
       <Layer
-        id={constants.SELECTED_FEATURE_BORDER_LAYER_ID}
-        source-layer={constants.TRIBAL_SOURCE_NAME}
+        id={constants.SELECTED_TRIBAL_FEATURE_BORDER_LAYER_ID}
+        source-layer={constants.TRIBAL_SOURCE_LAYER}
+        filter={tribalSelectionFilter}
         type='line'
         paint={{
           'line-color': constants.SELECTED_FEATURE_BORDER_COLOR,
@@ -67,6 +79,23 @@ const MapTribalLayer = () => {
         }}
         minzoom={constants.TRIBAL_MIN_ZOOM}
       />
+
+      {/* Alaska layer */}
+      {/* // Todo: Figure out why this isn't working */}
+      <Layer
+        id={constants.SELECTED_FEATURE_BORDER_LAYER_ID}
+        source-layer={constants.TRIBAL_SOURCE_NAME}
+
+        // Using other filter expressions, such as equality decisions here
+        // may cause the open-source to error out on circle not defined
+        filter={['geometry-type', 'Point']}
+        type='circle'
+        paint={{
+          'circle-radius': 100,
+          'circle-color': '#007cbf',
+        }}
+        minzoom={constants.TRIBAL_MIN_ZOOM}
+      />
     </Source>
   );
 };
diff --git a/client/src/components/mapInfoPanel.tsx b/client/src/components/mapInfoPanel.tsx
index 1a4544482..c0ec06876 100644
--- a/client/src/components/mapInfoPanel.tsx
+++ b/client/src/components/mapInfoPanel.tsx
@@ -7,13 +7,33 @@ interface IMapInfoPanelProps {
     featureProperties: { [key:string]: string | number } | undefined,
     selectedFeatureId: string | number | undefined
     hash: string[],
+    isCensusLayerSelected: boolean,
+    layerToggled: boolean, // indicates if census layer or tribal layer has been toggled
   }
 
-const MapInfoPanel = ({className, featureProperties, selectedFeatureId, hash}:IMapInfoPanelProps) => {
+const MapInfoPanel = ({
+  className,
+  featureProperties,
+  selectedFeatureId,
+  hash,
+  isCensusLayerSelected,
+  layerToggled,
+}:IMapInfoPanelProps) => {
   return (
     <div className={className} >
-      {(featureProperties && selectedFeatureId ) ?
-          <AreaDetail properties={featureProperties} hash={hash}/> :
+      {/* The tertiary conditional statement below will control the side panel state. Currently
+      there are two states, namely showing the AreaDetail or SidePanelInfo. When a feature
+      is selected, on - for example - the census tract layer, and if the Tribal Layer is the selected
+      the Side Panel should revert back to the SidePanelInfo.
+
+      A new boolean called layerToggle captures that a layer has been selected and to render
+      the SidePanelInfo component */}
+      {(featureProperties && selectedFeatureId && !layerToggled) ?
+          <AreaDetail
+            properties={featureProperties}
+            hash={hash}
+            isCensusLayerSelected={isCensusLayerSelected}
+          /> :
           <SidePanelInfo />
       }
     </div>
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index c30b4e287..572ad9c94 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -27,6 +27,7 @@ export type J40Properties = { [key: string]: any };
 
 // Tribal signals
 export const TRIBAL_ID = 'tribalId';
+export const LAND_AREA_NAME = 'landAreaName';
 
 // Set the threshold percentile used by most indicators in the side panel
 export const DEFAULT_THRESHOLD_PERCENTILE = 90;
@@ -202,6 +203,7 @@ export const LOW_ZOOM_LAYER_ID = 'low-zoom-layer-id';
 export const FEATURE_BORDER_LAYER_ID = 'feature-border-layer-id';
 export const SELECTED_FEATURE_BORDER_LAYER_ID = 'selected-feature-border-layer-id';
 export const TRIBAL_LAYER_ID = 'tribal-layer-id';
+export const SELECTED_TRIBAL_FEATURE_BORDER_LAYER_ID = 'selected-feature-tribal-border-layer-id';
 
 // Used in layer filters:
 export const SCORE_PROPERTY_LOW = 'M_SCORE';
@@ -234,9 +236,9 @@ export const FEATURE_BORDER_COLOR = '#4EA5CF';
 export const SELECTED_FEATURE_BORDER_COLOR = '#1A4480';
 export const PRIORITIZED_FEATURE_FILL_COLOR = '#768FB3';
 
-export const TRIBAL_BORDER_COLOR = '#0000FF';
-export const SELECTED_TRIBAL_BORDER_COLOR = '#FF0000';
-export const TRIBAL_FILL_COLOR = '#00FF00';
+export const TRIBAL_BORDER_COLOR = '##4EA5CF';
+export const SELECTED_TRIBAL_BORDER_COLOR = '#1A4480';
+export const TRIBAL_FILL_COLOR = '#768FB3';
 
 
 // Widths
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 52439cf3a..ac4c18493 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -300,6 +300,15 @@ export const SIDE_PANEL_CBG_INFO = defineMessages({
   },
 });
 
+export const SIDE_PANEL_TRIBAL_INFO = defineMessages({
+  LAND_AREA_NAME: {
+    id: 'explore.map.page.side.panel.tribalInfo.landAreaName',
+    defaultMessage: 'Land Area Name:',
+    description: `Navigate to the explore the map page. Click on Tribal Lands, when the map is in view, 
+    click on the map. The side panel will show the land area name of the feature selected`,
+  },
+});
+
 export const COMMUNITY = {
   OF_FOCUS: <FormattedMessage
     id={'explore.map.page.side.panel.community.of.focus'}
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 7a3d1210a..d1ab8c7cf 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -823,6 +823,10 @@
     "defaultMessage": "AND",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. Click on a category to expand. This is the AND spacer around thresholds."
   },
+  "explore.map.page.side.panel.tribalInfo.landAreaName": {
+    "defaultMessage": "Land Area Name:",
+    "description": "Navigate to the explore the map page. Click on Tribal Lands, when the map is in view, \n    click on the map. The side panel will show the land area name of the feature selected"
+  },
   "explore.map.page.side.panel.version.title": {
     "defaultMessage": "Methodology version {version}",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the methodology version number"

From c3d1c3a75e199ebc12427eb1dd1ac7f8fe06c8ca Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Sat, 6 Aug 2022 04:11:56 -0700
Subject: [PATCH 028/130] Update snapshots

---
 .../tests/__snapshots__/areaDetail.test.tsx.snap     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index d714f6b1f..6a01fa3bc 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -57,11 +57,11 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
       </div>
       <a
         href="
-            mailto:Screeningtool-Support@omb.eop.gov?subject=
+              mailto:Screeningtool-Support@omb.eop.gov?subject=
     Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
   &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
     
-          "
+              "
         rel="noreferrer"
         target="_blank"
       >
@@ -418,11 +418,11 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
       </div>
       <a
         href="
-            mailto:Screeningtool-Support@omb.eop.gov?subject=
+              mailto:Screeningtool-Support@omb.eop.gov?subject=
     Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
   &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
     
-          "
+              "
         rel="noreferrer"
         target="_blank"
       >
@@ -2154,11 +2154,11 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
       </div>
       <a
         href="
-            mailto:Screeningtool-Support@omb.eop.gov?subject=
+              mailto:Screeningtool-Support@omb.eop.gov?subject=
     Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
   &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
     
-          "
+              "
         rel="noreferrer"
         target="_blank"
       >

From ffffe53a4d51e5eeae14d3189e6a6f4e7c73048a Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Sat, 6 Aug 2022 05:18:23 -0700
Subject: [PATCH 029/130] Update tribal path on production build

---
 client/.env.production | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/.env.production b/client/.env.production
index 196be237f..93712b45c 100644
--- a/client/.env.production
+++ b/client/.env.production
@@ -6,6 +6,7 @@
 GATSBY_CDN_TILES_BASE_URL=https://static-data-screeningtool.geoplatform.gov
 
 GATSBY_DATA_PIPELINE_SCORE_PATH=data-pipeline/data/score
+GATSBY_DATA_PIPELINE_TRIBAL_PATH=data-pipeline/data/tribal
 
 GATSBY_FILE_DL_PATH_SCREENING_TOOL_DATA_ZIP=downloadable/Screening_Tool_Data.zip
 GATSBY_FILE_DL_PATH_SHAPE_FILE_ZIP=shapefile/usa.zip

From 7ad8b83399cca323ad66314ccdce4438b55de375 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Sun, 7 Aug 2022 23:22:34 -0700
Subject: [PATCH 030/130] Comment update

---
 client/src/components/MapTribalLayer/MapTribalLayer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/MapTribalLayer/MapTribalLayer.tsx b/client/src/components/MapTribalLayer/MapTribalLayer.tsx
index e2519b53c..c6f7d7443 100644
--- a/client/src/components/MapTribalLayer/MapTribalLayer.tsx
+++ b/client/src/components/MapTribalLayer/MapTribalLayer.tsx
@@ -87,7 +87,7 @@ const MapTribalLayer = ({
         source-layer={constants.TRIBAL_SOURCE_NAME}
 
         // Using other filter expressions, such as equality decisions here
-        // may cause the open-source to error out on circle not defined
+        // may cause the open-source map to error out on - circle-radius not defined
         filter={['geometry-type', 'Point']}
         type='circle'
         paint={{

From 3befcdf3aa0f554e5bf7347495045257031bda72 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Sun, 7 Aug 2022 23:49:15 -0700
Subject: [PATCH 031/130] add QA feedback

- swap expand/collapse icons
- add parens and slash to copy
---
 .../__snapshots__/areaDetail.test.tsx.snap    | 174 ++++++++++--------
 .../TractDemographics.module.scss             |   7 +-
 .../TractDemographics/TractDemographics.tsx   |  54 +++---
 .../TractDemographics.test.tsx.snap           |  58 +++---
 4 files changed, 166 insertions(+), 127 deletions(-)

diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index 4e95a612d..f4d8bbbfc 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -49,19 +49,23 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
         Tract demographics
       </div>
       <h6>
-        Racial Ethnographic
-        <button
-          aria-controls="race-panel"
-          aria-expanded="false"
-          id="race-header"
-          tabindex="0"
-        >
-          show
-        </button>
-        <img
-          alt="collapse icon"
-          src="test-file-stub"
-        />
+        Racial / Ethnographic
+        <span>
+          (
+          <button
+            aria-controls="race-panel"
+            aria-expanded="false"
+            id="race-header"
+            tabindex="0"
+          >
+            show
+          </button>
+          <img
+            alt="expand icon"
+            src="test-file-stub"
+          />
+          )
+        </span>
       </h6>
       <section
         aria-labelledby="race-header"
@@ -143,18 +147,22 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
       </section>
       <h6>
         Age
-        <button
-          aria-controls="age-panel"
-          aria-expanded="false"
-          id="age-header"
-          tabindex="0"
-        >
-          show
-        </button>
-        <img
-          alt="collapse icon"
-          src="test-file-stub"
-        />
+        <span>
+          (
+          <button
+            aria-controls="age-panel"
+            aria-expanded="false"
+            id="age-header"
+            tabindex="0"
+          >
+            show
+          </button>
+          <img
+            alt="expand icon"
+            src="test-file-stub"
+          />
+          )
+        </span>
       </h6>
       <section
         aria-labelledby="age-header"
@@ -558,19 +566,23 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         Tract demographics
       </div>
       <h6>
-        Racial Ethnographic
-        <button
-          aria-controls="race-panel"
-          aria-expanded="false"
-          id="race-header"
-          tabindex="0"
-        >
-          show
-        </button>
-        <img
-          alt="collapse icon"
-          src="test-file-stub"
-        />
+        Racial / Ethnographic
+        <span>
+          (
+          <button
+            aria-controls="race-panel"
+            aria-expanded="false"
+            id="race-header"
+            tabindex="0"
+          >
+            show
+          </button>
+          <img
+            alt="expand icon"
+            src="test-file-stub"
+          />
+          )
+        </span>
       </h6>
       <section
         aria-labelledby="race-header"
@@ -652,18 +664,22 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
       </section>
       <h6>
         Age
-        <button
-          aria-controls="age-panel"
-          aria-expanded="false"
-          id="age-header"
-          tabindex="0"
-        >
-          show
-        </button>
-        <img
-          alt="collapse icon"
-          src="test-file-stub"
-        />
+        <span>
+          (
+          <button
+            aria-controls="age-panel"
+            aria-expanded="false"
+            id="age-header"
+            tabindex="0"
+          >
+            show
+          </button>
+          <img
+            alt="expand icon"
+            src="test-file-stub"
+          />
+          )
+        </span>
       </h6>
       <section
         aria-labelledby="age-header"
@@ -2442,19 +2458,23 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         Tract demographics
       </div>
       <h6>
-        Racial Ethnographic
-        <button
-          aria-controls="race-panel"
-          aria-expanded="false"
-          id="race-header"
-          tabindex="0"
-        >
-          show
-        </button>
-        <img
-          alt="collapse icon"
-          src="test-file-stub"
-        />
+        Racial / Ethnographic
+        <span>
+          (
+          <button
+            aria-controls="race-panel"
+            aria-expanded="false"
+            id="race-header"
+            tabindex="0"
+          >
+            show
+          </button>
+          <img
+            alt="expand icon"
+            src="test-file-stub"
+          />
+          )
+        </span>
       </h6>
       <section
         aria-labelledby="race-header"
@@ -2536,18 +2556,22 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
       </section>
       <h6>
         Age
-        <button
-          aria-controls="age-panel"
-          aria-expanded="false"
-          id="age-header"
-          tabindex="0"
-        >
-          show
-        </button>
-        <img
-          alt="collapse icon"
-          src="test-file-stub"
-        />
+        <span>
+          (
+          <button
+            aria-controls="age-panel"
+            aria-expanded="false"
+            id="age-header"
+            tabindex="0"
+          >
+            show
+          </button>
+          <img
+            alt="expand icon"
+            src="test-file-stub"
+          />
+          )
+        </span>
       </h6>
       <section
         aria-labelledby="age-header"
diff --git a/client/src/components/TractDemographics/TractDemographics.module.scss b/client/src/components/TractDemographics/TractDemographics.module.scss
index c5cafb72e..2ba7bfca2 100644
--- a/client/src/components/TractDemographics/TractDemographics.module.scss
+++ b/client/src/components/TractDemographics/TractDemographics.module.scss
@@ -26,6 +26,10 @@
         @include u-margin-top(.5);
         font-size: .875rem;
         
+        span{
+            @include u-margin-left(1);
+        }
+
         .showHideText {
             //remove styling of button
             border: none;
@@ -37,10 +41,7 @@
             text-decoration:underline;
     
             min-width: 45px;
-
             padding-left: 0;
-            padding-right: 0;
-            margin-left: 6px;
         }
 
         .showHideIcon{
diff --git a/client/src/components/TractDemographics/TractDemographics.tsx b/client/src/components/TractDemographics/TractDemographics.tsx
index 90d5ba2a3..2fb96a98a 100644
--- a/client/src/components/TractDemographics/TractDemographics.tsx
+++ b/client/src/components/TractDemographics/TractDemographics.tsx
@@ -61,29 +61,35 @@ const J40AccordionItem = ({id, title, children}:IJ40AccordionItem) => {
     <>
       <h6 className={styles.demographicHeading}>
         {title}
-        <button
-          className={styles.showHideText}
-          id={`${id}-header`}
-          aria-controls={`${id}-panel`}
-          aria-expanded={isExpanded}
-          onClick={() => setIsExpanded(!isExpanded)}
-          tabIndex={0}
-        >
-          {isExpanded ? 'hide' : 'show'}
-        </button>
-        { isExpanded ?
-        <img
-          className={styles.showHideIcon}
-          src={expandIcon}
-          alt={'expand icon'}
-          onClick={() => setIsExpanded(!isExpanded)}
-        /> :
-        <img
-          className={styles.showHideIcon}
-          src={collapseIcon}
-          alt={'collapse icon'}
-          onClick={() => setIsExpanded(!isExpanded)}
-        />}
+        <span>
+          {'('}
+          <button
+            className={styles.showHideText}
+            id={`${id}-header`}
+            aria-controls={`${id}-panel`}
+            aria-expanded={isExpanded}
+            onClick={() => setIsExpanded(!isExpanded)}
+            tabIndex={0}
+          >
+            {isExpanded ? 'hide' : 'show'}
+          </button>
+          { isExpanded ?
+          <img
+            className={styles.showHideIcon}
+            src={collapseIcon}
+            alt={'collapse icon'}
+            onClick={() => setIsExpanded(!isExpanded)}
+          /> :
+          <img
+            className={styles.showHideIcon}
+            src={expandIcon}
+            alt={'expand icon'}
+            onClick={() => setIsExpanded(!isExpanded)}
+          />
+          }
+          {')'}
+        </span>
+
       </h6>
 
       <section
@@ -102,7 +108,7 @@ const TractDemographics = () => {
         Tract demographics
       </div>
       <>
-        <J40AccordionItem id={'race'} title={`Racial Ethnographic`}>
+        <J40AccordionItem id={'race'} title={`Racial / Ethnographic`}>
           {demographicItemGen(demographicsData.racial)}
         </J40AccordionItem>
         <J40AccordionItem id={'age'} title={`Age`}>
diff --git a/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
index 7c3b4c8c6..84f1b4584 100644
--- a/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
+++ b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
@@ -7,19 +7,23 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
       Tract demographics
     </div>
     <h6>
-      Racial Ethnographic
-      <button
-        aria-controls="race-panel"
-        aria-expanded="false"
-        id="race-header"
-        tabindex="0"
-      >
-        show
-      </button>
-      <img
-        alt="collapse icon"
-        src="test-file-stub"
-      />
+      Racial / Ethnographic
+      <span>
+        (
+        <button
+          aria-controls="race-panel"
+          aria-expanded="false"
+          id="race-header"
+          tabindex="0"
+        >
+          show
+        </button>
+        <img
+          alt="expand icon"
+          src="test-file-stub"
+        />
+        )
+      </span>
     </h6>
     <section
       aria-labelledby="race-header"
@@ -101,18 +105,22 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
     </section>
     <h6>
       Age
-      <button
-        aria-controls="age-panel"
-        aria-expanded="false"
-        id="age-header"
-        tabindex="0"
-      >
-        show
-      </button>
-      <img
-        alt="collapse icon"
-        src="test-file-stub"
-      />
+      <span>
+        (
+        <button
+          aria-controls="age-panel"
+          aria-expanded="false"
+          id="age-header"
+          tabindex="0"
+        >
+          show
+        </button>
+        <img
+          alt="expand icon"
+          src="test-file-stub"
+        />
+        )
+      </span>
     </h6>
     <section
       aria-labelledby="age-header"

From c8218d352fcc4cc3386c145ccc6a93bd08880a5f Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 9 Aug 2022 02:03:30 -0700
Subject: [PATCH 032/130] Add initial AK points

- corrects filter expression
- adds radius and color to constants
---
 .../components/MapTribalLayer/MapTribalLayer.tsx    | 13 +++++--------
 client/src/data/constants.tsx                       |  3 ++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/client/src/components/MapTribalLayer/MapTribalLayer.tsx b/client/src/components/MapTribalLayer/MapTribalLayer.tsx
index c6f7d7443..c8fb932a6 100644
--- a/client/src/components/MapTribalLayer/MapTribalLayer.tsx
+++ b/client/src/components/MapTribalLayer/MapTribalLayer.tsx
@@ -81,20 +81,17 @@ const MapTribalLayer = ({
       />
 
       {/* Alaska layer */}
-      {/* // Todo: Figure out why this isn't working */}
       <Layer
         id={constants.SELECTED_FEATURE_BORDER_LAYER_ID}
-        source-layer={constants.TRIBAL_SOURCE_NAME}
-
-        // Using other filter expressions, such as equality decisions here
-        // may cause the open-source map to error out on - circle-radius not defined
-        filter={['geometry-type', 'Point']}
+        source-layer={constants.TRIBAL_SOURCE_LAYER}
+        filter={['==', ['geometry-type'], 'Point']}
         type='circle'
         paint={{
-          'circle-radius': 100,
-          'circle-color': '#007cbf',
+          'circle-radius': constants.TRIBAL_ALASKA_CIRCLE_RADIUS,
+          'circle-color': constants.TRIBAL_ALASKA_CIRCLE_FILL_COLOR,
         }}
         minzoom={constants.TRIBAL_MIN_ZOOM}
+        maxzoom={constants.TRIBAL_MAX_ZOOM}
       />
     </Source>
   );
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index 572ad9c94..024434e78 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -239,7 +239,8 @@ export const PRIORITIZED_FEATURE_FILL_COLOR = '#768FB3';
 export const TRIBAL_BORDER_COLOR = '##4EA5CF';
 export const SELECTED_TRIBAL_BORDER_COLOR = '#1A4480';
 export const TRIBAL_FILL_COLOR = '#768FB3';
-
+export const TRIBAL_ALASKA_CIRCLE_FILL_COLOR = '#768FB3';
+export const TRIBAL_ALASKA_CIRCLE_RADIUS = 10;
 
 // Widths
 export const FEATURE_BORDER_WIDTH = 0.8;

From 73ae583e1efeca39aa4c1778296104f4d36b53f1 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 9 Aug 2022 04:34:03 -0700
Subject: [PATCH 033/130] Update staging deploy script

- update domain name
- update path
---
 .github/workflows/deploy_fe_staging.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy_fe_staging.yml b/.github/workflows/deploy_fe_staging.yml
index 0ddc1f868..44d844cdb 100644
--- a/.github/workflows/deploy_fe_staging.yml
+++ b/.github/workflows/deploy_fe_staging.yml
@@ -36,7 +36,7 @@ jobs:
           # https://github.com/usds/justice40-tool/blob/main/client/README.md
           DATA_SOURCE: cdn
           SITE_URL: "${{ secrets.STAGE_SITE_URL }}"
-          PATH_PREFIX: "/justice40-tool/${{env.DESTINATION_FOLDER}}"
+          PATH_PREFIX: "/${{env.DESTINATION_FOLDER}}"
           MAPBOX_STYLES_READ_TOKEN: "${{ secrets.MAPBOX_STYLES_READ_TOKEN }}"
       - name: Get directory contents
         run: ls -la public
@@ -94,7 +94,7 @@ jobs:
           # Deploy to S3 for the staging URL
           message: |
             **🚢  Here is the frontend staging link: 🚢**   
-            Find it here: http://usds-geoplatform-justice40-website.s3-website-us-east-1.amazonaws.com/justice40-tool/${{env.DESTINATION_FOLDER}}/en/ !
+            Find it here: https://screeningtool-staging.geoplatform.gov/${{env.DESTINATION_FOLDER}}/en/ !
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           repo-token-user-login: "github-actions[bot]" # The user.login for temporary GitHub tokens
           allow-repeats: false # This is the default

From bac8c85a6c17ffb7f0af4b8daa2af0d1505a59d5 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Thu, 11 Aug 2022 06:51:11 -0700
Subject: [PATCH 034/130] Update AK layer id

- make AK layer clickable
---
 client/src/components/J40Map.tsx              | 21 +++++++++++++------
 .../MapTribalLayer/MapTribalLayer.tsx         |  3 ++-
 client/src/data/constants.tsx                 |  1 +
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index d2be5e865..dcbce5903 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -84,7 +84,7 @@ const J40Map = ({location}: IJ40Interface) => {
   const [transitionInProgress, setTransitionInProgress] = useState<boolean>(false);
   const [geolocationInProgress, setGeolocationInProgress] = useState<boolean>(false);
   const [isMobileMapState, setIsMobileMapState] = useState<boolean>(false);
-  const [censusSelected, setCensusSelected] = useState(true);
+  const [censusSelected, setCensusSelected] = useState<boolean>(true);
 
   // In order to detect that the layer has been toggled (between census and tribal),
   // this state variable will hold that information
@@ -350,7 +350,15 @@ const J40Map = ({location}: IJ40Interface) => {
           dragRotate={false}
           touchRotate={false}
           // eslint-disable-next-line max-len
-          interactiveLayerIds={censusSelected ? [constants.HIGH_ZOOM_LAYER_ID, constants.PRIORITIZED_HIGH_ZOOM_LAYER_ID] : [constants.TRIBAL_LAYER_ID]}
+          interactiveLayerIds={censusSelected ?
+            [
+              constants.HIGH_ZOOM_LAYER_ID,
+              constants.PRIORITIZED_HIGH_ZOOM_LAYER_ID,
+            ] : [
+              constants.TRIBAL_LAYER_ID,
+              constants.TRIBAL_ALASKA_POINTS_LAYER_ID,
+            ]
+          }
 
 
           // ****** Callback props: ******
@@ -367,15 +375,16 @@ const J40Map = ({location}: IJ40Interface) => {
 
           {/* Load either the Tribal layer or census layer */}
           {
+            // Todo: may not need both props...
             censusSelected ?
               <MapTractLayers
                 selectedFeature={selectedFeature}
                 selectedFeatureId={selectedFeatureId}
               /> :
-                <MapTribalLayer
-                  selectedFeature={selectedFeature}
-                  selectedFeatureId={selectedFeatureId}
-                />
+              <MapTribalLayer
+                selectedFeature={selectedFeature}
+                selectedFeatureId={selectedFeatureId}
+              />
           }
 
           {/* This will add the navigation controls of the zoom in and zoom out buttons */}
diff --git a/client/src/components/MapTribalLayer/MapTribalLayer.tsx b/client/src/components/MapTribalLayer/MapTribalLayer.tsx
index c8fb932a6..9ee53aaef 100644
--- a/client/src/components/MapTribalLayer/MapTribalLayer.tsx
+++ b/client/src/components/MapTribalLayer/MapTribalLayer.tsx
@@ -81,8 +81,9 @@ const MapTribalLayer = ({
       />
 
       {/* Alaska layer */}
+      {/* // Todo: limit zoom in amount */}
       <Layer
-        id={constants.SELECTED_FEATURE_BORDER_LAYER_ID}
+        id={constants.TRIBAL_ALASKA_POINTS_LAYER_ID}
         source-layer={constants.TRIBAL_SOURCE_LAYER}
         filter={['==', ['geometry-type'], 'Point']}
         type='circle'
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index 024434e78..73daefe5e 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -204,6 +204,7 @@ export const FEATURE_BORDER_LAYER_ID = 'feature-border-layer-id';
 export const SELECTED_FEATURE_BORDER_LAYER_ID = 'selected-feature-border-layer-id';
 export const TRIBAL_LAYER_ID = 'tribal-layer-id';
 export const SELECTED_TRIBAL_FEATURE_BORDER_LAYER_ID = 'selected-feature-tribal-border-layer-id';
+export const TRIBAL_ALASKA_POINTS_LAYER_ID = 'tribal-alaska-points-layer-id';
 
 // Used in layer filters:
 export const SCORE_PROPERTY_LOW = 'M_SCORE';

From 31a9bf51d5168ea244acdcac816fd3d37ca7ab77 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 15 Aug 2022 19:00:53 -0700
Subject: [PATCH 035/130] Add OS map functionality

- split source/layers between Map*Layers.tsx and getOSBaseMap file
- update getOSBaseMap to return eithe tribal or tracts layers/sources
---
 client/src/components/J40Map.tsx              |  5 +-
 .../MapTractLayers/MapTractLayers.tsx         | 49 ++++++++++++--
 .../src/components/MapTribalLayer/index.tsx   |  3 -
 .../MapTribalLayers.tsx}                      | 50 ++++++++++++--
 .../src/components/MapTribalLayers/index.tsx  |  3 +
 client/src/data/getOSBaseMap.tsx              | 65 +++++++++++++++++--
 6 files changed, 155 insertions(+), 20 deletions(-)
 delete mode 100644 client/src/components/MapTribalLayer/index.tsx
 rename client/src/components/{MapTribalLayer/MapTribalLayer.tsx => MapTribalLayers/MapTribalLayers.tsx} (63%)
 create mode 100644 client/src/components/MapTribalLayers/index.tsx

diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index dcbce5903..ec31b2eee 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -27,6 +27,7 @@ import AreaDetail from './AreaDetail';
 import MapInfoPanel from './mapInfoPanel';
 import MapSearch from './MapSearch';
 import MapTractLayers from './MapTractLayers/MapTractLayers';
+import MapTribalLayer from './MapTribalLayers/MapTribalLayers';
 import LayerSelector from './LayerSelector';
 import TerritoryFocusControl from './territoryFocusControl';
 import {getOSBaseMap} from '../data/getOSBaseMap';
@@ -35,7 +36,6 @@ import {getOSBaseMap} from '../data/getOSBaseMap';
 import 'maplibre-gl/dist/maplibre-gl.css';
 import * as constants from '../data/constants';
 import * as styles from './J40Map.module.scss';
-import MapTribalLayer from './MapTribalLayer/MapTribalLayer';
 declare global {
   interface Window {
     Cypress?: object;
@@ -373,9 +373,8 @@ const J40Map = ({location}: IJ40Interface) => {
           data-cy={'reactMapGL'}
         >
 
-          {/* Load either the Tribal layer or census layer */}
+          {/* Load either the Tribal layer or Census layer depending on the censusSelected state variable */}
           {
-            // Todo: may not need both props...
             censusSelected ?
               <MapTractLayers
                 selectedFeature={selectedFeature}
diff --git a/client/src/components/MapTractLayers/MapTractLayers.tsx b/client/src/components/MapTractLayers/MapTractLayers.tsx
index a8815dacc..472bf4b58 100644
--- a/client/src/components/MapTractLayers/MapTractLayers.tsx
+++ b/client/src/components/MapTractLayers/MapTractLayers.tsx
@@ -56,13 +56,28 @@ export const featureURLForTilesetName = (tilesetName: string): string => {
   }
 };
 
+/**
+ * This component will return the appropriate source and layers for the census layer on the
+ * map.
+ *
+ * There are two use cases here, eg, when the MapBox token is or isn't provided. When the token
+ * is not provided, the open-source map will be rendered. When the open-source map is rendered
+ * only the interactive layers are returned from this component. The reason being is that the
+ * other layers are supplied by he getOSBaseMap function.
+ *
+ * @param {AnyLayer} selectedFeatureId
+ * @param {AnyLayer} selectedFeature
+ * @return {Style}
+ */
 const MapTractLayers = ({
   selectedFeatureId,
   selectedFeature,
 }: IMapTractLayers) => {
   const filter = useMemo(() => ['in', constants.GEOID_PROPERTY, selectedFeatureId], [selectedFeature]);
 
-  return (
+  return process.env.MAPBOX_STYLES_READ_TOKEN ? (
+
+    // In this case the MapBox token is found and All source(s)/layer(s) are returned.
     <>
       <Source
         id={constants.LOW_ZOOM_SOURCE_NAME}
@@ -87,9 +102,7 @@ const MapTractLayers = ({
         />
       </Source>
 
-      {/**
-     * The high zoom source
-    */}
+      {/* The high zoom source */}
       <Source
         id={constants.HIGH_ZOOM_SOURCE_NAME}
         type="vector"
@@ -152,6 +165,34 @@ const MapTractLayers = ({
         />
       </Source>
     </>
+  ): (
+
+    /**
+     * In this case the MapBox token is NOT found and ONLY interactive source(s)/layer(s) are returned
+     * In this case, the other layers (non-interactive) are provided by getOSBaseMap
+     */
+    <Source
+      id={constants.HIGH_ZOOM_SOURCE_NAME}
+      type="vector"
+      promoteId={constants.GEOID_PROPERTY}
+      tiles={[featureURLForTilesetName('high')]}
+      maxzoom={constants.GLOBAL_MAX_ZOOM_HIGH}
+      minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
+    >
+
+      {/* High zoom layer - border styling around the selected feature */}
+      <Layer
+        id={constants.SELECTED_FEATURE_BORDER_LAYER_ID}
+        source-layer={constants.SCORE_SOURCE_LAYER}
+        filter={filter} // This filter filters out all other features except the selected feature.
+        type='line'
+        paint={{
+          'line-color': constants.SELECTED_FEATURE_BORDER_COLOR,
+          'line-width': constants.SELECTED_FEATURE_BORDER_WIDTH,
+        }}
+        minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
+      />
+    </Source>
   );
 };
 
diff --git a/client/src/components/MapTribalLayer/index.tsx b/client/src/components/MapTribalLayer/index.tsx
deleted file mode 100644
index 204655893..000000000
--- a/client/src/components/MapTribalLayer/index.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import MapTribalLayer from './MapTribalLayer';
-
-export default MapTribalLayer;
diff --git a/client/src/components/MapTribalLayer/MapTribalLayer.tsx b/client/src/components/MapTribalLayers/MapTribalLayers.tsx
similarity index 63%
rename from client/src/components/MapTribalLayer/MapTribalLayer.tsx
rename to client/src/components/MapTribalLayers/MapTribalLayers.tsx
index 9ee53aaef..e019a0e1c 100644
--- a/client/src/components/MapTribalLayer/MapTribalLayer.tsx
+++ b/client/src/components/MapTribalLayers/MapTribalLayers.tsx
@@ -24,13 +24,29 @@ export const tribalURL = (): string => {
   ].join('/');
 };
 
+
+/**
+ * This component will return the appropriate source and layers for the tribal layer on the
+ * map.
+ *
+ * There are two use cases here, eg, when the MapBox token is or isn't provided. When the token
+ * is not provided, the open-source map will be rendered. When the open-source map is rendered
+ * only the interactive layers are returned from this component. The reason being is that the
+ * other layers are supplied by he getOSBaseMap function.
+ *
+ * @param {AnyLayer} selectedFeatureId
+ * @param {AnyLayer} selectedFeature
+ * @return {Style}
+ */
 const MapTribalLayer = ({
   selectedFeatureId,
   selectedFeature,
 }: IMapTribalLayers) => {
   const tribalSelectionFilter = useMemo(() => ['in', constants.TRIBAL_ID, selectedFeatureId], [selectedFeature]);
 
-  return (
+  return process.env.MAPBOX_STYLES_READ_TOKEN ? (
+
+    // In this case the MapBox token is found and ALL source(s)/layer(s) are returned.
     <Source
       id={constants.TRIBAL_SOURCE_NAME}
       type="vector"
@@ -44,7 +60,6 @@ const MapTribalLayer = ({
       <Layer
         id={constants.TRIBAL_LAYER_ID}
         source-layer={constants.TRIBAL_SOURCE_LAYER}
-        //   filter={['>', constants.SCORE_PROPERTY_LOW, constants.SCORE_BOUNDARY_THRESHOLD]}
         type='fill'
         paint={{
           'fill-color': constants.TRIBAL_FILL_COLOR,
@@ -56,7 +71,7 @@ const MapTribalLayer = ({
       {/* Tribal layer - controls the border between features */}
       <Layer
         id={constants.FEATURE_BORDER_LAYER_ID}
-        source-layer={constants.SCORE_SOURCE_LAYER}
+        source-layer={constants.TRIBAL_SOURCE_LAYER}
         type='line'
         paint={{
           'line-color': constants.FEATURE_BORDER_COLOR,
@@ -95,8 +110,35 @@ const MapTribalLayer = ({
         maxzoom={constants.TRIBAL_MAX_ZOOM}
       />
     </Source>
+  ) : (
+
+    /**
+     * In this case the MapBox token is NOT found and ONLY INTERACTIVE source(s)/layer(s) are returned.
+     * In this case, the other layers (non-interactive) are provided by getOSBaseMap
+     */
+    <Source
+      id={constants.TRIBAL_SOURCE_NAME}
+      type="vector"
+      promoteId={constants.TRIBAL_ID}
+      tiles={[tribalURL()]}
+      minzoom={constants.TRIBAL_MIN_ZOOM}
+      maxzoom={constants.TRIBAL_MAX_ZOOM}
+    >
+
+      {/* Tribal layer - border styling around the selected feature */}
+      <Layer
+        id={constants.SELECTED_TRIBAL_FEATURE_BORDER_LAYER_ID}
+        source-layer={constants.TRIBAL_SOURCE_LAYER}
+        filter={tribalSelectionFilter}
+        type='line'
+        paint={{
+          'line-color': constants.SELECTED_FEATURE_BORDER_COLOR,
+          'line-width': constants.SELECTED_FEATURE_BORDER_WIDTH,
+        }}
+        minzoom={constants.TRIBAL_MIN_ZOOM}
+      />
+    </Source>
   );
 };
 
 export default MapTribalLayer;
-//
diff --git a/client/src/components/MapTribalLayers/index.tsx b/client/src/components/MapTribalLayers/index.tsx
new file mode 100644
index 000000000..9d4849315
--- /dev/null
+++ b/client/src/components/MapTribalLayers/index.tsx
@@ -0,0 +1,3 @@
+import MapTribalLayers from './MapTribalLayers';
+
+export default MapTribalLayers;
diff --git a/client/src/data/getOSBaseMap.tsx b/client/src/data/getOSBaseMap.tsx
index ca2b38fc2..15d24717e 100644
--- a/client/src/data/getOSBaseMap.tsx
+++ b/client/src/data/getOSBaseMap.tsx
@@ -1,9 +1,11 @@
 import {Style} from 'maplibre-gl';
-import * as constants from '../data/constants';
+
 import {featureURLForTilesetName} from '../components/MapTractLayers/MapTractLayers';
-import {tribalURL} from '../components/MapTribalLayer/MapTribalLayer';
+import {tribalURL} from '../components/MapTribalLayers/MapTribalLayers';
+
+import * as constants from '../data/constants';
 
-// *********** BASE MAP SOURCES  ***************
+// *********** OPEN SOURCE BASE MAP CONSTANTS  ***************
 const imageSuffix = constants.isMobile ? '' : '@2x';
 
 // Original "light" Base layer
@@ -24,9 +26,21 @@ const cartoLightBaseLayer = {
 };
 
 
-// Utility function to get OpenSource base maps that are in accordance to JSON spec of MapBox
-// https://docs.mapbox.com/mapbox-gl-js/style-spec/
-export const getOSBaseMap = (censusSelected: boolean) : Style => {
+// *********** OPEN SOURCE STATIC MAP STYLES  ***************
+/**
+ * This function will be called when there is no MapBox token found. This function will
+ * return the open source base map along with styles for the chosen source. We currently
+ * have two sources, either the census tracts or the tribal layer.
+ * *
+ * This function returns a Style in accordance to JSON spec of MapBox
+ * https://docs.mapbox.com/mapbox-gl-js/style-spec/
+ *
+ * @param {boolean} censusSelected
+ * @return {Style}
+ */
+export const getOSBaseMap = (
+    censusSelected: boolean,
+) : Style => {
   return !censusSelected ? {
 
     /**
@@ -59,6 +73,12 @@ export const getOSBaseMap = (censusSelected: boolean) : Style => {
         'minzoom': constants.TRIBAL_MIN_ZOOM,
         'maxzoom': constants.TRIBAL_MAX_ZOOM,
       },
+
+      // The labels source:
+      'labels': {
+        'type': 'raster',
+        'tiles': cartoLightBaseLayer.labelsOnly,
+      },
     },
 
 
@@ -91,6 +111,39 @@ export const getOSBaseMap = (censusSelected: boolean) : Style => {
         'minzoom': constants.TRIBAL_MIN_ZOOM,
         'maxzoom': constants.TRIBAL_MAX_ZOOM,
       },
+
+      /**
+      * Tribal layer - controls the border between features
+      */
+      {
+        'id': constants.FEATURE_BORDER_LAYER_ID,
+        'source': constants.TRIBAL_SOURCE_NAME,
+        'source-layer': constants.TRIBAL_SOURCE_LAYER,
+        'type': 'line',
+        'paint': {
+          'line-color': constants.FEATURE_BORDER_COLOR,
+          'line-width': constants.FEATURE_BORDER_WIDTH,
+          'line-opacity': constants.FEATURE_BORDER_OPACITY},
+        'minzoom': constants.TRIBAL_MIN_ZOOM,
+        'maxzoom': constants.TRIBAL_MAX_ZOOM,
+      },
+
+      /**
+      * Alaska layer
+      */
+      {
+        'id': constants.TRIBAL_ALASKA_POINTS_LAYER_ID,
+        'source': constants.TRIBAL_SOURCE_NAME,
+        'source-layer': constants.TRIBAL_SOURCE_LAYER,
+        'type': 'circle',
+        'filter': ['==', ['geometry-type'], 'Point'],
+        'paint': {
+          'circle-radius': constants.TRIBAL_ALASKA_CIRCLE_RADIUS,
+          'circle-color': constants.TRIBAL_ALASKA_CIRCLE_FILL_COLOR,
+        },
+        'minzoom': constants.TRIBAL_MIN_ZOOM,
+        'maxzoom': constants.TRIBAL_MAX_ZOOM,
+      },
     ],
   } :
   {

From 49bf717c47032e966bfc2ee2f387284d20fde5bc Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 16 Aug 2022 15:34:56 -0700
Subject: [PATCH 036/130] Add geolocation locked signal to local storage

---
 client/src/components/J40Map.tsx | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index f4e57fc37..f6089259e 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -18,7 +18,7 @@ import bbox from '@turf/bbox';
 import * as d3 from 'd3-ease';
 import {isMobile} from 'react-device-detect';
 import {Grid} from '@trussworks/react-uswds';
-import {useWindowSize} from 'react-use';
+import {useWindowSize, useLocalStorage} from 'react-use';
 
 // Contexts:
 import {useFlags} from '../contexts/FlagContext';
@@ -136,6 +136,18 @@ const J40Map = ({location}: IJ40Interface) => {
   const [isMobileMapState, setIsMobileMapState] = useState<boolean>(false);
   const {width: windowWidth} = useWindowSize();
 
+  /**
+   * Store the geolocation lock state in local storage. The Geolocation component from MapBox does not
+   * expose (API) various geolocation lock/unlock states in the version we are using. This makes it
+   * challenging to change the UI state to match the Geolocation state. A work around is to store the
+   * geolocation "locked" state in local storage. The local storage state will then be used to show the
+   * "Finding location" message. The local storage will be removed everytime the map is reloaded.
+   *
+   * The "Finding location" message only applies for desktop layouts.
+   */
+  // eslint-disable-next-line max-len
+  const [isGeolocateLocked, setIsGeolocateLocked, removeGeolocateLock] = useLocalStorage('is-geolocate-locked', false, {raw: true});
+
   const mapRef = useRef<MapRef>(null);
   const flags = useFlags();
   const intl = useIntl();
@@ -268,6 +280,9 @@ const J40Map = ({location}: IJ40Interface) => {
       window.underlyingMap = mapRef.current.getMap();
     }
 
+    // When map loads remove the geolocate lock boolean in local storage
+    removeGeolocateLock();
+
     if (isMobile) setIsMobileMapState(true);
   };
 
@@ -326,6 +341,9 @@ const J40Map = ({location}: IJ40Interface) => {
 
   const onGeolocate = () => {
     setGeolocationInProgress(false);
+
+    // set local storage that location was locked on this app at some point
+    setIsGeolocateLocked(true);
   };
 
   const onClickGeolocate = () => {
@@ -498,9 +516,13 @@ const J40Map = ({location}: IJ40Interface) => {
             <MapSearch goToPlace={goToPlace}/>
 
             <div className={styles.geolocateBox}>
-              {windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG && <div
+              {windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+              <div
                 className={
-                  geolocationInProgress ? styles.geolocateMessage : styles.geolocateMessageHide}>
+                  (geolocationInProgress && !isGeolocateLocked) ?
+                  styles.geolocateMessage :
+                  styles.geolocateMessageHide}
+              >
                 {intl.formatMessage(EXPLORE_COPY.MAP.GEOLOC_MSG_LOCATING)}
               </div>}
               <div className={styles.geolocateIcon}>

From e1b5c598dae0f041b04e2cfaeba8d48a42104342 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 16 Aug 2022 16:18:34 -0700
Subject: [PATCH 037/130] Make source/layer comments correspond

- getOSBaseMap and Map*Layers should have the same layer comments
- modify constants to have matching styles between Tribal and Tracts
---
 .../MapTractLayers/MapTractLayers.tsx         | 22 +----
 .../MapTribalLayers/MapTribalLayers.tsx       |  4 +-
 client/src/data/constants.tsx                 |  3 +-
 client/src/data/getOSBaseMap.tsx              | 92 +++++++++++--------
 4 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/client/src/components/MapTractLayers/MapTractLayers.tsx b/client/src/components/MapTractLayers/MapTractLayers.tsx
index 472bf4b58..93c96d5af 100644
--- a/client/src/components/MapTractLayers/MapTractLayers.tsx
+++ b/client/src/components/MapTractLayers/MapTractLayers.tsx
@@ -88,7 +88,7 @@ const MapTractLayers = ({
         minzoom={constants.GLOBAL_MIN_ZOOM_LOW}
       >
 
-        {/* Low zoom layer - prioritized features only */}
+        {/* Low zoom layer (static) - prioritized features only */}
         <Layer
           id={constants.LOW_ZOOM_LAYER_ID}
           source-layer={constants.SCORE_SOURCE_LAYER}
@@ -112,7 +112,7 @@ const MapTractLayers = ({
         minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
       >
 
-        {/* High zoom layer - non-prioritized features only */}
+        {/* High zoom layer (static) - non-prioritized features only */}
         <Layer
           id={constants.HIGH_ZOOM_LAYER_ID}
           source-layer={constants.SCORE_SOURCE_LAYER}
@@ -124,7 +124,7 @@ const MapTractLayers = ({
           minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
         />
 
-        {/* High zoom layer - prioritized features only */}
+        {/* High zoom layer (static) - prioritized features only */}
         <Layer
           id={constants.PRIORITIZED_HIGH_ZOOM_LAYER_ID}
           source-layer={constants.SCORE_SOURCE_LAYER}
@@ -137,7 +137,7 @@ const MapTractLayers = ({
           minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
         />
 
-        {/* High zoom layer - controls the border between features */}
+        {/* High zoom layer (static) - controls the border between features */}
         <Layer
           id={constants.FEATURE_BORDER_LAYER_ID}
           source-layer={constants.SCORE_SOURCE_LAYER}
@@ -151,18 +151,6 @@ const MapTractLayers = ({
           minzoom={constants.GLOBAL_MIN_ZOOM_FEATURE_BORDER}
         />
 
-        {/* High zoom layer - border styling around the selected feature */}
-        <Layer
-          id={constants.SELECTED_FEATURE_BORDER_LAYER_ID}
-          source-layer={constants.SCORE_SOURCE_LAYER}
-          filter={filter} // This filter filters out all other features except the selected feature.
-          type='line'
-          paint={{
-            'line-color': constants.SELECTED_FEATURE_BORDER_COLOR,
-            'line-width': constants.SELECTED_FEATURE_BORDER_WIDTH,
-          }}
-          minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
-        />
       </Source>
     </>
   ): (
@@ -180,7 +168,7 @@ const MapTractLayers = ({
       minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
     >
 
-      {/* High zoom layer - border styling around the selected feature */}
+      {/* High zoom layer (dynamic) - border styling around the selected feature */}
       <Layer
         id={constants.SELECTED_FEATURE_BORDER_LAYER_ID}
         source-layer={constants.SCORE_SOURCE_LAYER}
diff --git a/client/src/components/MapTribalLayers/MapTribalLayers.tsx b/client/src/components/MapTribalLayers/MapTribalLayers.tsx
index e019a0e1c..8a4db968c 100644
--- a/client/src/components/MapTribalLayers/MapTribalLayers.tsx
+++ b/client/src/components/MapTribalLayers/MapTribalLayers.tsx
@@ -62,7 +62,7 @@ const MapTribalLayer = ({
         source-layer={constants.TRIBAL_SOURCE_LAYER}
         type='fill'
         paint={{
-          'fill-color': constants.TRIBAL_FILL_COLOR,
+          'fill-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
           'fill-opacity': constants.TRIBAL_FEATURE_FILL_OPACITY}}
         minzoom={constants.TRIBAL_MIN_ZOOM}
         maxzoom={constants.TRIBAL_MAX_ZOOM}
@@ -104,7 +104,7 @@ const MapTribalLayer = ({
         type='circle'
         paint={{
           'circle-radius': constants.TRIBAL_ALASKA_CIRCLE_RADIUS,
-          'circle-color': constants.TRIBAL_ALASKA_CIRCLE_FILL_COLOR,
+          'circle-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
         }}
         minzoom={constants.TRIBAL_MIN_ZOOM}
         maxzoom={constants.TRIBAL_MAX_ZOOM}
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index 73daefe5e..25bb5fa51 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -241,11 +241,12 @@ export const TRIBAL_BORDER_COLOR = '##4EA5CF';
 export const SELECTED_TRIBAL_BORDER_COLOR = '#1A4480';
 export const TRIBAL_FILL_COLOR = '#768FB3';
 export const TRIBAL_ALASKA_CIRCLE_FILL_COLOR = '#768FB3';
-export const TRIBAL_ALASKA_CIRCLE_RADIUS = 10;
+export const TRIBAL_ALASKA_CIRCLE_RADIUS = 5;
 
 // Widths
 export const FEATURE_BORDER_WIDTH = 0.8;
 export const SELECTED_FEATURE_BORDER_WIDTH = 5.0;
+export const ALAKSA_POINTS_STROKE_WIDTH = 1.0;
 
 // Bounds - these bounds can be obtained by using the getCurrentMapBoundingBox() function in the map
 export const GLOBAL_MAX_BOUNDS: LngLatBoundsLike = [
diff --git a/client/src/data/getOSBaseMap.tsx b/client/src/data/getOSBaseMap.tsx
index 15d24717e..4b6df523d 100644
--- a/client/src/data/getOSBaseMap.tsx
+++ b/client/src/data/getOSBaseMap.tsx
@@ -105,8 +105,8 @@ export const getOSBaseMap = (
         'source-layer': constants.TRIBAL_SOURCE_LAYER,
         'type': 'fill',
         'paint': {
-          'fill-color': constants.TRIBAL_FILL_COLOR,
-          'fill-opacity': constants.TRIBAL_FEATURE_FILL_OPACITY,
+          'fill-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
+          'fill-opacity': constants.HIGH_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY,
         },
         'minzoom': constants.TRIBAL_MIN_ZOOM,
         'maxzoom': constants.TRIBAL_MAX_ZOOM,
@@ -139,7 +139,11 @@ export const getOSBaseMap = (
         'filter': ['==', ['geometry-type'], 'Point'],
         'paint': {
           'circle-radius': constants.TRIBAL_ALASKA_CIRCLE_RADIUS,
-          'circle-color': constants.TRIBAL_ALASKA_CIRCLE_FILL_COLOR,
+          'circle-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
+          'circle-opacity': constants.HIGH_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY,
+          'circle-stroke-color': constants.FEATURE_BORDER_COLOR,
+          'circle-stroke-width': constants.ALAKSA_POINTS_STROKE_WIDTH,
+          'circle-stroke-opacity': constants.FEATURE_BORDER_OPACITY,
         },
         'minzoom': constants.TRIBAL_MIN_ZOOM,
         'maxzoom': constants.TRIBAL_MAX_ZOOM,
@@ -212,9 +216,41 @@ export const getOSBaseMap = (
         'maxzoom': constants.GLOBAL_MAX_ZOOM,
       },
 
-      /**
-       * High zoom layer - non-prioritized features only
-       */
+      // A layer for labels only
+      {
+        'id': 'labels-only-layer',
+        'source': 'labels',
+        'type': 'raster',
+        'layout': {
+          'visibility': 'visible',
+        },
+        'minzoom': constants.GLOBAL_MIN_ZOOM,
+        'maxzoom': constants.GLOBAL_MAX_ZOOM,
+      },
+
+      // Low zoom layer (static) - prioritized features only
+      {
+        'id': constants.LOW_ZOOM_LAYER_ID,
+        'source': constants.LOW_ZOOM_SOURCE_NAME,
+        'source-layer': constants.SCORE_SOURCE_LAYER,
+        /**
+         * This shows features where the low score > score boundary threshold.
+         * In other words, this filter out non-prioritized features
+         */
+        'filter': ['all',
+          ['>', constants.SCORE_PROPERTY_LOW, constants.SCORE_BOUNDARY_THRESHOLD],
+        ],
+
+        'type': 'fill',
+        'paint': {
+          'fill-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
+          'fill-opacity': constants.LOW_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY,
+        },
+        'minzoom': constants.GLOBAL_MIN_ZOOM_LOW,
+        'maxzoom': constants.GLOBAL_MAX_ZOOM_LOW,
+      },
+
+      // High zoom layer (static) - non-prioritized features only
       {
         'id': constants.HIGH_ZOOM_LAYER_ID,
         'source': constants.HIGH_ZOOM_SOURCE_NAME,
@@ -234,9 +270,7 @@ export const getOSBaseMap = (
         'minzoom': constants.GLOBAL_MIN_ZOOM_HIGH,
       },
 
-      /**
-       * High zoom layer - prioritized features only
-       */
+      // High zoom layer (static) - prioritized features only
       {
         'id': constants.PRIORITIZED_HIGH_ZOOM_LAYER_ID,
         'source': constants.HIGH_ZOOM_SOURCE_NAME,
@@ -257,41 +291,19 @@ export const getOSBaseMap = (
         'minzoom': constants.GLOBAL_MIN_ZOOM_HIGH,
       },
 
-
-      /**
-       * Low zoom layer - prioritized features only
-       */
+      // High zoom layer (static) - controls the border between features
       {
-        'id': constants.LOW_ZOOM_LAYER_ID,
-        'source': constants.LOW_ZOOM_SOURCE_NAME,
+        'id': constants.FEATURE_BORDER_LAYER_ID,
+        'source': constants.HIGH_ZOOM_SOURCE_NAME,
         'source-layer': constants.SCORE_SOURCE_LAYER,
-        /**
-         * This shows features where the low score > score boundary threshold.
-         * In other words, this filter out non-prioritized features
-         */
-        'filter': ['all',
-          ['>', constants.SCORE_PROPERTY_LOW, constants.SCORE_BOUNDARY_THRESHOLD],
-        ],
-
-        'type': 'fill',
+        'type': 'line',
         'paint': {
-          'fill-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
-          'fill-opacity': constants.LOW_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY,
-        },
-        'minzoom': constants.GLOBAL_MIN_ZOOM_LOW,
-        'maxzoom': constants.GLOBAL_MAX_ZOOM_LOW,
-      },
-
-      // A layer for labels only
-      {
-        'id': 'labels-only-layer',
-        'source': 'labels',
-        'type': 'raster',
-        'layout': {
-          'visibility': 'visible',
+          'line-color': constants.FEATURE_BORDER_COLOR,
+          'line-width': constants.FEATURE_BORDER_WIDTH,
+          'line-opacity': constants.FEATURE_BORDER_OPACITY,
         },
-        'minzoom': constants.GLOBAL_MIN_ZOOM,
-        'maxzoom': constants.GLOBAL_MAX_ZOOM,
+        'minzoom': constants.GLOBAL_MIN_ZOOM_FEATURE_BORDER,
+        'maxzoom': constants.GLOBAL_MAX_ZOOM_FEATURE_BORDER,
       },
     ],
   };

From dc6f57a2a8cbb6b0e54a73018e598ebbc99f63cc Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 16 Aug 2022 16:53:35 -0700
Subject: [PATCH 038/130] Remove zooming in on Alaska data point

---
 client/src/components/J40Map.tsx | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index ec31b2eee..bc84643b3 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -166,10 +166,24 @@ const J40Map = ({location}: IJ40Interface) => {
       // @ts-ignore
       const feature = event.features && event.features[0];
 
+      /**
+       * Given that Alaska has Points as their data type, we will not zoom into them when
+       * selected. In order to detect if a feature is a Point we will use Regex to determine
+       * the Alaska Point based on it's unique ID:
+       *
+       * E.g. {33FF6457-324C-4643-94E8-D543DD4339E0}
+       *
+       * The regex will test for any numeric, upper-case alpha with hyphens string enclosed
+       * in curly braces.
+       */
+      const alaskaIDRegex = /\{[0-9,A-Z,-]+\}/g;
+      const isFeatureAlaskaPoint = alaskaIDRegex.test(feature.id);
+
       if (feature) {
         // Get the current selected feature's bounding box:
         const [minLng, minLat, maxLng, maxLat] = bbox(feature);
 
+
         // Set the selectedFeature ID
         if (feature.id !== selectedFeatureId) {
           setSelectedFeature(feature);
@@ -177,8 +191,9 @@ const J40Map = ({location}: IJ40Interface) => {
           setSelectedFeature(undefined);
         }
 
-        // Go to the newly selected feature
-        goToPlace([
+
+        // Go to the newly selected feature (as long as it's not an Alaska Point)
+        !isFeatureAlaskaPoint && goToPlace([
           [minLng, minLat],
           [maxLng, maxLat],
         ]);
@@ -239,7 +254,7 @@ const J40Map = ({location}: IJ40Interface) => {
    * @param {LngLatBoundsLike} bounds
    * @param {boolean} isTerritory
    */
-  const goToPlace = (bounds: LngLatBoundsLike, isTerritory = false ) => {
+  const goToPlace = (bounds: LngLatBoundsLike, isTerritory = false) => {
     const newViewPort = new WebMercatorViewport({height: viewport.height!, width: viewport.width!});
     const {longitude, latitude, zoom} = newViewPort.fitBounds(
       bounds as [[number, number], [number, number]], {

From 976249b56c27195523a9bd0bd60a03d1252657bb Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 17 Aug 2022 10:35:44 -0700
Subject: [PATCH 039/130] Update Tribal shortname ID

---
 client/src/data/copy/explore.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 94f7801ab..d7085e41b 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -200,7 +200,7 @@ export const MAP = defineMessages({
     description: 'On the explore the map page, on the map, the full name indicating Tribal Lands',
   },
   TRIBAL_LANDS_SHORT: {
-    id: 'explore.map.page.map.layer.selector.tracts.short',
+    id: 'explore.map.page.map.layer.selector.tribal.short',
     defaultMessage: 'Tribal',
     description: 'On the explore the map page, on the map, the short name indicating Tribal Lands',
   },

From 198203fe139a26d7d329c3611c134ff1d3682a41 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 17 Aug 2022 11:46:47 -0700
Subject: [PATCH 040/130] Adjust CSS to place LayerSelector in MapHeader

---
 .../__snapshots__/areaDetail.test.tsx.snap    | 114 +++++++++++++++++-
 client/src/components/J40Map.module.scss      |  15 +--
 client/src/components/J40Map.tsx              |  16 +--
 .../LayerSelector/LayerSelector.module.scss   |  10 +-
 .../MapSearch/MapSearch.module.scss           |  28 ++---
 5 files changed, 141 insertions(+), 42 deletions(-)

diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index 3714f9b5b..d1e92e5b3 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -195,6 +195,40 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
         </div>
       </section>
     </div>
+    <ul>
+      <li>
+        <span>
+          Number:
+        </span>
+        <span>
+           98729374234
+        </span>
+      </li>
+      <li>
+        <span>
+          County:
+        </span>
+        <span>
+           Brooklyn
+        </span>
+      </li>
+      <li>
+        <span>
+          Territory: 
+        </span>
+        <span>
+           New York
+        </span>
+      </li>
+      <li>
+        <span>
+          Population:
+        </span>
+        <span>
+           3,435,435
+        </span>
+      </li>
+    </ul>
     <div>
       <div>
         Identified as disadvantaged?
@@ -210,11 +244,11 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
       </div>
       <a
         href="
-              mailto:Screeningtool-Support@omb.eop.gov?subject=
+                mailto:Screeningtool-Support@omb.eop.gov?subject=
     Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
   &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
     
-              "
+                "
         rel="noreferrer"
         target="_blank"
       >
@@ -712,6 +746,40 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         </div>
       </section>
     </div>
+    <ul>
+      <li>
+        <span>
+          Number:
+        </span>
+        <span>
+           98729374234
+        </span>
+      </li>
+      <li>
+        <span>
+          County:
+        </span>
+        <span>
+           Brooklyn
+        </span>
+      </li>
+      <li>
+        <span>
+          State: 
+        </span>
+        <span>
+           New York
+        </span>
+      </li>
+      <li>
+        <span>
+          Population:
+        </span>
+        <span>
+           3,435,435
+        </span>
+      </li>
+    </ul>
     <div>
       <div>
         Identified as disadvantaged?
@@ -727,11 +795,11 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
       </div>
       <a
         href="
-              mailto:Screeningtool-Support@omb.eop.gov?subject=
+                mailto:Screeningtool-Support@omb.eop.gov?subject=
     Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
   &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
     
-              "
+                "
         rel="noreferrer"
         target="_blank"
       >
@@ -2604,6 +2672,40 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         </div>
       </section>
     </div>
+    <ul>
+      <li>
+        <span>
+          Number:
+        </span>
+        <span>
+           98729374234
+        </span>
+      </li>
+      <li>
+        <span>
+          County:
+        </span>
+        <span>
+           Brooklyn
+        </span>
+      </li>
+      <li>
+        <span>
+          Territory: 
+        </span>
+        <span>
+           New York
+        </span>
+      </li>
+      <li>
+        <span>
+          Population:
+        </span>
+        <span>
+           3,435,435
+        </span>
+      </li>
+    </ul>
     <div>
       <div>
         Identified as disadvantaged?
@@ -2619,11 +2721,11 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
       </div>
       <a
         href="
-              mailto:Screeningtool-Support@omb.eop.gov?subject=
+                mailto:Screeningtool-Support@omb.eop.gov?subject=
     Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
   &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
     
-              "
+                "
         rel="noreferrer"
         target="_blank"
       >
diff --git a/client/src/components/J40Map.module.scss b/client/src/components/J40Map.module.scss
index 58f597c13..f9388d08c 100644
--- a/client/src/components/J40Map.module.scss
+++ b/client/src/components/J40Map.module.scss
@@ -11,14 +11,14 @@
   .mapHeaderRow{
     @include u-display("flex");
     @include u-padding-left(1.5);
-    justify-content: flex-start;
+    justify-content: space-between;
     
-
     .geolocateBox {
-      flex: 1 2 47%;
-      align-self: flex-end;
-      margin-bottom: 30px;
-      margin-left: 1rem;
+      // flex: 1 2 47%;
+      // align-self: flex-end;
+      // margin-bottom: 30px;
+      // margin-left: 1rem;
+      margin-top: 6px;
 
       .geolocateMessage {
         visibility: visible;
@@ -29,11 +29,12 @@
       
       .geolocateMessageHide {
         visibility: hidden;
+        min-width: fit-content;
         margin-bottom: 3px;
       }
 
       .geolocateIcon{
-        align-self: flex-end;
+        // align-self: flex-end;
       }
     }
   }
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index 363bb199c..a98095ba1 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -350,13 +350,6 @@ const J40Map = ({location}: IJ40Interface) => {
          * Any component declarations outside the <ReactMapGL> component may be susceptible to this bug.
          */}
 
-        {/* This will allow to select between the census tract layer and the tribal lands layer */}
-        <LayerSelector
-          censusSelected={censusSelected}
-          setCensusSelected={setCensusSelected}
-          setLayerToggled={setLayerToggled}
-        />
-
         {/**
          * The ReactMapGL component's props are grouped by the API's documentation. The component also has
          * some children.
@@ -426,6 +419,7 @@ const J40Map = ({location}: IJ40Interface) => {
           <div className={styles.mapHeaderRow}>
             <MapSearch goToPlace={goToPlace}/>
 
+            {/* Geolocate Icon */}
             <div className={styles.geolocateBox}>
               {windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
               <div
@@ -436,6 +430,7 @@ const J40Map = ({location}: IJ40Interface) => {
               >
                 {intl.formatMessage(EXPLORE_COPY.MAP.GEOLOC_MSG_LOCATING)}
               </div>}
+
               <div className={styles.geolocateIcon}>
                 <GeolocateControl
                   positionOptions={{enableHighAccuracy: true}}
@@ -448,6 +443,13 @@ const J40Map = ({location}: IJ40Interface) => {
               </div>
             </div>
 
+            {/* This will allow to select between the census tract layer and the tribal lands layer */}
+            <LayerSelector
+              censusSelected={censusSelected}
+              setCensusSelected={setCensusSelected}
+              setLayerToggled={setLayerToggled}
+            />
+
           </div>
 
           {/* This is the second row overlayed on the map, it will add the navigation controls
diff --git a/client/src/components/LayerSelector/LayerSelector.module.scss b/client/src/components/LayerSelector/LayerSelector.module.scss
index bb4916381..0ef271713 100644
--- a/client/src/components/LayerSelector/LayerSelector.module.scss
+++ b/client/src/components/LayerSelector/LayerSelector.module.scss
@@ -11,15 +11,9 @@
     
     // styles for mobile-lg (480px) and greater widths,
     @include at-media('mobile-lg') {
-        position: absolute;
-        top: units(2.5);
-        left: 62%;
+       @include u-margin-top(3);
+       @include u-margin-right(1);       
     }
-
-    // styles for less than mobile-lg (480px)
-    position: absolute;
-    top: -5.2rem;
-    
 }
   
   
diff --git a/client/src/components/MapSearch/MapSearch.module.scss b/client/src/components/MapSearch/MapSearch.module.scss
index ea9f6e731..347e1df71 100644
--- a/client/src/components/MapSearch/MapSearch.module.scss
+++ b/client/src/components/MapSearch/MapSearch.module.scss
@@ -7,21 +7,21 @@
   component across all device sizes.
   */
 
-  // width < 660
-  @include at-media-max("tablet") {
-    flex: 1 1 100%;
-  }
+  // // width < 660
+  // @include at-media-max("tablet") {
+  //   flex: 1 1 100%;
+  // }
 
-  //  660 < width < 1024
-  @include at-media-max("desktop") {
-    @include at-media("tablet"){
-      flex: 1 1 56%;
-    }
-  }
+  // //  660 < width < 1024
+  // @include at-media-max("desktop") {
+  //   @include at-media("tablet"){
+  //     flex: 1 1 56%;
+  //   }
+  // }
 
-  // > 1024
-  @include at-media("desktop") {
-    flex: 1 1 72%;
-  }
+  // // > 1024
+  // @include at-media("desktop") {
+  //   flex: 1 1 72%;
+  // }
 }
 

From 481e5e3dcefd6bdbba490083f1f1b813efba4e36 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 17 Aug 2022 12:50:07 -0700
Subject: [PATCH 041/130] Comment out markdown check on link

---
 .../data_pipeline/etl/sources/michigan_ejscreen/README.md     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/data-pipeline/data_pipeline/etl/sources/michigan_ejscreen/README.md b/data/data-pipeline/data_pipeline/etl/sources/michigan_ejscreen/README.md
index d5f559e13..579bdc7ff 100644
--- a/data/data-pipeline/data_pipeline/etl/sources/michigan_ejscreen/README.md
+++ b/data/data-pipeline/data_pipeline/etl/sources/michigan_ejscreen/README.md
@@ -1,7 +1,7 @@
 # Michigan EJSCREEN
-
+<!-- markdown-link-check-disable -->
 The Michigan EJSCREEN description and publication can be found [here](https://deepblue.lib.umich.edu/bitstream/handle/2027.42/149105/AssessingtheStateofEnvironmentalJusticeinMichigan_344.pdf).
-
+<!-- markdown-link-check-enable-->
 
 #### Some notes about the input source data column fields:
 

From a97a779171cdaa5ab3f8dde47163ac18c258ee28 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 17 Aug 2022 14:06:07 -0700
Subject: [PATCH 042/130] Add flooding and wildfire indicators to side panel

---
 .../src/components/AreaDetail/AreaDetail.tsx  | 18 +++++-
 .../__snapshots__/areaDetail.test.tsx.snap    | 62 +++++++++++++++++++
 client/src/data/constants.tsx                 | 19 ++++++
 client/src/data/copy/explore.tsx              | 26 ++++++++
 client/src/intl/en.json                       | 16 +++++
 5 files changed, 140 insertions(+), 1 deletion(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 2aeaa3379..e5cbf33e0 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -216,6 +216,22 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_EXP_POP_LOSS] ?
       properties[constants.IS_EXCEEDS_THRESH_FOR_EXP_POP_LOSS] : null,
   };
+  const flooding: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.FLOODING),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.FLOODING),
+    value: properties.hasOwnProperty(constants.FLOODING_PERCENTILE) ?
+      properties[constants.FLOODING_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FLOODING] ?
+      properties[constants.IS_EXCEEDS_THRESH_FLOODING] : null,
+  };
+  const wildfire: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.WILDFIRE),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.WILDFIRE),
+    value: properties.hasOwnProperty(constants.WASTEWATER_PERCENTILE) ?
+      properties[constants.WASTEWATER_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_WILDFIRE] ?
+      properties[constants.IS_EXCEEDS_THRESH_WILDFIRE] : null,
+  };
   const lowInc: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LOW_INCOME),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LOW_INCOME),
@@ -406,7 +422,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     {
       id: 'climate-change',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLIMATE),
-      indicators: [expAgLoss, expBldLoss, expPopLoss],
+      indicators: [expAgLoss, expBldLoss, expPopLoss, flooding, wildfire],
       socioEcIndicators: [lowInc, higherEd],
       isDisadvagtaged: properties[constants.IS_CLIMATE_FACTOR_DISADVANTAGED_M] ?
         properties[constants.IS_CLIMATE_FACTOR_DISADVANTAGED_M] : null,
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index d1e92e5b3..dfe0bb6ef 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -948,6 +948,68 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             </div>
           </div>
         </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Future flood risk
+              <div>
+                
+      Projected risk to properties from floods from tides, rain, riverine and storm surges in 30 years
+    
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Future wildfire risk
+              <div>
+                
+      Projected risk to properties from wildfire from fire fuels, weather, humans, and fire movement
+    
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
         <div>
           AND
         </div>
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index 25bb5fa51..1aa13fe96 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -71,6 +71,12 @@ export const IS_EXCEEDS_THRESH_FOR_EXP_BLD_LOSS = 'EBL_ET';
 export const EXP_POPULATION_LOSS_PERCENTILE = 'EPLR_PFS';
 export const IS_EXCEEDS_THRESH_FOR_EXP_POP_LOSS = 'EPL_ET';
 
+export const FLOODING_PERCENTILE = 'FLD_PFS';
+export const IS_EXCEEDS_THRESH_FLOODING = 'FLD_ET';
+
+export const WILDFIRE_PERCENTILE = 'WF_PFS';
+export const IS_EXCEEDS_THRESH_WILDFIRE = 'WF_ET';
+
 export const IS_EXCEED_BOTH_SOCIO_INDICATORS_M = 'M_EBSI';
 
 export const POVERTY_BELOW_200_PERCENTILE = 'P200_PFS';
@@ -100,6 +106,9 @@ export const IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS_M = 'M_TRN_EOMI';
 export const DIESEL_MATTER_PERCENTILE = 'DSF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_DIESEL_PM = 'DS_ET';
 
+export const TRAVEL_DISADV_PERCENTILE = 'TD_PFS';
+export const IS_EXCEEDS_THRESH_TRAVEL_DISADV = 'TD_ET';
+
 export const TRAFFIC_PERCENTILE = 'TF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_TRAFFIC_PROX = 'TP_ET';
 
@@ -111,6 +120,12 @@ export const IS_HOUSING_EXCEED_ONE_OR_MORE_INDICATORS_M = 'M_HSG_EOMI';
 export const HOUSING_BURDEN_PROPERTY_PERCENTILE = 'HBF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_HOUSE_BURDEN = 'HB_ET';
 
+export const IMPERVIOUS_PERCENTILE = 'IS_PFS';
+export const IS_EXCEEDS_THRESH_IMPERVIOUS = 'IS_ET';
+
+export const KITCHEN_PLUMB_PERCENTILE = 'KP_PFS';
+export const IS_EXCEEDS_THRESH_KITCHEN_PLUMB = 'KP_ET';
+
 export const LEAD_PAINT_PERCENTILE = 'LPF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_LEAD_PAINT_AND_MEDIAN_HOME_VAL = 'LPP_ET';
 
@@ -135,6 +150,10 @@ export const IS_EXCEEDS_THRESH_FOR_RMP = 'RMP_ET';
 export const IS_WATER_FACTOR_DISADVANTAGED_M = 'M_WTR';
 export const IS_WATER_EXCEED_ONE_OR_MORE_INDICATORS_M = 'M_WTR_EOMI';
 
+export const LEAKY_UNDER_PERCENTILE = 'UST_PFS';
+export const IS_EXCEEDS_THRESH_LEAKY_UNDER = 'UST_ET';
+export const LEAKY_UNDER_LOW_INCOME = 'USTLI';
+
 export const WASTEWATER_PERCENTILE = 'WF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_WASTEWATER = 'WD_ET';
 
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index d7085e41b..230b53bbc 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -481,6 +481,18 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
     id: 'explore.map.page.side.panel.indicator.exp.pop.loss',
     defaultMessage: 'Expected population loss rate',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show population loss rate
+`,
+  },
+  FLOODING: {
+    id: 'explore.map.page.side.panel.indicator.flooding',
+    defaultMessage: 'Future flood risk',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show flood risk
+`,
+  },
+  WILDFIRE: {
+    id: 'explore.map.page.side.panel.indicator.wildfire',
+    defaultMessage: 'Future wildfire risk',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show wildfire risk
 `,
   },
   LOW_INCOME: {
@@ -662,6 +674,20 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Economic loss rate to the population in fatalities and 
       injuries resulting from natural hazards`,
   },
+  FLOODING: {
+    id: 'explore.map.page.side.panel.indicator.description.flooding',
+    defaultMessage: `
+      Projected risk to properties from floods from tides, rain, riverine and storm surges in 30 years
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of flooding risk`,
+  },
+  WILDFIRE: {
+    id: 'explore.map.page.side.panel.indicator.description.wildfire',
+    defaultMessage: `
+      Projected risk to properties from wildfire from fire fuels, weather, humans, and fire movement
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of wildfire risk`,
+  },
   LOW_INCOME: {
     id: 'explore.map.page.side.panel.indicator.description.low.income',
     defaultMessage: `
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 513db9230..983c6e32c 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -531,6 +531,10 @@
     "defaultMessage": "Rate of fatalities and injuries resulting from natural hazards each year",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Economic loss rate to the population in fatalities and \n      injuries resulting from natural hazards"
   },
+  "explore.map.page.side.panel.indicator.description.flooding": {
+    "defaultMessage": "Projected risk to properties from floods from tides, rain, riverine and storm surges in 30 years",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of flooding risk"
+  },
   "explore.map.page.side.panel.indicator.description.heartDisease": {
     "defaultMessage": "People ages 18 years and older who have been told they have heart disease",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Weighted percent of people ages 18 years and older who have \n    been told they have heart disease"
@@ -603,6 +607,10 @@
     "defaultMessage": "Toxic concentrations at stream segments within 500 meters",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Toxic concentrations at stream segments within 500 meters"
   },
+  "explore.map.page.side.panel.indicator.description.wildfire": {
+    "defaultMessage": "Projected risk to properties from wildfire from fire fuels, weather, humans, and fire movement",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of wildfire risk"
+  },
   "explore.map.page.side.panel.indicator.diabetes": {
     "defaultMessage": "Diabetes",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Diabetes"
@@ -627,6 +635,10 @@
     "defaultMessage": "Expected population loss rate",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show population loss rate\n"
   },
+  "explore.map.page.side.panel.indicator.flooding": {
+    "defaultMessage": "Future flood risk",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show flood risk\n"
+  },
   "explore.map.page.side.panel.indicator.heartDisease": {
     "defaultMessage": "Heart disease",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Heart disease"
@@ -767,6 +779,10 @@
     "defaultMessage": "Wastewater discharge",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Wastewater discharge"
   },
+  "explore.map.page.side.panel.indicator.wildfire": {
+    "defaultMessage": "Future wildfire risk",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show wildfire risk\n"
+  },
   "explore.map.page.side.panel.info.alt.text.icon1": {
     "defaultMessage": "An icon that has depicts pieces of a block selected mimicking the census block census tracts",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the first icon in this side panel"

From fc930d19f695b248522e6b7349a5af03c07b7efa Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 17 Aug 2022 14:51:41 -0700
Subject: [PATCH 043/130] Add indicators

- barriers to transport
- lack of green space
- lack of plumbing
- leaky tanks
---
 .../src/components/AreaDetail/AreaDetail.tsx  |  38 +++++-
 .../__snapshots__/areaDetail.test.tsx.snap    | 116 ++++++++++++++++++
 client/src/data/copy/explore.tsx              |  43 ++++++-
 client/src/intl/en.json                       |  34 ++++-
 4 files changed, 225 insertions(+), 6 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index e5cbf33e0..0c43afe15 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -277,6 +277,14 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_DIESEL_PM] ?
       properties[constants.IS_EXCEEDS_THRESH_FOR_DIESEL_PM] : null,
   };
+  const barrierTransport: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.BARRIER_TRANS),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.BARRIER_TRANS),
+    value: properties.hasOwnProperty(constants.TRAVEL_DISADV_PERCENTILE) ?
+      properties[constants.TRAVEL_DISADV_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_TRAVEL_DISADV] ?
+      properties[constants.IS_EXCEEDS_THRESH_TRAVEL_DISADV] : null,
+  };
   const trafficVolume: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.TRAFFIC_VOLUME),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.TRAFFIC_VOLUME),
@@ -294,6 +302,22 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_HOUSE_BURDEN] ?
       properties[constants.IS_EXCEEDS_THRESH_FOR_HOUSE_BURDEN] : null,
   };
+  const lackGreenSpace: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LACK_GREEN_SPACE),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LACK_GREEN_SPACE),
+    value: properties.hasOwnProperty(constants.IMPERVIOUS_PERCENTILE) ?
+      properties[constants.IMPERVIOUS_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_IMPERVIOUS] ?
+      properties[constants.IS_EXCEEDS_THRESH_IMPERVIOUS] : null,
+  };
+  const lackPlumbing: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LACK_PLUMBING),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LACK_PLUMBING),
+    value: properties.hasOwnProperty(constants.KITCHEN_PLUMB_PERCENTILE) ?
+      properties[constants.KITCHEN_PLUMB_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_KITCHEN_PLUMB] ?
+      properties[constants.IS_EXCEEDS_THRESH_KITCHEN_PLUMB] : null,
+  };
   const leadPaint: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LEAD_PAINT),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LEAD_PAINT),
@@ -335,6 +359,14 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       properties[constants.IS_EXCEEDS_THRESH_FOR_RMP] : null,
   };
 
+  const leakyTanks: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LEAKY_TANKS),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LEAKY_TANKS),
+    value: properties.hasOwnProperty(constants.LEAKY_UNDER_PERCENTILE) ?
+      properties[constants.LEAKY_UNDER_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_LEAKY_UNDER] ?
+      properties[constants.IS_EXCEEDS_THRESH_LEAKY_UNDER] : null,
+  };
   const wasteWater: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.WASTE_WATER),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.WASTE_WATER),
@@ -446,7 +478,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     {
       id: 'clean-transport',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_TRANSPORT),
-      indicators: [dieselPartMatter, trafficVolume],
+      indicators: [dieselPartMatter, barrierTransport, trafficVolume],
       socioEcIndicators: [lowInc, higherEd],
       isDisadvagtaged: properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED_M] ?
         properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED_M] : null,
@@ -458,7 +490,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     {
       id: 'sustain-house',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.SUSTAIN_HOUSE),
-      indicators: [houseBurden, leadPaint],
+      indicators: [houseBurden, lackGreenSpace, lackPlumbing, leadPaint],
       socioEcIndicators: [lowInc, higherEd],
       isDisadvagtaged: properties[constants.IS_HOUSING_FACTOR_DISADVANTAGED_M] ?
         properties[constants.IS_HOUSING_FACTOR_DISADVANTAGED_M] : null,
@@ -482,7 +514,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     {
       id: 'clean-water',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_WATER),
-      indicators: [wasteWater],
+      indicators: [leakyTanks, wasteWater],
       socioEcIndicators: [lowInc, higherEd],
       isDisadvagtaged: properties[constants.IS_WATER_FACTOR_DISADVANTAGED_M] ?
         properties[constants.IS_WATER_FACTOR_DISADVANTAGED_M] : null,
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index dfe0bb6ef..a736bfc5b 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -1341,6 +1341,35 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             </div>
           </div>
         </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Transportation barriers
+              <div>
+                Cost and time spent on transportation
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -1534,6 +1563,64 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             </div>
           </div>
         </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Lack of green space
+              <div>
+                Amount of non-crop land covered with artificial materials like pavement and concrete
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Lack of plumbing
+              <div>
+                Share of homes without indoor kitchens or plumbing
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -1896,6 +1983,35 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             No
           </div>
         </div>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Leaking underground storage tanks
+              <div>
+                Count of leaking underground storage tanks when compared to all underground storage tanks
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  data is not available
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 230b53bbc..af2f5719a 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -520,6 +520,11 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
     defaultMessage: 'Diesel particulate matter exposure',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Diesel particulate matter exposure`,
   },
+  BARRIER_TRANS: {
+    id: 'explore.map.page.side.panel.indicator.barrier.transport',
+    defaultMessage: 'Transportation barriers',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show transportation barriers`,
+  },
   TRAFFIC_VOLUME: {
     id: 'explore.map.page.side.panel.indicator.trafficVolume',
     defaultMessage: 'Traffic proximity and volume',
@@ -540,6 +545,16 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
     defaultMessage: 'Housing cost burden',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost burden`,
   },
+  LACK_GREEN_SPACE: {
+    id: 'explore.map.page.side.panel.indicator.lack.green.space',
+    defaultMessage: 'Lack of green space',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lack of green space`,
+  },
+  LACK_PLUMBING: {
+    id: 'explore.map.page.side.panel.indicator.lack.plumbing',
+    defaultMessage: 'Lack of plumbing',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lack of plumbing`,
+  },
   PROX_HAZ: {
     id: 'explore.map.page.side.panel.indicator.prox.haz',
     defaultMessage: 'Proximity to hazardous waste facilities',
@@ -555,6 +570,11 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
     defaultMessage: 'Proximity to Risk Management Plan (RMP) facilities',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Count of proposed or listed RMP`,
   },
+  LEAKY_TANKS: {
+    id: 'explore.map.page.side.panel.indicator.leaky.tanks',
+    defaultMessage: 'Leaking underground storage tanks',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Leaking underground storage tanks`,
+  },
   WASTE_WATER: {
     id: 'explore.map.page.side.panel.indicator.wasteWater',
     defaultMessage: 'Wastewater discharge',
@@ -720,6 +740,11 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     defaultMessage: 'Diesel exhaust in the air',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Diesel exhaust in the air`,
   },
+  BARRIER_TRANS: {
+    id: 'explore.map.page.side.panel.indicator.description.barrierTrans',
+    defaultMessage: 'Cost and time spent on transportation',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Cost and time spent on transportation`,
+  },
   TRAFFIC_VOLUME: {
     id: 'explore.map.page.side.panel.indicator.description.trafficVolume',
     defaultMessage: 'Count of vehicles at major roads within 500 meters',
@@ -742,8 +767,17 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   HOUSE_BURDEN: {
     id: 'explore.map.page.side.panel.indicator.description.houseBurden',
     defaultMessage: 'Low income households spending more than 30% of income on housing',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing
-    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing`,
+  },
+  LACK_GREEN_SPACE: {
+    id: 'explore.map.page.side.panel.indicator.description.lack.green.space',
+    defaultMessage: 'Amount of non-crop land covered with artificial materials like pavement and concrete',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Amount of non-crop land covered with artificial materials like pavement and concrete`,
+  },
+  LACK_PLUMBING: {
+    id: 'explore.map.page.side.panel.indicator.description.lack.plumbing',
+    defaultMessage: 'Share of homes without indoor kitchens or plumbing',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes without indoor kitchens or plumbing`,
   },
 
   PROX_HAZ: {
@@ -762,6 +796,11 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Risk Management Plan facilities within 5 kilometers`,
   },
 
+  LEAKY_TANKS: {
+    id: 'explore.map.page.side.panel.indicator.description.leaky.tanks',
+    defaultMessage: `Count of leaking underground storage tanks when compared to all underground storage tanks`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of leaky storage tanks`,
+  },
   WASTE_WATER: {
     id: 'explore.map.page.side.panel.indicator.description.wasteWater',
     defaultMessage: 'Toxic concentrations at stream segments within 500 meters',
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 983c6e32c..02473524c 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -503,10 +503,18 @@
     "defaultMessage": "Asthma",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Asthma"
   },
+  "explore.map.page.side.panel.indicator.barrier.transport": {
+    "defaultMessage": "Transportation barriers",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show transportation barriers"
+  },
   "explore.map.page.side.panel.indicator.description.asthma": {
     "defaultMessage": "Weighted percent of people who have been told they have asthma",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Number of people who have been told they have asthma"
   },
+  "explore.map.page.side.panel.indicator.description.barrierTrans": {
+    "defaultMessage": "Cost and time spent on transportation",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Cost and time spent on transportation"
+  },
   "explore.map.page.side.panel.indicator.description.diabetes": {
     "defaultMessage": "Weighted percent of people ages 18 years and older who have diabetes other than diabetes during pregnancy",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of People ages 18 years and older who have diabetes other than \n      diabetes during pregnancy"
@@ -549,12 +557,24 @@
   },
   "explore.map.page.side.panel.indicator.description.houseBurden": {
     "defaultMessage": "Low income households spending more than 30% of income on housing",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing\n    "
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing"
+  },
+  "explore.map.page.side.panel.indicator.description.lack.green.space": {
+    "defaultMessage": "Amount of non-crop land covered with artificial materials like pavement and concrete",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Amount of non-crop land covered with artificial materials like pavement and concrete"
+  },
+  "explore.map.page.side.panel.indicator.description.lack.plumbing": {
+    "defaultMessage": "Share of homes without indoor kitchens or plumbing",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes without indoor kitchens or plumbing"
   },
   "explore.map.page.side.panel.indicator.description.leadPaint": {
     "defaultMessage": "Percentile of number of homes built before 1960 that are not among the most expensive",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Pre-1960 housing"
   },
+  "explore.map.page.side.panel.indicator.description.leaky.tanks": {
+    "defaultMessage": "Count of leaking underground storage tanks when compared to all underground storage tanks",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of leaky storage tanks"
+  },
   "explore.map.page.side.panel.indicator.description.lifeExpect": {
     "defaultMessage": "Average number of years a person can expect to live",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Average number of years of life a person can expect to live"
@@ -655,10 +675,22 @@
     "defaultMessage": "Housing cost burden",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost burden"
   },
+  "explore.map.page.side.panel.indicator.lack.green.space": {
+    "defaultMessage": "Lack of green space",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lack of green space"
+  },
+  "explore.map.page.side.panel.indicator.lack.plumbing": {
+    "defaultMessage": "Lack of plumbing",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lack of plumbing"
+  },
   "explore.map.page.side.panel.indicator.leadPaint": {
     "defaultMessage": "Lead paint",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lead paint"
   },
+  "explore.map.page.side.panel.indicator.leaky.tanks": {
+    "defaultMessage": "Leaking underground storage tanks",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Leaking underground storage tanks"
+  },
   "explore.map.page.side.panel.indicator.lifeExpect": {
     "defaultMessage": "Low life expectancy",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Low life expectancy"

From 908d7121443c74c5f4b742d462b721382e0cfb7c Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 17 Aug 2022 16:42:44 -0700
Subject: [PATCH 044/130] Add back the selected feature layer

---
 .../src/components/MapTractLayers/MapTractLayers.tsx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/client/src/components/MapTractLayers/MapTractLayers.tsx b/client/src/components/MapTractLayers/MapTractLayers.tsx
index 93c96d5af..74b5a3c9d 100644
--- a/client/src/components/MapTractLayers/MapTractLayers.tsx
+++ b/client/src/components/MapTractLayers/MapTractLayers.tsx
@@ -151,6 +151,18 @@ const MapTractLayers = ({
           minzoom={constants.GLOBAL_MIN_ZOOM_FEATURE_BORDER}
         />
 
+        {/* High zoom layer (dynamic) - border styling around the selected feature */}
+        <Layer
+          id={constants.SELECTED_FEATURE_BORDER_LAYER_ID}
+          source-layer={constants.SCORE_SOURCE_LAYER}
+          filter={filter} // This filter filters out all other features except the selected feature.
+          type='line'
+          paint={{
+            'line-color': constants.SELECTED_FEATURE_BORDER_COLOR,
+            'line-width': constants.SELECTED_FEATURE_BORDER_WIDTH,
+          }}
+          minzoom={constants.GLOBAL_MIN_ZOOM_HIGH}
+        />
       </Source>
     </>
   ): (

From 79d50e9cb4698d373862dc0af3af249caef88b04 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 17 Aug 2022 16:59:11 -0700
Subject: [PATCH 045/130] Show Tract info/demo only when tracts are selected

---
 .../src/components/AreaDetail/AreaDetail.tsx  |  55 ++--------
 .../__snapshots__/areaDetail.test.tsx.snap    | 102 ------------------
 client/src/components/J40Map.tsx              |   2 +-
 .../MapTribalLayers/MapTribalLayers.tsx       |   1 -
 4 files changed, 12 insertions(+), 148 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 0c43afe15..3bcd96e57 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -628,53 +628,20 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
 
   return (
     <aside className={styles.areaDetailContainer} data-cy={'aside'}>
-
-      {/* Tract Info */}
-      <TractInfo
-        blockGroup={blockGroup}
-        countyName={countyName}
-        stateName={stateName}
-        population={population}
-        sidePanelState={properties[constants.SIDE_PANEL_STATE]}
-      />
-
-      {/* Demographics */}
-      <TractDemographics />
-
-
       {
         isCensusLayerSelected ? (
           <>
-            {/* Census Info  */}
-            <ul className={styles.censusRow}>
-              <li>
-                <span className={styles.censusLabel}>
-                  {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.CENSUS_BLOCK_GROUP)}
-                </span>
-                <span className={styles.censusText}>{` ${blockGroup}`}</span>
-              </li>
-              <li>
-                <span className={styles.censusLabel}>
-                  {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.COUNTY)}
-                </span>
-                <span className={styles.censusText}>{` ${countyName}`}</span>
-              </li>
-              <li>
-                <span className={styles.censusLabel}>
-                  {properties[constants.SIDE_PANEL_STATE] !== constants.SIDE_PANEL_STATE_VALUES.NATION ?
-                    intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.TERRITORY) :
-                    intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.STATE)
-                  }
-                </span>
-                <span className={styles.censusText}>{` ${stateName}`}</span>
-              </li>
-              <li>
-                <span className={styles.censusLabel}>
-                  {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.POPULATION)}
-                </span>
-                <span className={styles.censusText}>{` ${population.toLocaleString()}`}</span>
-              </li>
-            </ul>
+            {/* Tract Info */}
+            <TractInfo
+              blockGroup={blockGroup}
+              countyName={countyName}
+              stateName={stateName}
+              population={population}
+              sidePanelState={properties[constants.SIDE_PANEL_STATE]}
+            />
+
+            {/* Demographics */}
+            <TractDemographics />
 
             {/* Disadvantaged? */}
             <div className={styles.categorization}>
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index a736bfc5b..5115492bf 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -195,40 +195,6 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
         </div>
       </section>
     </div>
-    <ul>
-      <li>
-        <span>
-          Number:
-        </span>
-        <span>
-           98729374234
-        </span>
-      </li>
-      <li>
-        <span>
-          County:
-        </span>
-        <span>
-           Brooklyn
-        </span>
-      </li>
-      <li>
-        <span>
-          Territory: 
-        </span>
-        <span>
-           New York
-        </span>
-      </li>
-      <li>
-        <span>
-          Population:
-        </span>
-        <span>
-           3,435,435
-        </span>
-      </li>
-    </ul>
     <div>
       <div>
         Identified as disadvantaged?
@@ -746,40 +712,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         </div>
       </section>
     </div>
-    <ul>
-      <li>
-        <span>
-          Number:
-        </span>
-        <span>
-           98729374234
-        </span>
-      </li>
-      <li>
-        <span>
-          County:
-        </span>
-        <span>
-           Brooklyn
-        </span>
-      </li>
-      <li>
-        <span>
-          State: 
-        </span>
-        <span>
-           New York
-        </span>
-      </li>
-      <li>
-        <span>
-          Population:
-        </span>
-        <span>
-           3,435,435
-        </span>
-      </li>
-    </ul>
     <div>
       <div>
         Identified as disadvantaged?
@@ -2850,40 +2782,6 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         </div>
       </section>
     </div>
-    <ul>
-      <li>
-        <span>
-          Number:
-        </span>
-        <span>
-           98729374234
-        </span>
-      </li>
-      <li>
-        <span>
-          County:
-        </span>
-        <span>
-           Brooklyn
-        </span>
-      </li>
-      <li>
-        <span>
-          Territory: 
-        </span>
-        <span>
-           New York
-        </span>
-      </li>
-      <li>
-        <span>
-          Population:
-        </span>
-        <span>
-           3,435,435
-        </span>
-      </li>
-    </ul>
     <div>
       <div>
         Identified as disadvantaged?
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index a98095ba1..cfdca7c26 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -431,7 +431,7 @@ const J40Map = ({location}: IJ40Interface) => {
                 {intl.formatMessage(EXPLORE_COPY.MAP.GEOLOC_MSG_LOCATING)}
               </div>}
 
-              <div className={styles.geolocateIcon}>
+              <div>
                 <GeolocateControl
                   positionOptions={{enableHighAccuracy: true}}
                   onGeolocate={onGeolocate}
diff --git a/client/src/components/MapTribalLayers/MapTribalLayers.tsx b/client/src/components/MapTribalLayers/MapTribalLayers.tsx
index 8a4db968c..8fe3dce70 100644
--- a/client/src/components/MapTribalLayers/MapTribalLayers.tsx
+++ b/client/src/components/MapTribalLayers/MapTribalLayers.tsx
@@ -96,7 +96,6 @@ const MapTribalLayer = ({
       />
 
       {/* Alaska layer */}
-      {/* // Todo: limit zoom in amount */}
       <Layer
         id={constants.TRIBAL_ALASKA_POINTS_LAYER_ID}
         source-layer={constants.TRIBAL_SOURCE_LAYER}

From df63450762135c53677735b5a6f7b8eaff6381d2 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 19 Aug 2022 21:16:54 -0700
Subject: [PATCH 046/130] Update SCORE_HIGH_PROP from SM_PFS to SM_C

- Will allow high zoom tiles to load with BE staging branch 1822/e638
---
 .../components/AreaDetail/tests/areaDetail.test.tsx  |  2 +-
 .../src/components/MapTractLayers/MapTractLayers.tsx |  4 ++--
 client/src/data/constants.tsx                        |  2 +-
 client/src/data/getOSBaseMap.tsx                     | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/src/components/AreaDetail/tests/areaDetail.test.tsx b/client/src/components/AreaDetail/tests/areaDetail.test.tsx
index 232c8bf4f..7186f31fc 100644
--- a/client/src/components/AreaDetail/tests/areaDetail.test.tsx
+++ b/client/src/components/AreaDetail/tests/areaDetail.test.tsx
@@ -13,7 +13,7 @@ describe('rendering of the AreaDetail', () => {
     [constants.LINGUISTIC_ISOLATION_PROPERTY_PERCENTILE]: .97,
     [constants.UNEMPLOYMENT_PROPERTY_PERCENTILE]: .96,
     [constants.HOUSING_BURDEN_PROPERTY_PERCENTILE]: .95,
-    [constants.SCORE_PROPERTY_HIGH]: .95,
+    [constants.SCORE_PROPERTY_HIGH]: true,
     [constants.GEOID_PROPERTY]: 98729374234,
     [constants.TOTAL_POPULATION]: 3435435,
     [constants.STATE_NAME]: 'New York',
diff --git a/client/src/components/MapTractLayers/MapTractLayers.tsx b/client/src/components/MapTractLayers/MapTractLayers.tsx
index 74b5a3c9d..ca83bc2ec 100644
--- a/client/src/components/MapTractLayers/MapTractLayers.tsx
+++ b/client/src/components/MapTractLayers/MapTractLayers.tsx
@@ -116,7 +116,7 @@ const MapTractLayers = ({
         <Layer
           id={constants.HIGH_ZOOM_LAYER_ID}
           source-layer={constants.SCORE_SOURCE_LAYER}
-          filter={['<', constants.SCORE_PROPERTY_HIGH, constants.SCORE_BOUNDARY_THRESHOLD]}
+          filter={['==', constants.SCORE_PROPERTY_HIGH, false]}
           type='fill'
           paint={{
             'fill-opacity': constants.NON_PRIORITIZED_FEATURE_FILL_OPACITY,
@@ -128,7 +128,7 @@ const MapTractLayers = ({
         <Layer
           id={constants.PRIORITIZED_HIGH_ZOOM_LAYER_ID}
           source-layer={constants.SCORE_SOURCE_LAYER}
-          filter={['>', constants.SCORE_PROPERTY_HIGH, constants.SCORE_BOUNDARY_THRESHOLD]}
+          filter={['==', constants.SCORE_PROPERTY_HIGH, true]}
           type='fill'
           paint={{
             'fill-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index 1aa13fe96..cec77dc8d 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -227,7 +227,7 @@ export const TRIBAL_ALASKA_POINTS_LAYER_ID = 'tribal-alaska-points-layer-id';
 
 // Used in layer filters:
 export const SCORE_PROPERTY_LOW = 'M_SCORE';
-export const SCORE_PROPERTY_HIGH = 'SM_PFS';
+export const SCORE_PROPERTY_HIGH = 'SM_C';
 
 // Zoom
 export const GLOBAL_MIN_ZOOM = 3;
diff --git a/client/src/data/getOSBaseMap.tsx b/client/src/data/getOSBaseMap.tsx
index 4b6df523d..f43c50123 100644
--- a/client/src/data/getOSBaseMap.tsx
+++ b/client/src/data/getOSBaseMap.tsx
@@ -256,11 +256,11 @@ export const getOSBaseMap = (
         'source': constants.HIGH_ZOOM_SOURCE_NAME,
         'source-layer': constants.SCORE_SOURCE_LAYER,
         /**
-         * This shows features where the high score < score boundary threshold.
-         * In other words, this filter out prioritized features
+         * The SCORE_PROPERTY_HIGH is a boolean value. True for
+         * prioritized and false for non-priorirized
          */
         'filter': ['all',
-          ['<', constants.SCORE_PROPERTY_HIGH, constants.SCORE_BOUNDARY_THRESHOLD],
+          ['==', constants.SCORE_PROPERTY_HIGH, false],
         ],
 
         'type': 'fill',
@@ -276,11 +276,11 @@ export const getOSBaseMap = (
         'source': constants.HIGH_ZOOM_SOURCE_NAME,
         'source-layer': constants.SCORE_SOURCE_LAYER,
         /**
-         * This shows features where the high score > score boundary threshold.
-         * In other words, this filter out non-prioritized features
+         * The SCORE_PROPERTY_HIGH is a boolean value. True for
+         * prioritized and false for non-priorirized
          */
         'filter': ['all',
-          ['>', constants.SCORE_PROPERTY_HIGH, constants.SCORE_BOUNDARY_THRESHOLD],
+          ['==', constants.SCORE_PROPERTY_HIGH, true],
         ],
 
         'type': 'fill',

From 8175407806d4fee83836c7c213f99f8a79b94e6d Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 22 Aug 2022 08:54:58 -0700
Subject: [PATCH 047/130] Fix 2 demographics typos

- repeated demographic
- change to race/ethnicity
---
 .../__snapshots__/areaDetail.test.tsx.snap    | 30 ++-----------------
 .../TractDemographics/TractDemographics.tsx   |  3 +-
 .../TractDemographics.test.tsx.snap           | 10 +------
 3 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index 5115492bf..ebe7c7e35 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -49,7 +49,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
         Tract demographics
       </div>
       <h6>
-        Racial / Ethnographic
+        Race / Ethnicity
         <span>
           (
           <button
@@ -96,14 +96,6 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
             10.3%
           </span>
         </div>
-        <div>
-          <span>
-            American Indian and Alaska Native
-          </span>
-          <span>
-            0.3%
-          </span>
-        </div>
         <div>
           <span>
             Asian
@@ -566,7 +558,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         Tract demographics
       </div>
       <h6>
-        Racial / Ethnographic
+        Race / Ethnicity
         <span>
           (
           <button
@@ -613,14 +605,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             10.3%
           </span>
         </div>
-        <div>
-          <span>
-            American Indian and Alaska Native
-          </span>
-          <span>
-            0.3%
-          </span>
-        </div>
         <div>
           <span>
             Asian
@@ -2636,7 +2620,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         Tract demographics
       </div>
       <h6>
-        Racial / Ethnographic
+        Race / Ethnicity
         <span>
           (
           <button
@@ -2683,14 +2667,6 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             10.3%
           </span>
         </div>
-        <div>
-          <span>
-            American Indian and Alaska Native
-          </span>
-          <span>
-            0.3%
-          </span>
-        </div>
         <div>
           <span>
             Asian
diff --git a/client/src/components/TractDemographics/TractDemographics.tsx b/client/src/components/TractDemographics/TractDemographics.tsx
index 2fb96a98a..0607dd180 100644
--- a/client/src/components/TractDemographics/TractDemographics.tsx
+++ b/client/src/components/TractDemographics/TractDemographics.tsx
@@ -19,7 +19,6 @@ const demographicsData:ITractDemographicsProps = {
     ['White', 61.4],
     ['Black or African Americon', 10.3],
     ['American Indian and Alaska Native', 10.3],
-    ['American Indian and Alaska Native', 0.3],
     ['Asian', 7.2],
     ['Native Hawiian or Pacific Islander', 4.2],
     ['Other', 2.5],
@@ -108,7 +107,7 @@ const TractDemographics = () => {
         Tract demographics
       </div>
       <>
-        <J40AccordionItem id={'race'} title={`Racial / Ethnographic`}>
+        <J40AccordionItem id={'race'} title={`Race / Ethnicity`}>
           {demographicItemGen(demographicsData.racial)}
         </J40AccordionItem>
         <J40AccordionItem id={'age'} title={`Age`}>
diff --git a/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
index 84f1b4584..bb7b765ce 100644
--- a/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
+++ b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
       Tract demographics
     </div>
     <h6>
-      Racial / Ethnographic
+      Race / Ethnicity
       <span>
         (
         <button
@@ -54,14 +54,6 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
           10.3%
         </span>
       </div>
-      <div>
-        <span>
-          American Indian and Alaska Native
-        </span>
-        <span>
-          0.3%
-        </span>
-      </div>
       <div>
         <span>
           Asian

From 83fb0e875d89187b4d20cb0e897ba01c54d54127 Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Tue, 30 Aug 2022 19:22:29 -0700
Subject: [PATCH 048/130] Add HRS, AML, FUDS and demographics (#1861)

* Add HRS_ET

- refactor to add IndicatorTypes
- modify tests
- add intl

* Add AML and FUDS

- update indicatorFilter
- update tests each indicator has 3 states to test

* Connect BE signal for demographics

- update tests
- i18n-ize

* Remove obsolete tests snapshots

* Update to Score N constants

* Remove higher ed socio-economic indicator

- remove spacer "Meets both socio"
- update snapshots

* Update BE signal types for

- AML
- FUDS

* Filter out missing historic underinvest. indicators

- For the special case when historic underinvestments are missing do not show that indicator at all
- update unit tests

* Make AML appear as No for all that are missing

* Update snapshot
---
 .../src/components/AreaDetail/AreaDetail.tsx  | 217 ++++-
 .../__snapshots__/areaDetail.test.tsx.snap    | 856 +++++-------------
 .../AreaDetail/tests/areaDetail.test.tsx      |  38 +-
 .../components/Indicator/Indicator.test.tsx   | 207 ++++-
 client/src/components/Indicator/Indicator.tsx | 160 ++--
 .../__snapshots__/Indicator.test.tsx.snap     | 291 +++++-
 .../TractDemographics.test.tsx                | 396 +++++++-
 .../TractDemographics/TractDemographics.tsx   | 175 +++-
 .../TractDemographics.test.tsx.snap           | 324 ++++++-
 client/src/data/constants.tsx                 |  66 +-
 client/src/data/copy/explore.tsx              | 123 ++-
 client/src/intl/en.json                       |  94 +-
 12 files changed, 2041 insertions(+), 906 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 3bcd96e57..f9cd4662e 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable quotes */
 // External Libs:
 import React from 'react';
-import {useIntl} from 'gatsby-plugin-intl';
+import {MessageDescriptor, useIntl} from 'gatsby-plugin-intl';
 import {Accordion, Button} from '@trussworks/react-uswds';
 
 // Components:
@@ -27,20 +27,34 @@ interface IAreaDetailProps {
   isCensusLayerSelected: boolean,
 }
 
+/**
+ * There are a 4 different indicator types. Each indicator type will render in the UI differently.
+ *
+ * percentile - is the majority of indicators
+ * percents - a few indicators fall into this type
+ * boolean - 3 indicators are of boolean type
+ *    - historic redlining
+ *    - abandoned land mines
+ *    - FUDS
+ *
+ */
+export type indicatorType = 'percentile' | 'percent' | 'boolean';
+
 /**
  * This interface is used as define the various fields for each indicator in the side panel
  *  label: the indicator label or title
  *  description: the description of the indicator used in the side panel
- *  value: the number from the geoJSON tile
+ *  type: see indicatorType above
+ *  value: the number from the geoJSON tile. If tile doesn't exist it get a null value. Could be boolean also
  *  isDisadvagtaged: the flag from the geoJSON tile
- *  isPercent: is the value a percent or percentile
+ *  threshold: a custom value of threshold for certain indicators
  *  */
 export interface indicatorInfo {
   label: string,
   description: string,
-  value: number | null,
+  type: indicatorType,
+  value: number | boolean | null,
   isDisadvagtaged: boolean,
-  isPercent?: boolean,
   threshold?: number,
 }
 
@@ -64,6 +78,35 @@ export interface ICategory {
   isExceedBothSocioBurdens: boolean | null,
 }
 
+/**
+ * This filter will remove indicators from appearing in the side panel by returning
+ * the filter function (curring). There is 1 use case. It can accept any indicator name
+ * as an input.
+ *
+ * 1. For Historic underinvestment if the value is null
+ *
+ * Recommendation is to use a separate filter for each indicator that needs filtering.
+ *
+ * @param {MessageDescriptor} label - allows to re-use this filter for all 3 indicators above
+ * @return {indicatorInfo}
+ */
+export const indicatorFilter = (label:MessageDescriptor) => {
+  const intl = useIntl();
+
+  return (indicator:indicatorInfo) => (
+    indicator.label !== intl.formatMessage(label) ||
+    ( indicator.label == intl.formatMessage(label) && indicator.value != null)
+  );
+};
+
+
+/**
+ * This is the main component. It will render the entire side panel and show the details
+ * of the area/feature that is selected.
+ *
+ * @param {IAreaDetailProps} {}
+ * @return {void}
+ */
 const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps) => {
   const intl = useIntl();
 
@@ -86,12 +129,15 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
 
   const feedbackEmailBody = intl.formatMessage(EXPLORE_COPY.SEND_FEEDBACK.EMAIL_BODY);
 
+
   /**
    * The workforce development category has some indicators who's source will vary depending on which
    * territory is selected. This function allows us to change the source of workforce development indicators
    * depending on which territory was selected
+   *
+   * @param {string} indicatorName
+   * @return {void}
    */
-
   const getWorkForceIndicatorValue = (indicatorName: string) => {
     if (sidePanelState === constants.SIDE_PANEL_STATE_VALUES.ISLAND_AREAS) {
       if (indicatorName === 'lowMedInc') {
@@ -138,12 +184,15 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     }
   };
 
+
   /**
    * The workforce development category has some indicators who's disadvantaged boolean
    * will vary depending on which territory is selected. This function allows us to change
    * the boolean of workforce development indicators depending on which territory was selected
+   *
+   * @param {string} indicatorName
+   * @return {void}
    */
-
   const getWorkForceIndicatorIsDisadv = (indicatorName: string) => {
     if (sidePanelState === constants.SIDE_PANEL_STATE_VALUES.ISLAND_AREAS) {
       if (indicatorName === 'lowMedInc') {
@@ -190,11 +239,19 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
         true : false;
     }
   };
-  // Define each indicator in the side panel with constants from copy file (for intl)
-  // Indicators are grouped by category
+
+
+  /**
+   * Define each indicator in the side panel with constants from copy file (for intl)
+   *
+   * Indicators are grouped by category
+   */
+
+  // Climate category
   const expAgLoss: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.EXP_AG_LOSS),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.EXP_AG_LOSS),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.EXP_AGRICULTURE_LOSS_PERCENTILE) ?
       properties[constants.EXP_AGRICULTURE_LOSS_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_EXP_AGR_LOSS] ?
@@ -203,6 +260,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const expBldLoss: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.EXP_BLD_LOSS),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.EXP_BLD_LOSS),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.EXP_BUILDING_LOSS_PERCENTILE) ?
       properties[constants.EXP_BUILDING_LOSS_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_EXP_BLD_LOSS] ?
@@ -211,6 +269,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const expPopLoss: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.EXP_POP_LOSS),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.EXP_POP_LOSS),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.EXP_POPULATION_LOSS_PERCENTILE) ?
       properties[constants.EXP_POPULATION_LOSS_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_EXP_POP_LOSS] ?
@@ -219,6 +278,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const flooding: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.FLOODING),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.FLOODING),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.FLOODING_PERCENTILE) ?
       properties[constants.FLOODING_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FLOODING] ?
@@ -227,6 +287,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const wildfire: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.WILDFIRE),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.WILDFIRE),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.WASTEWATER_PERCENTILE) ?
       properties[constants.WASTEWATER_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_WILDFIRE] ?
@@ -235,26 +296,30 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const lowInc: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LOW_INCOME),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LOW_INCOME),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.POVERTY_BELOW_200_PERCENTILE) ?
       properties[constants.POVERTY_BELOW_200_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_FEDERAL_POVERTY_LEVEL_200] ?
       properties[constants.IS_FEDERAL_POVERTY_LEVEL_200] : null,
     threshold: 65,
   };
-  const higherEd: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HIGH_ED),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HIGH_ED),
-    value: properties.hasOwnProperty(constants.NON_HIGHER_ED_PERCENTILE) ?
-      properties[constants.NON_HIGHER_ED_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_HIGHER_ED_PERCENTILE] ?
-      properties[constants.IS_HIGHER_ED_PERCENTILE] : null,
-    isPercent: true,
-    threshold: 80,
-  };
+  // const higherEd: indicatorInfo = {
+  //   label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HIGH_ED),
+  //   description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HIGH_ED),
+  //   type: 'percent',
+  //   value: properties.hasOwnProperty(constants.NON_HIGHER_ED_PERCENTILE) ?
+  //     properties[constants.NON_HIGHER_ED_PERCENTILE] : null,
+  //   isDisadvagtaged: properties[constants.IS_HIGHER_ED_PERCENTILE] ?
+  //     properties[constants.IS_HIGHER_ED_PERCENTILE] : null,
+  //   threshold: 80,
+  // };
 
+
+  // Energy category
   const energyBurden: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ENERGY_BURDEN),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.ENERGY_BURDEN),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.ENERGY_PERCENTILE) ?
       properties[constants.ENERGY_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_ENERGY_BURDEN] ?
@@ -263,15 +328,18 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const pm25: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.PM_2_5),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.PM_2_5),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.PM25_PERCENTILE) ?
       properties[constants.PM25_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_PM25] ?
       properties[constants.IS_EXCEEDS_THRESH_FOR_PM25] : null,
   };
 
+  // Transit category
   const dieselPartMatter: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.DIESEL_PARTICULATE_MATTER),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.DIESEL_PARTICULATE_MATTER),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.DIESEL_MATTER_PERCENTILE) ?
       properties[constants.DIESEL_MATTER_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_DIESEL_PM] ?
@@ -280,6 +348,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const barrierTransport: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.BARRIER_TRANS),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.BARRIER_TRANS),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.TRAVEL_DISADV_PERCENTILE) ?
       properties[constants.TRAVEL_DISADV_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_TRAVEL_DISADV] ?
@@ -288,15 +357,30 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const trafficVolume: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.TRAFFIC_VOLUME),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.TRAFFIC_VOLUME),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.TRAFFIC_PERCENTILE) ?
       properties[constants.TRAFFIC_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_TRAFFIC_PROX] ?
       properties[constants.IS_EXCEEDS_THRESH_FOR_TRAFFIC_PROX] : null,
   };
 
+  // Housing category
+  const historicUnderinvest: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HIST_UNDERINVEST),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HIST_UNDERINVEST),
+    type: 'boolean',
+    value: properties.hasOwnProperty(constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH) ?
+      (properties[constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH] ===
+        constants.HISTORIC_UNDERINVESTMENT_RAW_YES ? true : false) :
+      null,
+    isDisadvagtaged: properties.hasOwnProperty(constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH) &&
+    properties[constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH] ===
+    constants.HISTORIC_UNDERINVESTMENT_RAW_YES ? true : false,
+  };
   const houseBurden: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HOUSE_BURDEN),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HOUSE_BURDEN),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.HOUSING_BURDEN_PROPERTY_PERCENTILE) ?
       properties[constants.HOUSING_BURDEN_PROPERTY_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_HOUSE_BURDEN] ?
@@ -305,6 +389,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const lackGreenSpace: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LACK_GREEN_SPACE),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LACK_GREEN_SPACE),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.IMPERVIOUS_PERCENTILE) ?
       properties[constants.IMPERVIOUS_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_IMPERVIOUS] ?
@@ -313,6 +398,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const lackPlumbing: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LACK_PLUMBING),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LACK_PLUMBING),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.KITCHEN_PLUMB_PERCENTILE) ?
       properties[constants.KITCHEN_PLUMB_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_KITCHEN_PLUMB] ?
@@ -321,22 +407,37 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const leadPaint: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LEAD_PAINT),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LEAD_PAINT),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.LEAD_PAINT_PERCENTILE) ?
       properties[constants.LEAD_PAINT_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_LEAD_PAINT_AND_MEDIAN_HOME_VAL] ?
       properties[constants.IS_EXCEEDS_THRESH_FOR_LEAD_PAINT_AND_MEDIAN_HOME_VAL] : null,
   };
-  // const medHomeVal:indicatorInfo = {
-  //   label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.MED_HOME_VAL),
-  //   description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.MED_HOME_VAL),
-  //   value: properties[constants.MEDIAN_HOME_VALUE_PERCENTILE] ?
-  //   properties[constants.MEDIAN_HOME_VALUE_PERCENTILE] : null,
-  //   isDisadvagtaged: false,
-  // };
 
+  // Pollution categeory
+  const abandonMines: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ABANDON_MINES),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.ABANDON_MINES),
+    type: 'boolean',
+    value: properties.hasOwnProperty(constants.ABANDON_LAND_MINES_EXCEEDS_THRESH) ?
+      properties[constants.ABANDON_LAND_MINES_EXCEEDS_THRESH] : null,
+    isDisadvagtaged: properties.hasOwnProperty(constants.ABANDON_LAND_MINES_EXCEEDS_THRESH) ?
+    properties[constants.ABANDON_LAND_MINES_EXCEEDS_THRESH] : null,
+  };
+  const formerDefSites: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.FORMER_DEF_SITES),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.FORMER_DEF_SITES),
+    type: 'boolean',
+    value: properties.hasOwnProperty(constants.FORMER_DEF_SITES_RAW_VALUE) ?
+      (properties[constants.FORMER_DEF_SITES_RAW_VALUE] === constants.FUDS_RAW_YES ? true : false) :
+      null,
+    isDisadvagtaged: properties.hasOwnProperty(constants.FORMER_DEF_SITES_EXCEEDS_THRESH) ?
+    properties[constants.FORMER_DEF_SITES_EXCEEDS_THRESH] : null,
+  };
   const proxHaz: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.PROX_HAZ),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.PROX_HAZ),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.PROXIMITY_TSDF_SITES_PERCENTILE) ?
       properties[constants.PROXIMITY_TSDF_SITES_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_HAZARD_WASTE] ?
@@ -345,6 +446,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const proxNPL: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.PROX_NPL),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.PROX_NPL),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.PROXIMITY_NPL_SITES_PERCENTILE) ?
       properties[constants.PROXIMITY_NPL_SITES_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_SUPERFUND] ?
@@ -353,15 +455,18 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const proxRMP: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.PROX_RMP),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.PROX_RMP),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.PROXIMITY_RMP_SITES_PERCENTILE) ?
       properties[constants.PROXIMITY_RMP_SITES_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_RMP] ?
       properties[constants.IS_EXCEEDS_THRESH_FOR_RMP] : null,
   };
 
+  // Water category
   const leakyTanks: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LEAKY_TANKS),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LEAKY_TANKS),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.LEAKY_UNDER_PERCENTILE) ?
       properties[constants.LEAKY_UNDER_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_LEAKY_UNDER] ?
@@ -370,15 +475,18 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const wasteWater: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.WASTE_WATER),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.WASTE_WATER),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.WASTEWATER_PERCENTILE) ?
       properties[constants.WASTEWATER_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_WASTEWATER] ?
       properties[constants.IS_EXCEEDS_THRESH_FOR_WASTEWATER] : null,
   };
 
+  // Health category
   const asthma: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ASTHMA),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.ASTHMA),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.ASTHMA_PERCENTILE) ?
       properties[constants.ASTHMA_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_ASTHMA] ?
@@ -387,6 +495,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const diabetes: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.DIABETES),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.DIABETES),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.DIABETES_PERCENTILE) ?
       properties[constants.DIABETES_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_DIABETES] ?
@@ -395,6 +504,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const heartDisease: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HEART_DISEASE),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HEART_DISEASE),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.HEART_PERCENTILE) ?
       properties[constants.HEART_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_HEART_DISEASE] ?
@@ -403,15 +513,18 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const lifeExpect: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LIFE_EXPECT),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LOW_LIFE_EXPECT),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.LIFE_PERCENTILE) ?
       properties[constants.LIFE_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_LOW_LIFE_EXP] ?
       properties[constants.IS_EXCEEDS_THRESH_FOR_LOW_LIFE_EXP] : null,
   };
 
+  // Workforce dev category
   const lingIso: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LING_ISO),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LING_ISO),
+    type: 'percentile',
     value: properties.hasOwnProperty(constants.LINGUISTIC_ISOLATION_PROPERTY_PERCENTILE) ?
       properties[constants.LINGUISTIC_ISOLATION_PROPERTY_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_LINGUISITIC_ISO] ?
@@ -420,30 +533,34 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const lowMedInc: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LOW_MED_INC),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LOW_MED_INCOME),
+    type: 'percentile',
     value: getWorkForceIndicatorValue('lowMedInc'),
     isDisadvagtaged: getWorkForceIndicatorIsDisadv('lowMedInc'),
   };
   const unemploy: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.UNEMPLOY),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.UNEMPLOY),
+    type: 'percentile',
     value: getWorkForceIndicatorValue('unemploy'),
     isDisadvagtaged: getWorkForceIndicatorIsDisadv('unemploy'),
   };
   const poverty: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.POVERTY),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.POVERTY),
+    type: 'percentile',
     value: getWorkForceIndicatorValue('poverty'),
     isDisadvagtaged: getWorkForceIndicatorIsDisadv('poverty'),
   };
   const highSchool: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HIGH_SCL),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HIGH_SKL),
+    type: 'percent',
     value: getWorkForceIndicatorValue('highSchool'),
     isDisadvagtaged: getWorkForceIndicatorIsDisadv('highSchool'),
-    isPercent: true,
     threshold: 10,
   };
 
+
   /**
    * Aggregate indicators based on categories
    *
@@ -455,7 +572,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       id: 'climate-change',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLIMATE),
       indicators: [expAgLoss, expBldLoss, expPopLoss, flooding, wildfire],
-      socioEcIndicators: [lowInc, higherEd],
+      socioEcIndicators: [lowInc],
       isDisadvagtaged: properties[constants.IS_CLIMATE_FACTOR_DISADVANTAGED_M] ?
         properties[constants.IS_CLIMATE_FACTOR_DISADVANTAGED_M] : null,
       isExceed1MoreBurden: properties[constants.IS_CLIMATE_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
@@ -467,7 +584,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       id: 'clean-energy',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_ENERGY),
       indicators: [energyBurden, pm25],
-      socioEcIndicators: [lowInc, higherEd],
+      socioEcIndicators: [lowInc],
       isDisadvagtaged: properties[constants.IS_ENERGY_FACTOR_DISADVANTAGED_M] ?
         properties[constants.IS_ENERGY_FACTOR_DISADVANTAGED_M] : null,
       isExceed1MoreBurden: properties[constants.IS_ENERGY_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
@@ -479,7 +596,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       id: 'clean-transport',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_TRANSPORT),
       indicators: [dieselPartMatter, barrierTransport, trafficVolume],
-      socioEcIndicators: [lowInc, higherEd],
+      socioEcIndicators: [lowInc],
       isDisadvagtaged: properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED_M] ?
         properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED_M] : null,
       isExceed1MoreBurden: properties[constants.IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
@@ -490,8 +607,8 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     {
       id: 'sustain-house',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.SUSTAIN_HOUSE),
-      indicators: [houseBurden, lackGreenSpace, lackPlumbing, leadPaint],
-      socioEcIndicators: [lowInc, higherEd],
+      indicators: [historicUnderinvest, houseBurden, lackGreenSpace, lackPlumbing, leadPaint],
+      socioEcIndicators: [lowInc],
       isDisadvagtaged: properties[constants.IS_HOUSING_FACTOR_DISADVANTAGED_M] ?
         properties[constants.IS_HOUSING_FACTOR_DISADVANTAGED_M] : null,
       isExceed1MoreBurden: properties[constants.IS_HOUSING_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
@@ -502,8 +619,8 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     {
       id: 'leg-pollute',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.LEG_POLLUTE),
-      indicators: [proxHaz, proxNPL, proxRMP],
-      socioEcIndicators: [lowInc, higherEd],
+      indicators: [abandonMines, formerDefSites, proxHaz, proxNPL, proxRMP],
+      socioEcIndicators: [lowInc],
       isDisadvagtaged: properties[constants.IS_POLLUTION_FACTOR_DISADVANTAGED_M] ?
         properties[constants.IS_POLLUTION_FACTOR_DISADVANTAGED_M] : null,
       isExceed1MoreBurden: properties[constants.IS_POLLUTION_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
@@ -515,7 +632,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       id: 'clean-water',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_WATER),
       indicators: [leakyTanks, wasteWater],
-      socioEcIndicators: [lowInc, higherEd],
+      socioEcIndicators: [lowInc],
       isDisadvagtaged: properties[constants.IS_WATER_FACTOR_DISADVANTAGED_M] ?
         properties[constants.IS_WATER_FACTOR_DISADVANTAGED_M] : null,
       isExceed1MoreBurden: properties[constants.IS_WATER_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
@@ -527,7 +644,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       id: 'health-burdens',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.HEALTH_BURDEN),
       indicators: [asthma, diabetes, heartDisease, lifeExpect],
-      socioEcIndicators: [lowInc, higherEd],
+      socioEcIndicators: [lowInc],
       isDisadvagtaged: properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED_M] ?
         properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED_M] : null,
       isExceed1MoreBurden: properties[constants.IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
@@ -539,7 +656,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       id: 'work-dev',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.WORK_DEV),
       indicators: [lingIso, lowMedInc, unemploy, poverty],
-      socioEcIndicators: [highSchool, higherEd],
+      socioEcIndicators: [highSchool],
       isDisadvagtaged: properties[constants.IS_WORKFORCE_FACTOR_DISADVANTAGED_M] ?
         properties[constants.IS_WORKFORCE_FACTOR_DISADVANTAGED_M] : null,
       isExceed1MoreBurden: properties[constants.IS_WORKFORCE_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
@@ -549,6 +666,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     },
   ];
 
+
   /**
    * Modify the category array depending on the sidePanelState field. This field comes from the backend
    * and is called UI_EXP.
@@ -577,9 +695,11 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   }
 
 
-  // Create the AccoridionItems by mapping over the categories array. In this array we define the
-  // various indicators for a specific category. This is an array which then maps over the <Indicator />
-  // component to render the actual Indicator
+  /**
+   * Create the AccoridionItems by mapping over the categories array. In this array we define the
+   * various indicators for a specific category. This is an array which then maps over the
+   * <Indicator /> component to render the actual Indicator
+   */
   const categoryItems = categories.map((category) => ({
     id: category.id,
 
@@ -600,10 +720,12 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
           isBurdened={category.isExceed1MoreBurden}
         />
 
-        {/* indicators */}
-        {category.indicators.map((indicator: any, index: number) => {
-          return <Indicator key={`ind${index}`} indicator={indicator} />;
-        })}
+        {/* Indicators - filters then map */}
+        {category.indicators
+            .filter(indicatorFilter(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HIST_UNDERINVEST))
+            .map((indicator: any, index: number) => {
+              return <Indicator key={`ind${index}`} indicator={indicator} />;
+            })}
 
         {/* AND */}
         <div className={styles.categorySpacer}>
@@ -611,10 +733,10 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
         </div>
 
         {/* Exceeds both socioeconomic burdens */}
-        <ExceedBurden
+        {/* <ExceedBurden
           text={EXPLORE_COPY.SIDE_PANEL_SPACERS.EXCEED_BOTH_SOCIO}
           isBurdened={category.isExceedBothSocioBurdens}
-        />
+        /> */}
 
         {/* socio-economic indicators */}
         {category.socioEcIndicators.map((indicator: any, index: number) => {
@@ -641,7 +763,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
             />
 
             {/* Demographics */}
-            <TractDemographics />
+            <TractDemographics properties={properties}/>
 
             {/* Disadvantaged? */}
             <div className={styles.categorization}>
@@ -671,6 +793,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
               {/* <div className={styles.showThresholdExceed}>
                 {EXPLORE_COPY.numberOfThresholdsExceeded(properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS])}
               </div> */}
+
               {/* Send Feedback button */}
               <a
                 className={styles.sendFeedbackLink}
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index ebe7c7e35..360033667 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are present 1`] = `
+exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISLAND AREAS are present 1`] = `
 <DocumentFragment>
   <aside
     data-cy="aside"
@@ -77,15 +77,15 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
             White
           </span>
           <span>
-            61.4%
+            --
           </span>
         </div>
         <div>
           <span>
-            Black or African Americon
+            Black or African American
           </span>
           <span>
-            10.3%
+            --
           </span>
         </div>
         <div>
@@ -93,7 +93,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
             American Indian and Alaska Native
           </span>
           <span>
-            10.3%
+            --
           </span>
         </div>
         <div>
@@ -101,7 +101,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
             Asian
           </span>
           <span>
-            7.2%
+            --
           </span>
         </div>
         <div>
@@ -109,7 +109,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
             Native Hawiian or Pacific Islander
           </span>
           <span>
-            4.2%
+            --
           </span>
         </div>
         <div>
@@ -117,7 +117,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
             Other
           </span>
           <span>
-            2.5%
+            --
           </span>
         </div>
         <div>
@@ -125,7 +125,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
             Two or more races
           </span>
           <span>
-            6.7%
+            --
           </span>
         </div>
         <div>
@@ -133,7 +133,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
             Hispanic or Latino
           </span>
           <span>
-            10.4%
+            --
           </span>
         </div>
       </section>
@@ -166,7 +166,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
             Children under 10
           </span>
           <span>
-            1.4%
+            --
           </span>
         </div>
         <div>
@@ -174,15 +174,15 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
             Ages 10 - 64
           </span>
           <span>
-            80.3%
+            --
           </span>
         </div>
         <div>
           <span>
-            Elderly over 65
+            Elderly over 64
           </span>
           <span>
-            7.2%
+            --
           </span>
         </div>
       </section>
@@ -420,7 +420,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -429,14 +429,6 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
         <div>
           AND
         </div>
-        <div>
-          <div>
-            At or above both associated thresholds?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -462,39 +454,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
               </div>
               <div>
                 <div>
-                  data is not available
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Higher education non-enrollment
-              <div>
-                
-      Percent of the census tract's population 15 or older not enrolled in college, university, or 
-      graduate school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -509,7 +469,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
 </DocumentFragment>
 `;
 
-exports[`rendering of the AreaDetail checks if indicators for NATION is present 1`] = `
+exports[`rendering of the Islan areas in AreaDetail checks if indicators for NATION is present 1`] = `
 <DocumentFragment>
   <aside
     data-cy="aside"
@@ -586,15 +546,15 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             White
           </span>
           <span>
-            61.4%
+            --
           </span>
         </div>
         <div>
           <span>
-            Black or African Americon
+            Black or African American
           </span>
           <span>
-            10.3%
+            --
           </span>
         </div>
         <div>
@@ -602,7 +562,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             American Indian and Alaska Native
           </span>
           <span>
-            10.3%
+            --
           </span>
         </div>
         <div>
@@ -610,7 +570,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             Asian
           </span>
           <span>
-            7.2%
+            --
           </span>
         </div>
         <div>
@@ -618,7 +578,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             Native Hawiian or Pacific Islander
           </span>
           <span>
-            4.2%
+            --
           </span>
         </div>
         <div>
@@ -626,7 +586,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             Other
           </span>
           <span>
-            2.5%
+            --
           </span>
         </div>
         <div>
@@ -634,7 +594,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             Two or more races
           </span>
           <span>
-            6.7%
+            --
           </span>
         </div>
         <div>
@@ -642,7 +602,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             Hispanic or Latino
           </span>
           <span>
-            10.4%
+            --
           </span>
         </div>
       </section>
@@ -675,7 +635,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             Children under 10
           </span>
           <span>
-            1.4%
+            --
           </span>
         </div>
         <div>
@@ -683,15 +643,15 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             Ages 10 - 64
           </span>
           <span>
-            80.3%
+            --
           </span>
         </div>
         <div>
           <span>
-            Elderly over 65
+            Elderly over 64
           </span>
           <span>
-            7.2%
+            --
           </span>
         </div>
       </section>
@@ -798,7 +758,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -827,7 +787,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -858,7 +818,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -889,7 +849,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -920,7 +880,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -929,14 +889,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         <div>
           AND
         </div>
-        <div>
-          <div>
-            At or above both associated thresholds?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -981,38 +933,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             </div>
           </div>
         </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Higher education non-enrollment
-              <div>
-                
-      Percent of the census tract's population 15 or older not enrolled in college, university, or 
-      graduate school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  data is not available
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
       </div>
       <h4
         class="usa-accordion__heading"
@@ -1071,7 +991,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -1100,7 +1020,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -1109,14 +1029,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         <div>
           AND
         </div>
-        <div>
-          <div>
-            At or above both associated thresholds?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -1161,38 +1073,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             </div>
           </div>
         </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Higher education non-enrollment
-              <div>
-                
-      Percent of the census tract's population 15 or older not enrolled in college, university, or 
-      graduate school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  data is not available
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
       </div>
       <h4
         class="usa-accordion__heading"
@@ -1251,7 +1131,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -1280,7 +1160,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -1309,7 +1189,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -1318,14 +1198,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         <div>
           AND
         </div>
-        <div>
-          <div>
-            At or above both associated thresholds?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -1370,38 +1242,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             </div>
           </div>
         </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Higher education non-enrollment
-              <div>
-                
-      Percent of the census tract's population 15 or older not enrolled in college, university, or 
-      graduate school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  data is not available
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
       </div>
       <h4
         class="usa-accordion__heading"
@@ -1502,7 +1342,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -1531,7 +1371,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -1562,7 +1402,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -1571,14 +1411,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         <div>
           AND
         </div>
-        <div>
-          <div>
-            At or above both associated thresholds?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -1623,38 +1455,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             </div>
           </div>
         </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Higher education non-enrollment
-              <div>
-                
-      Percent of the census tract's population 15 or older not enrolled in college, university, or 
-      graduate school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  data is not available
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
       </div>
       <h4
         class="usa-accordion__heading"
@@ -1696,9 +1496,9 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         >
           <div>
             <div>
-              Proximity to hazardous waste facilities
+              Abandoned mine lands
               <div>
-                Count of hazardous waste facilities within 5 kilometers
+                Presence of an abandoned land mine within the tract
               </div>
             </div>
             <div>
@@ -1713,7 +1513,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -1725,9 +1525,9 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         >
           <div>
             <div>
-              Proximity to National Priorities List (NPL) sites
+              Formerly Used Defense Sites (FUDS)
               <div>
-                Proposed or listed NPL (Superfund) sites within 5 kilometers
+                Presence of a Formerly Used Defense Site within the tract
               </div>
             </div>
             <div>
@@ -1742,7 +1542,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -1754,9 +1554,9 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         >
           <div>
             <div>
-              Proximity to Risk Management Plan (RMP) facilities
+              Proximity to hazardous waste facilities
               <div>
-                RMP facilities within 5 kilometers
+                Count of hazardous waste facilities within 5 kilometers
               </div>
             </div>
             <div>
@@ -1771,62 +1571,36 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
           </div>
         </li>
-        <div>
-          AND
-        </div>
-        <div>
-          <div>
-            At or above both associated thresholds?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
         >
           <div>
             <div>
-              Low income
+              Proximity to National Priorities List (NPL) sites
               <div>
-                
-      Household income is less than or equal to twice the federal poverty level 
-    
+                Proposed or listed NPL (Superfund) sites within 5 kilometers
               </div>
             </div>
             <div>
               <div>
-                <div>
-                  19
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
+                <div />
                 <div>
                   <img
-                    alt="an icon for the down arrow"
+                    alt="an icon to represent data is unavailable"
                     src="test-file-stub"
                   />
                 </div>
               </div>
               <div>
                 <div>
-                  below 65
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
+                  missing data
                 </div>
               </div>
             </div>
@@ -1838,12 +1612,9 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         >
           <div>
             <div>
-              Higher education non-enrollment
+              Proximity to Risk Management Plan (RMP) facilities
               <div>
-                
-      Percent of the census tract's population 15 or older not enrolled in college, university, or 
-      graduate school 
-    
+                RMP facilities within 5 kilometers
               </div>
             </div>
             <div>
@@ -1858,46 +1629,14 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
           </div>
         </li>
-      </div>
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="clean-water"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_clean-water"
-          type="button"
-        >
-          <div>
-            <div>
-              Clean water and wastewater infrastructure
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_clean-water"
-        hidden=""
-        id="clean-water"
-      >
         <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
+          AND
         </div>
         <li
           data-cy="indicatorBox"
@@ -1905,7 +1644,86 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         >
           <div>
             <div>
-              Leaking underground storage tanks
+              Low income
+              <div>
+                
+      Household income is less than or equal to twice the federal poverty level 
+    
+              </div>
+            </div>
+            <div>
+              <div>
+                <div>
+                  19
+                  <sup
+                    style="top: -0.2em;"
+                  >
+                    th
+                  </sup>
+                </div>
+                <div>
+                  <img
+                    alt="an icon for the down arrow"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  below 65
+                  <sup
+                    style="top: -0.2em;"
+                  >
+                    th
+                  </sup>
+                   percentile
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+      </div>
+      <h4
+        class="usa-accordion__heading"
+      >
+        <button
+          aria-controls="clean-water"
+          aria-expanded="false"
+          class="usa-accordion__button"
+          data-testid="accordionButton_clean-water"
+          type="button"
+        >
+          <div>
+            <div>
+              Clean water and wastewater infrastructure
+            </div>
+            <div
+              class=""
+            />
+          </div>
+        </button>
+      </h4>
+      <div
+        class="usa-accordion__content usa-prose"
+        data-testid="accordionItem_clean-water"
+        hidden=""
+        id="clean-water"
+      >
+        <div>
+          <div>
+            At or above at least one threshold?
+          </div>
+          <div>
+            No
+          </div>
+        </div>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Leaking underground storage tanks
               <div>
                 Count of leaking underground storage tanks when compared to all underground storage tanks
               </div>
@@ -1922,7 +1740,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -1951,7 +1769,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -1960,14 +1778,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         <div>
           AND
         </div>
-        <div>
-          <div>
-            At or above both associated thresholds?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -2012,38 +1822,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             </div>
           </div>
         </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Higher education non-enrollment
-              <div>
-                
-      Percent of the census tract's population 15 or older not enrolled in college, university, or 
-      graduate school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  data is not available
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
       </div>
       <h4
         class="usa-accordion__heading"
@@ -2102,7 +1880,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -2134,7 +1912,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -2163,7 +1941,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -2192,7 +1970,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -2201,14 +1979,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         <div>
           AND
         </div>
-        <div>
-          <div>
-            At or above both associated thresholds?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -2253,38 +2023,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             </div>
           </div>
         </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Higher education non-enrollment
-              <div>
-                
-      Percent of the census tract's population 15 or older not enrolled in college, university, or 
-      graduate school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  data is not available
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
       </div>
       <h4
         class="usa-accordion__heading"
@@ -2387,7 +2125,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -2483,14 +2221,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         <div>
           AND
         </div>
-        <div>
-          <div>
-            At or above both associated thresholds?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -2530,38 +2260,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
             </div>
           </div>
         </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Higher education non-enrollment
-              <div>
-                
-      Percent of the census tract's population 15 or older not enrolled in college, university, or 
-      graduate school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  data is not available
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
       </div>
     </div>
     <div>
@@ -2571,7 +2269,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
 </DocumentFragment>
 `;
 
-exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are present 1`] = `
+exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUERTO RICO are present 1`] = `
 <DocumentFragment>
   <aside
     data-cy="aside"
@@ -2648,15 +2346,15 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             White
           </span>
           <span>
-            61.4%
+            --
           </span>
         </div>
         <div>
           <span>
-            Black or African Americon
+            Black or African American
           </span>
           <span>
-            10.3%
+            --
           </span>
         </div>
         <div>
@@ -2664,7 +2362,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             American Indian and Alaska Native
           </span>
           <span>
-            10.3%
+            --
           </span>
         </div>
         <div>
@@ -2672,7 +2370,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             Asian
           </span>
           <span>
-            7.2%
+            --
           </span>
         </div>
         <div>
@@ -2680,7 +2378,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             Native Hawiian or Pacific Islander
           </span>
           <span>
-            4.2%
+            --
           </span>
         </div>
         <div>
@@ -2688,7 +2386,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             Other
           </span>
           <span>
-            2.5%
+            --
           </span>
         </div>
         <div>
@@ -2696,7 +2394,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             Two or more races
           </span>
           <span>
-            6.7%
+            --
           </span>
         </div>
         <div>
@@ -2704,7 +2402,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             Hispanic or Latino
           </span>
           <span>
-            10.4%
+            --
           </span>
         </div>
       </section>
@@ -2737,7 +2435,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             Children under 10
           </span>
           <span>
-            1.4%
+            --
           </span>
         </div>
         <div>
@@ -2745,15 +2443,15 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             Ages 10 - 64
           </span>
           <span>
-            80.3%
+            --
           </span>
         </div>
         <div>
           <span>
-            Elderly over 65
+            Elderly over 64
           </span>
           <span>
-            7.2%
+            --
           </span>
         </div>
       </section>
@@ -2860,7 +2558,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -2889,7 +2587,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -2898,14 +2596,6 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         <div>
           AND
         </div>
-        <div>
-          <div>
-            At or above both associated thresholds?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -2950,38 +2640,6 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             </div>
           </div>
         </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Higher education non-enrollment
-              <div>
-                
-      Percent of the census tract's population 15 or older not enrolled in college, university, or 
-      graduate school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  data is not available
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
       </div>
       <h4
         class="usa-accordion__heading"
@@ -3062,14 +2720,6 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         <div>
           AND
         </div>
-        <div>
-          <div>
-            At or above both associated thresholds?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -3114,38 +2764,6 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             </div>
           </div>
         </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Higher education non-enrollment
-              <div>
-                
-      Percent of the census tract's population 15 or older not enrolled in college, university, or 
-      graduate school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  data is not available
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
       </div>
       <h4
         class="usa-accordion__heading"
@@ -3181,6 +2799,64 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             No
           </div>
         </div>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Abandoned mine lands
+              <div>
+                Presence of an abandoned land mine within the tract
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  missing data
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Formerly Used Defense Sites (FUDS)
+              <div>
+                Presence of a Formerly Used Defense Site within the tract
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  missing data
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -3204,7 +2880,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -3233,7 +2909,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -3262,7 +2938,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -3271,14 +2947,6 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         <div>
           AND
         </div>
-        <div>
-          <div>
-            At or above both associated thresholds?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -3323,38 +2991,6 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             </div>
           </div>
         </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Higher education non-enrollment
-              <div>
-                
-      Percent of the census tract's population 15 or older not enrolled in college, university, or 
-      graduate school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  data is not available
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
       </div>
       <h4
         class="usa-accordion__heading"
@@ -3413,7 +3049,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
               </div>
               <div>
                 <div>
-                  data is not available
+                  missing data
                 </div>
               </div>
             </div>
@@ -3509,14 +3145,6 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         <div>
           AND
         </div>
-        <div>
-          <div>
-            At or above both associated thresholds?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -3556,38 +3184,6 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
             </div>
           </div>
         </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Higher education non-enrollment
-              <div>
-                
-      Percent of the census tract's population 15 or older not enrolled in college, university, or 
-      graduate school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  data is not available
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
       </div>
     </div>
     <div>
diff --git a/client/src/components/AreaDetail/tests/areaDetail.test.tsx b/client/src/components/AreaDetail/tests/areaDetail.test.tsx
index 7186f31fc..a4d3dcb6b 100644
--- a/client/src/components/AreaDetail/tests/areaDetail.test.tsx
+++ b/client/src/components/AreaDetail/tests/areaDetail.test.tsx
@@ -5,26 +5,26 @@ import {LocalizedComponent} from '../../../test/testHelpers';
 
 import * as constants from '../../../data/constants';
 
-// Todo: Update tests to take into account tribal layer selected
-describe('rendering of the AreaDetail', () => {
-  const properties = {
-    [constants.POVERTY_BELOW_100_PERCENTILE]: .12,
-    [constants.HIGH_SCHOOL_PROPERTY_PERCENTILE]: .98,
-    [constants.LINGUISTIC_ISOLATION_PROPERTY_PERCENTILE]: .97,
-    [constants.UNEMPLOYMENT_PROPERTY_PERCENTILE]: .96,
-    [constants.HOUSING_BURDEN_PROPERTY_PERCENTILE]: .95,
-    [constants.SCORE_PROPERTY_HIGH]: true,
-    [constants.GEOID_PROPERTY]: 98729374234,
-    [constants.TOTAL_POPULATION]: 3435435,
-    [constants.STATE_NAME]: 'New York',
-    [constants.COUNTY_NAME]: 'Brooklyn',
-    [constants.POVERTY_BELOW_200_PERCENTILE]: .19,
-    [constants.SIDE_PANEL_STATE]: constants.SIDE_PANEL_STATE_VALUES.NATION,
-    [constants.COUNT_OF_CATEGORIES_DISADV]: 5,
-    [constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS]: 3,
-  };
-  const hash = ['11.54', '36.0762', '-84.4494'];
+const properties = {
+  [constants.POVERTY_BELOW_100_PERCENTILE]: .12,
+  [constants.HIGH_SCHOOL_PROPERTY_PERCENTILE]: .98,
+  [constants.LINGUISTIC_ISOLATION_PROPERTY_PERCENTILE]: .97,
+  [constants.UNEMPLOYMENT_PROPERTY_PERCENTILE]: .96,
+  [constants.HOUSING_BURDEN_PROPERTY_PERCENTILE]: .95,
+  [constants.SCORE_PROPERTY_HIGH]: true,
+  [constants.GEOID_PROPERTY]: 98729374234,
+  [constants.TOTAL_POPULATION]: 3435435,
+  [constants.STATE_NAME]: 'New York',
+  [constants.COUNTY_NAME]: 'Brooklyn',
+  [constants.POVERTY_BELOW_200_PERCENTILE]: .19,
+  [constants.SIDE_PANEL_STATE]: constants.SIDE_PANEL_STATE_VALUES.NATION,
+  [constants.COUNT_OF_CATEGORIES_DISADV]: 5,
+  [constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS]: 3,
+};
+const hash = ['11.54', '36.0762', '-84.4494'];
 
+
+describe('rendering of the Islan areas in AreaDetail', () => {
   it('checks if indicators for NATION is present', () => {
     const {asFragment} = render(
         <LocalizedComponent>
diff --git a/client/src/components/Indicator/Indicator.test.tsx b/client/src/components/Indicator/Indicator.test.tsx
index 3f06bf771..f648d80ea 100644
--- a/client/src/components/Indicator/Indicator.test.tsx
+++ b/client/src/components/Indicator/Indicator.test.tsx
@@ -6,15 +6,14 @@ import {indicatorInfo} from '../AreaDetail/AreaDetail';
 
 import * as EXPLORE_COPY from '../../data/copy/explore';
 
-
 describe('rendering of the Indicator', () => {
   it('checks if component renders', () => {
     const highSchool:indicatorInfo = {
       label: 'some label',
       description: 'some description',
+      type: 'percent',
       value: .97,
       isDisadvagtaged: true,
-      isPercent: true,
       threshold: 20,
     };
     const {asFragment} = render(
@@ -31,9 +30,9 @@ describe('rendering of the Indicator', () => {
     const highSchool:indicatorInfo = {
       label: 'some label',
       description: 'some description',
+      type: 'percent',
       value: .426,
       isDisadvagtaged: true,
-      isPercent: true,
       threshold: 20,
     };
     const {asFragment} = render(
@@ -52,6 +51,7 @@ describe('test rendering of Indicator value icons', () => {
     const {asFragment} = render(
         <LocalizedComponent>
           <IndicatorValueIcon
+            type='percent'
             value={90}
             isAboveThresh={true}
           />
@@ -64,6 +64,7 @@ describe('test rendering of Indicator value icons', () => {
     const {asFragment} = render(
         <LocalizedComponent>
           <IndicatorValueIcon
+            type='percentile'
             value={13}
             isAboveThresh={false}
           />
@@ -77,6 +78,7 @@ describe('test rendering of Indicator value icons', () => {
     const {asFragment} = render(
         <LocalizedComponent>
           <IndicatorValueIcon
+            type='percentile'
             value={0}
             isAboveThresh={false}
           />
@@ -86,10 +88,25 @@ describe('test rendering of Indicator value icons', () => {
     screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.ARROW_DOWN.defaultMessage);
   });
 
-  it('renders the unavailable icon when the value is null', () => {
+  it('renders the unavailable icon when the value is a boolean null', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <IndicatorValueIcon
+            type='boolean'
+            value={null}
+            isAboveThresh={false}
+          />
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+    screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE.defaultMessage);
+  });
+
+  it('renders the unavailable icon when the value is a percentile null', () => {
     const {asFragment} = render(
         <LocalizedComponent>
           <IndicatorValueIcon
+            type='percentile'
             value={null}
             isAboveThresh={false}
           />
@@ -108,7 +125,7 @@ describe('test rendering of Indicator value sub-text', () => {
             value={95}
             isAboveThresh={true}
             threshold={90}
-            isPercent={false}
+            type='percentile'
           />
         </LocalizedComponent>,
     );
@@ -121,20 +138,20 @@ describe('test rendering of Indicator value sub-text', () => {
             value={89}
             isAboveThresh={false}
             threshold={90}
-            isPercent={false}
+            type='percentile'
           />
         </LocalizedComponent>,
     );
     expect(asFragment()).toMatchSnapshot();
   });
-  it('renders the "data is not available"', () => {
+  it(`renders missing data `, () => {
     const {asFragment} = render(
         <LocalizedComponent>
           <IndicatorValueSubText
             value={null}
             isAboveThresh={false}
             threshold={90}
-            isPercent={false}
+            type='percentile'
           />
         </LocalizedComponent>,
     );
@@ -144,60 +161,186 @@ describe('test rendering of Indicator value sub-text', () => {
 
 describe('test that the unit suffix renders correctly', ()=> {
   it('renders correctly when the value is a percentile', () => {
-    const lowLife:indicatorInfo = {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <IndicatorValue
+            type={'percentile'}
+            displayStat={90}
+          />
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
+
+  it('renders correctly when the value is a percent', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <IndicatorValue
+            type={'percent'}
+            displayStat={90}
+          />
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
+
+  it('renders correctly when the value is a null', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <IndicatorValue
+            type={'percentile'}
+            displayStat={null}
+          />
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
+});
+
+describe('renders value correctly for historic underinvest.', () => {
+  it('checks if it renders when HRS_ET = true', () => {
+    const historicUnderinvest:indicatorInfo = {
       label: 'some label',
       description: 'some description',
-      value: 97,
+      type: 'boolean',
+      value: true,
       isDisadvagtaged: true,
-      isPercent: false,
-      threshold: 20,
     };
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <Indicator indicator={historicUnderinvest}/>
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
 
+  it('checks if it renders when HRS_ET = false:', () => {
+    const historicUnderinvest:indicatorInfo = {
+      label: 'some label',
+      description: 'some description',
+      type: 'boolean',
+      value: false,
+      isDisadvagtaged: true,
+    };
     const {asFragment} = render(
         <LocalizedComponent>
-          <IndicatorValue
-            isPercent={lowLife.isPercent}
-            displayStat={90}
-          />
+          <Indicator indicator={historicUnderinvest}/>
         </LocalizedComponent>,
     );
     expect(asFragment()).toMatchSnapshot();
   });
-  it('renders correctly when the value is a percent', () => {
-    const lowLife:indicatorInfo = {
+
+  it('checks if it renders nothin when HRS_ET = null:', () => {
+    const historicUnderinvest:indicatorInfo = {
       label: 'some label',
       description: 'some description',
-      value: 97,
+      type: 'boolean',
+      value: null,
       isDisadvagtaged: true,
-      isPercent: true,
-      threshold: 20,
     };
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <Indicator indicator={historicUnderinvest}/>
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
+});
 
+describe('renders value correctly for abandoned land mines', () => {
+  it('checks if it renders when AML_RAW = true', () => {
+    const abandonMines:indicatorInfo = {
+      label: 'some label',
+      description: 'some description',
+      type: 'boolean',
+      value: true,
+      isDisadvagtaged: true,
+    };
     const {asFragment} = render(
         <LocalizedComponent>
-          <IndicatorValue
-            isPercent={lowLife.isPercent}
-            displayStat={90}
-          />
+          <Indicator indicator={abandonMines}/>
         </LocalizedComponent>,
     );
     expect(asFragment()).toMatchSnapshot();
   });
-  it('renders correctly when the value is a null', () => {
-    const lowLife:indicatorInfo = {
+
+  it('checks if it renders when AML_RAW = false:', () => {
+    const abandonMines:indicatorInfo = {
       label: 'some label',
       description: 'some description',
+      type: 'boolean',
+      value: false,
+      isDisadvagtaged: true,
+    };
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <Indicator indicator={abandonMines}/>
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
+
+  it('checks if it renders nothin when AML_RAW = null:', () => {
+    const abandonMines:indicatorInfo = {
+      label: 'some label',
+      description: 'some description',
+      type: 'boolean',
       value: null,
       isDisadvagtaged: true,
-      isPercent: false,
     };
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <Indicator indicator={abandonMines}/>
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
+});
+
+describe('renders value correctly for Former defense sites', () => {
+  it('checks if it renders when FUDS_RAW = true', () => {
+    const formerDefSites:indicatorInfo = {
+      label: 'some label',
+      description: 'some description',
+      type: 'boolean',
+      value: true,
+      isDisadvagtaged: true,
+    };
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <Indicator indicator={formerDefSites}/>
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
+
+  it('checks if it renders when FUDS_RAW = false:', () => {
+    const formerDefSites:indicatorInfo = {
+      label: 'some label',
+      description: 'some description',
+      type: 'boolean',
+      value: false,
+      isDisadvagtaged: true,
+    };
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <Indicator indicator={formerDefSites}/>
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
 
+  it('checks if it renders nothin when FUDS_RAW = null:', () => {
+    const formerDefSites:indicatorInfo = {
+      label: 'some label',
+      description: 'some description',
+      type: 'boolean',
+      value: null,
+      isDisadvagtaged: true,
+    };
     const {asFragment} = render(
         <LocalizedComponent>
-          <IndicatorValue
-            isPercent={lowLife.isPercent}
-            displayStat={null}
-          />
+          <Indicator indicator={formerDefSites}/>
         </LocalizedComponent>,
     );
     expect(asFragment()).toMatchSnapshot();
diff --git a/client/src/components/Indicator/Indicator.tsx b/client/src/components/Indicator/Indicator.tsx
index f69657e39..efbc2a05e 100644
--- a/client/src/components/Indicator/Indicator.tsx
+++ b/client/src/components/Indicator/Indicator.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import {useIntl} from 'gatsby-plugin-intl';
 
-import {indicatorInfo} from '../AreaDetail/AreaDetail';
+import {indicatorInfo, indicatorType} from '../AreaDetail/AreaDetail';
 
 import * as styles from './Indicator.module.scss';
 import * as constants from '../../data/constants';
@@ -15,23 +15,24 @@ import upArrow from '/node_modules/uswds/dist/img/usa-icons/arrow_upward.svg';
 import unAvailable from '/node_modules/uswds/dist/img/usa-icons/do_not_disturb.svg';
 
 interface IIndicator {
-    indicator: indicatorInfo,
+  indicator: indicatorInfo,
 }
 
 interface IIndicatorValueIcon {
+  type: indicatorType,
   value: number | null,
   isAboveThresh: boolean,
 };
 
 interface IIndicatorValueSubText {
-  value: number | null,
+  type: indicatorType,
+  value: number | null | boolean,
   isAboveThresh: boolean,
   threshold: number,
-  isPercent: boolean | undefined,
 }
 
 interface IIndicatorValue {
-  isPercent: boolean | undefined,
+  type: indicatorType,
   displayStat: number | null,
 }
 
@@ -42,7 +43,7 @@ interface IIndicatorValue {
  * @param {number | null} props
  * @return {JSX.Element}
  */
-export const IndicatorValueIcon = ({value, isAboveThresh}: IIndicatorValueIcon) => {
+export const IndicatorValueIcon = ({type, value, isAboveThresh}: IIndicatorValueIcon) => {
   const intl = useIntl();
 
   if (value == null) {
@@ -50,7 +51,7 @@ export const IndicatorValueIcon = ({value, isAboveThresh}: IIndicatorValueIcon)
       src={unAvailable}
       alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE)}
     />;
-  } else {
+  } else if (type === 'percent' || type === 'percentile') {
     return isAboveThresh ?
       <img
         src={upArrow}
@@ -60,7 +61,7 @@ export const IndicatorValueIcon = ({value, isAboveThresh}: IIndicatorValueIcon)
         src={downArrow}
         alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.ARROW_DOWN)}
       />;
-  }
+  } else return <></>;
 };
 
 /**
@@ -69,32 +70,40 @@ export const IndicatorValueIcon = ({value, isAboveThresh}: IIndicatorValueIcon)
  *   "below 20 percent"
  *   "data is not available"
  *
- *  Todo: refactor into single component, add to i18n and add to tests
- *
+ * @param {IIndicatorValueSubText} {}
  * @return {JSX.Element}
  */
-export const IndicatorValueSubText = ({value, isAboveThresh, threshold, isPercent}:IIndicatorValueSubText) => {
-  return value == null ?
-    <div>
-      {EXPLORE_COPY.SIDE_PANEL_VALUES.UNAVAILBLE_MSG}
-    </div> :
-    <div>
-      {
-        isAboveThresh ?
-        EXPLORE_COPY.SIDE_PANEL_VALUES.ABOVE :
-        EXPLORE_COPY.SIDE_PANEL_VALUES.BELOW
-      }
-      {threshold ?
-        <IndicatorValue isPercent={isPercent} displayStat={threshold} /> :
-        <IndicatorValue isPercent={isPercent} displayStat={90} />
-      }
-      {` `}
-      {
-        isPercent ?
-        EXPLORE_COPY.SIDE_PANEL_VALUES.PERCENT :
-        EXPLORE_COPY.SIDE_PANEL_VALUES.PERCENTILE
-      }
-    </div>;
+export const IndicatorValueSubText = ({type, value, isAboveThresh, threshold}:IIndicatorValueSubText) => {
+  if (value === null) {
+    return (
+      <div>
+        {EXPLORE_COPY.SIDE_PANEL_VALUES.UNAVAILBLE_MSG}
+      </div>
+    );
+  } else if (type === 'percent' || type === 'percentile') {
+    return (
+      <div>
+        {
+          isAboveThresh ?
+          EXPLORE_COPY.SIDE_PANEL_VALUES.ABOVE :
+          EXPLORE_COPY.SIDE_PANEL_VALUES.BELOW
+        }
+        {
+          threshold ?
+          <IndicatorValue type={type} displayStat={threshold}/> :
+          <IndicatorValue type={type} displayStat={90}/>
+        }
+        {` `}
+        {
+          type === 'percent' ?
+          EXPLORE_COPY.SIDE_PANEL_VALUES.PERCENT :
+          EXPLORE_COPY.SIDE_PANEL_VALUES.PERCENTILE
+        }
+      </div>
+    );
+  } else {
+    return (<></>);
+  }
 };
 
 /**
@@ -138,46 +147,61 @@ export const superscriptOrdinal = (indicatorValueWithSuffix:string) => {
 };
 
 /**
- * This component will return the indicators's value with an ordinal suffix
- * or a percentage sign using i18n functions
+ * This component will return the indicators's value. The value depends on the
+ * indicator type. Each type renders a different UI.
  *
  * @return {JSX.Element | null}
  */
-export const IndicatorValue = ({isPercent, displayStat}:IIndicatorValue) => {
+export const IndicatorValue = ({type, displayStat}:IIndicatorValue) => {
   const intl = useIntl();
 
   if (displayStat === null) return <React.Fragment></React.Fragment>;
 
-  const i18nOrdinalSuffix: string = intl.formatMessage(
-      {
-        id: 'explore.map.page.side.panel.indicator.percentile.value.ordinal.suffix',
-        // eslint-disable-next-line max-len
-        description: `Navigate to the explore the tool page. Click on the map. The side panel will show categories. Open a category. This will define the indicator value's ordinal suffix. For example the st in 91st, the rd in 23rd, and the th in 26th, etc.`,
-        defaultMessage: `
+  if (type === 'percent' || type === 'percentile') {
+    // In this case we will show no value and an icon only
+
+    if (type === 'percent') {
+      // If the type is percent, return the intl percent format
+      return (
+        <span>
+          {intl.formatNumber(
+              displayStat,
+              {
+                style: 'unit',
+                unit: 'percent',
+                unitDisplay: 'short',
+              },
+          )}
+        </span>
+      );
+    } else {
+    // If the type is percentile, create the intl ordinal and return it as a superscript
+      const i18nOrdinalSuffix: string = intl.formatMessage(
+          {
+            id: 'explore.map.page.side.panel.indicator.percentile.value.ordinal.suffix',
+            // eslint-disable-next-line max-len
+            description: `Navigate to the explore the tool page. Click on the map. The side panel will show categories. Open a category. This will define the indicator value's ordinal suffix. For example the st in 91st, the rd in 23rd, and the th in 26th, etc.`,
+            defaultMessage: `
         {indicatorValue, selectordinal, 
           one {#st} 
           two {#nd}
           =3 {#rd} 
           other {#th}
-      }
-      `,
-      },
-      {
-        indicatorValue: displayStat,
-      },
-  );
-
-  return isPercent ?
-    <span>
-      {intl.formatNumber(
-          displayStat,
+        }
+        `,
+          },
           {
-            style: 'unit',
-            unit: 'percent',
-            unitDisplay: 'short',
+            indicatorValue: displayStat,
           },
-      )}
-    </span> : superscriptOrdinal(i18nOrdinalSuffix);
+      );
+      return superscriptOrdinal(i18nOrdinalSuffix);
+    }
+  } else {
+    // when the type === boolean the display stat will be either 100 (true) or 0 (false)
+    return displayStat === 0 ?
+      EXPLORE_COPY.SIDE_PANEL_SPACERS.NO :
+      EXPLORE_COPY.SIDE_PANEL_SPACERS.YES;
+  }
 };
 
 /**
@@ -187,8 +211,14 @@ export const IndicatorValue = ({isPercent, displayStat}:IIndicatorValue) => {
  * @return {JSX.Element}
  */
 const Indicator = ({indicator}:IIndicator) => {
-  // Convert the decimal value to a stat to display
-  const displayStat = indicator.value !== null ? Math.floor(indicator.value * 100) : null;
+  /**
+   * The indicator value could be a number | boolean | null. In all cases we coerce to number
+   * before flooring.
+   *
+   * In the case where indicator.value is a boolean, the displayStat will be either 100 or 0, depending
+   * on if indicator.value is true or false respectively.
+   */
+  const displayStat = indicator.value !== null ? Math.floor(Number(indicator.value) * 100) : null;
 
   // If the threshold exists, set it, otherwise set it to the default value
   const threshold = indicator.threshold ? indicator.threshold : constants.DEFAULT_THRESHOLD_PERCENTILE;
@@ -196,7 +226,6 @@ const Indicator = ({indicator}:IIndicator) => {
   // A boolean to represent if the indicator is above or below the threshold
   const isAboveThresh = displayStat !== null && displayStat >= threshold ? true : false;
 
-
   return (
     <li
       className={indicator.isDisadvagtaged ? styles.disadvantagedIndicator : styles.indicatorBoxMain}
@@ -218,12 +247,16 @@ const Indicator = ({indicator}:IIndicator) => {
 
             {/* Indicator value */}
             <div className={styles.indicatorValue}>
-              <IndicatorValue isPercent={indicator.isPercent} displayStat={displayStat}/>
+              <IndicatorValue
+                type={indicator.type}
+                displayStat={displayStat}
+              />
             </div>
 
             {/* Indicator icon - up arrow, down arrow, or unavailable */}
             <div className={styles.indicatorArrow}>
               <IndicatorValueIcon
+                type={indicator.type}
                 value={displayStat}
                 isAboveThresh={isAboveThresh}
               />
@@ -236,9 +269,10 @@ const Indicator = ({indicator}:IIndicator) => {
               value={displayStat}
               isAboveThresh={isAboveThresh}
               threshold={threshold}
-              isPercent={indicator.isPercent}
+              type={indicator.type}
             />
           </div>
+
         </div>
       </div>
     </li>
diff --git a/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap b/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
index b1e1697a1..4e44d9f50 100644
--- a/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
+++ b/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
@@ -84,6 +84,270 @@ exports[`rendering of the Indicator checks if the flooring function works 1`] =
 </DocumentFragment>
 `;
 
+exports[`renders value correctly for Former defense sites checks if it renders nothin when FUDS_RAW = null: 1`] = `
+<DocumentFragment>
+  <li
+    data-cy="indicatorBox"
+    data-testid="indicator-box"
+  >
+    <div>
+      <div>
+        some label
+        <div>
+          some description
+        </div>
+      </div>
+      <div>
+        <div>
+          <div />
+          <div>
+            <img
+              alt="an icon to represent data is unavailable"
+              src="test-file-stub"
+            />
+          </div>
+        </div>
+        <div>
+          <div>
+            missing data
+          </div>
+        </div>
+      </div>
+    </div>
+  </li>
+</DocumentFragment>
+`;
+
+exports[`renders value correctly for Former defense sites checks if it renders when FUDS_RAW = false: 1`] = `
+<DocumentFragment>
+  <li
+    data-cy="indicatorBox"
+    data-testid="indicator-box"
+  >
+    <div>
+      <div>
+        some label
+        <div>
+          some description
+        </div>
+      </div>
+      <div>
+        <div>
+          <div>
+            No
+          </div>
+          <div />
+        </div>
+        <div />
+      </div>
+    </div>
+  </li>
+</DocumentFragment>
+`;
+
+exports[`renders value correctly for Former defense sites checks if it renders when FUDS_RAW = true 1`] = `
+<DocumentFragment>
+  <li
+    data-cy="indicatorBox"
+    data-testid="indicator-box"
+  >
+    <div>
+      <div>
+        some label
+        <div>
+          some description
+        </div>
+      </div>
+      <div>
+        <div>
+          <div>
+            Yes
+          </div>
+          <div />
+        </div>
+        <div />
+      </div>
+    </div>
+  </li>
+</DocumentFragment>
+`;
+
+exports[`renders value correctly for abandoned land mines checks if it renders nothin when AML_RAW = null: 1`] = `
+<DocumentFragment>
+  <li
+    data-cy="indicatorBox"
+    data-testid="indicator-box"
+  >
+    <div>
+      <div>
+        some label
+        <div>
+          some description
+        </div>
+      </div>
+      <div>
+        <div>
+          <div />
+          <div>
+            <img
+              alt="an icon to represent data is unavailable"
+              src="test-file-stub"
+            />
+          </div>
+        </div>
+        <div>
+          <div>
+            missing data
+          </div>
+        </div>
+      </div>
+    </div>
+  </li>
+</DocumentFragment>
+`;
+
+exports[`renders value correctly for abandoned land mines checks if it renders when AML_RAW = false: 1`] = `
+<DocumentFragment>
+  <li
+    data-cy="indicatorBox"
+    data-testid="indicator-box"
+  >
+    <div>
+      <div>
+        some label
+        <div>
+          some description
+        </div>
+      </div>
+      <div>
+        <div>
+          <div>
+            No
+          </div>
+          <div />
+        </div>
+        <div />
+      </div>
+    </div>
+  </li>
+</DocumentFragment>
+`;
+
+exports[`renders value correctly for abandoned land mines checks if it renders when AML_RAW = true 1`] = `
+<DocumentFragment>
+  <li
+    data-cy="indicatorBox"
+    data-testid="indicator-box"
+  >
+    <div>
+      <div>
+        some label
+        <div>
+          some description
+        </div>
+      </div>
+      <div>
+        <div>
+          <div>
+            Yes
+          </div>
+          <div />
+        </div>
+        <div />
+      </div>
+    </div>
+  </li>
+</DocumentFragment>
+`;
+
+exports[`renders value correctly for historic underinvest. checks if it renders nothin when HRS_ET = null: 1`] = `
+<DocumentFragment>
+  <li
+    data-cy="indicatorBox"
+    data-testid="indicator-box"
+  >
+    <div>
+      <div>
+        some label
+        <div>
+          some description
+        </div>
+      </div>
+      <div>
+        <div>
+          <div />
+          <div>
+            <img
+              alt="an icon to represent data is unavailable"
+              src="test-file-stub"
+            />
+          </div>
+        </div>
+        <div>
+          <div>
+            missing data
+          </div>
+        </div>
+      </div>
+    </div>
+  </li>
+</DocumentFragment>
+`;
+
+exports[`renders value correctly for historic underinvest. checks if it renders when HRS_ET = false: 1`] = `
+<DocumentFragment>
+  <li
+    data-cy="indicatorBox"
+    data-testid="indicator-box"
+  >
+    <div>
+      <div>
+        some label
+        <div>
+          some description
+        </div>
+      </div>
+      <div>
+        <div>
+          <div>
+            No
+          </div>
+          <div />
+        </div>
+        <div />
+      </div>
+    </div>
+  </li>
+</DocumentFragment>
+`;
+
+exports[`renders value correctly for historic underinvest. checks if it renders when HRS_ET = true 1`] = `
+<DocumentFragment>
+  <li
+    data-cy="indicatorBox"
+    data-testid="indicator-box"
+  >
+    <div>
+      <div>
+        some label
+        <div>
+          some description
+        </div>
+      </div>
+      <div>
+        <div>
+          <div>
+            Yes
+          </div>
+          <div />
+        </div>
+        <div />
+      </div>
+    </div>
+  </li>
+</DocumentFragment>
+`;
+
 exports[`test rendering of Indicator value icons renders the down arrow when the value is above the threshold 1`] = `
 <DocumentFragment>
   <img
@@ -102,7 +366,16 @@ exports[`test rendering of Indicator value icons renders the down arrow when the
 </DocumentFragment>
 `;
 
-exports[`test rendering of Indicator value icons renders the unavailable icon when the value is null 1`] = `
+exports[`test rendering of Indicator value icons renders the unavailable icon when the value is a boolean null 1`] = `
+<DocumentFragment>
+  <img
+    alt="an icon to represent data is unavailable"
+    src="test-file-stub"
+  />
+</DocumentFragment>
+`;
+
+exports[`test rendering of Indicator value icons renders the unavailable icon when the value is a percentile null 1`] = `
 <DocumentFragment>
   <img
     alt="an icon to represent data is unavailable"
@@ -120,6 +393,14 @@ exports[`test rendering of Indicator value icons renders the up arrow when value
 </DocumentFragment>
 `;
 
+exports[`test rendering of Indicator value sub-text renders missing data  1`] = `
+<DocumentFragment>
+  <div>
+    missing data
+  </div>
+</DocumentFragment>
+`;
+
 exports[`test rendering of Indicator value sub-text renders the "above 90 percentile" 1`] = `
 <DocumentFragment>
   <div>
@@ -148,14 +429,6 @@ exports[`test rendering of Indicator value sub-text renders the "below 90 percen
 </DocumentFragment>
 `;
 
-exports[`test rendering of Indicator value sub-text renders the "data is not available" 1`] = `
-<DocumentFragment>
-  <div>
-    data is not available
-  </div>
-</DocumentFragment>
-`;
-
 exports[`test that the unit suffix renders correctly renders correctly when the value is a null 1`] = `<DocumentFragment />`;
 
 exports[`test that the unit suffix renders correctly renders correctly when the value is a percent 1`] = `
diff --git a/client/src/components/TractDemographics/TractDemographics.test.tsx b/client/src/components/TractDemographics/TractDemographics.test.tsx
index 60cd1c9a1..c7d667408 100644
--- a/client/src/components/TractDemographics/TractDemographics.test.tsx
+++ b/client/src/components/TractDemographics/TractDemographics.test.tsx
@@ -3,13 +3,395 @@ import {render} from '@testing-library/react';
 import {LocalizedComponent} from '../../test/testHelpers';
 import TractDemographics from './TractDemographics';
 
-describe('rendering of TractDemographics Component', () => {
-  const {asFragment} = render(
-      <LocalizedComponent>
-        <TractDemographics />
-      </LocalizedComponent>,
-  );
-  it('checks if component renders', () => {
+const propertiesAS = {
+  'GEOID10': '60010950300',
+  'SF': 'American Samoa',
+  'M_WTR': false,
+  'M_WKFC': true,
+  'M_CLT': false,
+  'M_ENY': false,
+  'M_TRN': false,
+  'M_HSG': false,
+  'M_PLN': false,
+  'M_HLTH': false,
+  'SM_C': true,
+  'SM_DON': false,
+  'SM_NO_DON': true,
+  'EPLRLI': false,
+  'EALRLI': false,
+  'EBLRLI': false,
+  'PM25LI': false,
+  'EBLI': false,
+  'DPMLI': false,
+  'TPLI': false,
+  'LPMHVLI': false,
+  'HBLI': false,
+  'RMPLI': false,
+  'SFLI': false,
+  'HWLI': false,
+  'WDLI': false,
+  'USTLI': false,
+  'DLI': false,
+  'ALI': false,
+  'HDLI': false,
+  'LLELI': false,
+  'LILHSE': false,
+  'PLHSE': false,
+  'LMILHSE': false,
+  'ULHSE': false,
+  'EPL_ET': false,
+  'EAL_ET': false,
+  'EBL_ET': false,
+  'EB_ET': false,
+  'PM25_ET': false,
+  'DS_ET': false,
+  'TP_ET': false,
+  'LPP_ET': false,
+  'KP_ET': false,
+  'HB_ET': false,
+  'RMP_ET': false,
+  'NPL_ET': false,
+  'TSDF_ET': false,
+  'WD_ET': false,
+  'UST_ET': false,
+  'DB_ET': false,
+  'A_ET': false,
+  'HD_ET': false,
+  'LLE_ET': false,
+  'UN_ET': false,
+  'LISO_ET': false,
+  'POV_ET': false,
+  'LMI_ET': false,
+  'IA_LMI_ET': false,
+  'IA_UN_ET': false,
+  'IA_POV_ET': true,
+  'TC': 1,
+  'CC': 1,
+  'IAULHSE': false,
+  'IAPLHSE': true,
+  'IALMILHSE': false,
+  'IALMILHSE_PFS': 0.27,
+  'IAPLHSE_PFS': 0.98,
+  'IAULHSE_PFS': 0.75,
+  'LHE': false,
+  'IALHE': true,
+  'IAHSEF': 0.52,
+  'CA_LT20': false,
+  'M_CLT_EOMI': false,
+  'M_ENY_EOMI': false,
+  'M_TRN_EOMI': false,
+  'M_HSG_EOMI': false,
+  'M_PLN_EOMI': false,
+  'M_WTR_EOMI': false,
+  'M_HLTH_EOMI': false,
+  'M_WKFC_EOMI': true,
+  'FPL200S': false,
+  'M_WKFC_EBSI': true,
+  'TD_ET': false,
+  'FLD_ET': false,
+  'WFR_ET': false,
+  'ADJ_ET': true,
+  'ADJ_PFS': 1,
+  'IS_ET': false,
+  'FUDS_ET': '0',
+  'UI_EXP': 'Island Areas',
+  'THRHLD': 3,
+};
+
+const propertiesNYC = {
+  'GEOID10': '36081020800',
+  'SF': 'New York',
+  'CF': 'Queens County',
+  'DF_PFS': 0.69,
+  'AF_PFS': 0.46,
+  'HDF_PFS': 0.29,
+  'DSF_PFS': 0.96,
+  'EBF_PFS': 0.75,
+  'EBLR_PFS': 0.11,
+  'EPLR_PFS': 0.19,
+  'HBF_PFS': 0.75,
+  'LLEF_PFS': 0.2,
+  'LIF_PFS': 0.9,
+  'LMI_PFS': 0.35,
+  'MHVF_PFS': 0.93,
+  'PM25F_PFS': 0.44,
+  'HSEF': 0.2830459770114942,
+  'P100_PFS': 0.43,
+  'P200_PFS': 0.41,
+  'P200_I_PFS': 0.37,
+  'LPF_PFS': 0.93,
+  'KP_PFS': 0.2159833426939357,
+  'NPL_PFS': 0.73,
+  'RMP_PFS': 0.42,
+  'TSDF_PFS': 0.87,
+  'TPF': 3136,
+  'TF_PFS': 0.92,
+  'UF_PFS': 0.86,
+  'UST_PFS': 0.9877704355346548,
+  'M_WTR': false,
+  'M_WKFC': true,
+  'M_CLT': false,
+  'M_ENY': false,
+  'M_TRN': false,
+  'M_HSG': false,
+  'M_PLN': false,
+  'M_HLTH': false,
+  'SM_C': true,
+  'SM_DON': false,
+  'SM_NO_DON': true,
+  'EPLRLI': false,
+  'EALRLI': false,
+  'EBLRLI': false,
+  'PM25LI': false,
+  'EBLI': false,
+  'DPMLI': false,
+  'TPLI': false,
+  'LPMHVLI': false,
+  'HBLI': false,
+  'RMPLI': false,
+  'SFLI': false,
+  'HWLI': false,
+  'WDLI': false,
+  'USTLI': false,
+  'DLI': false,
+  'ALI': false,
+  'HDLI': false,
+  'LLELI': false,
+  'LILHSE': true,
+  'PLHSE': false,
+  'LMILHSE': false,
+  'ULHSE': false,
+  'EPL_ET': false,
+  'EAL_ET': false,
+  'EBL_ET': false,
+  'EB_ET': false,
+  'PM25_ET': false,
+  'DS_ET': true,
+  'TP_ET': true,
+  'LPP_ET': false,
+  'HRS_ET': '1',
+  'KP_ET': false,
+  'HB_ET': false,
+  'RMP_ET': false,
+  'NPL_ET': false,
+  'TSDF_ET': false,
+  'WD_ET': false,
+  'UST_ET': true,
+  'DB_ET': false,
+  'A_ET': false,
+  'HD_ET': false,
+  'LLE_ET': false,
+  'UN_ET': false,
+  'LISO_ET': true,
+  'POV_ET': false,
+  'LMI_ET': false,
+  'IA_LMI_ET': false,
+  'IA_UN_ET': false,
+  'IA_POV_ET': false,
+  'TC': 1,
+  'CC': 1,
+  'IAULHSE': false,
+  'IAPLHSE': false,
+  'IALMILHSE': false,
+  'LHE': true,
+  'IALHE': false,
+  'CA': 0.1,
+  'NCA': 0.89,
+  'CA_LT20': true,
+  'M_CLT_EOMI': false,
+  'M_ENY_EOMI': false,
+  'M_TRN_EOMI': true,
+  'M_HSG_EOMI': false,
+  'M_PLN_EOMI': false,
+  'M_WTR_EOMI': false,
+  'M_HLTH_EOMI': false,
+  'M_WKFC_EOMI': true,
+  'FPL200S': false,
+  'M_WKFC_EBSI': true,
+  'TD_ET': false,
+  'TD_PFS': 0.61,
+  'FLD_PFS': 0.52,
+  'WFR_PFS': 0.33,
+  'FLD_ET': false,
+  'WFR_ET': false,
+  'ADJ_ET': true,
+  'ADJ_PFS': 1,
+  'IS_PFS': 0.99,
+  'IS_ET': false,
+  'IMP_FLG': '0',
+  'DM_B': 0.22,
+  'DM_AI': 0.03,
+  'DM_A': 0.09,
+  'DM_HI': 0,
+  'DM_T': 0.1,
+  'DM_W': 0.11,
+  'DM_H': 0.33,
+  'DM_O': 0.36,
+  'AGE_10': 0.13,
+  'AGE_MIDDLE': 0.8,
+  'AGE_OLD': 0.06,
+  'UI_EXP': 'Nation',
+  'THRHLD': 21,
+};
+
+const propertiesAK = {
+  'GEOID10': '02290000300',
+  'SF': 'Alaska',
+  'CF': 'Yukon-Koyukuk Census Area',
+  'DF_PFS': 0.87,
+  'AF_PFS': 0.93,
+  'HDF_PFS': 0.92,
+  'DSF_PFS': 0,
+  'EBF_PFS': 0.97,
+  'EBLR_PFS': 0.76,
+  'EPLR_PFS': 0.71,
+  'HBF_PFS': 0.22,
+  'LLEF_PFS': 0.79,
+  'LIF_PFS': 0.5,
+  'LMI_PFS': 0.89,
+  'MHVF_PFS': 0.07,
+  'HSEF': 0.128,
+  'P100_PFS': 0.84,
+  'P200_PFS': 0.79,
+  'P200_I_PFS': 0.81,
+  'LPF_PFS': 0.11,
+  'KP_PFS': 0.9996164436103616,
+  'NPL_PFS': 0,
+  'RMP_PFS': 0,
+  'TSDF_PFS': 0,
+  'TPF': 1821,
+  'UF_PFS': 0.97,
+  'UST_PFS': 0.0563641031877947,
+  'M_WTR': false,
+  'M_WKFC': true,
+  'M_CLT': false,
+  'M_ENY': true,
+  'M_TRN': false,
+  'M_HSG': false,
+  'M_PLN': false,
+  'M_HLTH': true,
+  'SM_C': true,
+  'SM_DON': false,
+  'SM_NO_DON': true,
+  'EPLRLI': false,
+  'EALRLI': false,
+  'EBLRLI': false,
+  'PM25LI': false,
+  'EBLI': true,
+  'DPMLI': false,
+  'TPLI': false,
+  'LPMHVLI': false,
+  'HBLI': false,
+  'RMPLI': false,
+  'SFLI': false,
+  'HWLI': false,
+  'WDLI': false,
+  'USTLI': false,
+  'DLI': false,
+  'ALI': true,
+  'HDLI': true,
+  'LLELI': false,
+  'LILHSE': false,
+  'PLHSE': false,
+  'LMILHSE': false,
+  'ULHSE': true,
+  'EPL_ET': false,
+  'EAL_ET': false,
+  'EBL_ET': false,
+  'EB_ET': true,
+  'PM25_ET': false,
+  'DS_ET': false,
+  'TP_ET': false,
+  'LPP_ET': false,
+  'KP_ET': true,
+  'HB_ET': false,
+  'RMP_ET': false,
+  'NPL_ET': false,
+  'TSDF_ET': false,
+  'WD_ET': false,
+  'UST_ET': false,
+  'DB_ET': false,
+  'A_ET': true,
+  'HD_ET': true,
+  'LLE_ET': false,
+  'UN_ET': true,
+  'LISO_ET': false,
+  'POV_ET': false,
+  'LMI_ET': false,
+  'IA_LMI_ET': false,
+  'IA_UN_ET': false,
+  'IA_POV_ET': false,
+  'TC': 6,
+  'CC': 5,
+  'IAULHSE': false,
+  'IAPLHSE': false,
+  'IALMILHSE': false,
+  'LHE': true,
+  'IALHE': false,
+  'CA': 0.05,
+  'NCA': 0.94,
+  'CA_LT20': true,
+  'M_CLT_EOMI': false,
+  'M_ENY_EOMI': true,
+  'M_TRN_EOMI': false,
+  'M_HSG_EOMI': true,
+  'M_PLN_EOMI': true,
+  'M_WTR_EOMI': false,
+  'M_HLTH_EOMI': true,
+  'M_WKFC_EOMI': true,
+  'FPL200S': true,
+  'M_WKFC_EBSI': true,
+  'TD_ET': false,
+  'TD_PFS': 0.43,
+  'FLD_PFS': 0.05,
+  'FLD_ET': false,
+  'WFR_ET': false,
+  'ADJ_ET': false,
+  'ADJ_PFS': 0.75,
+  'IS_ET': false,
+  'FUDS_ET': '1',
+  'IMP_FLG': '0',
+  'DM_B': 0,
+  'DM_AI': 0.78,
+  'DM_A': 0,
+  'DM_HI': 0,
+  'DM_T': 0.03,
+  'DM_W': 0.15,
+  'DM_H': 0.02,
+  'DM_O': 0,
+  'AGE_10': 0.17,
+  'AGE_MIDDLE': 0.69,
+  'AGE_OLD': 0.12,
+  'UI_EXP': 'Nation',
+  'THRHLD': 21,
+};
+
+
+describe('rendering of TractDemographics component', () => {
+  it('does it render a tract in American Samoa correctly? ', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <TractDemographics properties={propertiesAS}/>
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
+
+  it('does it render a tract in NYC correctly? ', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <TractDemographics properties={propertiesNYC}/>
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
+
+  it('does it render a tract in Alaska correctly? ', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <TractDemographics properties={propertiesAK}/>
+        </LocalizedComponent>,
+    );
     expect(asFragment()).toMatchSnapshot();
   });
 });
diff --git a/client/src/components/TractDemographics/TractDemographics.tsx b/client/src/components/TractDemographics/TractDemographics.tsx
index 0607dd180..9cb56278f 100644
--- a/client/src/components/TractDemographics/TractDemographics.tsx
+++ b/client/src/components/TractDemographics/TractDemographics.tsx
@@ -6,54 +6,32 @@ import expandIcon from '/node_modules/uswds/dist/img/usa-icons/expand_more.svg';
 import collapseIcon from '/node_modules/uswds/dist/img/usa-icons/expand_less.svg';
 
 import * as styles from './TractDemographics.module.scss';
+import * as constants from '../../data/constants';
+import * as EXPLORE_COPY from '../../data/copy/explore';
 
-// Mock interface
 export interface ITractDemographicsProps {
-  racial: [string, number][],
-  age: [string, number][]
+  properties: constants.J40Properties
 }
 
-// Mock backend data
-const demographicsData:ITractDemographicsProps = {
-  racial: [
-    ['White', 61.4],
-    ['Black or African Americon', 10.3],
-    ['American Indian and Alaska Native', 10.3],
-    ['Asian', 7.2],
-    ['Native Hawiian or Pacific Islander', 4.2],
-    ['Other', 2.5],
-    ['Two or more races', 6.7],
-    ['Hispanic or Latino', 10.4],
-  ],
-  age: [
-    ['Children under 10', 1.4],
-    ['Ages 10 - 64', 80.3],
-    ['Elderly over 65', 7.2],
-  ],
-};
-
-/*
- * Generate the demographic item based the input
- * // TODO: Update after actual data is created
- *
- */
-const demographicItemGen = (demographicData: any[]) => {
-  return demographicData.map((el, index) => {
-    return (
-      <div key={index} className={styles.demographicItem}>
-        <span>{ el[0] }</span>
-        <span>{`${el[1]}%`}</span>
-      </div>
-    );
-  });
-};
+interface IDemographicsData {
+  race: [React.ReactElement, number][],
+  age: [React.ReactElement, number][],
+}
 
 interface IJ40AccordionItem {
   id: string,
-  title: string,
-  children: React.ElementType
+  title: React.ReactElement,
+  children: React.ReactElement
 }
 
+
+/**
+ * This function will create the custom Accordion item. This will be used
+ * for the race and age demographic UI elements
+ *
+ * @param {IJ40AccordionItem} props
+ * @return {JSX.Element}
+ */
 const J40AccordionItem = ({id, title, children}:IJ40AccordionItem) => {
   const [isExpanded, setIsExpanded] = useState(false);
   return (
@@ -100,18 +78,125 @@ const J40AccordionItem = ({id, title, children}:IJ40AccordionItem) => {
   );
 };
 
-const TractDemographics = () => {
+
+/**
+ * This function will create each line item on the list of demographics
+ *
+ * @param {[]} demographicData
+ * @return {JSX.Element}
+ */
+const demographicItemGen = (demographicData: []) => {
+  return demographicData.map((el, index) => {
+    return (
+      <div key={index} className={styles.demographicItem}>
+        <span>{ el[0] }</span>
+        {typeof el[1] === 'number' ?
+        <span>{`${el[1]}%`}</span> :
+        <span>{`${el[1]}`}</span> }
+      </div>
+    );
+  });
+};
+
+
+/**
+ * This function will return the numeric value of each demographic. Taking into
+ * account cases when the data is undefined or is null
+ *
+ * @param {number} stat
+ * @return {number}
+ */
+const displayStat = (stat: number) => {
+  if (stat === undefined || stat === null) {
+    return '--';
+  } else if (stat === 0) {
+    return 0;
+  }
+
+  return Number(Math.floor(stat * 100));
+};
+
+
+/**
+ * This function will create the data structure for the demographics data
+ *
+ * @param {constants.J40Properties} properties
+ * @return {IDemographicsData}
+ */
+const getDemographicsData = (properties:constants.J40Properties):IDemographicsData => (
+  {
+    race: [
+      [
+        EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.DEMO_NON_HISPANIC_WHITE,
+        displayStat(properties[constants.DEMO_NON_HISPANIC_WHITE]),
+      ],
+      [
+        EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.DEMO_BLACK,
+        displayStat(properties[constants.DEMO_BLACK]),
+      ],
+      [
+        EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.DEMO_AMERICAN_INDIAN,
+        displayStat(properties[constants.DEMO_AMERICAN_INDIAN]),
+      ],
+      [
+        EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.DEMO_ASIAN,
+        displayStat(properties[constants.DEMO_ASIAN]),
+      ],
+      [
+        EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.DEMO_HAWAIIAN,
+        displayStat(properties[constants.DEMO_HAWAIIAN]),
+      ],
+      [
+        EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.DEMO_OTHER_RACE,
+        displayStat(properties[constants.DEMO_OTHER_RACE]),
+      ],
+      [
+        EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.DEMO_TWO_OR_MORE_RACES,
+        displayStat(properties[constants.DEMO_TWO_OR_MORE_RACES]),
+      ],
+      [
+        EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.DEMO_HISPANIC,
+        displayStat(properties[constants.DEMO_HISPANIC]),
+      ],
+    ],
+    age: [
+      [
+        EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.DEMO_AGE_UNDER_10,
+        displayStat(properties[constants.DEMO_AGE_UNDER_10]),
+      ],
+      [
+        EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.DEMO_AGE_MID,
+        displayStat(properties[constants.DEMO_AGE_MID]),
+      ],
+      [
+        EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.DEMO_AGE_OVER_64,
+        displayStat(properties[constants.DEMO_AGE_OVER_64]),
+      ],
+    ],
+  });
+
+
+/**
+ * This is the main component for this file. It accepts the selected feature
+ * as a prop and return the demographics component.
+ *
+ * @param {ITractDemographicsProps} props
+ * @return {JSX.Element}
+ */
+const TractDemographics = ({properties}: ITractDemographicsProps) => {
+  const {race, age} = getDemographicsData(properties);
+
   return (
     <div className={styles.demographicsContainer}>
       <div className={styles.demographicsTitle}>
-        Tract demographics
+        {EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.TITLE}
       </div>
       <>
-        <J40AccordionItem id={'race'} title={`Race / Ethnicity`}>
-          {demographicItemGen(demographicsData.racial)}
+        <J40AccordionItem id={'race'} title={EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.RACE_TITLE}>
+          {demographicItemGen(race)}
         </J40AccordionItem>
-        <J40AccordionItem id={'age'} title={`Age`}>
-          {demographicItemGen(demographicsData.age)}
+        <J40AccordionItem id={'age'} title={EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.AGE_TITLE}>
+          {demographicItemGen(age)}
         </J40AccordionItem>
       </>
     </div>
diff --git a/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
index bb7b765ce..9e3b5d498 100644
--- a/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
+++ b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`rendering of TractDemographics Component checks if component renders 1`] = `
+exports[`rendering of TractDemographics component does it render a tract in Alaska correctly?  1`] = `
 <DocumentFragment>
   <div>
     <div>
@@ -35,15 +35,15 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
           White
         </span>
         <span>
-          61.4%
+          15%
         </span>
       </div>
       <div>
         <span>
-          Black or African Americon
+          Black or African American
         </span>
         <span>
-          10.3%
+          0%
         </span>
       </div>
       <div>
@@ -51,7 +51,7 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
           American Indian and Alaska Native
         </span>
         <span>
-          10.3%
+          78%
         </span>
       </div>
       <div>
@@ -59,7 +59,7 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
           Asian
         </span>
         <span>
-          7.2%
+          0%
         </span>
       </div>
       <div>
@@ -67,7 +67,7 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
           Native Hawiian or Pacific Islander
         </span>
         <span>
-          4.2%
+          0%
         </span>
       </div>
       <div>
@@ -75,7 +75,7 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
           Other
         </span>
         <span>
-          2.5%
+          0%
         </span>
       </div>
       <div>
@@ -83,7 +83,7 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
           Two or more races
         </span>
         <span>
-          6.7%
+          3%
         </span>
       </div>
       <div>
@@ -91,7 +91,7 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
           Hispanic or Latino
         </span>
         <span>
-          10.4%
+          2%
         </span>
       </div>
     </section>
@@ -124,7 +124,7 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
           Children under 10
         </span>
         <span>
-          1.4%
+          17%
         </span>
       </div>
       <div>
@@ -132,15 +132,311 @@ exports[`rendering of TractDemographics Component checks if component renders 1`
           Ages 10 - 64
         </span>
         <span>
-          80.3%
+          69%
         </span>
       </div>
       <div>
         <span>
-          Elderly over 65
+          Elderly over 64
         </span>
         <span>
-          7.2%
+          12%
+        </span>
+      </div>
+    </section>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractDemographics component does it render a tract in American Samoa correctly?  1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      Tract demographics
+    </div>
+    <h6>
+      Race / Ethnicity
+      <span>
+        (
+        <button
+          aria-controls="race-panel"
+          aria-expanded="false"
+          id="race-header"
+          tabindex="0"
+        >
+          show
+        </button>
+        <img
+          alt="expand icon"
+          src="test-file-stub"
+        />
+        )
+      </span>
+    </h6>
+    <section
+      aria-labelledby="race-header"
+      hidden=""
+      id="race-panel"
+    >
+      <div>
+        <span>
+          White
+        </span>
+        <span>
+          --
+        </span>
+      </div>
+      <div>
+        <span>
+          Black or African American
+        </span>
+        <span>
+          --
+        </span>
+      </div>
+      <div>
+        <span>
+          American Indian and Alaska Native
+        </span>
+        <span>
+          --
+        </span>
+      </div>
+      <div>
+        <span>
+          Asian
+        </span>
+        <span>
+          --
+        </span>
+      </div>
+      <div>
+        <span>
+          Native Hawiian or Pacific Islander
+        </span>
+        <span>
+          --
+        </span>
+      </div>
+      <div>
+        <span>
+          Other
+        </span>
+        <span>
+          --
+        </span>
+      </div>
+      <div>
+        <span>
+          Two or more races
+        </span>
+        <span>
+          --
+        </span>
+      </div>
+      <div>
+        <span>
+          Hispanic or Latino
+        </span>
+        <span>
+          --
+        </span>
+      </div>
+    </section>
+    <h6>
+      Age
+      <span>
+        (
+        <button
+          aria-controls="age-panel"
+          aria-expanded="false"
+          id="age-header"
+          tabindex="0"
+        >
+          show
+        </button>
+        <img
+          alt="expand icon"
+          src="test-file-stub"
+        />
+        )
+      </span>
+    </h6>
+    <section
+      aria-labelledby="age-header"
+      hidden=""
+      id="age-panel"
+    >
+      <div>
+        <span>
+          Children under 10
+        </span>
+        <span>
+          --
+        </span>
+      </div>
+      <div>
+        <span>
+          Ages 10 - 64
+        </span>
+        <span>
+          --
+        </span>
+      </div>
+      <div>
+        <span>
+          Elderly over 64
+        </span>
+        <span>
+          --
+        </span>
+      </div>
+    </section>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractDemographics component does it render a tract in NYC correctly?  1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      Tract demographics
+    </div>
+    <h6>
+      Race / Ethnicity
+      <span>
+        (
+        <button
+          aria-controls="race-panel"
+          aria-expanded="false"
+          id="race-header"
+          tabindex="0"
+        >
+          show
+        </button>
+        <img
+          alt="expand icon"
+          src="test-file-stub"
+        />
+        )
+      </span>
+    </h6>
+    <section
+      aria-labelledby="race-header"
+      hidden=""
+      id="race-panel"
+    >
+      <div>
+        <span>
+          White
+        </span>
+        <span>
+          11%
+        </span>
+      </div>
+      <div>
+        <span>
+          Black or African American
+        </span>
+        <span>
+          22%
+        </span>
+      </div>
+      <div>
+        <span>
+          American Indian and Alaska Native
+        </span>
+        <span>
+          3%
+        </span>
+      </div>
+      <div>
+        <span>
+          Asian
+        </span>
+        <span>
+          9%
+        </span>
+      </div>
+      <div>
+        <span>
+          Native Hawiian or Pacific Islander
+        </span>
+        <span>
+          0%
+        </span>
+      </div>
+      <div>
+        <span>
+          Other
+        </span>
+        <span>
+          36%
+        </span>
+      </div>
+      <div>
+        <span>
+          Two or more races
+        </span>
+        <span>
+          10%
+        </span>
+      </div>
+      <div>
+        <span>
+          Hispanic or Latino
+        </span>
+        <span>
+          33%
+        </span>
+      </div>
+    </section>
+    <h6>
+      Age
+      <span>
+        (
+        <button
+          aria-controls="age-panel"
+          aria-expanded="false"
+          id="age-header"
+          tabindex="0"
+        >
+          show
+        </button>
+        <img
+          alt="expand icon"
+          src="test-file-stub"
+        />
+        )
+      </span>
+    </h6>
+    <section
+      aria-labelledby="age-header"
+      hidden=""
+      id="age-panel"
+    >
+      <div>
+        <span>
+          Children under 10
+        </span>
+        <span>
+          13%
+        </span>
+      </div>
+      <div>
+        <span>
+          Ages 10 - 64
+        </span>
+        <span>
+          80%
+        </span>
+      </div>
+      <div>
+        <span>
+          Elderly over 64
+        </span>
+        <span>
+          6%
         </span>
       </div>
     </section>
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index cec77dc8d..cc3e1846e 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -38,6 +38,20 @@ export const COUNTY_NAME = 'CF';
 export const STATE_NAME = 'SF';
 export const TOTAL_POPULATION = 'TPF';
 
+
+// Demographics
+export const DEMO_NON_HISPANIC_WHITE = 'DM_W';
+export const DEMO_BLACK = 'DM_B';
+export const DEMO_AMERICAN_INDIAN = 'DM_AI';
+export const DEMO_ASIAN = 'DM_A';
+export const DEMO_HAWAIIAN = 'DM_HI';
+export const DEMO_OTHER_RACE = 'DM_O';
+export const DEMO_TWO_OR_MORE_RACES = 'DM_T';
+export const DEMO_HISPANIC = 'DM_H';
+export const DEMO_AGE_UNDER_10 = 'AGE_10';
+export const DEMO_AGE_MID = 'AGE_MIDDLE';
+export const DEMO_AGE_OVER_64 = 'AGE_OLD';
+
 /**
  * The SCORE_BOUNDAY_THRESHOLD will determine if the tract is disadvantaged
  * or not. Currently all values are railed to 0 or 1. If the
@@ -59,8 +73,8 @@ export const SIDE_PANEL_STATE_VALUES = {
 };
 
 // Climate category
-export const IS_CLIMATE_FACTOR_DISADVANTAGED_M = 'M_CLT';
-export const IS_CLIMATE_EXCEED_ONE_OR_MORE_INDICATORS_M = 'M_CLT_EOMI';
+export const IS_CLIMATE_FACTOR_DISADVANTAGED_M = 'N_CLT';
+export const IS_CLIMATE_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_CLT_EOMI';
 
 export const EXP_AGRICULTURE_LOSS_PERCENTILE = 'EALR_PFS';
 export const IS_EXCEEDS_THRESH_FOR_EXP_AGR_LOSS = 'EAL_ET';
@@ -77,7 +91,7 @@ export const IS_EXCEEDS_THRESH_FLOODING = 'FLD_ET';
 export const WILDFIRE_PERCENTILE = 'WF_PFS';
 export const IS_EXCEEDS_THRESH_WILDFIRE = 'WF_ET';
 
-export const IS_EXCEED_BOTH_SOCIO_INDICATORS_M = 'M_EBSI';
+export const IS_EXCEED_BOTH_SOCIO_INDICATORS_M = 'N_EBSI';
 
 export const POVERTY_BELOW_200_PERCENTILE = 'P200_PFS';
 export const IS_FEDERAL_POVERTY_LEVEL_200 = 'FPL200S';
@@ -89,8 +103,8 @@ export const NON_HIGHER_ED_PERCENTILE = 'NCA';
 
 
 // Energy category
-export const IS_ENERGY_FACTOR_DISADVANTAGED_M = 'M_ENY';
-export const IS_ENERGY_EXCEED_ONE_OR_MORE_INDICATORS_M = 'M_ENY_EOMI';
+export const IS_ENERGY_FACTOR_DISADVANTAGED_M = 'N_ENY';
+export const IS_ENERGY_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_ENY_EOMI';
 
 export const ENERGY_PERCENTILE = 'EBF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_ENERGY_BURDEN = 'EB_ET';
@@ -100,8 +114,8 @@ export const IS_EXCEEDS_THRESH_FOR_PM25 = 'PM25_ET';
 
 
 // Transport category
-export const IS_TRANSPORT_FACTOR_DISADVANTAGED_M = 'M_TRN';
-export const IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS_M = 'M_TRN_EOMI';
+export const IS_TRANSPORT_FACTOR_DISADVANTAGED_M = 'N_TRN';
+export const IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_TRN_EOMI';
 
 export const DIESEL_MATTER_PERCENTILE = 'DSF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_DIESEL_PM = 'DS_ET';
@@ -114,8 +128,11 @@ export const IS_EXCEEDS_THRESH_FOR_TRAFFIC_PROX = 'TP_ET';
 
 
 // Housing category
-export const IS_HOUSING_FACTOR_DISADVANTAGED_M = 'M_HSG';
-export const IS_HOUSING_EXCEED_ONE_OR_MORE_INDICATORS_M = 'M_HSG_EOMI';
+export const IS_HOUSING_FACTOR_DISADVANTAGED_M = 'N_HSG';
+export const IS_HOUSING_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_HSG_EOMI';
+
+export const HISTORIC_UNDERINVESTMENT_EXCEED_THRESH = 'HRS_ET';
+export const HISTORIC_UNDERINVESTMENT_RAW_YES = 1;
 
 export const HOUSING_BURDEN_PROPERTY_PERCENTILE = 'HBF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_HOUSE_BURDEN = 'HB_ET';
@@ -133,8 +150,17 @@ export const IS_EXCEEDS_THRESH_FOR_LEAD_PAINT_AND_MEDIAN_HOME_VAL = 'LPP_ET';
 
 
 // Pollution category
-export const IS_POLLUTION_FACTOR_DISADVANTAGED_M = 'M_PLN';
-export const IS_POLLUTION_EXCEED_ONE_OR_MORE_INDICATORS_M = 'M_PLN_EOMI';
+export const IS_POLLUTION_FACTOR_DISADVANTAGED_M = 'N_PLN';
+export const IS_POLLUTION_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_PLN_EOMI';
+
+export const ABANDON_LAND_MINES_RAW_VALUE = 'AML_RAW';
+export const AML_RAW_YES = 1;
+export const ABANDON_LAND_MINES_EXCEEDS_THRESH = 'AML_ET';
+
+export const FORMER_DEF_SITES_RAW_VALUE = 'FUDS_RAW';
+export const FUDS_RAW_YES = 1;
+export const FUDS_RAW_NO = 0;
+export const FORMER_DEF_SITES_EXCEEDS_THRESH = 'FUDS_ET';
 
 export const PROXIMITY_TSDF_SITES_PERCENTILE = 'TSDF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_HAZARD_WASTE = 'TSDF_ET';
@@ -147,8 +173,8 @@ export const IS_EXCEEDS_THRESH_FOR_RMP = 'RMP_ET';
 
 
 // Water category
-export const IS_WATER_FACTOR_DISADVANTAGED_M = 'M_WTR';
-export const IS_WATER_EXCEED_ONE_OR_MORE_INDICATORS_M = 'M_WTR_EOMI';
+export const IS_WATER_FACTOR_DISADVANTAGED_M = 'N_WTR';
+export const IS_WATER_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_WTR_EOMI';
 
 export const LEAKY_UNDER_PERCENTILE = 'UST_PFS';
 export const IS_EXCEEDS_THRESH_LEAKY_UNDER = 'UST_ET';
@@ -159,8 +185,8 @@ export const IS_EXCEEDS_THRESH_FOR_WASTEWATER = 'WD_ET';
 
 
 // Health category
-export const IS_HEALTH_FACTOR_DISADVANTAGED_M = 'M_HLTH';
-export const IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS_M = 'M_HLTH_EOMI';
+export const IS_HEALTH_FACTOR_DISADVANTAGED_M = 'N_HLTH';
+export const IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_HLTH_EOMI';
 
 export const ASTHMA_PERCENTILE = 'AF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_ASTHMA = 'A_ET';
@@ -176,8 +202,8 @@ export const IS_EXCEEDS_THRESH_FOR_LOW_LIFE_EXP = 'LLE_ET';
 
 
 // Workforce category
-export const IS_WORKFORCE_FACTOR_DISADVANTAGED_M = 'M_WKFC';
-export const IS_WORKFORCE_EXCEED_ONE_OR_MORE_INDICATORS_M = 'M_WKFC_EOMI';
+export const IS_WORKFORCE_FACTOR_DISADVANTAGED_M = 'N_WKFC';
+export const IS_WORKFORCE_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_WKFC_EOMI';
 
 export const LINGUISTIC_ISOLATION_PROPERTY_PERCENTILE = 'LIF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_LINGUISITIC_ISO = 'LISO_ET';
@@ -197,7 +223,7 @@ export const IS_EXCEEDS_THRESH_FOR_BELOW_100_POVERTY = 'POV_ET';
 export const ISLAND_AREAS_POVERTY_LOW_HS_EDU_PERCENTILE_FIELD= 'IAPLHSE_PFS';
 export const IS_EXCEEDS_THRESH_FOR_ISLAND_AREA_BELOW_100_POVERTY = 'IA_POV_ET';
 
-export const IS_WORKFORCE_EXCEED_BOTH_SOCIO_INDICATORS_M = 'M_WKFC_EBSI';
+export const IS_WORKFORCE_EXCEED_BOTH_SOCIO_INDICATORS_M = 'N_WKFC_EBSI';
 
 export const HIGH_SCHOOL_PROPERTY_PERCENTILE = `HSEF`;
 export const IS_LOW_HS_EDUCATION_LOW_HIGHER_ED_PRIORITIZED = 'LHE';
@@ -226,8 +252,8 @@ export const SELECTED_TRIBAL_FEATURE_BORDER_LAYER_ID = 'selected-feature-tribal-
 export const TRIBAL_ALASKA_POINTS_LAYER_ID = 'tribal-alaska-points-layer-id';
 
 // Used in layer filters:
-export const SCORE_PROPERTY_LOW = 'M_SCORE';
-export const SCORE_PROPERTY_HIGH = 'SM_C';
+export const SCORE_PROPERTY_LOW = 'SCORE';
+export const SCORE_PROPERTY_HIGH = 'SN_C';
 
 // Zoom
 export const GLOBAL_MIN_ZOOM = 3;
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index af2f5719a..13af0affd 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -331,6 +331,79 @@ export const SIDE_PANEL_CBG_INFO = defineMessages({
   },
 });
 
+export const SIDE_PANEL_DEMOGRAPHICS = {
+  TITLE: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.title'}
+    defaultMessage={'Tract demographics'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demograhics title`}
+  />,
+  RACE_TITLE: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.race.title'}
+    defaultMessage={'Race / Ethnicity'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demograhics race title`}
+  />,
+  AGE_TITLE: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.age.title'}
+    defaultMessage={'Age'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demograhics age title`}
+  />,
+  DEMO_NON_HISPANIC_WHITE: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.white'}
+    defaultMessage={'White'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: White`}
+  />,
+  DEMO_BLACK: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.black'}
+    defaultMessage={'Black or African American'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Black`}
+  />,
+  DEMO_AMERICAN_INDIAN: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.american.indian'}
+    defaultMessage={'American Indian and Alaska Native'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: American Indian and Alaska Native`}
+  />,
+  DEMO_ASIAN: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.asian'}
+    defaultMessage={'Asian'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Asian`}
+  />,
+  DEMO_HAWAIIAN: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.hawaiian'}
+    defaultMessage={'Native Hawiian or Pacific Islander'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Native Hawiian or Pacific Islander`}
+  />,
+  DEMO_OTHER_RACE: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.other'}
+    defaultMessage={'Other'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Other`}
+  />,
+  DEMO_TWO_OR_MORE_RACES: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.two.or.more'}
+    defaultMessage={'Two or more races'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Two or more races`}
+  />,
+  DEMO_HISPANIC: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.hispanic'}
+    defaultMessage={'Hispanic or Latino'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Hispanic or Latino`}
+  />,
+  DEMO_AGE_UNDER_10: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.age.under.10'}
+    defaultMessage={'Children under 10'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Children under 10`}
+  />,
+  DEMO_AGE_MID: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.of.age.mid'}
+    defaultMessage={'Ages 10 - 64'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Ages 10 - 64`}
+  />,
+  DEMO_AGE_OVER_64: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.age.over.64'}
+    defaultMessage={'Elderly over 64'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Elderly over 64`}
+  />,
+};
+
 export const SIDE_PANEL_TRIBAL_INFO = defineMessages({
   LAND_AREA_NAME: {
     id: 'explore.map.page.side.panel.tribalInfo.landAreaName',
@@ -468,32 +541,27 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
   EXP_AG_LOSS: {
     id: 'explore.map.page.side.panel.indicator.exp.ag.loss',
     defaultMessage: 'Expected agriculture loss rate',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show agriculture loss rate
-`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show agriculture loss rate`,
   },
   EXP_BLD_LOSS: {
     id: 'explore.map.page.side.panel.indicator.exp.bld.loss',
     defaultMessage: 'Expected building loss rate',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show building loss rate
-`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show building loss rate`,
   },
   EXP_POP_LOSS: {
     id: 'explore.map.page.side.panel.indicator.exp.pop.loss',
     defaultMessage: 'Expected population loss rate',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show population loss rate
-`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show population loss rate`,
   },
   FLOODING: {
     id: 'explore.map.page.side.panel.indicator.flooding',
     defaultMessage: 'Future flood risk',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show flood risk
-`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show flood risk`,
   },
   WILDFIRE: {
     id: 'explore.map.page.side.panel.indicator.wildfire',
     defaultMessage: 'Future wildfire risk',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show wildfire risk
-`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show wildfire risk`,
   },
   LOW_INCOME: {
     id: 'explore.map.page.side.panel.indicator.low.income',
@@ -502,8 +570,7 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
   HIGH_ED: {
     id: 'explore.map.page.side.panel.indicator.high.ed',
     defaultMessage: 'Higher education non-enrollment',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Higher ed degree achievement rate
-`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Higher ed degree achievement rate`,
   },
   ENERGY_BURDEN: {
     id: 'explore.map.page.side.panel.indicator.energyBurden',
@@ -540,6 +607,11 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
     defaultMessage: 'Median home value',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost burden`,
   },
+  HIST_UNDERINVEST: {
+    id: 'explore.map.page.side.panel.indicator.historic.underinvest',
+    defaultMessage: 'Historic underinvestment',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Historic underinvestment`,
+  },
   HOUSE_BURDEN: {
     id: 'explore.map.page.side.panel.indicator.houseBurden',
     defaultMessage: 'Housing cost burden',
@@ -555,6 +627,16 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
     defaultMessage: 'Lack of plumbing',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lack of plumbing`,
   },
+  ABANDON_MINES: {
+    id: 'explore.map.page.side.panel.indicator.abandon.mines',
+    defaultMessage: 'Abandoned mine lands',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Abandoned land mines`,
+  },
+  FORMER_DEF_SITES: {
+    id: 'explore.map.page.side.panel.indicator.former.def.sites',
+    defaultMessage: 'Formerly Used Defense Sites (FUDS)',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Formerly Used Defense Sites (FUDS)`,
+  },
   PROX_HAZ: {
     id: 'explore.map.page.side.panel.indicator.prox.haz',
     defaultMessage: 'Proximity to hazardous waste facilities',
@@ -668,7 +750,7 @@ export const SIDE_PANEL_VALUES = {
   UNAVAILBLE_MSG: <FormattedMessage
     id={'explore.map.page.side.panel.indicator.value.subtext.unavailable'}
     description={'subtext for indicator when data is N/A'}
-    defaultMessage={`data is not available`}
+    defaultMessage={`missing data`}
   />,
 };
 
@@ -764,6 +846,11 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Median home value in area`,
 
   },
+  HIST_UNDERINVEST: {
+    id: 'explore.map.page.side.panel.indicator.description.historic.underinvestment',
+    defaultMessage: 'Census tracts with historically high barriers to accessing home loans',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing`,
+  },
   HOUSE_BURDEN: {
     id: 'explore.map.page.side.panel.indicator.description.houseBurden',
     defaultMessage: 'Low income households spending more than 30% of income on housing',
@@ -780,6 +867,16 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes without indoor kitchens or plumbing`,
   },
 
+  ABANDON_MINES: {
+    id: 'explore.map.page.side.panel.indicator.description.abandon.mines',
+    defaultMessage: 'Presence of an abandoned land mine within the tract',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned land mine within the tract`,
+  },
+  FORMER_DEF_SITES: {
+    id: 'explore.map.page.side.panel.indicator.description.former.def.sites',
+    defaultMessage: 'Presence of a Formerly Used Defense Site within the tract',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of a Formerly Used Defense Site within the tract`,
+  },
   PROX_HAZ: {
     id: 'explore.map.page.side.panel.indicator.description.prox.haz',
     defaultMessage: 'Count of hazardous waste facilities within 5 kilometers',
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 02473524c..ec1070c1c 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -467,6 +467,62 @@
     "defaultMessage": "YES",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the communities the score currently is focused on"
   },
+  "explore.map.page.side.panel.demo.age.over.64": {
+    "defaultMessage": "Elderly over 64",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Elderly over 64"
+  },
+  "explore.map.page.side.panel.demo.age.title": {
+    "defaultMessage": "Age",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demograhics age title"
+  },
+  "explore.map.page.side.panel.demo.age.under.10": {
+    "defaultMessage": "Children under 10",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Children under 10"
+  },
+  "explore.map.page.side.panel.demo.american.indian": {
+    "defaultMessage": "American Indian and Alaska Native",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: American Indian and Alaska Native"
+  },
+  "explore.map.page.side.panel.demo.asian": {
+    "defaultMessage": "Asian",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Asian"
+  },
+  "explore.map.page.side.panel.demo.black": {
+    "defaultMessage": "Black or African American",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Black"
+  },
+  "explore.map.page.side.panel.demo.hawaiian": {
+    "defaultMessage": "Native Hawiian or Pacific Islander",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Native Hawiian or Pacific Islander"
+  },
+  "explore.map.page.side.panel.demo.hispanic": {
+    "defaultMessage": "Hispanic or Latino",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Hispanic or Latino"
+  },
+  "explore.map.page.side.panel.demo.of.age.mid": {
+    "defaultMessage": "Ages 10 - 64",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Ages 10 - 64"
+  },
+  "explore.map.page.side.panel.demo.other": {
+    "defaultMessage": "Other",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Other"
+  },
+  "explore.map.page.side.panel.demo.race.title": {
+    "defaultMessage": "Race / Ethnicity",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demograhics race title"
+  },
+  "explore.map.page.side.panel.demo.title": {
+    "defaultMessage": "Tract demographics",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demograhics title"
+  },
+  "explore.map.page.side.panel.demo.two.or.more": {
+    "defaultMessage": "Two or more races",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Two or more races"
+  },
+  "explore.map.page.side.panel.demo.white": {
+    "defaultMessage": "White",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: White"
+  },
   "explore.map.page.side.panel.exceed.burden.answer.no": {
     "defaultMessage": "No",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. This will display NO if the census tract is disadvantaged"
@@ -499,6 +555,10 @@
     "defaultMessage": "Tract information",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the census tract info title"
   },
+  "explore.map.page.side.panel.indicator.abandon.mines": {
+    "defaultMessage": "Abandoned mine lands",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Abandoned land mines"
+  },
   "explore.map.page.side.panel.indicator.asthma": {
     "defaultMessage": "Asthma",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Asthma"
@@ -507,6 +567,10 @@
     "defaultMessage": "Transportation barriers",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show transportation barriers"
   },
+  "explore.map.page.side.panel.indicator.description.abandon.mines": {
+    "defaultMessage": "Presence of an abandoned land mine within the tract",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned land mine within the tract"
+  },
   "explore.map.page.side.panel.indicator.description.asthma": {
     "defaultMessage": "Weighted percent of people who have been told they have asthma",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Number of people who have been told they have asthma"
@@ -543,6 +607,10 @@
     "defaultMessage": "Projected risk to properties from floods from tides, rain, riverine and storm surges in 30 years",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of flooding risk"
   },
+  "explore.map.page.side.panel.indicator.description.former.def.sites": {
+    "defaultMessage": "Presence of a Formerly Used Defense Site within the tract",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of a Formerly Used Defense Site within the tract"
+  },
   "explore.map.page.side.panel.indicator.description.heartDisease": {
     "defaultMessage": "People ages 18 years and older who have been told they have heart disease",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Weighted percent of people ages 18 years and older who have \n    been told they have heart disease"
@@ -555,6 +623,10 @@
     "defaultMessage": "Percent of people ages 25 years or older whose education level is less than a high school diploma",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of people ages 25 years or older whose education level \n      is less than a high school diploma"
   },
+  "explore.map.page.side.panel.indicator.description.historic.underinvestment": {
+    "defaultMessage": "Census tracts with historically high barriers to accessing home loans",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing"
+  },
   "explore.map.page.side.panel.indicator.description.houseBurden": {
     "defaultMessage": "Low income households spending more than 30% of income on housing",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing"
@@ -645,19 +717,23 @@
   },
   "explore.map.page.side.panel.indicator.exp.ag.loss": {
     "defaultMessage": "Expected agriculture loss rate",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show agriculture loss rate\n"
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show agriculture loss rate"
   },
   "explore.map.page.side.panel.indicator.exp.bld.loss": {
     "defaultMessage": "Expected building loss rate",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show building loss rate\n"
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show building loss rate"
   },
   "explore.map.page.side.panel.indicator.exp.pop.loss": {
     "defaultMessage": "Expected population loss rate",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show population loss rate\n"
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show population loss rate"
   },
   "explore.map.page.side.panel.indicator.flooding": {
     "defaultMessage": "Future flood risk",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show flood risk\n"
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show flood risk"
+  },
+  "explore.map.page.side.panel.indicator.former.def.sites": {
+    "defaultMessage": "Formerly Used Defense Sites (FUDS)",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Formerly Used Defense Sites (FUDS)"
   },
   "explore.map.page.side.panel.indicator.heartDisease": {
     "defaultMessage": "Heart disease",
@@ -665,12 +741,16 @@
   },
   "explore.map.page.side.panel.indicator.high.ed": {
     "defaultMessage": "Higher education non-enrollment",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Higher ed degree achievement rate\n"
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Higher ed degree achievement rate"
   },
   "explore.map.page.side.panel.indicator.high.school": {
     "defaultMessage": "High school degree non-attainment",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show High school degree achievement rate"
   },
+  "explore.map.page.side.panel.indicator.historic.underinvest": {
+    "defaultMessage": "Historic underinvestment",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Historic underinvestment"
+  },
   "explore.map.page.side.panel.indicator.houseBurden": {
     "defaultMessage": "Housing cost burden",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost burden"
@@ -800,7 +880,7 @@
     "description": "indicating percentile units"
   },
   "explore.map.page.side.panel.indicator.value.subtext.unavailable": {
-    "defaultMessage": "data is not available",
+    "defaultMessage": "missing data",
     "description": "subtext for indicator when data is N/A"
   },
   "explore.map.page.side.panel.indicator.value.unavailable.alt.text": {
@@ -813,7 +893,7 @@
   },
   "explore.map.page.side.panel.indicator.wildfire": {
     "defaultMessage": "Future wildfire risk",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show wildfire risk\n"
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show wildfire risk"
   },
   "explore.map.page.side.panel.info.alt.text.icon1": {
     "defaultMessage": "An icon that has depicts pieces of a block selected mimicking the census block census tracts",

From 4b9580c28a21835b92f349ca887d557e027c2224 Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Thu, 1 Sep 2022 08:48:58 -0700
Subject: [PATCH 049/130] Correct BE signal on low income (#1877)

---
 client/src/data/constants.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index cc3e1846e..df540e7dc 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -93,7 +93,7 @@ export const IS_EXCEEDS_THRESH_WILDFIRE = 'WF_ET';
 
 export const IS_EXCEED_BOTH_SOCIO_INDICATORS_M = 'N_EBSI';
 
-export const POVERTY_BELOW_200_PERCENTILE = 'P200_PFS';
+export const POVERTY_BELOW_200_PERCENTILE = 'P200_I_PFS';
 export const IS_FEDERAL_POVERTY_LEVEL_200 = 'FPL200S';
 
 export const HIGHER_ED_PERCENTILE = 'CA';

From ffcd352f6e4c1029e2d399d49efccaab3621a7a3 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 2 Sep 2022 00:50:02 -0700
Subject: [PATCH 050/130] Adds adjacency, impute flag and custom colors

---
 .../src/components/AreaDetail/AreaDetail.tsx  |  28 +++++
 .../__snapshots__/areaDetail.test.tsx.snap    | 100 ++++++++++++++++++
 client/src/components/J40Map.tsx              |   2 +-
 client/src/data/constants.tsx                 |   5 +
 client/src/data/copy/explore.tsx              |  31 ++++++
 client/src/intl/en.json                       |  16 ++-
 6 files changed, 179 insertions(+), 3 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index f9cd4662e..80766f955 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -560,6 +560,25 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     threshold: 10,
   };
 
+  // Temp adding to workforce category
+  const adjacency: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ADJ),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.ADJ),
+    type: 'percentile',
+    value: properties.hasOwnProperty(constants.ADJACENCY_PERCENTILE) ?
+      properties[constants.ADJACENCY_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.ADJACENCY_EXCEEDS_THRESH] ?
+      properties[constants.ADJACENCY_EXCEEDS_THRESH] : null,
+  };
+  const imputeFlag: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.IMP_FLG),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.IMP_FLG),
+    type: 'boolean',
+    value: properties.hasOwnProperty(constants.IMPUTE_FLAG) ?
+      (properties[constants.IMPUTE_FLAG] == '0' ? false : true) : null,
+    isDisadvagtaged: false,
+  };
+
 
   /**
    * Aggregate indicators based on categories
@@ -664,6 +683,15 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       isExceedBothSocioBurdens: properties[constants.IS_WORKFORCE_EXCEED_BOTH_SOCIO_INDICATORS_M] ?
         properties[constants.IS_WORKFORCE_EXCEED_BOTH_SOCIO_INDICATORS_M] : null,
     },
+    {
+      id: 'test',
+      titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.TEST),
+      indicators: [adjacency],
+      socioEcIndicators: [imputeFlag],
+      isDisadvagtaged: null,
+      isExceed1MoreBurden: null,
+      isExceedBothSocioBurdens: null,
+    },
   ];
 
 
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index 360033667..c67d20347 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -2261,6 +2261,106 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
           </div>
         </li>
       </div>
+      <h4
+        class="usa-accordion__heading"
+      >
+        <button
+          aria-controls="test"
+          aria-expanded="false"
+          class="usa-accordion__button"
+          data-testid="accordionButton_test"
+          type="button"
+        >
+          <div>
+            <div>
+              Testing
+            </div>
+            <div
+              class=""
+            />
+          </div>
+        </button>
+      </h4>
+      <div
+        class="usa-accordion__content usa-prose"
+        data-testid="accordionItem_test"
+        hidden=""
+        id="test"
+      >
+        <div>
+          <div>
+            At or above at least one threshold?
+          </div>
+          <div>
+            No
+          </div>
+        </div>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Adjacency
+              <div>
+                
+      Adjacency percentile?
+    
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  missing data
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <div>
+          AND
+        </div>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Impute flag
+              <div>
+                
+      A flag to inform imputation?
+    
+              </div>
+            </div>
+            <div>
+              <div>
+                <div />
+                <div>
+                  <img
+                    alt="an icon to represent data is unavailable"
+                    src="test-file-stub"
+                  />
+                </div>
+              </div>
+              <div>
+                <div>
+                  missing data
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+      </div>
     </div>
     <div>
       Methodology version 0.1
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index cfdca7c26..6b946643b 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -324,7 +324,7 @@ const J40Map = ({location}: IJ40Interface) => {
     setGeolocationInProgress(true);
   };
 
-  const mapBoxBaseLayer = 'tl' in flags ? `mapbox://styles/justice40/cl2qimpi2000014qeb1egpox8` : `mapbox://styles/mapbox/streets-v11`;
+  const mapBoxBaseLayer = 'tl' in flags ? `mapbox://styles/justice40/cl2qimpi2000014qeb1egpox8` : `mapbox://styles/justice40/cl5mp95tu000k14lpl21spgny`;
 
   return (
     <>
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index df540e7dc..6d97a890a 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -230,6 +230,11 @@ export const IS_LOW_HS_EDUCATION_LOW_HIGHER_ED_PRIORITIZED = 'LHE';
 export const ISLAND_AREAS_HS_EDU_PERCENTAGE_FIELD= 'IAHSEF';
 export const ISLAND_AREA_LOW_HS_EDU = 'IALHE';
 
+// Misc category
+export const ADJACENCY_PERCENTILE = 'ADJ_PFS';
+export const ADJACENCY_EXCEEDS_THRESH = 'ADJ_ET';
+export const IMPUTE_FLAG = 'IMP_FLG';
+
 
 // ********** MAP CONSTANTS ***************
 // Source name constants
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 13af0affd..ef7864478 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -533,6 +533,12 @@ export const SIDE_PANEL_CATEGORY = defineMessages({
     id: 'explore.map.page.side.panel.indicator.title.work.dev',
     defaultMessage: 'Workforce development',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Workforce development title
+`,
+  },
+  TEST: {
+    id: 'explore.map.page.side.panel.indicator.title.testing',
+    defaultMessage: 'Testing',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Testing title
 `,
   },
 });
@@ -707,6 +713,17 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
     defaultMessage: 'High school degree non-attainment',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show High school degree achievement rate`,
   },
+  ADJ: {
+    id: 'explore.map.page.side.panel.indicator.adjacency',
+    defaultMessage: 'Adjacency',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Adjancency`,
+  },
+  IMP_FLG: {
+    id: 'explore.map.page.side.panel.indicator.imp.flg',
+    defaultMessage: 'Impute flag',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Impute flag`,
+  },
+
 });
 
 export const SIDE_PANEL_VALUES = {
@@ -964,6 +981,20 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of people ages 25 years or older whose education level 
       is less than a high school diploma`,
   },
+  ADJ: {
+    id: 'explore.map.page.side.panel.indicator.description.ling.iso',
+    defaultMessage: `
+      Adjacency percentile?
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator about adjacency`,
+  },
+  IMP_FLG: {
+    id: 'explore.map.page.side.panel.indicator.description.ling.iso',
+    defaultMessage: `
+      A flag to inform imputation?
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator about adjacency`,
+  },
 });
 
 export const SIDE_PANEL_SPACERS = {
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index ec1070c1c..408563d9c 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -559,6 +559,10 @@
     "defaultMessage": "Abandoned mine lands",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Abandoned land mines"
   },
+  "explore.map.page.side.panel.indicator.adjacency": {
+    "defaultMessage": "Adjacency",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Adjancency"
+  },
   "explore.map.page.side.panel.indicator.asthma": {
     "defaultMessage": "Asthma",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Asthma"
@@ -652,8 +656,8 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Average number of years of life a person can expect to live"
   },
   "explore.map.page.side.panel.indicator.description.ling.iso": {
-    "defaultMessage": "Percent of households where no one over the age 14 speaks English well",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Households in which no one age 14 and over speaks English only or also speaks a language other than English"
+    "defaultMessage": "A flag to inform imputation?",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator about adjacency"
   },
   "explore.map.page.side.panel.indicator.description.low.income": {
     "defaultMessage": "Household income is less than or equal to twice the federal poverty level",
@@ -755,6 +759,10 @@
     "defaultMessage": "Housing cost burden",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost burden"
   },
+  "explore.map.page.side.panel.indicator.imp.flg": {
+    "defaultMessage": "Impute flag",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Impute flag"
+  },
   "explore.map.page.side.panel.indicator.lack.green.space": {
     "defaultMessage": "Lack of green space",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lack of green space"
@@ -843,6 +851,10 @@
     "defaultMessage": "Sustainable housing",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Sustainable housing title\n"
   },
+  "explore.map.page.side.panel.indicator.title.testing": {
+    "defaultMessage": "Testing",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Testing title\n"
+  },
   "explore.map.page.side.panel.indicator.title.work.dev": {
     "defaultMessage": "Workforce development",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Workforce development title\n"

From 6be93a48f674a4ce1dd28b328e2405f1c8fe4844 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 2 Sep 2022 00:55:57 -0700
Subject: [PATCH 051/130] Update Quickstart docker link

---
 QUICKSTART.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/QUICKSTART.md b/QUICKSTART.md
index 00edc3f8c..37806f43e 100644
--- a/QUICKSTART.md
+++ b/QUICKSTART.md
@@ -10,7 +10,7 @@ Cloning into 'justice40-tool'...
 $ cd justice40-tool
 ```
 
-Install [`docker`](https://www.docker.com/). See [Install Docker](INSTALLATION.md#install-docker).
+Install [`docker`](https://docs.docker.com/get-docker/). See [Install Docker](INSTALLATION.md#install-docker).
 
 > *Important*: To be able to run the entire application, you may need to increase the memory allocated for docker to at least 8096 MB. See [this post](https://stackoverflow.com/a/44533437) for more details.
 

From c71d7a34b745f559db2f072b60d4af941559c6c6 Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Wed, 7 Sep 2022 13:13:50 -0700
Subject: [PATCH 052/130]  Remove duplicate Higher Ed indicator, update higher
 ed types and correct copy on 404 page (#1886)

* remove duplicate high school degree indicator

- for island areas

* Update 404 page copy

* Remove link that is failing during markdown checks

* Updated FE indicators constants to remove _M

- by removing these _M suffix on the FE
constants, we remove any dependency on changes to the BE score
---
 INSTALLATION.md                               |   2 +
 .../src/components/AreaDetail/AreaDetail.tsx  | 103 +++++++++---------
 .../__snapshots__/areaDetail.test.tsx.snap    |  31 ------
 client/src/data/constants.tsx                 |  36 +++---
 client/src/data/copy/404.tsx                  |   8 +-
 client/src/intl/en.json                       |   2 +-
 6 files changed, 77 insertions(+), 105 deletions(-)

diff --git a/INSTALLATION.md b/INSTALLATION.md
index b20101f7a..4e1279e58 100644
--- a/INSTALLATION.md
+++ b/INSTALLATION.md
@@ -72,7 +72,9 @@ While any IDE can be used, we're outlining how to set up VS Code
 
 ### Recommended VS Code Extensions
 
+<!-- markdown-link-check-disable -->
 1. [Browser Preview](https://github.com/auchenberg/vscode-browser-preview)
+<!-- markdown-link-check-enable -->
 2. [Live Server](https://github.com/ritwickdey/vscode-live-server)
 3. [Live Share](https://github.com/MicrosoftDocs/live-share)
 4. [Live Share Audio](https://github.com/MicrosoftDocs/live-share)
diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 80766f955..99d0db5cc 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -234,9 +234,8 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     }
     if (indicatorName === 'highSchool') {
       return properties.hasOwnProperty(constants
-          .IS_LOW_HS_EDUCATION_LOW_HIGHER_ED_PRIORITIZED) &&
-        properties[constants.IS_LOW_HS_EDUCATION_LOW_HIGHER_ED_PRIORITIZED] == 1 ?
-        true : false;
+          .IS_LOW_HS_EDUCATION_LOW_HIGHER_ED_PRIORITIZED) ?
+        properties[constants.IS_LOW_HS_EDUCATION_LOW_HIGHER_ED_PRIORITIZED] : null;
     }
   };
 
@@ -592,96 +591,96 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLIMATE),
       indicators: [expAgLoss, expBldLoss, expPopLoss, flooding, wildfire],
       socioEcIndicators: [lowInc],
-      isDisadvagtaged: properties[constants.IS_CLIMATE_FACTOR_DISADVANTAGED_M] ?
-        properties[constants.IS_CLIMATE_FACTOR_DISADVANTAGED_M] : null,
-      isExceed1MoreBurden: properties[constants.IS_CLIMATE_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
-        properties[constants.IS_CLIMATE_EXCEED_ONE_OR_MORE_INDICATORS_M] : null,
-      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] ?
-        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] : null,
+      isDisadvagtaged: properties[constants.IS_CLIMATE_FACTOR_DISADVANTAGED] ?
+        properties[constants.IS_CLIMATE_FACTOR_DISADVANTAGED] : null,
+      isExceed1MoreBurden: properties[constants.IS_CLIMATE_EXCEED_ONE_OR_MORE_INDICATORS] ?
+        properties[constants.IS_CLIMATE_EXCEED_ONE_OR_MORE_INDICATORS] : null,
+      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
+        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
     {
       id: 'clean-energy',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_ENERGY),
       indicators: [energyBurden, pm25],
       socioEcIndicators: [lowInc],
-      isDisadvagtaged: properties[constants.IS_ENERGY_FACTOR_DISADVANTAGED_M] ?
-        properties[constants.IS_ENERGY_FACTOR_DISADVANTAGED_M] : null,
-      isExceed1MoreBurden: properties[constants.IS_ENERGY_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
-        properties[constants.IS_ENERGY_EXCEED_ONE_OR_MORE_INDICATORS_M] : null,
-      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] ?
-        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] : null,
+      isDisadvagtaged: properties[constants.IS_ENERGY_FACTOR_DISADVANTAGED] ?
+        properties[constants.IS_ENERGY_FACTOR_DISADVANTAGED] : null,
+      isExceed1MoreBurden: properties[constants.IS_ENERGY_EXCEED_ONE_OR_MORE_INDICATORS] ?
+        properties[constants.IS_ENERGY_EXCEED_ONE_OR_MORE_INDICATORS] : null,
+      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
+        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
     {
       id: 'clean-transport',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_TRANSPORT),
       indicators: [dieselPartMatter, barrierTransport, trafficVolume],
       socioEcIndicators: [lowInc],
-      isDisadvagtaged: properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED_M] ?
-        properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED_M] : null,
-      isExceed1MoreBurden: properties[constants.IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
-        properties[constants.IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS_M] : null,
-      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] ?
-        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] : null,
+      isDisadvagtaged: properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED] ?
+        properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED] : null,
+      isExceed1MoreBurden: properties[constants.IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS] ?
+        properties[constants.IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS] : null,
+      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
+        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
     {
       id: 'sustain-house',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.SUSTAIN_HOUSE),
       indicators: [historicUnderinvest, houseBurden, lackGreenSpace, lackPlumbing, leadPaint],
       socioEcIndicators: [lowInc],
-      isDisadvagtaged: properties[constants.IS_HOUSING_FACTOR_DISADVANTAGED_M] ?
-        properties[constants.IS_HOUSING_FACTOR_DISADVANTAGED_M] : null,
-      isExceed1MoreBurden: properties[constants.IS_HOUSING_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
-        properties[constants.IS_HOUSING_EXCEED_ONE_OR_MORE_INDICATORS_M] : null,
-      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] ?
-        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] : null,
+      isDisadvagtaged: properties[constants.IS_HOUSING_FACTOR_DISADVANTAGED] ?
+        properties[constants.IS_HOUSING_FACTOR_DISADVANTAGED] : null,
+      isExceed1MoreBurden: properties[constants.IS_HOUSING_EXCEED_ONE_OR_MORE_INDICATORS] ?
+        properties[constants.IS_HOUSING_EXCEED_ONE_OR_MORE_INDICATORS] : null,
+      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
+        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
     {
       id: 'leg-pollute',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.LEG_POLLUTE),
       indicators: [abandonMines, formerDefSites, proxHaz, proxNPL, proxRMP],
       socioEcIndicators: [lowInc],
-      isDisadvagtaged: properties[constants.IS_POLLUTION_FACTOR_DISADVANTAGED_M] ?
-        properties[constants.IS_POLLUTION_FACTOR_DISADVANTAGED_M] : null,
-      isExceed1MoreBurden: properties[constants.IS_POLLUTION_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
-        properties[constants.IS_POLLUTION_EXCEED_ONE_OR_MORE_INDICATORS_M] : null,
-      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] ?
-        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] : null,
+      isDisadvagtaged: properties[constants.IS_POLLUTION_FACTOR_DISADVANTAGED] ?
+        properties[constants.IS_POLLUTION_FACTOR_DISADVANTAGED] : null,
+      isExceed1MoreBurden: properties[constants.IS_POLLUTION_EXCEED_ONE_OR_MORE_INDICATORS] ?
+        properties[constants.IS_POLLUTION_EXCEED_ONE_OR_MORE_INDICATORS] : null,
+      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
+        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
     {
       id: 'clean-water',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_WATER),
       indicators: [leakyTanks, wasteWater],
       socioEcIndicators: [lowInc],
-      isDisadvagtaged: properties[constants.IS_WATER_FACTOR_DISADVANTAGED_M] ?
-        properties[constants.IS_WATER_FACTOR_DISADVANTAGED_M] : null,
-      isExceed1MoreBurden: properties[constants.IS_WATER_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
-        properties[constants.IS_WATER_EXCEED_ONE_OR_MORE_INDICATORS_M] : null,
-      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] ?
-        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] : null,
+      isDisadvagtaged: properties[constants.IS_WATER_FACTOR_DISADVANTAGED] ?
+        properties[constants.IS_WATER_FACTOR_DISADVANTAGED] : null,
+      isExceed1MoreBurden: properties[constants.IS_WATER_EXCEED_ONE_OR_MORE_INDICATORS] ?
+        properties[constants.IS_WATER_EXCEED_ONE_OR_MORE_INDICATORS] : null,
+      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
+        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
     {
       id: 'health-burdens',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.HEALTH_BURDEN),
       indicators: [asthma, diabetes, heartDisease, lifeExpect],
       socioEcIndicators: [lowInc],
-      isDisadvagtaged: properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED_M] ?
-        properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED_M] : null,
-      isExceed1MoreBurden: properties[constants.IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
-        properties[constants.IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS_M] : null,
-      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] ?
-        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS_M] : null,
+      isDisadvagtaged: properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED] ?
+        properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED] : null,
+      isExceed1MoreBurden: properties[constants.IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS] ?
+        properties[constants.IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS] : null,
+      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
+        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
     {
       id: 'work-dev',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.WORK_DEV),
       indicators: [lingIso, lowMedInc, unemploy, poverty],
       socioEcIndicators: [highSchool],
-      isDisadvagtaged: properties[constants.IS_WORKFORCE_FACTOR_DISADVANTAGED_M] ?
-        properties[constants.IS_WORKFORCE_FACTOR_DISADVANTAGED_M] : null,
-      isExceed1MoreBurden: properties[constants.IS_WORKFORCE_EXCEED_ONE_OR_MORE_INDICATORS_M] ?
-        properties[constants.IS_WORKFORCE_EXCEED_ONE_OR_MORE_INDICATORS_M] : null,
-      isExceedBothSocioBurdens: properties[constants.IS_WORKFORCE_EXCEED_BOTH_SOCIO_INDICATORS_M] ?
-        properties[constants.IS_WORKFORCE_EXCEED_BOTH_SOCIO_INDICATORS_M] : null,
+      isDisadvagtaged: properties[constants.IS_WORKFORCE_FACTOR_DISADVANTAGED] ?
+        properties[constants.IS_WORKFORCE_FACTOR_DISADVANTAGED] : null,
+      isExceed1MoreBurden: properties[constants.IS_WORKFORCE_EXCEED_ONE_OR_MORE_INDICATORS] ?
+        properties[constants.IS_WORKFORCE_EXCEED_ONE_OR_MORE_INDICATORS] : null,
+      isExceedBothSocioBurdens: properties[constants.IS_WORKFORCE_EXCEED_BOTH_SOCIO_INDICATORS] ?
+        properties[constants.IS_WORKFORCE_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
     {
       id: 'test',
@@ -719,7 +718,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     // For Island Areas - only show workforce dev category
     categories = categories.filter((category) => category.id === 'work-dev');
     // For Island Areas - remove the linguistic Isolation
-    categories[0].indicators = [lowMedInc, unemploy, poverty, highSchool];
+    categories[0].indicators = [lowMedInc, unemploy, poverty];
   }
 
 
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index c67d20347..bf25cf635 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -395,37 +395,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
             </div>
           </div>
         </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              High school degree non-attainment
-              <div>
-                
-      Percent of people ages 25 years or older whose education level is less than a high school diploma 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
         <div>
           AND
         </div>
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index 6d97a890a..42728f4b4 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -73,8 +73,8 @@ export const SIDE_PANEL_STATE_VALUES = {
 };
 
 // Climate category
-export const IS_CLIMATE_FACTOR_DISADVANTAGED_M = 'N_CLT';
-export const IS_CLIMATE_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_CLT_EOMI';
+export const IS_CLIMATE_FACTOR_DISADVANTAGED = 'N_CLT';
+export const IS_CLIMATE_EXCEED_ONE_OR_MORE_INDICATORS = 'N_CLT_EOMI';
 
 export const EXP_AGRICULTURE_LOSS_PERCENTILE = 'EALR_PFS';
 export const IS_EXCEEDS_THRESH_FOR_EXP_AGR_LOSS = 'EAL_ET';
@@ -91,7 +91,7 @@ export const IS_EXCEEDS_THRESH_FLOODING = 'FLD_ET';
 export const WILDFIRE_PERCENTILE = 'WF_PFS';
 export const IS_EXCEEDS_THRESH_WILDFIRE = 'WF_ET';
 
-export const IS_EXCEED_BOTH_SOCIO_INDICATORS_M = 'N_EBSI';
+export const IS_EXCEED_BOTH_SOCIO_INDICATORS = 'N_EBSI';
 
 export const POVERTY_BELOW_200_PERCENTILE = 'P200_I_PFS';
 export const IS_FEDERAL_POVERTY_LEVEL_200 = 'FPL200S';
@@ -103,8 +103,8 @@ export const NON_HIGHER_ED_PERCENTILE = 'NCA';
 
 
 // Energy category
-export const IS_ENERGY_FACTOR_DISADVANTAGED_M = 'N_ENY';
-export const IS_ENERGY_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_ENY_EOMI';
+export const IS_ENERGY_FACTOR_DISADVANTAGED = 'N_ENY';
+export const IS_ENERGY_EXCEED_ONE_OR_MORE_INDICATORS = 'N_ENY_EOMI';
 
 export const ENERGY_PERCENTILE = 'EBF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_ENERGY_BURDEN = 'EB_ET';
@@ -114,8 +114,8 @@ export const IS_EXCEEDS_THRESH_FOR_PM25 = 'PM25_ET';
 
 
 // Transport category
-export const IS_TRANSPORT_FACTOR_DISADVANTAGED_M = 'N_TRN';
-export const IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_TRN_EOMI';
+export const IS_TRANSPORT_FACTOR_DISADVANTAGED = 'N_TRN';
+export const IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS = 'N_TRN_EOMI';
 
 export const DIESEL_MATTER_PERCENTILE = 'DSF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_DIESEL_PM = 'DS_ET';
@@ -128,8 +128,8 @@ export const IS_EXCEEDS_THRESH_FOR_TRAFFIC_PROX = 'TP_ET';
 
 
 // Housing category
-export const IS_HOUSING_FACTOR_DISADVANTAGED_M = 'N_HSG';
-export const IS_HOUSING_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_HSG_EOMI';
+export const IS_HOUSING_FACTOR_DISADVANTAGED = 'N_HSG';
+export const IS_HOUSING_EXCEED_ONE_OR_MORE_INDICATORS = 'N_HSG_EOMI';
 
 export const HISTORIC_UNDERINVESTMENT_EXCEED_THRESH = 'HRS_ET';
 export const HISTORIC_UNDERINVESTMENT_RAW_YES = 1;
@@ -150,8 +150,8 @@ export const IS_EXCEEDS_THRESH_FOR_LEAD_PAINT_AND_MEDIAN_HOME_VAL = 'LPP_ET';
 
 
 // Pollution category
-export const IS_POLLUTION_FACTOR_DISADVANTAGED_M = 'N_PLN';
-export const IS_POLLUTION_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_PLN_EOMI';
+export const IS_POLLUTION_FACTOR_DISADVANTAGED = 'N_PLN';
+export const IS_POLLUTION_EXCEED_ONE_OR_MORE_INDICATORS = 'N_PLN_EOMI';
 
 export const ABANDON_LAND_MINES_RAW_VALUE = 'AML_RAW';
 export const AML_RAW_YES = 1;
@@ -173,8 +173,8 @@ export const IS_EXCEEDS_THRESH_FOR_RMP = 'RMP_ET';
 
 
 // Water category
-export const IS_WATER_FACTOR_DISADVANTAGED_M = 'N_WTR';
-export const IS_WATER_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_WTR_EOMI';
+export const IS_WATER_FACTOR_DISADVANTAGED = 'N_WTR';
+export const IS_WATER_EXCEED_ONE_OR_MORE_INDICATORS = 'N_WTR_EOMI';
 
 export const LEAKY_UNDER_PERCENTILE = 'UST_PFS';
 export const IS_EXCEEDS_THRESH_LEAKY_UNDER = 'UST_ET';
@@ -185,8 +185,8 @@ export const IS_EXCEEDS_THRESH_FOR_WASTEWATER = 'WD_ET';
 
 
 // Health category
-export const IS_HEALTH_FACTOR_DISADVANTAGED_M = 'N_HLTH';
-export const IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_HLTH_EOMI';
+export const IS_HEALTH_FACTOR_DISADVANTAGED = 'N_HLTH';
+export const IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS = 'N_HLTH_EOMI';
 
 export const ASTHMA_PERCENTILE = 'AF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_ASTHMA = 'A_ET';
@@ -202,8 +202,8 @@ export const IS_EXCEEDS_THRESH_FOR_LOW_LIFE_EXP = 'LLE_ET';
 
 
 // Workforce category
-export const IS_WORKFORCE_FACTOR_DISADVANTAGED_M = 'N_WKFC';
-export const IS_WORKFORCE_EXCEED_ONE_OR_MORE_INDICATORS_M = 'N_WKFC_EOMI';
+export const IS_WORKFORCE_FACTOR_DISADVANTAGED = 'N_WKFC';
+export const IS_WORKFORCE_EXCEED_ONE_OR_MORE_INDICATORS = 'N_WKFC_EOMI';
 
 export const LINGUISTIC_ISOLATION_PROPERTY_PERCENTILE = 'LIF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_LINGUISITIC_ISO = 'LISO_ET';
@@ -223,7 +223,7 @@ export const IS_EXCEEDS_THRESH_FOR_BELOW_100_POVERTY = 'POV_ET';
 export const ISLAND_AREAS_POVERTY_LOW_HS_EDU_PERCENTILE_FIELD= 'IAPLHSE_PFS';
 export const IS_EXCEEDS_THRESH_FOR_ISLAND_AREA_BELOW_100_POVERTY = 'IA_POV_ET';
 
-export const IS_WORKFORCE_EXCEED_BOTH_SOCIO_INDICATORS_M = 'N_WKFC_EBSI';
+export const IS_WORKFORCE_EXCEED_BOTH_SOCIO_INDICATORS = 'N_WKFC_EBSI';
 
 export const HIGH_SCHOOL_PROPERTY_PERCENTILE = `HSEF`;
 export const IS_LOW_HS_EDUCATION_LOW_HIGHER_ED_PRIORITIZED = 'LHE';
diff --git a/client/src/data/copy/404.tsx b/client/src/data/copy/404.tsx
index cb7265bfe..5c9639406 100644
--- a/client/src/data/copy/404.tsx
+++ b/client/src/data/copy/404.tsx
@@ -26,10 +26,12 @@ export const ERROR_MSG =
 <FormattedMessage
   id={'pageNotFound.apology.text'}
   defaultMessage={`
-    Sorry, the page you were looking for was not found. Click <link1>home</link1> to go home.
-    `}
+    Sorry, the page you are looking for is not found. <link1>Explore the map</link1> or learn 
+    more <link2>about</link2> the tool.
+  `}
   description={'main error message'}
   values={{
-    link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
+    link1: linkFn(PAGES_ENDPOINTS.EXPLORE, true, false),
+    link2: linkFn(PAGES_ENDPOINTS.ABOUT, true, false),
   }}
 />;
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 408563d9c..e5134ed5d 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1524,7 +1524,7 @@
     "description": "page not found guidance text"
   },
   "pageNotFound.apology.text": {
-    "defaultMessage": "Sorry, the page you were looking for was not found. Click <link1>home</link1> to go home.",
+    "defaultMessage": "Sorry, the page you are looking for is not found. <link1>Explore the map</link1> or learn more <link2>about</link2> the tool.",
     "description": "main error message"
   },
   "pageNotFound.heading.text": {

From 825361ab1ceaa78fde73376c3ca08a7cc6462523 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Thu, 8 Sep 2022 23:12:57 -0700
Subject: [PATCH 053/130] Remove up/down arrows from indicators

---
 .../Indicator/Indicator.module.scss           |  2 +-
 client/src/components/Indicator/Indicator.tsx | 38 +++++--------------
 client/src/data/constants.tsx                 |  2 +
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/client/src/components/Indicator/Indicator.module.scss b/client/src/components/Indicator/Indicator.module.scss
index 2f6dbade8..6d9ef09b9 100644
--- a/client/src/components/Indicator/Indicator.module.scss
+++ b/client/src/components/Indicator/Indicator.module.scss
@@ -59,7 +59,7 @@
 
           }
           .unavailable {
-            opacity: .2;
+            opacity: .6;
           }
         }
       }
diff --git a/client/src/components/Indicator/Indicator.tsx b/client/src/components/Indicator/Indicator.tsx
index efbc2a05e..ff1c774a6 100644
--- a/client/src/components/Indicator/Indicator.tsx
+++ b/client/src/components/Indicator/Indicator.tsx
@@ -8,20 +8,14 @@ import * as constants from '../../data/constants';
 import * as EXPLORE_COPY from '../../data/copy/explore';
 
 // @ts-ignore
-import downArrow from '/node_modules/uswds/dist/img/usa-icons/arrow_downward.svg';
-// @ts-ignore
-import upArrow from '/node_modules/uswds/dist/img/usa-icons/arrow_upward.svg';
-// @ts-ignore
-import unAvailable from '/node_modules/uswds/dist/img/usa-icons/do_not_disturb.svg';
+import unAvailable from '/node_modules/uswds/dist/img/usa-icons/error_outline.svg';
 
 interface IIndicator {
   indicator: indicatorInfo,
 }
 
 interface IIndicatorValueIcon {
-  type: indicatorType,
   value: number | null,
-  isAboveThresh: boolean,
 };
 
 interface IIndicatorValueSubText {
@@ -37,31 +31,21 @@ interface IIndicatorValue {
 }
 
 /**
- * This component will determine what indicator's icon should be (arrowUp, arrowDown or unavailable) and
- * return the appropriate JSX.
+ * This component will determine what indicator's icon should be. Either show the unavailable icon
+ * or show nothing.
  *
- * @param {number | null} props
+ * @param {number | null} value
  * @return {JSX.Element}
  */
-export const IndicatorValueIcon = ({type, value, isAboveThresh}: IIndicatorValueIcon) => {
+export const IndicatorValueIcon = ({value}: IIndicatorValueIcon) => {
   const intl = useIntl();
 
-  if (value == null) {
-    return <img className={styles.unavailable}
+  return value === null ? (
+    <img className={styles.unavailable}
       src={unAvailable}
       alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE)}
-    />;
-  } else if (type === 'percent' || type === 'percentile') {
-    return isAboveThresh ?
-      <img
-        src={upArrow}
-        alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.ARROW_UP)}
-      /> :
-      <img
-        src={downArrow}
-        alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.ARROW_DOWN)}
-      />;
-  } else return <></>;
+    />
+  ) : <></>;
 };
 
 /**
@@ -155,7 +139,7 @@ export const superscriptOrdinal = (indicatorValueWithSuffix:string) => {
 export const IndicatorValue = ({type, displayStat}:IIndicatorValue) => {
   const intl = useIntl();
 
-  if (displayStat === null) return <React.Fragment></React.Fragment>;
+  if (displayStat === null) return <>{constants.MISSING_DATA_STRING}</>;
 
   if (type === 'percent' || type === 'percentile') {
     // In this case we will show no value and an icon only
@@ -256,9 +240,7 @@ const Indicator = ({indicator}:IIndicator) => {
             {/* Indicator icon - up arrow, down arrow, or unavailable */}
             <div className={styles.indicatorArrow}>
               <IndicatorValueIcon
-                type={indicator.type}
                 value={displayStat}
-                isAboveThresh={isAboveThresh}
               />
             </div>
           </div>
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index 42728f4b4..7224b6f2e 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -25,6 +25,8 @@ export type J40Properties = { [key: string]: any };
 
 // ****** SIDE PANEL BACKEND SIGNALS ***********
 
+export const MISSING_DATA_STRING = '--';
+
 // Tribal signals
 export const TRIBAL_ID = 'tribalId';
 export const LAND_AREA_NAME = 'landAreaName';

From 2bfa7d454fd13a418755c6d5bc219bf80027272c Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Thu, 8 Sep 2022 23:14:34 -0700
Subject: [PATCH 054/130] update style of side panel categories if supported

- if the browser has ":has" support, the new category styles will be applied
- if not, the older style will remain in place
---
 .../components/Category/Category.module.scss  | 11 ++-
 .../Category/Category.module.scss.d.ts        |  2 +-
 client/src/components/Category/Category.tsx   | 27 ++++++-
 client/src/components/utils.scss              |  4 +-
 .../images/sidePanelIcons/accordion-minus.svg |  1 +
 .../images/sidePanelIcons/accordion-plus.svg  |  1 +
 client/src/styles/global.scss                 | 71 +++++++++++--------
 7 files changed, 81 insertions(+), 36 deletions(-)
 create mode 100644 client/src/images/sidePanelIcons/accordion-minus.svg
 create mode 100644 client/src/images/sidePanelIcons/accordion-plus.svg

diff --git a/client/src/components/Category/Category.module.scss b/client/src/components/Category/Category.module.scss
index d06ffca3d..4abb87918 100644
--- a/client/src/components/Category/Category.module.scss
+++ b/client/src/components/Category/Category.module.scss
@@ -7,4 +7,13 @@
     .category {
         flex-basis: 80%;
     }
-}
\ No newline at end of file
+}
+
+.disCategoryContainer {
+    display: flex;
+    justify-content: space-between;
+
+    .category {
+        flex-basis: 80%;
+    }
+}
diff --git a/client/src/components/Category/Category.module.scss.d.ts b/client/src/components/Category/Category.module.scss.d.ts
index 9eafab431..174616bcf 100644
--- a/client/src/components/Category/Category.module.scss.d.ts
+++ b/client/src/components/Category/Category.module.scss.d.ts
@@ -2,7 +2,7 @@ declare namespace CategoryNamespace {
     export interface ICategoryScss {
         categoryContainer: string;
         category:string;
-        disadvantageDot: string;
+        disCategoryContainer: string;
     }
   }
 
diff --git a/client/src/components/Category/Category.tsx b/client/src/components/Category/Category.tsx
index 9200088dd..f3d501981 100644
--- a/client/src/components/Category/Category.tsx
+++ b/client/src/components/Category/Category.tsx
@@ -8,8 +8,32 @@ interface ICategory {
     isDisadvantaged: boolean | null;
 }
 
+/**
+ * This component controls the Categories on the side panel.
+ *
+ * The category will be styled differently differently depending on
+ * if the category is disadvantaged or not. The JSX in the return
+ * statement is identical however in the global CSS file, we
+ * override the disadvantaged case with a psuedo-selector (:has) that
+ * is new. In order to fallback gracefully for browsers that do
+ * not yet support the ":has" psuedo selector, this redundant JSX
+ * will allow the disadvantaged case show the older category styling
+ * while browsers that do support the ":has" psuedo selector will
+ * render the newer category style.
+ *
+ * @param {string} name
+ * @param {boolean} isDisadvagtaged
+ * @return {JSX.Element}
+ */
 const Category = ({name, isDisadvantaged}:ICategory) => {
-  return (
+  return isDisadvantaged ? (
+    <div className={styles.disCategoryContainer}>
+      <div className={styles.category}>
+        {name}
+      </div>
+      <DisadvantageDot isDisadvantaged={isDisadvantaged}/>
+    </div>
+  ) : (
     <div className={styles.categoryContainer}>
       <div className={styles.category}>
         {name}
@@ -18,5 +42,4 @@ const Category = ({name, isDisadvantaged}:ICategory) => {
     </div>
   );
 };
-
 export default Category;
diff --git a/client/src/components/utils.scss b/client/src/components/utils.scss
index ee393ff2d..e9486889b 100644
--- a/client/src/components/utils.scss
+++ b/client/src/components/utils.scss
@@ -8,8 +8,8 @@
 //Styles associated with the side panel
 $sidePanelBorderColor: #f2f2f2;
 $sidePanelBorder: 2px solid $sidePanelBorderColor;
-$mobileBreakpoint: 400px;
-$featureSelectBorderColor: #00bde3;
+$mobileBreakpoint: 400px; // Todo replace with USWDS breakpoint
+
 $additionalCardsBGColor: #FAFAFA;
 $sidePanelLabelFontColor: #171716;
 
diff --git a/client/src/images/sidePanelIcons/accordion-minus.svg b/client/src/images/sidePanelIcons/accordion-minus.svg
new file mode 100644
index 000000000..40554225f
--- /dev/null
+++ b/client/src/images/sidePanelIcons/accordion-minus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M19 13H5v-2h14v2z" fill="white"/></svg>
\ No newline at end of file
diff --git a/client/src/images/sidePanelIcons/accordion-plus.svg b/client/src/images/sidePanelIcons/accordion-plus.svg
new file mode 100644
index 000000000..66e3c50d8
--- /dev/null
+++ b/client/src/images/sidePanelIcons/accordion-plus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" fill="white"/></svg>
\ No newline at end of file
diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss
index 62469d652..a687c278c 100644
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@@ -18,25 +18,32 @@ There are 3 things that should be included in this file:
 // 3. Include or point to your project's custom Sass
 /* 
   Instead of having a separate file for these styles, all styles are being placed here.
-  - Global styles
-  - Layout styles
-    -- Main content styles
-    -- Footer styles
-  - Component styles
-    -- Map styles
-    -- Demographics styles
-    -- Public Event styles
-    -- About styles
-    -- Summary box
-*/
 
+  Ideally, this file should only hold styles for when we need to override the USWDS component 
+  or the Trusswork component. J40 component styles should be contained in it's own component styles.
+
+  - GLOBAL STYLES
+  - MAIN CONTENT STYLES
+  - FOOTER STYLES
+  - MAP STYLES
+  - ACCORDION STYLES
+  - DEMOGRAPHICS STYLES
+  - PUBLIC EVENT STYLES
+  - ABOUT CARD STYLES
+  - SUMMARY BOX STYLES
+*/
 
 
 
-/***************** GLOBAL STYLES **************************************************************/
+/* 
+******************************
+*      GLOBAL STYLES
+****************************** 
+*/
 
 $primary-color: #112f4e;  // Used for header font color - selection color is #005EA2
 $j40-blue-background-color: #e7f2f5;  // Hex value of 'blue-cool-5'
+$disadvantaged-color-side-panel: #1a4480;
 
 // The j40-element mixin is used to create any font element. E.g. <h1>, <p> tags, etc.
 // Arguments to the mixins must be tokens from USWDS
@@ -97,12 +104,6 @@ p.flush {
   @include j40-element('lg', 2, 'bold', 0 );
 }
 
-/***************** LAYOUT STYLES **************************************************************
-This section will outline styles for components that are on each page. These 
-components include:
-
-- main content styles
-- footer styles
 
 
 /* 
@@ -184,14 +185,6 @@ li[class*='datasetCard-module'] .usa-link--external::after {
 }
 
 
-
-/***************** COMPONENT STYLES **************************************************************
-This section will outline styles that are component specific
-
-- map
-- timeline
-- about
-
 /* 
 ******************************
 *      MAP STYLES
@@ -359,16 +352,34 @@ Beacon - the beacon's color (*-location-dot) and proximity animation (::before),
 }
 
 
-.usa-accordion__content {
-  padding-bottom: 0;
-}
-
 //As per Mikel Maron's (MapBox advocate) suggestion to use svg data URI override:
 a.mapboxgl-ctrl-logo { 
   background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='88' height='23' viewBox='0 0 88 23' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' fill-rule='evenodd'%3E %3Cdefs%3E %3Cpath id='logo' d='M11.5 2.25c5.105 0 9.25 4.145 9.25 9.25s-4.145 9.25-9.25 9.25-9.25-4.145-9.25-9.25 4.145-9.25 9.25-9.25zM6.997 15.983c-.051-.338-.828-5.802 2.233-8.873a4.395 4.395 0 013.13-1.28c1.27 0 2.49.51 3.39 1.42.91.9 1.42 2.12 1.42 3.39 0 1.18-.449 2.301-1.28 3.13C12.72 16.93 7 16 7 16l-.003-.017zM15.3 10.5l-2 .8-.8 2-.8-2-2-.8 2-.8.8-2 .8 2 2 .8z'/%3E %3Cpath id='text' d='M50.63 8c.13 0 .23.1.23.23V9c.7-.76 1.7-1.18 2.73-1.18 2.17 0 3.95 1.85 3.95 4.17s-1.77 4.19-3.94 4.19c-1.04 0-2.03-.43-2.74-1.18v3.77c0 .13-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V8.23c0-.12.1-.23.23-.23h1.4zm-3.86.01c.01 0 .01 0 .01-.01.13 0 .22.1.22.22v7.55c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V15c-.7.76-1.69 1.19-2.73 1.19-2.17 0-3.94-1.87-3.94-4.19 0-2.32 1.77-4.19 3.94-4.19 1.03 0 2.02.43 2.73 1.18v-.75c0-.12.1-.23.23-.23h1.4zm26.375-.19a4.24 4.24 0 00-4.16 3.29c-.13.59-.13 1.19 0 1.77a4.233 4.233 0 004.17 3.3c2.35 0 4.26-1.87 4.26-4.19 0-2.32-1.9-4.17-4.27-4.17zM60.63 5c.13 0 .23.1.23.23v3.76c.7-.76 1.7-1.18 2.73-1.18 1.88 0 3.45 1.4 3.84 3.28.13.59.13 1.2 0 1.8-.39 1.88-1.96 3.29-3.84 3.29-1.03 0-2.02-.43-2.73-1.18v.77c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V5.23c0-.12.1-.23.23-.23h1.4zm-34 11h-1.4c-.13 0-.23-.11-.23-.23V8.22c.01-.13.1-.22.23-.22h1.4c.13 0 .22.11.23.22v.68c.5-.68 1.3-1.09 2.16-1.1h.03c1.09 0 2.09.6 2.6 1.55.45-.95 1.4-1.55 2.44-1.56 1.62 0 2.93 1.25 2.9 2.78l.03 5.2c0 .13-.1.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.8 0-1.46.7-1.59 1.62l.01 4.68c0 .13-.11.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.85 0-1.54.79-1.6 1.8v4.5c0 .13-.1.23-.23.23zm53.615 0h-1.61c-.04 0-.08-.01-.12-.03-.09-.06-.13-.19-.06-.28l2.43-3.71-2.39-3.65a.213.213 0 01-.03-.12c0-.12.09-.21.21-.21h1.61c.13 0 .24.06.3.17l1.41 2.37 1.4-2.37a.34.34 0 01.3-.17h1.6c.04 0 .08.01.12.03.09.06.13.19.06.28l-2.37 3.65 2.43 3.7c0 .05.01.09.01.13 0 .12-.09.21-.21.21h-1.61c-.13 0-.24-.06-.3-.17l-1.44-2.42-1.44 2.42a.34.34 0 01-.3.17zm-7.12-1.49c-1.33 0-2.42-1.12-2.42-2.51 0-1.39 1.08-2.52 2.42-2.52 1.33 0 2.42 1.12 2.42 2.51 0 1.39-1.08 2.51-2.42 2.52zm-19.865 0c-1.32 0-2.39-1.11-2.42-2.48v-.07c.02-1.38 1.09-2.49 2.4-2.49 1.32 0 2.41 1.12 2.41 2.51 0 1.39-1.07 2.52-2.39 2.53zm-8.11-2.48c-.01 1.37-1.09 2.47-2.41 2.47s-2.42-1.12-2.42-2.51c0-1.39 1.08-2.52 2.4-2.52 1.33 0 2.39 1.11 2.41 2.48l.02.08zm18.12 2.47c-1.32 0-2.39-1.11-2.41-2.48v-.06c.02-1.38 1.09-2.48 2.41-2.48s2.42 1.12 2.42 2.51c0 1.39-1.09 2.51-2.42 2.51z'/%3E %3C/defs%3E %3Cmask id='clip'%3E %3Crect x='0' y='0' width='100%25' height='100%25' fill='white'/%3E %3Cuse xlink:href='%23logo'/%3E %3Cuse xlink:href='%23text'/%3E %3C/mask%3E %3Cg id='outline' opacity='0.3' stroke='%23000' stroke-width='3'%3E %3Ccircle mask='url(/studio-manual/assets/%23clip)' cx='11.5' cy='11.5' r='9.25'/%3E %3Cuse xlink:href='%23text' mask='url(/studio-manual/assets/%23clip)'/%3E %3C/g%3E %3Cg id='fill' opacity='0.9' fill='%23fff'%3E %3Cuse xlink:href='%23logo'/%3E %3Cuse xlink:href='%23text'/%3E %3C/g%3E %3C/svg%3E") !important;
 };
 
 
+/* 
+******************************
+*      ACCORDION STYLES
+****************************** 
+*/
+.usa-accordion__content {
+  padding-bottom: 0;
+}
+
+// The following two styles will only work in browsers that support the ":has" selector
+button.usa-accordion__button:has(div[class*="disCategoryContainer"])  {
+  background-color: $disadvantaged-color-side-panel;
+  background-image: url("../images/sidePanelIcons/accordion-plus.svg");
+
+  div[class*="disCategoryContainer"]{
+    color: white;
+  }
+}
+button.usa-accordion__button[aria-expanded=true]:has(div[class*="disCategoryContainer"])  {
+  background-image: url("../images/sidePanelIcons/accordion-minus.svg");
+}
+
 /* 
 ******************************
 *      DEMOGRAPHICS STYLES

From b0b2bc387b91433f0edda76a7db70dc2436a3c4d Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Thu, 8 Sep 2022 23:23:14 -0700
Subject: [PATCH 055/130] update snapshots

---
 .../__snapshots__/areaDetail.test.tsx.snap    | 298 ++++++++----------
 .../components/Indicator/Indicator.test.tsx   |  59 +---
 .../__snapshots__/Indicator.test.tsx.snap     |  70 +---
 3 files changed, 148 insertions(+), 279 deletions(-)

diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index bf25cf635..dc3db5b13 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -287,12 +287,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -329,12 +324,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -374,12 +364,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -413,7 +398,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -717,7 +704,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -746,7 +735,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -777,7 +768,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -808,7 +801,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -839,7 +834,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -881,12 +878,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -950,7 +942,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -979,7 +973,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1021,12 +1017,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1090,7 +1081,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1119,7 +1112,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1148,7 +1143,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1190,12 +1187,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1267,12 +1259,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1301,7 +1288,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1330,7 +1319,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1361,7 +1352,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1403,12 +1396,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1472,7 +1460,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1501,7 +1491,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1530,7 +1522,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1559,7 +1553,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1588,7 +1584,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1630,12 +1628,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1699,7 +1692,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1728,7 +1723,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1770,12 +1767,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1839,7 +1831,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1871,7 +1865,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1900,7 +1896,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1929,7 +1927,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -1971,12 +1971,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2050,12 +2045,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2084,7 +2074,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -2121,12 +2113,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2166,12 +2153,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2210,12 +2192,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     98%
                   </span>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2279,7 +2256,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -2313,7 +2292,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -2617,7 +2598,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -2646,7 +2629,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -2688,12 +2673,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2765,12 +2745,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2812,12 +2787,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2881,7 +2851,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -2910,7 +2882,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -2939,7 +2913,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -2968,7 +2944,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -2997,7 +2975,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -3039,12 +3019,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -3108,7 +3083,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             </div>
             <div>
               <div>
-                <div />
+                <div>
+                  --
+                </div>
                 <div>
                   <img
                     alt="an icon to represent data is unavailable"
@@ -3145,12 +3122,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -3190,12 +3162,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -3234,12 +3201,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     98%
                   </span>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
diff --git a/client/src/components/Indicator/Indicator.test.tsx b/client/src/components/Indicator/Indicator.test.tsx
index f648d80ea..92ab4fdf7 100644
--- a/client/src/components/Indicator/Indicator.test.tsx
+++ b/client/src/components/Indicator/Indicator.test.tsx
@@ -47,68 +47,11 @@ describe('rendering of the Indicator', () => {
 });
 
 describe('test rendering of Indicator value icons', () => {
-  it('renders the up arrow when value is above threshold', () => {
+  it('renders the unavailable icon when the value is null', () => {
     const {asFragment} = render(
         <LocalizedComponent>
           <IndicatorValueIcon
-            type='percent'
-            value={90}
-            isAboveThresh={true}
-          />
-        </LocalizedComponent>,
-    );
-    expect(asFragment()).toMatchSnapshot();
-    screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.ARROW_UP.defaultMessage);
-  });
-  it('renders the down arrow when the value is above the threshold', () => {
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <IndicatorValueIcon
-            type='percentile'
-            value={13}
-            isAboveThresh={false}
-          />
-        </LocalizedComponent>,
-    );
-    expect(asFragment()).toMatchSnapshot();
-    screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.ARROW_DOWN.defaultMessage);
-  });
-
-  it('renders the down arrow when the value is zero', () => {
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <IndicatorValueIcon
-            type='percentile'
-            value={0}
-            isAboveThresh={false}
-          />
-        </LocalizedComponent>,
-    );
-    expect(asFragment()).toMatchSnapshot();
-    screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.ARROW_DOWN.defaultMessage);
-  });
-
-  it('renders the unavailable icon when the value is a boolean null', () => {
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <IndicatorValueIcon
-            type='boolean'
-            value={null}
-            isAboveThresh={false}
-          />
-        </LocalizedComponent>,
-    );
-    expect(asFragment()).toMatchSnapshot();
-    screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE.defaultMessage);
-  });
-
-  it('renders the unavailable icon when the value is a percentile null', () => {
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <IndicatorValueIcon
-            type='percentile'
             value={null}
-            isAboveThresh={false}
           />
         </LocalizedComponent>,
     );
diff --git a/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap b/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
index 4e44d9f50..96a48b8fb 100644
--- a/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
+++ b/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
@@ -20,12 +20,7 @@ exports[`rendering of the Indicator checks if component renders 1`] = `
               97%
             </span>
           </div>
-          <div>
-            <img
-              alt="an icon for the up arrow"
-              src="test-file-stub"
-            />
-          </div>
+          <div />
         </div>
         <div>
           <div>
@@ -62,12 +57,7 @@ exports[`rendering of the Indicator checks if the flooring function works 1`] =
               42%
             </span>
           </div>
-          <div>
-            <img
-              alt="an icon for the up arrow"
-              src="test-file-stub"
-            />
-          </div>
+          <div />
         </div>
         <div>
           <div>
@@ -99,7 +89,9 @@ exports[`renders value correctly for Former defense sites checks if it renders n
       </div>
       <div>
         <div>
-          <div />
+          <div>
+            --
+          </div>
           <div>
             <img
               alt="an icon to represent data is unavailable"
@@ -187,7 +179,9 @@ exports[`renders value correctly for abandoned land mines checks if it renders n
       </div>
       <div>
         <div>
-          <div />
+          <div>
+            --
+          </div>
           <div>
             <img
               alt="an icon to represent data is unavailable"
@@ -275,7 +269,9 @@ exports[`renders value correctly for historic underinvest. checks if it renders
       </div>
       <div>
         <div>
-          <div />
+          <div>
+            --
+          </div>
           <div>
             <img
               alt="an icon to represent data is unavailable"
@@ -348,34 +344,7 @@ exports[`renders value correctly for historic underinvest. checks if it renders
 </DocumentFragment>
 `;
 
-exports[`test rendering of Indicator value icons renders the down arrow when the value is above the threshold 1`] = `
-<DocumentFragment>
-  <img
-    alt="an icon for the down arrow"
-    src="test-file-stub"
-  />
-</DocumentFragment>
-`;
-
-exports[`test rendering of Indicator value icons renders the down arrow when the value is zero 1`] = `
-<DocumentFragment>
-  <img
-    alt="an icon for the down arrow"
-    src="test-file-stub"
-  />
-</DocumentFragment>
-`;
-
-exports[`test rendering of Indicator value icons renders the unavailable icon when the value is a boolean null 1`] = `
-<DocumentFragment>
-  <img
-    alt="an icon to represent data is unavailable"
-    src="test-file-stub"
-  />
-</DocumentFragment>
-`;
-
-exports[`test rendering of Indicator value icons renders the unavailable icon when the value is a percentile null 1`] = `
+exports[`test rendering of Indicator value icons renders the unavailable icon when the value is null 1`] = `
 <DocumentFragment>
   <img
     alt="an icon to represent data is unavailable"
@@ -384,15 +353,6 @@ exports[`test rendering of Indicator value icons renders the unavailable icon wh
 </DocumentFragment>
 `;
 
-exports[`test rendering of Indicator value icons renders the up arrow when value is above threshold 1`] = `
-<DocumentFragment>
-  <img
-    alt="an icon for the up arrow"
-    src="test-file-stub"
-  />
-</DocumentFragment>
-`;
-
 exports[`test rendering of Indicator value sub-text renders missing data  1`] = `
 <DocumentFragment>
   <div>
@@ -429,7 +389,11 @@ exports[`test rendering of Indicator value sub-text renders the "below 90 percen
 </DocumentFragment>
 `;
 
-exports[`test that the unit suffix renders correctly renders correctly when the value is a null 1`] = `<DocumentFragment />`;
+exports[`test that the unit suffix renders correctly renders correctly when the value is a null 1`] = `
+<DocumentFragment>
+  --
+</DocumentFragment>
+`;
 
 exports[`test that the unit suffix renders correctly renders correctly when the value is a percent 1`] = `
 <DocumentFragment>

From a49dbfdf90ddfac764571baed614c84e4712c6c6 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Thu, 8 Sep 2022 23:52:16 -0700
Subject: [PATCH 056/130] update styling for indicator values

- refactor disadvantaged blue dot to utils.scss
---
 .../DisadvantageDot.module.scss               |  3 +-
 .../Indicator/Indicator.module.scss           | 42 ++++++-------------
 .../Indicator/Indicator.module.scss.d.ts      |  1 +
 client/src/components/Indicator/Indicator.tsx |  6 ++-
 client/src/components/utils.scss              | 10 ++---
 5 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/client/src/components/DisadvantageDot/DisadvantageDot.module.scss b/client/src/components/DisadvantageDot/DisadvantageDot.module.scss
index 848804ab2..5d77c58a3 100644
--- a/client/src/components/DisadvantageDot/DisadvantageDot.module.scss
+++ b/client/src/components/DisadvantageDot/DisadvantageDot.module.scss
@@ -1,4 +1,5 @@
 @use '../../styles/design-system.scss' as *;
+@import "../utils.scss";
 
 .disadvantagedDotSmall {
     @include u-circle('105');
@@ -12,7 +13,7 @@
     @include u-circle(4);
     margin: 2.3rem 1.5rem 2rem 0;
     // opacity: .6;
-    border: 3px solid #1A4480;
+    border: 3px solid $disadvantagedDotColor;
     
     //Maintain aspect ratio as screen width decreases
     flex: 1 0 2rem;
diff --git a/client/src/components/Indicator/Indicator.module.scss b/client/src/components/Indicator/Indicator.module.scss
index 6d9ef09b9..1bd84e8b5 100644
--- a/client/src/components/Indicator/Indicator.module.scss
+++ b/client/src/components/Indicator/Indicator.module.scss
@@ -1,6 +1,11 @@
 @use '../../styles/design-system.scss' as *;
 @import "../utils.scss";
 
+@mixin indicatorPadding {
+  @include u-padding-left(1);
+  @include u-padding-right(1);
+}
+
 @mixin indicator {
   display: flex;
   flex-direction: column;
@@ -46,8 +51,14 @@
         align-self: end;
 
         .indicatorValue {
-          margin-left: 2.2rem;
-        } 
+          @include indicatorPadding();
+        }
+        
+        .disIndicatorValue {
+          @include indicatorPadding();
+          color: white;
+          background-color: $disadvantagedDotColor;
+        }
 
         .indicatorArrow {
           margin-bottom: -.375rem;
@@ -82,30 +93,3 @@
 .indicatorBoxMain {
   @include indicator;
 }
-
-.disadvantagedIndicator {
-  @include indicator;
-  @include u-bg('blue-warm-10');
-
-  // A darker bg color:
-  // background-color: #D2DAE3;
-
-  // Add a border
-  // border: 1px solid #1A4480;
-
-  margin: 0 -20px 1px -20px;
-  @include u-padding-left(2.5);
-  @include u-padding-right(2.5);
-
-
-  // Overwrite indicator mixin with bolder fonts for disadv. indicator 
-  .indicatorRow {
-    .indicatorName {
-      @include u-text('bold'); 
-      
-      .indicatorDesc {
-        @include u-text('normal'); 
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/client/src/components/Indicator/Indicator.module.scss.d.ts b/client/src/components/Indicator/Indicator.module.scss.d.ts
index 6d10859d7..9a8e43f2c 100644
--- a/client/src/components/Indicator/Indicator.module.scss.d.ts
+++ b/client/src/components/Indicator/Indicator.module.scss.d.ts
@@ -7,6 +7,7 @@ declare namespace IndicatorNamespace {
       indicatorValueCol:string;
       indicatorValueRow:string;
       indicatorValue:string;
+      disIndicatorValue:string;
       indicatorSuperscript:string;
       indicatorArrow:string;
       unavailable:string;
diff --git a/client/src/components/Indicator/Indicator.tsx b/client/src/components/Indicator/Indicator.tsx
index ff1c774a6..d3729c03f 100644
--- a/client/src/components/Indicator/Indicator.tsx
+++ b/client/src/components/Indicator/Indicator.tsx
@@ -212,7 +212,7 @@ const Indicator = ({indicator}:IIndicator) => {
 
   return (
     <li
-      className={indicator.isDisadvagtaged ? styles.disadvantagedIndicator : styles.indicatorBoxMain}
+      className={styles.indicatorBoxMain}
       data-cy={'indicatorBox'}
       data-testid='indicator-box'>
       <div className={styles.indicatorRow}>
@@ -230,7 +230,9 @@ const Indicator = ({indicator}:IIndicator) => {
           <div className={styles.indicatorValueRow}>
 
             {/* Indicator value */}
-            <div className={styles.indicatorValue}>
+            <div className={indicator.isDisadvagtaged ?
+              styles.disIndicatorValue : styles.indicatorValue}
+            >
               <IndicatorValue
                 type={indicator.type}
                 displayStat={displayStat}
diff --git a/client/src/components/utils.scss b/client/src/components/utils.scss
index e9486889b..112cd6bc5 100644
--- a/client/src/components/utils.scss
+++ b/client/src/components/utils.scss
@@ -6,10 +6,10 @@
 */
 
 //Styles associated with the side panel
-$sidePanelBorderColor: #f2f2f2;
+$sidePanelBorderColor: #F2F2F2;
 $sidePanelBorder: 2px solid $sidePanelBorderColor;
 $mobileBreakpoint: 400px; // Todo replace with USWDS breakpoint
-
+$disadvantagedDotColor: #1A4480;
 $additionalCardsBGColor: #FAFAFA;
 $sidePanelLabelFontColor: #171716;
 
@@ -21,6 +21,6 @@ $sidePanelLabelFontColor: #171716;
   
 
 //Styles with Dataset container
-$datasetContainerColor: #eef6fb;
-$headingFontColor: #122e51;
-$j40AlertWarningColor: #faf3d1;
+$datasetContainerColor: #EEF6FB;
+$headingFontColor: #122E51;
+$j40AlertWarningColor: #FAF3D1;

From 228aca0da5b19ebbcd3a9903412c2b08dbb385db Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 9 Sep 2022 15:46:11 -0700
Subject: [PATCH 057/130] remove missing icon and reduce subtext font size

---
 .../__snapshots__/areaDetail.test.tsx.snap    | 252 +++---------------
 .../Indicator/Indicator.module.scss           |   2 +-
 .../components/Indicator/Indicator.test.tsx   |  26 +-
 client/src/components/Indicator/Indicator.tsx |  19 +-
 .../__snapshots__/Indicator.test.tsx.snap     |  30 +--
 5 files changed, 61 insertions(+), 268 deletions(-)

diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index dc3db5b13..bc8e76ce4 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -401,12 +401,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -707,12 +702,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -738,12 +728,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -771,12 +756,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -804,12 +784,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -837,12 +812,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -945,12 +915,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -976,12 +941,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1084,12 +1044,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1115,12 +1070,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1146,12 +1096,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1291,12 +1236,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1322,12 +1262,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1355,12 +1290,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1463,12 +1393,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1494,12 +1419,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1525,12 +1445,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1556,12 +1471,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1587,12 +1497,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1695,12 +1600,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1726,12 +1626,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1834,12 +1729,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1868,12 +1758,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1899,12 +1784,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1930,12 +1810,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2077,12 +1952,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2259,12 +2129,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2295,12 +2160,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2601,12 +2461,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2632,12 +2487,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2854,12 +2704,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2885,12 +2730,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2916,12 +2756,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2947,12 +2782,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2978,12 +2808,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -3086,12 +2911,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                 <div>
                   --
                 </div>
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
diff --git a/client/src/components/Indicator/Indicator.module.scss b/client/src/components/Indicator/Indicator.module.scss
index 1bd84e8b5..3d5c705d4 100644
--- a/client/src/components/Indicator/Indicator.module.scss
+++ b/client/src/components/Indicator/Indicator.module.scss
@@ -81,7 +81,7 @@
         align-self: flex-end;
         text-align: right;
         @include u-width(8);
-        @include typeset('sans', '3xs', 2);
+        @include typeset('sans', 'micro', 2);
         @include u-text('thin'); 
       }
     }
diff --git a/client/src/components/Indicator/Indicator.test.tsx b/client/src/components/Indicator/Indicator.test.tsx
index 92ab4fdf7..9336baa36 100644
--- a/client/src/components/Indicator/Indicator.test.tsx
+++ b/client/src/components/Indicator/Indicator.test.tsx
@@ -46,19 +46,19 @@ describe('rendering of the Indicator', () => {
   });
 });
 
-describe('test rendering of Indicator value icons', () => {
-  it('renders the unavailable icon when the value is null', () => {
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <IndicatorValueIcon
-            value={null}
-          />
-        </LocalizedComponent>,
-    );
-    expect(asFragment()).toMatchSnapshot();
-    screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE.defaultMessage);
-  });
-});
+// describe('test rendering of Indicator value icons', () => {
+//   it('renders the unavailable icon when the value is null', () => {
+//     const {asFragment} = render(
+//         <LocalizedComponent>
+//           <IndicatorValueIcon
+//             value={null}
+//           />
+//         </LocalizedComponent>,
+//     );
+//     expect(asFragment()).toMatchSnapshot();
+//     screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE.defaultMessage);
+//   });
+// });
 
 describe('test rendering of Indicator value sub-text', () => {
   it('renders the "above 90 percentile"', () => {
diff --git a/client/src/components/Indicator/Indicator.tsx b/client/src/components/Indicator/Indicator.tsx
index d3729c03f..63883b415 100644
--- a/client/src/components/Indicator/Indicator.tsx
+++ b/client/src/components/Indicator/Indicator.tsx
@@ -8,7 +8,7 @@ import * as constants from '../../data/constants';
 import * as EXPLORE_COPY from '../../data/copy/explore';
 
 // @ts-ignore
-import unAvailable from '/node_modules/uswds/dist/img/usa-icons/error_outline.svg';
+// import unAvailable from '/node_modules/uswds/dist/img/usa-icons/error_outline.svg';
 
 interface IIndicator {
   indicator: indicatorInfo,
@@ -31,21 +31,18 @@ interface IIndicatorValue {
 }
 
 /**
- * This component will determine what indicator's icon should be. Either show the unavailable icon
- * or show nothing.
+ * This component will determine what indicator's icon should be. ATM there are no icons to show, however
+ * this may change and so leaving a place holder function here for easy change in the future
  *
  * @param {number | null} value
  * @return {JSX.Element}
  */
 export const IndicatorValueIcon = ({value}: IIndicatorValueIcon) => {
-  const intl = useIntl();
-
-  return value === null ? (
-    <img className={styles.unavailable}
-      src={unAvailable}
-      alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE)}
-    />
-  ) : <></>;
+  return value === null ? <></> : <></>;
+  // <img className={styles.unavailable}
+  //   src={unAvailable}
+  //   alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE)}
+  // />
 };
 
 /**
diff --git a/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap b/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
index 96a48b8fb..27cbe6f0b 100644
--- a/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
+++ b/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
@@ -92,12 +92,7 @@ exports[`renders value correctly for Former defense sites checks if it renders n
           <div>
             --
           </div>
-          <div>
-            <img
-              alt="an icon to represent data is unavailable"
-              src="test-file-stub"
-            />
-          </div>
+          <div />
         </div>
         <div>
           <div>
@@ -182,12 +177,7 @@ exports[`renders value correctly for abandoned land mines checks if it renders n
           <div>
             --
           </div>
-          <div>
-            <img
-              alt="an icon to represent data is unavailable"
-              src="test-file-stub"
-            />
-          </div>
+          <div />
         </div>
         <div>
           <div>
@@ -272,12 +262,7 @@ exports[`renders value correctly for historic underinvest. checks if it renders
           <div>
             --
           </div>
-          <div>
-            <img
-              alt="an icon to represent data is unavailable"
-              src="test-file-stub"
-            />
-          </div>
+          <div />
         </div>
         <div>
           <div>
@@ -344,15 +329,6 @@ exports[`renders value correctly for historic underinvest. checks if it renders
 </DocumentFragment>
 `;
 
-exports[`test rendering of Indicator value icons renders the unavailable icon when the value is null 1`] = `
-<DocumentFragment>
-  <img
-    alt="an icon to represent data is unavailable"
-    src="test-file-stub"
-  />
-</DocumentFragment>
-`;
-
 exports[`test rendering of Indicator value sub-text renders missing data  1`] = `
 <DocumentFragment>
   <div>

From be227972c8ec25c06a84b602a52a0998d1986de2 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 9 Sep 2022 15:52:20 -0700
Subject: [PATCH 058/130] Remove un-needed import in test file

---
 client/src/components/Indicator/Indicator.test.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/src/components/Indicator/Indicator.test.tsx b/client/src/components/Indicator/Indicator.test.tsx
index 9336baa36..9e072aced 100644
--- a/client/src/components/Indicator/Indicator.test.tsx
+++ b/client/src/components/Indicator/Indicator.test.tsx
@@ -1,11 +1,9 @@
 import * as React from 'react';
-import {render, screen} from '@testing-library/react';
+import {render} from '@testing-library/react';
 import {LocalizedComponent} from '../../test/testHelpers';
-import Indicator, {IndicatorValueIcon, IndicatorValueSubText, IndicatorValue} from './Indicator';
+import Indicator, {IndicatorValueSubText, IndicatorValue} from './Indicator';
 import {indicatorInfo} from '../AreaDetail/AreaDetail';
 
-import * as EXPLORE_COPY from '../../data/copy/explore';
-
 describe('rendering of the Indicator', () => {
   it('checks if component renders', () => {
     const highSchool:indicatorInfo = {

From 5ecebf3247edd17f76ce410bd78865d869704a19 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 13 Sep 2022 10:05:23 -0700
Subject: [PATCH 059/130] Update category, indicator copy

---
 .../src/components/AreaDetail/AreaDetail.tsx  | 200 +++++-----
 .../__snapshots__/areaDetail.test.tsx.snap    | 227 ++++++------
 client/src/data/copy/explore.tsx              | 348 ++++++++++--------
 client/src/intl/en.json                       |  76 ++--
 4 files changed, 442 insertions(+), 409 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 99d0db5cc..7330b9048 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -315,9 +315,9 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
 
 
   // Energy category
-  const energyBurden: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ENERGY_BURDEN),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.ENERGY_BURDEN),
+  const energyCost: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ENERGY_COST),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.ENERGY_COST),
     type: 'percentile',
     value: properties.hasOwnProperty(constants.ENERGY_PERCENTILE) ?
       properties[constants.ENERGY_PERCENTILE] : null,
@@ -334,34 +334,44 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       properties[constants.IS_EXCEEDS_THRESH_FOR_PM25] : null,
   };
 
-  // Transit category
-  const dieselPartMatter: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.DIESEL_PARTICULATE_MATTER),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.DIESEL_PARTICULATE_MATTER),
+  // Health category
+  const asthma: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ASTHMA),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.ASTHMA),
     type: 'percentile',
-    value: properties.hasOwnProperty(constants.DIESEL_MATTER_PERCENTILE) ?
-      properties[constants.DIESEL_MATTER_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_DIESEL_PM] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_DIESEL_PM] : null,
+    value: properties.hasOwnProperty(constants.ASTHMA_PERCENTILE) ?
+      properties[constants.ASTHMA_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_ASTHMA] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_ASTHMA] : null,
   };
-  const barrierTransport: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.BARRIER_TRANS),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.BARRIER_TRANS),
+  const diabetes: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.DIABETES),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.DIABETES),
     type: 'percentile',
-    value: properties.hasOwnProperty(constants.TRAVEL_DISADV_PERCENTILE) ?
-      properties[constants.TRAVEL_DISADV_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_TRAVEL_DISADV] ?
-      properties[constants.IS_EXCEEDS_THRESH_TRAVEL_DISADV] : null,
+    value: properties.hasOwnProperty(constants.DIABETES_PERCENTILE) ?
+      properties[constants.DIABETES_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_DIABETES] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_DIABETES] : null,
   };
-  const trafficVolume: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.TRAFFIC_VOLUME),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.TRAFFIC_VOLUME),
+  const heartDisease: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HEART_DISEASE),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HEART_DISEASE),
     type: 'percentile',
-    value: properties.hasOwnProperty(constants.TRAFFIC_PERCENTILE) ?
-      properties[constants.TRAFFIC_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_TRAFFIC_PROX] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_TRAFFIC_PROX] : null,
+    value: properties.hasOwnProperty(constants.HEART_PERCENTILE) ?
+      properties[constants.HEART_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_HEART_DISEASE] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_HEART_DISEASE] : null,
   };
+  const lifeExpect: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LIFE_EXPECT),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LOW_LIFE_EXPECT),
+    type: 'percentile',
+    value: properties.hasOwnProperty(constants.LIFE_PERCENTILE) ?
+      properties[constants.LIFE_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_LOW_LIFE_EXP] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_LOW_LIFE_EXP] : null,
+  };
+
 
   // Housing category
   const historicUnderinvest: indicatorInfo = {
@@ -370,15 +380,14 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     type: 'boolean',
     value: properties.hasOwnProperty(constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH) ?
       (properties[constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH] ===
-        constants.HISTORIC_UNDERINVESTMENT_RAW_YES ? true : false) :
-      null,
+        constants.HISTORIC_UNDERINVESTMENT_RAW_YES ? true : false) : null,
     isDisadvagtaged: properties.hasOwnProperty(constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH) &&
-    properties[constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH] ===
-    constants.HISTORIC_UNDERINVESTMENT_RAW_YES ? true : false,
+      properties[constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH] ===
+        constants.HISTORIC_UNDERINVESTMENT_RAW_YES ? true : false,
   };
-  const houseBurden: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HOUSE_BURDEN),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HOUSE_BURDEN),
+  const houseCost: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HOUSE_COST),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HOUSE_COST),
     type: 'percentile',
     value: properties.hasOwnProperty(constants.HOUSING_BURDEN_PROPERTY_PERCENTILE) ?
       properties[constants.HOUSING_BURDEN_PROPERTY_PERCENTILE] : null,
@@ -413,6 +422,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       properties[constants.IS_EXCEEDS_THRESH_FOR_LEAD_PAINT_AND_MEDIAN_HOME_VAL] : null,
   };
 
+
   // Pollution categeory
   const abandonMines: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ABANDON_MINES),
@@ -442,6 +452,15 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_HAZARD_WASTE] ?
       properties[constants.IS_EXCEEDS_THRESH_FOR_HAZARD_WASTE] : null,
   };
+  const proxRMP: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.PROX_RMP),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.PROX_RMP),
+    type: 'percentile',
+    value: properties.hasOwnProperty(constants.PROXIMITY_RMP_SITES_PERCENTILE) ?
+      properties[constants.PROXIMITY_RMP_SITES_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_RMP] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_RMP] : null,
+  };
   const proxNPL: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.PROX_NPL),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.PROX_NPL),
@@ -451,16 +470,38 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_SUPERFUND] ?
       properties[constants.IS_EXCEEDS_THRESH_FOR_SUPERFUND] : null,
   };
-  const proxRMP: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.PROX_RMP),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.PROX_RMP),
+
+
+  // Transpotation category
+  const dieselPartMatter: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.DIESEL_PARTICULATE_MATTER),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.DIESEL_PARTICULATE_MATTER),
     type: 'percentile',
-    value: properties.hasOwnProperty(constants.PROXIMITY_RMP_SITES_PERCENTILE) ?
-      properties[constants.PROXIMITY_RMP_SITES_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_RMP] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_RMP] : null,
+    value: properties.hasOwnProperty(constants.DIESEL_MATTER_PERCENTILE) ?
+      properties[constants.DIESEL_MATTER_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_DIESEL_PM] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_DIESEL_PM] : null,
+  };
+  const barrierTransport: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.BARRIER_TRANS),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.BARRIER_TRANS),
+    type: 'percentile',
+    value: properties.hasOwnProperty(constants.TRAVEL_DISADV_PERCENTILE) ?
+      properties[constants.TRAVEL_DISADV_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_TRAVEL_DISADV] ?
+      properties[constants.IS_EXCEEDS_THRESH_TRAVEL_DISADV] : null,
+  };
+  const trafficVolume: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.TRAFFIC_VOLUME),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.TRAFFIC_VOLUME),
+    type: 'percentile',
+    value: properties.hasOwnProperty(constants.TRAFFIC_PERCENTILE) ?
+      properties[constants.TRAFFIC_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_TRAFFIC_PROX] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_TRAFFIC_PROX] : null,
   };
 
+
   // Water category
   const leakyTanks: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LEAKY_TANKS),
@@ -481,43 +522,6 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       properties[constants.IS_EXCEEDS_THRESH_FOR_WASTEWATER] : null,
   };
 
-  // Health category
-  const asthma: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ASTHMA),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.ASTHMA),
-    type: 'percentile',
-    value: properties.hasOwnProperty(constants.ASTHMA_PERCENTILE) ?
-      properties[constants.ASTHMA_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_ASTHMA] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_ASTHMA] : null,
-  };
-  const diabetes: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.DIABETES),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.DIABETES),
-    type: 'percentile',
-    value: properties.hasOwnProperty(constants.DIABETES_PERCENTILE) ?
-      properties[constants.DIABETES_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_DIABETES] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_DIABETES] : null,
-  };
-  const heartDisease: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HEART_DISEASE),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HEART_DISEASE),
-    type: 'percentile',
-    value: properties.hasOwnProperty(constants.HEART_PERCENTILE) ?
-      properties[constants.HEART_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_HEART_DISEASE] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_HEART_DISEASE] : null,
-  };
-  const lifeExpect: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LIFE_EXPECT),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LOW_LIFE_EXPECT),
-    type: 'percentile',
-    value: properties.hasOwnProperty(constants.LIFE_PERCENTILE) ?
-      properties[constants.LIFE_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_LOW_LIFE_EXP] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_LOW_LIFE_EXP] : null,
-  };
 
   // Workforce dev category
   const lingIso: indicatorInfo = {
@@ -601,7 +605,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     {
       id: 'clean-energy',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_ENERGY),
-      indicators: [energyBurden, pm25],
+      indicators: [energyCost, pm25],
       socioEcIndicators: [lowInc],
       isDisadvagtaged: properties[constants.IS_ENERGY_FACTOR_DISADVANTAGED] ?
         properties[constants.IS_ENERGY_FACTOR_DISADVANTAGED] : null,
@@ -611,21 +615,21 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
         properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
     {
-      id: 'clean-transport',
-      titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_TRANSPORT),
-      indicators: [dieselPartMatter, barrierTransport, trafficVolume],
+      id: 'health-burdens',
+      titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.HEALTH_BURDEN),
+      indicators: [asthma, diabetes, heartDisease, lifeExpect],
       socioEcIndicators: [lowInc],
-      isDisadvagtaged: properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED] ?
-        properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED] : null,
-      isExceed1MoreBurden: properties[constants.IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS] ?
-        properties[constants.IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS] : null,
+      isDisadvagtaged: properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED] ?
+        properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED] : null,
+      isExceed1MoreBurden: properties[constants.IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS] ?
+        properties[constants.IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS] : null,
       isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
         properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
     {
       id: 'sustain-house',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.SUSTAIN_HOUSE),
-      indicators: [historicUnderinvest, houseBurden, lackGreenSpace, lackPlumbing, leadPaint],
+      indicators: [historicUnderinvest, houseCost, lackGreenSpace, lackPlumbing, leadPaint],
       socioEcIndicators: [lowInc],
       isDisadvagtaged: properties[constants.IS_HOUSING_FACTOR_DISADVANTAGED] ?
         properties[constants.IS_HOUSING_FACTOR_DISADVANTAGED] : null,
@@ -646,6 +650,18 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
         properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
+    {
+      id: 'clean-transport',
+      titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_TRANSPORT),
+      indicators: [dieselPartMatter, barrierTransport, trafficVolume],
+      socioEcIndicators: [lowInc],
+      isDisadvagtaged: properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED] ?
+        properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED] : null,
+      isExceed1MoreBurden: properties[constants.IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS] ?
+        properties[constants.IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS] : null,
+      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
+        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
+    },
     {
       id: 'clean-water',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_WATER),
@@ -658,18 +674,6 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
         properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
-    {
-      id: 'health-burdens',
-      titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.HEALTH_BURDEN),
-      indicators: [asthma, diabetes, heartDisease, lifeExpect],
-      socioEcIndicators: [lowInc],
-      isDisadvagtaged: properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED] ?
-        properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED] : null,
-      isExceed1MoreBurden: properties[constants.IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS] ?
-        properties[constants.IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS] : null,
-      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
-        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
-    },
     {
       id: 'work-dev',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.WORK_DEV),
@@ -710,7 +714,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
 
     // eslint-disable-next-line max-len
     categories = categories.filter((category) => category.id === 'work-dev' || category.id === 'clean-energy' || category.id === 'leg-pollute' || category.id === 'sustain-house');
-    categories[1].indicators = [houseBurden];
+    categories[1].indicators = [houseCost];
     categories[3].indicators = [lowMedInc, unemploy, poverty];
   }
 
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index bc8e76ce4..94fec8053 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -274,7 +274,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
             <div>
               Low median income
               <div>
-                Median income calculated as a percent of the area’s median income
+                Comparison of income in the tract to incomes in the area
               </div>
             </div>
             <div>
@@ -389,10 +389,10 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
         >
           <div>
             <div>
-              High school degree non-attainment
+              High school education
               <div>
                 
-      Percent of people ages 25 years or older whose education level is less than a high school diploma 
+      Percent of people ages 25 years or older who did not graduate high school 
     
               </div>
             </div>
@@ -772,7 +772,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Future flood risk
+              Projected flood risk
               <div>
                 
       Projected risk to properties from floods from tides, rain, riverine and storm surges in 30 years
@@ -800,7 +800,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Future wildfire risk
+              Projected wildfire risk
               <div>
                 
       Projected risk to properties from wildfire from fire fuels, weather, humans, and fire movement
@@ -877,7 +877,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Clean energy and energy efficiency
+              Energy
             </div>
             <div
               class=""
@@ -905,7 +905,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Energy burden
+              Energy cost
               <div>
                 Average annual energy costs divided by household income
               </div>
@@ -998,15 +998,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         class="usa-accordion__heading"
       >
         <button
-          aria-controls="clean-transport"
+          aria-controls="health-burdens"
           aria-expanded="false"
           class="usa-accordion__button"
-          data-testid="accordionButton_clean-transport"
+          data-testid="accordionButton_health-burdens"
           type="button"
         >
           <div>
             <div>
-              Clean transit
+              Health
             </div>
             <div
               class=""
@@ -1016,9 +1016,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
       </h4>
       <div
         class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_clean-transport"
+        data-testid="accordionItem_health-burdens"
         hidden=""
-        id="clean-transport"
+        id="health-burdens"
       >
         <div>
           <div>
@@ -1034,9 +1034,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Diesel particulate matter exposure
+              Asthma
               <div>
-                Diesel exhaust in the air
+                Weighted percent of people who have been told they have asthma
               </div>
             </div>
             <div>
@@ -1060,9 +1060,12 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Transportation barriers
+              Diabetes
               <div>
-                Cost and time spent on transportation
+                
+      Weighted percent of people ages 18 years and older who have diabetes other than 
+      diabetes during pregnancy
+    
               </div>
             </div>
             <div>
@@ -1086,9 +1089,35 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Traffic proximity and volume
+              Heart disease
               <div>
-                Count of vehicles at major roads within 500 meters
+                People ages 18 years and older who have been told they have heart disease
+              </div>
+            </div>
+            <div>
+              <div>
+                <div>
+                  --
+                </div>
+                <div />
+              </div>
+              <div>
+                <div>
+                  missing data
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Low life expectancy
+              <div>
+                Average number of years a person can expect to live
               </div>
             </div>
             <div>
@@ -1161,7 +1190,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Sustainable housing
+              Housing
             </div>
             <div
               class=""
@@ -1189,7 +1218,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Housing cost burden
+              Housing cost
               <div>
                 Low income households spending more than 30% of income on housing
               </div>
@@ -1228,7 +1257,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Lack of green space
               <div>
-                Amount of non-crop land covered with artificial materials like pavement and concrete
+                Share of land covered with artificial materials like concrete or pavement and crop land
               </div>
             </div>
             <div>
@@ -1385,7 +1414,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Abandoned mine lands
               <div>
-                Presence of an abandoned land mine within the tract
+                Presence of an abandoned mine lands within the tract
               </div>
             </div>
             <div>
@@ -1409,7 +1438,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Formerly Used Defense Sites (FUDS)
+              Formerly Used Defense Sites
               <div>
                 Presence of a Formerly Used Defense Site within the tract
               </div>
@@ -1461,9 +1490,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Proximity to National Priorities List (NPL) sites
+              Proximity to Superfund sites
               <div>
-                Proposed or listed NPL (Superfund) sites within 5 kilometers
+                Count of Risk Management Plan facilities within 5 kilometers
               </div>
             </div>
             <div>
@@ -1487,7 +1516,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Proximity to Risk Management Plan (RMP) facilities
+              Proximity to Risk Management Plan facilities
               <div>
                 RMP facilities within 5 kilometers
               </div>
@@ -1554,15 +1583,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         class="usa-accordion__heading"
       >
         <button
-          aria-controls="clean-water"
+          aria-controls="clean-transport"
           aria-expanded="false"
           class="usa-accordion__button"
-          data-testid="accordionButton_clean-water"
+          data-testid="accordionButton_clean-transport"
           type="button"
         >
           <div>
             <div>
-              Clean water and wastewater infrastructure
+              Transportation
             </div>
             <div
               class=""
@@ -1572,9 +1601,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
       </h4>
       <div
         class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_clean-water"
+        data-testid="accordionItem_clean-transport"
         hidden=""
-        id="clean-water"
+        id="clean-transport"
       >
         <div>
           <div>
@@ -1590,9 +1619,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Leaking underground storage tanks
+              Diesel particulate matter exposure
               <div>
-                Count of leaking underground storage tanks when compared to all underground storage tanks
+                Amount of diesel exhaust in the air
               </div>
             </div>
             <div>
@@ -1616,9 +1645,35 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Wastewater discharge
+              Transportation barriers
               <div>
-                Toxic concentrations at stream segments within 500 meters
+                Average of relative cost and time spent on transportation
+              </div>
+            </div>
+            <div>
+              <div>
+                <div>
+                  --
+                </div>
+                <div />
+              </div>
+              <div>
+                <div>
+                  missing data
+                </div>
+              </div>
+            </div>
+          </div>
+        </li>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
+          <div>
+            <div>
+              Traffic proximity and volume
+              <div>
+                Count of vehicles at major roads within 500 meters
               </div>
             </div>
             <div>
@@ -1683,15 +1738,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         class="usa-accordion__heading"
       >
         <button
-          aria-controls="health-burdens"
+          aria-controls="clean-water"
           aria-expanded="false"
           class="usa-accordion__button"
-          data-testid="accordionButton_health-burdens"
+          data-testid="accordionButton_clean-water"
           type="button"
         >
           <div>
             <div>
-              Health burdens
+              Water
             </div>
             <div
               class=""
@@ -1701,9 +1756,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
       </h4>
       <div
         class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_health-burdens"
+        data-testid="accordionItem_clean-water"
         hidden=""
-        id="health-burdens"
+        id="clean-water"
       >
         <div>
           <div>
@@ -1719,37 +1774,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Asthma
-              <div>
-                Weighted percent of people who have been told they have asthma
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Diabetes
+              Leaking underground storage tanks
               <div>
-                
-      Weighted percent of people ages 18 years and older who have diabetes other than 
-      diabetes during pregnancy
+                Formula that counts leaking underground storage tanks and number of all underground storage tanks within 1500 feet
     
               </div>
             </div>
@@ -1774,35 +1801,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Heart disease
-              <div>
-                People ages 18 years and older who have been told they have heart disease
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low life expectancy
+              Wastewater discharge
               <div>
-                Average number of years a person can expect to live
+                Toxic concentrations at stream segments within 500 meters
               </div>
             </div>
             <div>
@@ -1944,7 +1945,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Low median income
               <div>
-                Median income calculated as a percent of the area’s median income
+                Comparison of income in the tract to incomes in the area
               </div>
             </div>
             <div>
@@ -2048,10 +2049,10 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              High school degree non-attainment
+              High school education
               <div>
                 
-      Percent of people ages 25 years or older whose education level is less than a high school diploma 
+      Percent of people ages 25 years or older who did not graduate high school 
     
               </div>
             </div>
@@ -2423,7 +2424,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              Clean energy and energy efficiency
+              Energy
             </div>
             <div
               class=""
@@ -2451,7 +2452,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              Energy burden
+              Energy cost
               <div>
                 Average annual energy costs divided by household income
               </div>
@@ -2552,7 +2553,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              Sustainable housing
+              Housing
             </div>
             <div
               class=""
@@ -2580,7 +2581,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              Housing cost burden
+              Housing cost
               <div>
                 Low income households spending more than 30% of income on housing
               </div>
@@ -2696,7 +2697,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             <div>
               Abandoned mine lands
               <div>
-                Presence of an abandoned land mine within the tract
+                Presence of an abandoned mine lands within the tract
               </div>
             </div>
             <div>
@@ -2720,7 +2721,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              Formerly Used Defense Sites (FUDS)
+              Formerly Used Defense Sites
               <div>
                 Presence of a Formerly Used Defense Site within the tract
               </div>
@@ -2772,9 +2773,9 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              Proximity to National Priorities List (NPL) sites
+              Proximity to Superfund sites
               <div>
-                Proposed or listed NPL (Superfund) sites within 5 kilometers
+                Count of Risk Management Plan facilities within 5 kilometers
               </div>
             </div>
             <div>
@@ -2798,7 +2799,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              Proximity to Risk Management Plan (RMP) facilities
+              Proximity to Risk Management Plan facilities
               <div>
                 RMP facilities within 5 kilometers
               </div>
@@ -2903,7 +2904,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             <div>
               Low median income
               <div>
-                Median income calculated as a percent of the area’s median income
+                Comparison of income in the tract to incomes in the area
               </div>
             </div>
             <div>
@@ -3007,10 +3008,10 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              High school degree non-attainment
+              High school education
               <div>
                 
-      Percent of people ages 25 years or older whose education level is less than a high school diploma 
+      Percent of people ages 25 years or older who did not graduate high school 
     
               </div>
             </div>
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index ef7864478..bbdac33ed 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -495,20 +495,20 @@ export const SIDE_PANEL_CATEGORY = defineMessages({
   },
   CLEAN_ENERGY: {
     id: 'explore.map.page.side.panel.indicator.title.clean.energy',
-    defaultMessage: 'Clean energy and energy efficiency',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Clean, efficient energy title
+    defaultMessage: 'Energy',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Energy title
 `,
   },
-  CLEAN_TRANSPORT: {
-    id: 'explore.map.page.side.panel.indicator.title.clean.transport',
-    defaultMessage: 'Clean transit',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Clean transportation title
+  HEALTH_BURDEN: {
+    id: 'explore.map.page.side.panel.indicator.title.health.burden',
+    defaultMessage: 'Health',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Healt title
 `,
   },
   SUSTAIN_HOUSE: {
     id: 'explore.map.page.side.panel.indicator.title.sustain.house',
-    defaultMessage: 'Sustainable housing',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Sustainable housing title
+    defaultMessage: 'Housing',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing title
 `,
   },
   LEG_POLLUTE: {
@@ -517,16 +517,16 @@ export const SIDE_PANEL_CATEGORY = defineMessages({
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Legacy pollution title
 `,
   },
-  CLEAN_WATER: {
-    id: 'explore.map.page.side.panel.indicator.title.clean.water',
-    defaultMessage: 'Clean water and wastewater infrastructure',
-    description: `Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show Clean water and waste title
+  CLEAN_TRANSPORT: {
+    id: 'explore.map.page.side.panel.indicator.title.clean.transport',
+    defaultMessage: 'Transportation',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Transportation title
 `,
   },
-  HEALTH_BURDEN: {
-    id: 'explore.map.page.side.panel.indicator.title.health.burden',
-    defaultMessage: 'Health burdens',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Health burdens title
+  CLEAN_WATER: {
+    id: 'explore.map.page.side.panel.indicator.title.clean.water',
+    defaultMessage: 'Water',
+    description: `Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show Water title
 `,
   },
   WORK_DEV: {
@@ -544,6 +544,7 @@ export const SIDE_PANEL_CATEGORY = defineMessages({
 });
 
 export const SIDE_PANEL_INDICATORS = defineMessages({
+  // Climate Change
   EXP_AG_LOSS: {
     id: 'explore.map.page.side.panel.indicator.exp.ag.loss',
     defaultMessage: 'Expected agriculture loss rate',
@@ -561,12 +562,12 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
   },
   FLOODING: {
     id: 'explore.map.page.side.panel.indicator.flooding',
-    defaultMessage: 'Future flood risk',
+    defaultMessage: 'Projected flood risk',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show flood risk`,
   },
   WILDFIRE: {
     id: 'explore.map.page.side.panel.indicator.wildfire',
-    defaultMessage: 'Future wildfire risk',
+    defaultMessage: 'Projected wildfire risk',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show wildfire risk`,
   },
   LOW_INCOME: {
@@ -578,50 +579,51 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
     defaultMessage: 'Higher education non-enrollment',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Higher ed degree achievement rate`,
   },
-  ENERGY_BURDEN: {
+
+  // Energy
+  ENERGY_COST: {
     id: 'explore.map.page.side.panel.indicator.energyBurden',
-    defaultMessage: 'Energy burden',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Energy burden`,
+    defaultMessage: 'Energy cost',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Energy cost`,
   },
   PM_2_5: {
     id: 'explore.map.page.side.panel.indicator.pm25',
     defaultMessage: 'PM2.5 in the air',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show PM2.5 in the air`,
   },
-  DIESEL_PARTICULATE_MATTER: {
-    id: 'explore.map.page.side.panel.indicator.dieselPartMatter',
-    defaultMessage: 'Diesel particulate matter exposure',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Diesel particulate matter exposure`,
-  },
-  BARRIER_TRANS: {
-    id: 'explore.map.page.side.panel.indicator.barrier.transport',
-    defaultMessage: 'Transportation barriers',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show transportation barriers`,
+
+  // Health
+  ASTHMA: {
+    id: 'explore.map.page.side.panel.indicator.asthma',
+    defaultMessage: 'Asthma',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Asthma`,
   },
-  TRAFFIC_VOLUME: {
-    id: 'explore.map.page.side.panel.indicator.trafficVolume',
-    defaultMessage: 'Traffic proximity and volume',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Traffic proximity and volume`,
+  DIABETES: {
+    id: 'explore.map.page.side.panel.indicator.diabetes',
+    defaultMessage: 'Diabetes',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Diabetes`,
   },
-  LEAD_PAINT: {
-    id: 'explore.map.page.side.panel.indicator.leadPaint',
-    defaultMessage: 'Lead paint',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lead paint`,
+  HEART_DISEASE: {
+    id: 'explore.map.page.side.panel.indicator.heartDisease',
+    defaultMessage: 'Heart disease',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Heart disease`,
   },
-  MED_HOME_VAL: {
-    id: 'explore.map.page.side.panel.indicator.med.home.val',
-    defaultMessage: 'Median home value',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost burden`,
+  LIFE_EXPECT: {
+    id: 'explore.map.page.side.panel.indicator.lifeExpect',
+    defaultMessage: 'Low life expectancy',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Low life expectancy`,
   },
+
+  // Housing
   HIST_UNDERINVEST: {
     id: 'explore.map.page.side.panel.indicator.historic.underinvest',
     defaultMessage: 'Historic underinvestment',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Historic underinvestment`,
   },
-  HOUSE_BURDEN: {
-    id: 'explore.map.page.side.panel.indicator.houseBurden',
-    defaultMessage: 'Housing cost burden',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost burden`,
+  HOUSE_COST: {
+    id: 'explore.map.page.side.panel.indicator.house.cost',
+    defaultMessage: 'Housing cost',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost`,
   },
   LACK_GREEN_SPACE: {
     id: 'explore.map.page.side.panel.indicator.lack.green.space',
@@ -633,6 +635,18 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
     defaultMessage: 'Lack of plumbing',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lack of plumbing`,
   },
+  LEAD_PAINT: {
+    id: 'explore.map.page.side.panel.indicator.leadPaint',
+    defaultMessage: 'Lead paint',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lead paint`,
+  },
+  MED_HOME_VAL: {
+    id: 'explore.map.page.side.panel.indicator.med.home.val',
+    defaultMessage: 'Median home value',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost burden`,
+  },
+
+  // Legacy Pollution
   ABANDON_MINES: {
     id: 'explore.map.page.side.panel.indicator.abandon.mines',
     defaultMessage: 'Abandoned mine lands',
@@ -640,24 +654,43 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
   },
   FORMER_DEF_SITES: {
     id: 'explore.map.page.side.panel.indicator.former.def.sites',
-    defaultMessage: 'Formerly Used Defense Sites (FUDS)',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Formerly Used Defense Sites (FUDS)`,
+    defaultMessage: 'Formerly Used Defense Sites',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Formerly Used Defense Sites`,
   },
   PROX_HAZ: {
     id: 'explore.map.page.side.panel.indicator.prox.haz',
     defaultMessage: 'Proximity to hazardous waste facilities',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Proximity to hazardous waste facilities`,
   },
+  PROX_RMP: {
+    id: 'explore.map.page.side.panel.indicator.prox.rmp',
+    defaultMessage: 'Proximity to Risk Management Plan facilities',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Count of proposed or listed RMP`,
+  },
   PROX_NPL: {
     id: 'explore.map.page.side.panel.indicator.prox.npl',
-    defaultMessage: 'Proximity to National Priorities List (NPL) sites',
+    defaultMessage: 'Proximity to Superfund sites',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Count of proposed or listed NPL `,
   },
-  PROX_RMP: {
-    id: 'explore.map.page.side.panel.indicator.prox.rmp',
-    defaultMessage: 'Proximity to Risk Management Plan (RMP) facilities',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Count of proposed or listed RMP`,
+
+  // Transportation
+  DIESEL_PARTICULATE_MATTER: {
+    id: 'explore.map.page.side.panel.indicator.dieselPartMatter',
+    defaultMessage: 'Diesel particulate matter exposure',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Diesel particulate matter exposure`,
   },
+  BARRIER_TRANS: {
+    id: 'explore.map.page.side.panel.indicator.barrier.transport',
+    defaultMessage: 'Transportation barriers',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show transportation barriers`,
+  },
+  TRAFFIC_VOLUME: {
+    id: 'explore.map.page.side.panel.indicator.trafficVolume',
+    defaultMessage: 'Traffic proximity and volume',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Traffic proximity and volume`,
+  },
+
+  // Water
   LEAKY_TANKS: {
     id: 'explore.map.page.side.panel.indicator.leaky.tanks',
     defaultMessage: 'Leaking underground storage tanks',
@@ -668,51 +701,35 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
     defaultMessage: 'Wastewater discharge',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Wastewater discharge`,
   },
-  ASTHMA: {
-    id: 'explore.map.page.side.panel.indicator.asthma',
-    defaultMessage: 'Asthma',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Asthma`,
-  },
-  DIABETES: {
-    id: 'explore.map.page.side.panel.indicator.diabetes',
-    defaultMessage: 'Diabetes',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Diabetes`,
-  },
-  HEART_DISEASE: {
-    id: 'explore.map.page.side.panel.indicator.heartDisease',
-    defaultMessage: 'Heart disease',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Heart disease`,
-  },
-  LIFE_EXPECT: {
-    id: 'explore.map.page.side.panel.indicator.lifeExpect',
-    defaultMessage: 'Low life expectancy',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Low life expectancy`,
+
+  // Workforce development
+  LING_ISO: {
+    id: 'explore.map.page.side.panel.indicator.ling.iso',
+    defaultMessage: 'Linguistic isolation',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Linguistic isolation`,
   },
   LOW_MED_INC: {
     id: 'explore.map.page.side.panel.indicator.low.med.income',
     defaultMessage: 'Low median income',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Low median income`,
   },
-  LING_ISO: {
-    id: 'explore.map.page.side.panel.indicator.ling.iso',
-    defaultMessage: 'Linguistic isolation',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Linguistic isolation`,
+  POVERTY: {
+    id: 'explore.map.page.side.panel.indicator.poverty',
+    defaultMessage: 'Poverty',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Unemployment`,
   },
   UNEMPLOY: {
     id: 'explore.map.page.side.panel.indicator.unemploy',
     defaultMessage: 'Unemployment',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Unemployment`,
   },
-  POVERTY: {
-    id: 'explore.map.page.side.panel.indicator.poverty',
-    defaultMessage: 'Poverty',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Unemployment`,
-  },
   HIGH_SCL: {
     id: 'explore.map.page.side.panel.indicator.high.school',
-    defaultMessage: 'High school degree non-attainment',
+    defaultMessage: 'High school education',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show High school degree achievement rate`,
   },
+
+  // Testing
   ADJ: {
     id: 'explore.map.page.side.panel.indicator.adjacency',
     defaultMessage: 'Adjacency',
@@ -772,12 +789,12 @@ export const SIDE_PANEL_VALUES = {
 };
 
 export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
+  // Climate change
   EXP_AG_LOSS: {
     id: 'explore.map.page.side.panel.indicator.description.exp.ag.loss',
     defaultMessage: 'Economic loss rate to agricultural value resulting from natural hazards each year',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Economic loss rate to agriculture resulting from natural hazards
     `,
-
   },
   EXP_BLD_LOSS: {
     id: 'explore.map.page.side.panel.indicator.description.exp.bld.loss',
@@ -823,8 +840,10 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of the census tract's population 15 or older not 
       enrolled in college, university, or graduate school`,
   },
-  ENERGY_BURDEN: {
-    id: 'explore.map.page.side.panel.indicator.description.energyBurden',
+
+  // Energy
+  ENERGY_COST: {
+    id: 'explore.map.page.side.panel.indicator.description.energy.cost',
     defaultMessage: 'Average annual energy costs divided by household income',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Energy costs divided by household income`,
   },
@@ -834,60 +853,73 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Fine inhalable particles, 2.5 micrometers and smaller`,
   },
 
-  DIESEL_PARTICULATE_MATTER: {
-    id: 'explore.map.page.side.panel.indicator.description.dieselPartMatter',
-    defaultMessage: 'Diesel exhaust in the air',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Diesel exhaust in the air`,
-  },
-  BARRIER_TRANS: {
-    id: 'explore.map.page.side.panel.indicator.description.barrierTrans',
-    defaultMessage: 'Cost and time spent on transportation',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Cost and time spent on transportation`,
-  },
-  TRAFFIC_VOLUME: {
-    id: 'explore.map.page.side.panel.indicator.description.trafficVolume',
-    defaultMessage: 'Count of vehicles at major roads within 500 meters',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of vehicles at major roads within 500 meters`,
+  // Health
+  ASTHMA: {
+    id: 'explore.map.page.side.panel.indicator.description.asthma',
+    defaultMessage: 'Weighted percent of people who have been told they have asthma',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Number of people who have been told they have asthma`,
   },
-
-  LEAD_PAINT: {
-    id: 'explore.map.page.side.panel.indicator.description.leadPaint',
+  DIABETES: {
+    id: 'explore.map.page.side.panel.indicator.description.diabetes',
     defaultMessage: `
-      Percentile of number of homes built before 1960 that are not among the most expensive
+      Weighted percent of people ages 18 years and older who have diabetes other than 
+      diabetes during pregnancy
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Pre-1960 housing`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of People ages 18 years and older who have diabetes other than 
+      diabetes during pregnancy`,
   },
-  MED_HOME_VAL: {
-    id: 'explore.map.page.side.panel.indicator.description.med.home.val',
-    defaultMessage: 'Median home value in area',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Median home value in area`,
-
+  HEART_DISEASE: {
+    id: 'explore.map.page.side.panel.indicator.description.heartDisease',
+    defaultMessage: `People ages 18 years and older who have been told they have heart disease`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Weighted percent of people ages 18 years and older who have 
+    been told they have heart disease`,
+  },
+  LOW_LIFE_EXPECT: {
+    id: 'explore.map.page.side.panel.indicator.description.lifeExpect',
+    defaultMessage: 'Average number of years a person can expect to live',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Average number of years of life a person can expect to live`,
   },
+
+  // Housing
   HIST_UNDERINVEST: {
     id: 'explore.map.page.side.panel.indicator.description.historic.underinvestment',
     defaultMessage: 'Census tracts with historically high barriers to accessing home loans',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing`,
   },
-  HOUSE_BURDEN: {
-    id: 'explore.map.page.side.panel.indicator.description.houseBurden',
+  HOUSE_COST: {
+    id: 'explore.map.page.side.panel.indicator.description.house.cost',
     defaultMessage: 'Low income households spending more than 30% of income on housing',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing`,
+    description: `Share of households making less than 80% of the area median family income and spending more than 30% of income on housing`,
   },
   LACK_GREEN_SPACE: {
     id: 'explore.map.page.side.panel.indicator.description.lack.green.space',
-    defaultMessage: 'Amount of non-crop land covered with artificial materials like pavement and concrete',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Amount of non-crop land covered with artificial materials like pavement and concrete`,
+    defaultMessage: 'Share of land covered with artificial materials like concrete or pavement and crop land',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Share of land covered with artificial materials like concrete or pavement and crop land`,
   },
   LACK_PLUMBING: {
     id: 'explore.map.page.side.panel.indicator.description.lack.plumbing',
     defaultMessage: 'Share of homes without indoor kitchens or plumbing',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes without indoor kitchens or plumbing`,
   },
+  LEAD_PAINT: {
+    id: 'explore.map.page.side.panel.indicator.description.leadPaint',
+    defaultMessage: `
+      Percentile of number of homes built before 1960 that are not among the most expensive
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Pre-1960 housing`,
+  },
+  MED_HOME_VAL: {
+    id: 'explore.map.page.side.panel.indicator.description.med.home.val',
+    defaultMessage: 'Median home value in area',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Median home value in area`,
 
+  },
+
+  // Legacy Pollution
   ABANDON_MINES: {
     id: 'explore.map.page.side.panel.indicator.description.abandon.mines',
-    defaultMessage: 'Presence of an abandoned land mine within the tract',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned land mine within the tract`,
+    defaultMessage: 'Presence of an abandoned mine lands within the tract',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned mine lands within the tract`,
   },
   FORMER_DEF_SITES: {
     id: 'explore.map.page.side.panel.indicator.description.former.def.sites',
@@ -899,20 +931,39 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     defaultMessage: 'Count of hazardous waste facilities within 5 kilometers',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of hazardous waste facilities within 5 kilometers`,
   },
+  PROX_RMP: {
+    id: 'explore.map.page.side.panel.indicator.description.prox.rmp',
+    defaultMessage: 'RMP facilities within 5 kilometers',
+    description: `Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers`,
+  },
   PROX_NPL: {
     id: 'explore.map.page.side.panel.indicator.description.prox.npl',
-    defaultMessage: 'Proposed or listed NPL (Superfund) sites within 5 kilometers',
+    defaultMessage: 'Count of Risk Management Plan facilities within 5 kilometers',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Proposed or listed NPL (Superfund) sites within 5 kilometers`,
   },
-  PROX_RMP: {
-    id: 'explore.map.page.side.panel.indicator.description.prox.rmp',
-    defaultMessage: 'RMP facilities within 5 kilometers',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Risk Management Plan facilities within 5 kilometers`,
+
+  // Transportation
+  DIESEL_PARTICULATE_MATTER: {
+    id: 'explore.map.page.side.panel.indicator.description.dieselPartMatter',
+    defaultMessage: 'Amount of diesel exhaust in the air',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Diesel exhaust in the air`,
+  },
+  BARRIER_TRANS: {
+    id: 'explore.map.page.side.panel.indicator.description.barrierTrans',
+    defaultMessage: 'Average of relative cost and time spent on transportation',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Cost and time spent on transportation`,
+  },
+  TRAFFIC_VOLUME: {
+    id: 'explore.map.page.side.panel.indicator.description.trafficVolume',
+    defaultMessage: 'Count of vehicles at major roads within 500 meters',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of vehicles at major roads within 500 meters`,
   },
 
+  // Water
   LEAKY_TANKS: {
     id: 'explore.map.page.side.panel.indicator.description.leaky.tanks',
-    defaultMessage: `Count of leaking underground storage tanks when compared to all underground storage tanks`,
+    defaultMessage: `Formula that counts leaking underground storage tanks and number of all underground storage tanks within 1500 feet
+    `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of leaky storage tanks`,
   },
   WASTE_WATER: {
@@ -921,37 +972,8 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Toxic concentrations at stream segments within 500 meters`,
   },
 
-  ASTHMA: {
-    id: 'explore.map.page.side.panel.indicator.description.asthma',
-    defaultMessage: 'Weighted percent of people who have been told they have asthma',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Number of people who have been told they have asthma`,
-  },
-  DIABETES: {
-    id: 'explore.map.page.side.panel.indicator.description.diabetes',
-    defaultMessage: `
-      Weighted percent of people ages 18 years and older who have diabetes other than 
-      diabetes during pregnancy
-    `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of People ages 18 years and older who have diabetes other than 
-      diabetes during pregnancy`,
-  },
-  HEART_DISEASE: {
-    id: 'explore.map.page.side.panel.indicator.description.heartDisease',
-    defaultMessage: `People ages 18 years and older who have been told they have heart disease`,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Weighted percent of people ages 18 years and older who have 
-    been told they have heart disease`,
-  },
-  LOW_LIFE_EXPECT: {
-    id: 'explore.map.page.side.panel.indicator.description.lifeExpect',
-    defaultMessage: 'Average number of years a person can expect to live',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Average number of years of life a person can expect to live`,
-  },
 
-  LOW_MED_INCOME: {
-    id: 'explore.map.page.side.panel.indicator.description.low.med.income',
-    defaultMessage: 'Median income calculated as a percent of the area’s median income',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Median income calculated as a percent of the area’s median income`,
-  },
+  // Workforce development
   LING_ISO: {
     id: 'explore.map.page.side.panel.indicator.description.ling.iso',
     defaultMessage: `
@@ -959,11 +981,10 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Households in which no one age 14 and over speaks English only or also speaks a language other than English`,
   },
-  UNEMPLOY: {
-    id: 'explore.map.page.side.panel.indicator.description.unemploy',
-    defaultMessage: 'Number of unemployed people as a percentage of the labor force',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side 
-    panel will show an indicator description of Number of unemployed people as a percentage of the labor force`,
+  LOW_MED_INCOME: {
+    id: 'explore.map.page.side.panel.indicator.description.low.med.income',
+    defaultMessage: 'Comparison of income in the tract to incomes in the area',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Comparison of income in the tract to incomes in the area`,
   },
   POVERTY: {
     id: 'explore.map.page.side.panel.indicator.description.poverty',
@@ -973,14 +994,21 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of individuals in households where the household income is at or below 100% of the federal poverty level`,
   },
+  UNEMPLOY: {
+    id: 'explore.map.page.side.panel.indicator.description.unemploy',
+    defaultMessage: 'Number of unemployed people as a percentage of the labor force',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side 
+    panel will show an indicator description of Number of unemployed people as a percentage of the labor force`,
+  },
   HIGH_SKL: {
     id: 'explore.map.page.side.panel.indicator.description.high.school',
     defaultMessage: `
-      Percent of people ages 25 years or older whose education level is less than a high school diploma 
+      Percent of people ages 25 years or older who did not graduate high school 
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of people ages 25 years or older whose education level 
-      is less than a high school diploma`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of people ages 25 years or older who did not graduate high school`,
   },
+
+  // Testing
   ADJ: {
     id: 'explore.map.page.side.panel.indicator.description.ling.iso',
     defaultMessage: `
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index e5134ed5d..4b206eba9 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -572,15 +572,15 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show transportation barriers"
   },
   "explore.map.page.side.panel.indicator.description.abandon.mines": {
-    "defaultMessage": "Presence of an abandoned land mine within the tract",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned land mine within the tract"
+    "defaultMessage": "Presence of an abandoned mine lands within the tract",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned mine lands within the tract"
   },
   "explore.map.page.side.panel.indicator.description.asthma": {
     "defaultMessage": "Weighted percent of people who have been told they have asthma",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Number of people who have been told they have asthma"
   },
   "explore.map.page.side.panel.indicator.description.barrierTrans": {
-    "defaultMessage": "Cost and time spent on transportation",
+    "defaultMessage": "Average of relative cost and time spent on transportation",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Cost and time spent on transportation"
   },
   "explore.map.page.side.panel.indicator.description.diabetes": {
@@ -588,10 +588,10 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of People ages 18 years and older who have diabetes other than \n      diabetes during pregnancy"
   },
   "explore.map.page.side.panel.indicator.description.dieselPartMatter": {
-    "defaultMessage": "Diesel exhaust in the air",
+    "defaultMessage": "Amount of diesel exhaust in the air",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Diesel exhaust in the air"
   },
-  "explore.map.page.side.panel.indicator.description.energyBurden": {
+  "explore.map.page.side.panel.indicator.description.energy.cost": {
     "defaultMessage": "Average annual energy costs divided by household income",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Energy costs divided by household income"
   },
@@ -624,20 +624,20 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of the census tract's population 15 or older not \n      enrolled in college, university, or graduate school"
   },
   "explore.map.page.side.panel.indicator.description.high.school": {
-    "defaultMessage": "Percent of people ages 25 years or older whose education level is less than a high school diploma",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of people ages 25 years or older whose education level \n      is less than a high school diploma"
+    "defaultMessage": "Percent of people ages 25 years or older who did not graduate high school",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of people ages 25 years or older who did not graduate high school"
   },
   "explore.map.page.side.panel.indicator.description.historic.underinvestment": {
     "defaultMessage": "Census tracts with historically high barriers to accessing home loans",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing"
   },
-  "explore.map.page.side.panel.indicator.description.houseBurden": {
+  "explore.map.page.side.panel.indicator.description.house.cost": {
     "defaultMessage": "Low income households spending more than 30% of income on housing",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing"
+    "description": "Share of households making less than 80% of the area median family income and spending more than 30% of income on housing"
   },
   "explore.map.page.side.panel.indicator.description.lack.green.space": {
-    "defaultMessage": "Amount of non-crop land covered with artificial materials like pavement and concrete",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Amount of non-crop land covered with artificial materials like pavement and concrete"
+    "defaultMessage": "Share of land covered with artificial materials like concrete or pavement and crop land",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Share of land covered with artificial materials like concrete or pavement and crop land"
   },
   "explore.map.page.side.panel.indicator.description.lack.plumbing": {
     "defaultMessage": "Share of homes without indoor kitchens or plumbing",
@@ -648,7 +648,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Pre-1960 housing"
   },
   "explore.map.page.side.panel.indicator.description.leaky.tanks": {
-    "defaultMessage": "Count of leaking underground storage tanks when compared to all underground storage tanks",
+    "defaultMessage": "Formula that counts leaking underground storage tanks and number of all underground storage tanks within 1500 feet",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of leaky storage tanks"
   },
   "explore.map.page.side.panel.indicator.description.lifeExpect": {
@@ -664,8 +664,8 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Household income is less than or equal to twice the federal poverty level"
   },
   "explore.map.page.side.panel.indicator.description.low.med.income": {
-    "defaultMessage": "Median income calculated as a percent of the area’s median income",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Median income calculated as a percent of the area’s median income"
+    "defaultMessage": "Comparison of income in the tract to incomes in the area",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Comparison of income in the tract to incomes in the area"
   },
   "explore.map.page.side.panel.indicator.description.med.home.val": {
     "defaultMessage": "Median home value in area",
@@ -684,12 +684,12 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of hazardous waste facilities within 5 kilometers"
   },
   "explore.map.page.side.panel.indicator.description.prox.npl": {
-    "defaultMessage": "Proposed or listed NPL (Superfund) sites within 5 kilometers",
+    "defaultMessage": "Count of Risk Management Plan facilities within 5 kilometers",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Proposed or listed NPL (Superfund) sites within 5 kilometers"
   },
   "explore.map.page.side.panel.indicator.description.prox.rmp": {
     "defaultMessage": "RMP facilities within 5 kilometers",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Risk Management Plan facilities within 5 kilometers"
+    "description": "Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers"
   },
   "explore.map.page.side.panel.indicator.description.trafficVolume": {
     "defaultMessage": "Count of vehicles at major roads within 500 meters",
@@ -716,8 +716,8 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Diesel particulate matter exposure"
   },
   "explore.map.page.side.panel.indicator.energyBurden": {
-    "defaultMessage": "Energy burden",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Energy burden"
+    "defaultMessage": "Energy cost",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Energy cost"
   },
   "explore.map.page.side.panel.indicator.exp.ag.loss": {
     "defaultMessage": "Expected agriculture loss rate",
@@ -732,12 +732,12 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show population loss rate"
   },
   "explore.map.page.side.panel.indicator.flooding": {
-    "defaultMessage": "Future flood risk",
+    "defaultMessage": "Projected flood risk",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show flood risk"
   },
   "explore.map.page.side.panel.indicator.former.def.sites": {
-    "defaultMessage": "Formerly Used Defense Sites (FUDS)",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Formerly Used Defense Sites (FUDS)"
+    "defaultMessage": "Formerly Used Defense Sites",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Formerly Used Defense Sites"
   },
   "explore.map.page.side.panel.indicator.heartDisease": {
     "defaultMessage": "Heart disease",
@@ -748,16 +748,16 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Higher ed degree achievement rate"
   },
   "explore.map.page.side.panel.indicator.high.school": {
-    "defaultMessage": "High school degree non-attainment",
+    "defaultMessage": "High school education",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show High school degree achievement rate"
   },
   "explore.map.page.side.panel.indicator.historic.underinvest": {
     "defaultMessage": "Historic underinvestment",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Historic underinvestment"
   },
-  "explore.map.page.side.panel.indicator.houseBurden": {
-    "defaultMessage": "Housing cost burden",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost burden"
+  "explore.map.page.side.panel.indicator.house.cost": {
+    "defaultMessage": "Housing cost",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost"
   },
   "explore.map.page.side.panel.indicator.imp.flg": {
     "defaultMessage": "Impute flag",
@@ -816,40 +816,40 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Proximity to hazardous waste facilities"
   },
   "explore.map.page.side.panel.indicator.prox.npl": {
-    "defaultMessage": "Proximity to National Priorities List (NPL) sites",
+    "defaultMessage": "Proximity to Superfund sites",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Count of proposed or listed NPL "
   },
   "explore.map.page.side.panel.indicator.prox.rmp": {
-    "defaultMessage": "Proximity to Risk Management Plan (RMP) facilities",
+    "defaultMessage": "Proximity to Risk Management Plan facilities",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Count of proposed or listed RMP"
   },
   "explore.map.page.side.panel.indicator.title.clean.energy": {
-    "defaultMessage": "Clean energy and energy efficiency",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Clean, efficient energy title\n"
+    "defaultMessage": "Energy",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Energy title\n"
   },
   "explore.map.page.side.panel.indicator.title.clean.transport": {
-    "defaultMessage": "Clean transit",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Clean transportation title\n"
+    "defaultMessage": "Transportation",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Transportation title\n"
   },
   "explore.map.page.side.panel.indicator.title.clean.water": {
-    "defaultMessage": "Clean water and wastewater infrastructure",
-    "description": "Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show Clean water and waste title\n"
+    "defaultMessage": "Water",
+    "description": "Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show Water title\n"
   },
   "explore.map.page.side.panel.indicator.title.climate": {
     "defaultMessage": "Climate change",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Climate change title\n"
   },
   "explore.map.page.side.panel.indicator.title.health.burden": {
-    "defaultMessage": "Health burdens",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Health burdens title\n"
+    "defaultMessage": "Health",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Healt title\n"
   },
   "explore.map.page.side.panel.indicator.title.legacy.pollution": {
     "defaultMessage": "Legacy pollution",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Legacy pollution title\n"
   },
   "explore.map.page.side.panel.indicator.title.sustain.house": {
-    "defaultMessage": "Sustainable housing",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Sustainable housing title\n"
+    "defaultMessage": "Housing",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing title\n"
   },
   "explore.map.page.side.panel.indicator.title.testing": {
     "defaultMessage": "Testing",
@@ -904,7 +904,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Wastewater discharge"
   },
   "explore.map.page.side.panel.indicator.wildfire": {
-    "defaultMessage": "Future wildfire risk",
+    "defaultMessage": "Projected wildfire risk",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show wildfire risk"
   },
   "explore.map.page.side.panel.info.alt.text.icon1": {

From 5ed00f603c7d9cc03f83b23a9cf96cb377b99366 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 13 Sep 2022 11:48:48 -0700
Subject: [PATCH 060/130] Update copy indicator desc and titles

---
 .../__snapshots__/areaDetail.test.tsx.snap    | 72 +++++++++----------
 client/src/data/copy/explore.tsx              | 70 ++++++++----------
 client/src/intl/en.json                       | 58 +++++++--------
 3 files changed, 93 insertions(+), 107 deletions(-)

diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index 94fec8053..7f1341527 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -311,7 +311,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
             <div>
               Unemployment
               <div>
-                Number of unemployed people as a percentage of the labor force
+                Number of unemployed people as a part of the labor force
               </div>
             </div>
             <div>
@@ -349,8 +349,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
               Poverty
               <div>
                 
-      Percent of a census tract's population in households where the household income is at or below 100% 
-      of the Federal poverty level 
+      Share of people in households where the income is at or below 100% of the Federal poverty level 
     
               </div>
             </div>
@@ -694,7 +693,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Expected agriculture loss rate
               <div>
-                Economic loss rate to agricultural value resulting from natural hazards each year
+                Economic loss to agricultural value resulting from natural hazards each year
               </div>
             </div>
             <div>
@@ -720,7 +719,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Expected building loss rate
               <div>
-                Economic loss rate to agricultural value resulting from natural hazards each year
+                Economic loss to agricultural value resulting from natural hazards each year
               </div>
             </div>
             <div>
@@ -747,7 +746,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Expected population loss rate
               <div>
                 
-      Rate of fatalities and injuries resulting from natural hazards each year
+      Fatalities and injuries resulting from natural hazards each year
     
               </div>
             </div>
@@ -834,7 +833,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -933,7 +932,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               PM2.5 in the air
               <div>
-                Fine inhalable particles, 2.5 micrometers or smaller
+                Level of inhalable particles, 2.5 micrometers or smaller
               </div>
             </div>
             <div>
@@ -963,7 +962,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -1036,7 +1035,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Asthma
               <div>
-                Weighted percent of people who have been told they have asthma
+                Share of people who have been told they have asthma
               </div>
             </div>
             <div>
@@ -1063,8 +1062,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Diabetes
               <div>
                 
-      Weighted percent of people ages 18 years and older who have diabetes other than 
-      diabetes during pregnancy
+      Share of people ages 18 years and older who have diabetes
     
               </div>
             </div>
@@ -1091,7 +1089,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Heart disease
               <div>
-                People ages 18 years and older who have been told they have heart disease
+                Share of people ages 18 years and older who have been told they have heart disease
               </div>
             </div>
             <div>
@@ -1147,7 +1145,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -1220,7 +1218,8 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Housing cost
               <div>
-                Low income households spending more than 30% of income on housing
+                Share of households making less than 80% of the area median family income and spending more than 30% of income on housing
+    
               </div>
             </div>
             <div>
@@ -1310,7 +1309,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Lead paint
               <div>
                 
-      Percentile of number of homes built before 1960 that are not among the most expensive
+      Share of homes that are not very expensive and are likely to have lead paint
     
               </div>
             </div>
@@ -1341,7 +1340,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -1492,7 +1491,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Proximity to Superfund sites
               <div>
-                Count of Risk Management Plan facilities within 5 kilometers
+                Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers
               </div>
             </div>
             <div>
@@ -1518,7 +1517,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Proximity to Risk Management Plan facilities
               <div>
-                RMP facilities within 5 kilometers
+                Count of Risk Management Plan facilities within 5 kilometers
               </div>
             </div>
             <div>
@@ -1548,7 +1547,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -1703,7 +1702,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -1803,7 +1802,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Wastewater discharge
               <div>
-                Toxic concentrations at stream segments within 500 meters
+                Modeled toxic concentrations at parts of streams within 500 meters
               </div>
             </div>
             <div>
@@ -1833,7 +1832,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -1907,7 +1906,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Linguistic isolation
               <div>
                 
-      Percent of households where no one over the age 14 speaks English well
+    Share of households where no one over the age 14 speaks English well
     
               </div>
             </div>
@@ -1971,7 +1970,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Unemployment
               <div>
-                Number of unemployed people as a percentage of the labor force
+                Number of unemployed people as a part of the labor force
               </div>
             </div>
             <div>
@@ -2009,8 +2008,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Poverty
               <div>
                 
-      Percent of a census tract's population in households where the household income is at or below 100% 
-      of the Federal poverty level 
+      Share of people in households where the income is at or below 100% of the Federal poverty level 
     
               </div>
             </div>
@@ -2480,7 +2478,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             <div>
               PM2.5 in the air
               <div>
-                Fine inhalable particles, 2.5 micrometers or smaller
+                Level of inhalable particles, 2.5 micrometers or smaller
               </div>
             </div>
             <div>
@@ -2510,7 +2508,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -2583,7 +2581,8 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             <div>
               Housing cost
               <div>
-                Low income households spending more than 30% of income on housing
+                Share of households making less than 80% of the area median family income and spending more than 30% of income on housing
+    
               </div>
             </div>
             <div>
@@ -2624,7 +2623,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -2775,7 +2774,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             <div>
               Proximity to Superfund sites
               <div>
-                Count of Risk Management Plan facilities within 5 kilometers
+                Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers
               </div>
             </div>
             <div>
@@ -2801,7 +2800,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             <div>
               Proximity to Risk Management Plan facilities
               <div>
-                RMP facilities within 5 kilometers
+                Count of Risk Management Plan facilities within 5 kilometers
               </div>
             </div>
             <div>
@@ -2831,7 +2830,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -2930,7 +2929,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             <div>
               Unemployment
               <div>
-                Number of unemployed people as a percentage of the labor force
+                Number of unemployed people as a part of the labor force
               </div>
             </div>
             <div>
@@ -2968,8 +2967,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
               Poverty
               <div>
                 
-      Percent of a census tract's population in households where the household income is at or below 100% 
-      of the Federal poverty level 
+      Share of people in households where the income is at or below 100% of the Federal poverty level 
     
               </div>
             </div>
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index bbdac33ed..d8748a088 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -792,20 +792,20 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   // Climate change
   EXP_AG_LOSS: {
     id: 'explore.map.page.side.panel.indicator.description.exp.ag.loss',
-    defaultMessage: 'Economic loss rate to agricultural value resulting from natural hazards each year',
+    defaultMessage: 'Economic loss to agricultural value resulting from natural hazards each year',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Economic loss rate to agriculture resulting from natural hazards
     `,
   },
   EXP_BLD_LOSS: {
     id: 'explore.map.page.side.panel.indicator.description.exp.bld.loss',
-    defaultMessage: 'Economic loss rate to agricultural value resulting from natural hazards each year',
+    defaultMessage: 'Economic loss to agricultural value resulting from natural hazards each year',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side 
     panel will show an indicator description of Economic loss rate to buildings resulting from natural hazards`,
   },
   EXP_POP_LOSS: {
     id: 'explore.map.page.side.panel.indicator.description.exp.pop.loss',
     defaultMessage: `
-      Rate of fatalities and injuries resulting from natural hazards each year
+      Fatalities and injuries resulting from natural hazards each year
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Economic loss rate to the population in fatalities and 
       injuries resulting from natural hazards`,
@@ -827,9 +827,9 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   LOW_INCOME: {
     id: 'explore.map.page.side.panel.indicator.description.low.income',
     defaultMessage: `
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Household income is less than or equal to twice the federal poverty level`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description ofPeople in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed`,
   },
   HIGH_ED: {
     id: 'explore.map.page.side.panel.indicator.description.high.ed',
@@ -849,30 +849,27 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   },
   PM_2_5: {
     id: 'explore.map.page.side.panel.indicator.description.pm25',
-    defaultMessage: 'Fine inhalable particles, 2.5 micrometers or smaller',
+    defaultMessage: 'Level of inhalable particles, 2.5 micrometers or smaller',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Fine inhalable particles, 2.5 micrometers and smaller`,
   },
 
   // Health
   ASTHMA: {
     id: 'explore.map.page.side.panel.indicator.description.asthma',
-    defaultMessage: 'Weighted percent of people who have been told they have asthma',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Number of people who have been told they have asthma`,
+    defaultMessage: 'Share of people who have been told they have asthma',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people who have been told they have asthma`,
   },
   DIABETES: {
     id: 'explore.map.page.side.panel.indicator.description.diabetes',
     defaultMessage: `
-      Weighted percent of people ages 18 years and older who have diabetes other than 
-      diabetes during pregnancy
+      Share of people ages 18 years and older who have diabetes
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of People ages 18 years and older who have diabetes other than 
-      diabetes during pregnancy`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people ages 18 years and older who have diabetes`,
   },
   HEART_DISEASE: {
     id: 'explore.map.page.side.panel.indicator.description.heartDisease',
-    defaultMessage: `People ages 18 years and older who have been told they have heart disease`,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Weighted percent of people ages 18 years and older who have 
-    been told they have heart disease`,
+    defaultMessage: `Share of people ages 18 years and older who have been told they have heart disease`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people ages 18 years and older who have been told they have heart disease`,
   },
   LOW_LIFE_EXPECT: {
     id: 'explore.map.page.side.panel.indicator.description.lifeExpect',
@@ -884,12 +881,13 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   HIST_UNDERINVEST: {
     id: 'explore.map.page.side.panel.indicator.description.historic.underinvestment',
     defaultMessage: 'Census tracts with historically high barriers to accessing home loans',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Census tracts with historically high barriers to accessing home loans`,
   },
   HOUSE_COST: {
     id: 'explore.map.page.side.panel.indicator.description.house.cost',
-    defaultMessage: 'Low income households spending more than 30% of income on housing',
-    description: `Share of households making less than 80% of the area median family income and spending more than 30% of income on housing`,
+    defaultMessage: `Share of households making less than 80% of the area median family income and spending more than 30% of income on housing
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of households making less than 80% of the area median family income and spending more than 30% of income on housing`,
   },
   LACK_GREEN_SPACE: {
     id: 'explore.map.page.side.panel.indicator.description.lack.green.space',
@@ -904,15 +902,10 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   LEAD_PAINT: {
     id: 'explore.map.page.side.panel.indicator.description.leadPaint',
     defaultMessage: `
-      Percentile of number of homes built before 1960 that are not among the most expensive
+      Share of homes that are not very expensive and are likely to have lead paint
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes that are not very expensive and are likely to have lead paint   
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Pre-1960 housing`,
-  },
-  MED_HOME_VAL: {
-    id: 'explore.map.page.side.panel.indicator.description.med.home.val',
-    defaultMessage: 'Median home value in area',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Median home value in area`,
-
   },
 
   // Legacy Pollution
@@ -933,13 +926,13 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   },
   PROX_RMP: {
     id: 'explore.map.page.side.panel.indicator.description.prox.rmp',
-    defaultMessage: 'RMP facilities within 5 kilometers',
-    description: `Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers`,
+    defaultMessage: 'Count of Risk Management Plan facilities within 5 kilometers',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of Risk Management Plan facilities within 5 kilometers`,
   },
   PROX_NPL: {
     id: 'explore.map.page.side.panel.indicator.description.prox.npl',
-    defaultMessage: 'Count of Risk Management Plan facilities within 5 kilometers',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Proposed or listed NPL (Superfund) sites within 5 kilometers`,
+    defaultMessage: `Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers`,
   },
 
   // Transportation
@@ -968,8 +961,8 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   },
   WASTE_WATER: {
     id: 'explore.map.page.side.panel.indicator.description.wasteWater',
-    defaultMessage: 'Toxic concentrations at stream segments within 500 meters',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Toxic concentrations at stream segments within 500 meters`,
+    defaultMessage: 'Modeled toxic concentrations at parts of streams within 500 meters',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Modeled toxic concentrations at parts of streams within 500 meters`,
   },
 
 
@@ -977,9 +970,9 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   LING_ISO: {
     id: 'explore.map.page.side.panel.indicator.description.ling.iso',
     defaultMessage: `
-      Percent of households where no one over the age 14 speaks English well
+    Share of households where no one over the age 14 speaks English well
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Households in which no one age 14 and over speaks English only or also speaks a language other than English`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of households where no one over the age 14 speaks English well`,
   },
   LOW_MED_INCOME: {
     id: 'explore.map.page.side.panel.indicator.description.low.med.income',
@@ -989,16 +982,15 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   POVERTY: {
     id: 'explore.map.page.side.panel.indicator.description.poverty',
     defaultMessage: `
-      Percent of a census tract's population in households where the household income is at or below 100% 
-      of the Federal poverty level 
+      Share of people in households where the income is at or below 100% of the Federal poverty level 
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of individuals in households where the household income is at or below 100% of the federal poverty level`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people in households where the income is at or below 100% of the Federal poverty level`,
   },
   UNEMPLOY: {
     id: 'explore.map.page.side.panel.indicator.description.unemploy',
-    defaultMessage: 'Number of unemployed people as a percentage of the labor force',
+    defaultMessage: 'Number of unemployed people as a part of the labor force',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side 
-    panel will show an indicator description of Number of unemployed people as a percentage of the labor force`,
+    panel will show an indicator description of Number of unemployed people as a part of the labor force`,
   },
   HIGH_SKL: {
     id: 'explore.map.page.side.panel.indicator.description.high.school',
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 4b206eba9..423a8e804 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -576,16 +576,16 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned mine lands within the tract"
   },
   "explore.map.page.side.panel.indicator.description.asthma": {
-    "defaultMessage": "Weighted percent of people who have been told they have asthma",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Number of people who have been told they have asthma"
+    "defaultMessage": "Share of people who have been told they have asthma",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people who have been told they have asthma"
   },
   "explore.map.page.side.panel.indicator.description.barrierTrans": {
     "defaultMessage": "Average of relative cost and time spent on transportation",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Cost and time spent on transportation"
   },
   "explore.map.page.side.panel.indicator.description.diabetes": {
-    "defaultMessage": "Weighted percent of people ages 18 years and older who have diabetes other than diabetes during pregnancy",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of People ages 18 years and older who have diabetes other than \n      diabetes during pregnancy"
+    "defaultMessage": "Share of people ages 18 years and older who have diabetes",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people ages 18 years and older who have diabetes"
   },
   "explore.map.page.side.panel.indicator.description.dieselPartMatter": {
     "defaultMessage": "Amount of diesel exhaust in the air",
@@ -596,15 +596,15 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Energy costs divided by household income"
   },
   "explore.map.page.side.panel.indicator.description.exp.ag.loss": {
-    "defaultMessage": "Economic loss rate to agricultural value resulting from natural hazards each year",
+    "defaultMessage": "Economic loss to agricultural value resulting from natural hazards each year",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Economic loss rate to agriculture resulting from natural hazards\n    "
   },
   "explore.map.page.side.panel.indicator.description.exp.bld.loss": {
-    "defaultMessage": "Economic loss rate to agricultural value resulting from natural hazards each year",
+    "defaultMessage": "Economic loss to agricultural value resulting from natural hazards each year",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side \n    panel will show an indicator description of Economic loss rate to buildings resulting from natural hazards"
   },
   "explore.map.page.side.panel.indicator.description.exp.pop.loss": {
-    "defaultMessage": "Rate of fatalities and injuries resulting from natural hazards each year",
+    "defaultMessage": "Fatalities and injuries resulting from natural hazards each year",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Economic loss rate to the population in fatalities and \n      injuries resulting from natural hazards"
   },
   "explore.map.page.side.panel.indicator.description.flooding": {
@@ -616,8 +616,8 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of a Formerly Used Defense Site within the tract"
   },
   "explore.map.page.side.panel.indicator.description.heartDisease": {
-    "defaultMessage": "People ages 18 years and older who have been told they have heart disease",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Weighted percent of people ages 18 years and older who have \n    been told they have heart disease"
+    "defaultMessage": "Share of people ages 18 years and older who have been told they have heart disease",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people ages 18 years and older who have been told they have heart disease"
   },
   "explore.map.page.side.panel.indicator.description.high.ed": {
     "defaultMessage": "Percent of the census tract's population 15 or older not enrolled in college, university, or graduate school",
@@ -629,11 +629,11 @@
   },
   "explore.map.page.side.panel.indicator.description.historic.underinvestment": {
     "defaultMessage": "Census tracts with historically high barriers to accessing home loans",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing"
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Census tracts with historically high barriers to accessing home loans"
   },
   "explore.map.page.side.panel.indicator.description.house.cost": {
-    "defaultMessage": "Low income households spending more than 30% of income on housing",
-    "description": "Share of households making less than 80% of the area median family income and spending more than 30% of income on housing"
+    "defaultMessage": "Share of households making less than 80% of the area median family income and spending more than 30% of income on housing",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of households making less than 80% of the area median family income and spending more than 30% of income on housing"
   },
   "explore.map.page.side.panel.indicator.description.lack.green.space": {
     "defaultMessage": "Share of land covered with artificial materials like concrete or pavement and crop land",
@@ -644,8 +644,8 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes without indoor kitchens or plumbing"
   },
   "explore.map.page.side.panel.indicator.description.leadPaint": {
-    "defaultMessage": "Percentile of number of homes built before 1960 that are not among the most expensive",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Pre-1960 housing"
+    "defaultMessage": "Share of homes that are not very expensive and are likely to have lead paint",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes that are not very expensive and are likely to have lead paint   \n    "
   },
   "explore.map.page.side.panel.indicator.description.leaky.tanks": {
     "defaultMessage": "Formula that counts leaking underground storage tanks and number of all underground storage tanks within 1500 feet",
@@ -660,48 +660,44 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator about adjacency"
   },
   "explore.map.page.side.panel.indicator.description.low.income": {
-    "defaultMessage": "Household income is less than or equal to twice the federal poverty level",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Household income is less than or equal to twice the federal poverty level"
+    "defaultMessage": "People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description ofPeople in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed"
   },
   "explore.map.page.side.panel.indicator.description.low.med.income": {
     "defaultMessage": "Comparison of income in the tract to incomes in the area",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Comparison of income in the tract to incomes in the area"
   },
-  "explore.map.page.side.panel.indicator.description.med.home.val": {
-    "defaultMessage": "Median home value in area",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Median home value in area"
-  },
   "explore.map.page.side.panel.indicator.description.pm25": {
-    "defaultMessage": "Fine inhalable particles, 2.5 micrometers or smaller",
+    "defaultMessage": "Level of inhalable particles, 2.5 micrometers or smaller",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Fine inhalable particles, 2.5 micrometers and smaller"
   },
   "explore.map.page.side.panel.indicator.description.poverty": {
-    "defaultMessage": "Percent of a census tract's population in households where the household income is at or below 100% of the Federal poverty level",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of individuals in households where the household income is at or below 100% of the federal poverty level"
+    "defaultMessage": "Share of people in households where the income is at or below 100% of the Federal poverty level",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people in households where the income is at or below 100% of the Federal poverty level"
   },
   "explore.map.page.side.panel.indicator.description.prox.haz": {
     "defaultMessage": "Count of hazardous waste facilities within 5 kilometers",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of hazardous waste facilities within 5 kilometers"
   },
   "explore.map.page.side.panel.indicator.description.prox.npl": {
-    "defaultMessage": "Count of Risk Management Plan facilities within 5 kilometers",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Proposed or listed NPL (Superfund) sites within 5 kilometers"
+    "defaultMessage": "Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers"
   },
   "explore.map.page.side.panel.indicator.description.prox.rmp": {
-    "defaultMessage": "RMP facilities within 5 kilometers",
-    "description": "Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers"
+    "defaultMessage": "Count of Risk Management Plan facilities within 5 kilometers",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of Risk Management Plan facilities within 5 kilometers"
   },
   "explore.map.page.side.panel.indicator.description.trafficVolume": {
     "defaultMessage": "Count of vehicles at major roads within 500 meters",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of vehicles at major roads within 500 meters"
   },
   "explore.map.page.side.panel.indicator.description.unemploy": {
-    "defaultMessage": "Number of unemployed people as a percentage of the labor force",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side \n    panel will show an indicator description of Number of unemployed people as a percentage of the labor force"
+    "defaultMessage": "Number of unemployed people as a part of the labor force",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side \n    panel will show an indicator description of Number of unemployed people as a part of the labor force"
   },
   "explore.map.page.side.panel.indicator.description.wasteWater": {
-    "defaultMessage": "Toxic concentrations at stream segments within 500 meters",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Toxic concentrations at stream segments within 500 meters"
+    "defaultMessage": "Modeled toxic concentrations at parts of streams within 500 meters",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Modeled toxic concentrations at parts of streams within 500 meters"
   },
   "explore.map.page.side.panel.indicator.description.wildfire": {
     "defaultMessage": "Projected risk to properties from wildfire from fire fuels, weather, humans, and fire movement",

From dec33058349a1a112938c8b63403c3847ed12a28 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 13 Sep 2022 14:16:41 -0700
Subject: [PATCH 061/130] update side panel styling for 1.0

---
 .../src/components/AreaDetail/AreaDetail.tsx  |   7 --
 .../AreaDetail/areaDetail.module.scss         |   9 +-
 .../__snapshots__/areaDetail.test.tsx.snap    | 112 ------------------
 .../Indicator/Indicator.module.scss           |  21 ++--
 4 files changed, 15 insertions(+), 134 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 7330b9048..a505ef36e 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -8,7 +8,6 @@ import {Accordion, Button} from '@trussworks/react-uswds';
 import Category from '../Category';
 import TractDemographics from '../TractDemographics';
 import DisadvantageDot from '../DisadvantageDot';
-import ExceedBurden from '../ExceedBurden';
 import Indicator from '../Indicator';
 import TractInfo from '../TractInfo';
 
@@ -745,12 +744,6 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     title: <Category name={category.titleText} isDisadvantaged={category.isDisadvagtaged} />,
     content: (
       <>
-        {/* Exceeds one or more burdens */}
-        <ExceedBurden
-          text={EXPLORE_COPY.SIDE_PANEL_SPACERS.EXCEED_ONE_OR_MORE}
-          isBurdened={category.isExceed1MoreBurden}
-        />
-
         {/* Indicators - filters then map */}
         {category.indicators
             .filter(indicatorFilter(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HIST_UNDERINVEST))
diff --git a/client/src/components/AreaDetail/areaDetail.module.scss b/client/src/components/AreaDetail/areaDetail.module.scss
index 5906a67a0..315f3d4d5 100644
--- a/client/src/components/AreaDetail/areaDetail.module.scss
+++ b/client/src/components/AreaDetail/areaDetail.module.scss
@@ -113,14 +113,11 @@ $sidePanelLabelFontColor: #171716;
 }
 
 .categorySpacer {
-  @include u-bg('gray-cool-3');
-
   @include typeset('sans', '2xs', 2);
   @include u-text('bold'); 
 
-  margin: 0 -20px 1rem -20px;
-  @include u-padding-top(2);
-  @include u-padding-bottom(2);
+  margin-left: -20px;
+  @include u-padding-top(1);
+  @include u-padding-bottom(1);
   @include u-padding-left(2.5);
-  
 }
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index 7f1341527..9d8a72201 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -258,14 +258,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
         hidden=""
         id="work-dev"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -677,14 +669,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="climate-change"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -890,14 +874,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="clean-energy"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -1019,14 +995,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="health-burdens"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -1202,14 +1170,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="sustain-house"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -1397,14 +1357,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="leg-pollute"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -1604,14 +1556,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="clean-transport"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -1759,14 +1703,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="clean-water"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -1889,14 +1825,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="work-dev"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -2102,14 +2030,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="test"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -2436,14 +2356,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         hidden=""
         id="clean-energy"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -2565,14 +2477,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         hidden=""
         id="sustain-house"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -2680,14 +2584,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         hidden=""
         id="leg-pollute"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -2887,14 +2783,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         hidden=""
         id="work-dev"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
diff --git a/client/src/components/Indicator/Indicator.module.scss b/client/src/components/Indicator/Indicator.module.scss
index 3d5c705d4..af2cd6bd2 100644
--- a/client/src/components/Indicator/Indicator.module.scss
+++ b/client/src/components/Indicator/Indicator.module.scss
@@ -2,8 +2,8 @@
 @import "../utils.scss";
 
 @mixin indicatorPadding {
-  @include u-padding-left(1);
-  @include u-padding-right(1);
+  @include u-padding-left("05");
+  @include u-padding-right("05");
 }
 
 @mixin indicator {
@@ -24,12 +24,11 @@
     }
     
     .indicatorName {
-      // flex: 0 1 77%;
-      flex-basis: 60%;
+      flex-basis: 55%;
       display: flex;
       flex-direction: column;
       @include typeset('sans', '2xs', 2);
-      @include u-text('medium'); 
+      @include u-text('bold'); 
       
       .indicatorDesc {
         @include typeset('sans', '3xs', 2); 
@@ -45,6 +44,9 @@
     .indicatorValueCol {
       display: flex;
       flex-direction: column;
+      @include typeset('sans', '2xs', 2);
+      @include u-text('bold'); 
+      width: 40%;
 
       .indicatorValueRow {
         display: flex;
@@ -76,11 +78,11 @@
       }
       
       .indicatorValueSubText{
-        display: flex;
-        flex-direction: column;
-        align-self: flex-end;
+        // display: flex;
+        // flex-direction: column;
+        // align-self: flex-start;
         text-align: right;
-        @include u-width(8);
+        // @include u-width(8);
         @include typeset('sans', 'micro', 2);
         @include u-text('thin'); 
       }
@@ -92,4 +94,5 @@
 //Indicator box styles
 .indicatorBoxMain {
   @include indicator;
+  @include u-color('gray-warm-90');
 }

From 23c9b2d8d18b7dd84ff20e54026c4e8e0b114da4 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 13 Sep 2022 15:24:34 -0700
Subject: [PATCH 062/130] Update methodology version / styling

---
 client/src/components/AreaDetail/areaDetail.module.scss   | 2 +-
 .../tests/__snapshots__/areaDetail.test.tsx.snap          | 6 +++---
 client/src/data/copy/explore.tsx                          | 8 +++++++-
 client/src/data/copy/methodology.tsx                      | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/client/src/components/AreaDetail/areaDetail.module.scss b/client/src/components/AreaDetail/areaDetail.module.scss
index 315f3d4d5..890df4acb 100644
--- a/client/src/components/AreaDetail/areaDetail.module.scss
+++ b/client/src/components/AreaDetail/areaDetail.module.scss
@@ -10,7 +10,7 @@ $sidePanelLabelFontColor: #171716;
 }
 
 .versionInfo {
-  padding: .5rem 1rem .5rem 1.2rem;
+  padding: 2rem 1rem 2rem 1.2rem;
   text-align: center;
   font-size: medium;
   color: #A0A3A3;
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index 9d8a72201..d2bced89c 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -405,7 +405,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
       </div>
     </div>
     <div>
-      Methodology version 0.1
+      Methodology version 1.0
     </div>
   </aside>
 </DocumentFragment>
@@ -2092,7 +2092,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
       </div>
     </div>
     <div>
-      Methodology version 0.1
+      Methodology version 1.0
     </div>
   </aside>
 </DocumentFragment>
@@ -2925,7 +2925,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
       </div>
     </div>
     <div>
-      Methodology version 0.1
+      Methodology version 1.0
     </div>
   </aside>
 </DocumentFragment>
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index d8748a088..1ea020ecb 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -293,7 +293,13 @@ export const SIDE_PANEL_VERION = {
     defaultMessage={ 'Methodology version {version}'}
     description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the methodology version number`}
     values= {{
-      version: <FormattedNumber value={METHODOLOGY_COPY.VERSION_NUMBER}/>,
+      /**
+       * FormattedNumber currently renders 1.0 as 1. When the version number has a decimal point add back the
+       * Formatted Message component. Using toFixed will render the desire, however it returns a string which
+       * is unacceptable by the value prop of FormattedNumber.
+       */
+      // version: <FormattedNumber value={METHODOLOGY_COPY.VERSION_NUMBER} style="decimal"/>,
+      version: METHODOLOGY_COPY.VERSION_NUMBER,
     }}
   />,
 };
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index 79b624c5d..ab2379f2c 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -4,7 +4,7 @@ import {defineMessages} from 'react-intl';
 import {FormattedMessage} from 'gatsby-plugin-intl';
 import {boldFn, linkFn, simpleLink} from './common';
 
-export const VERSION_NUMBER = 0.1;
+export const VERSION_NUMBER = (1.0).toFixed(1);
 
 export const PAGE = defineMessages({
   TILE: {

From 6ae0ada1e2fa9b5e1018a681c9d47ce2f14c7a2f Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Thu, 15 Sep 2022 11:28:50 -0700
Subject: [PATCH 063/130] 1.0 side panel indicator designs (#1896)

* Remove up/down arrows from indicators

* update style of side panel categories if supported

- if the browser has ":has" support, the new category styles will be applied
- if not, the older style will remain in place

* update snapshots

* update styling for indicator values

- refactor disadvantaged blue dot to utils.scss

* remove missing icon and reduce subtext font size

* Remove un-needed import in test file

* Update category, indicator copy

* Update copy indicator desc and titles

* update side panel styling for 1.0

* Update methodology version / styling
---
 .../src/components/AreaDetail/AreaDetail.tsx  | 207 +++--
 .../AreaDetail/areaDetail.module.scss         |  11 +-
 .../__snapshots__/areaDetail.test.tsx.snap    | 791 +++++-------------
 .../components/Category/Category.module.scss  |  11 +-
 .../Category/Category.module.scss.d.ts        |   2 +-
 client/src/components/Category/Category.tsx   |  27 +-
 .../DisadvantageDot.module.scss               |   3 +-
 .../Indicator/Indicator.module.scss           |  63 +-
 .../Indicator/Indicator.module.scss.d.ts      |   1 +
 .../components/Indicator/Indicator.test.tsx   |  89 +-
 client/src/components/Indicator/Indicator.tsx |  49 +-
 .../__snapshots__/Indicator.test.tsx.snap     |  86 +-
 client/src/components/utils.scss              |  12 +-
 client/src/data/constants.tsx                 |   2 +
 client/src/data/copy/explore.tsx              | 378 +++++----
 client/src/data/copy/methodology.tsx          |   2 +-
 .../images/sidePanelIcons/accordion-minus.svg |   1 +
 .../images/sidePanelIcons/accordion-plus.svg  |   1 +
 client/src/intl/en.json                       | 128 ++-
 client/src/styles/global.scss                 |  71 +-
 20 files changed, 759 insertions(+), 1176 deletions(-)
 create mode 100644 client/src/images/sidePanelIcons/accordion-minus.svg
 create mode 100644 client/src/images/sidePanelIcons/accordion-plus.svg

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 99d0db5cc..a505ef36e 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -8,7 +8,6 @@ import {Accordion, Button} from '@trussworks/react-uswds';
 import Category from '../Category';
 import TractDemographics from '../TractDemographics';
 import DisadvantageDot from '../DisadvantageDot';
-import ExceedBurden from '../ExceedBurden';
 import Indicator from '../Indicator';
 import TractInfo from '../TractInfo';
 
@@ -315,9 +314,9 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
 
 
   // Energy category
-  const energyBurden: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ENERGY_BURDEN),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.ENERGY_BURDEN),
+  const energyCost: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ENERGY_COST),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.ENERGY_COST),
     type: 'percentile',
     value: properties.hasOwnProperty(constants.ENERGY_PERCENTILE) ?
       properties[constants.ENERGY_PERCENTILE] : null,
@@ -334,35 +333,45 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       properties[constants.IS_EXCEEDS_THRESH_FOR_PM25] : null,
   };
 
-  // Transit category
-  const dieselPartMatter: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.DIESEL_PARTICULATE_MATTER),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.DIESEL_PARTICULATE_MATTER),
+  // Health category
+  const asthma: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ASTHMA),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.ASTHMA),
     type: 'percentile',
-    value: properties.hasOwnProperty(constants.DIESEL_MATTER_PERCENTILE) ?
-      properties[constants.DIESEL_MATTER_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_DIESEL_PM] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_DIESEL_PM] : null,
+    value: properties.hasOwnProperty(constants.ASTHMA_PERCENTILE) ?
+      properties[constants.ASTHMA_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_ASTHMA] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_ASTHMA] : null,
   };
-  const barrierTransport: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.BARRIER_TRANS),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.BARRIER_TRANS),
+  const diabetes: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.DIABETES),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.DIABETES),
     type: 'percentile',
-    value: properties.hasOwnProperty(constants.TRAVEL_DISADV_PERCENTILE) ?
-      properties[constants.TRAVEL_DISADV_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_TRAVEL_DISADV] ?
-      properties[constants.IS_EXCEEDS_THRESH_TRAVEL_DISADV] : null,
+    value: properties.hasOwnProperty(constants.DIABETES_PERCENTILE) ?
+      properties[constants.DIABETES_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_DIABETES] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_DIABETES] : null,
   };
-  const trafficVolume: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.TRAFFIC_VOLUME),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.TRAFFIC_VOLUME),
+  const heartDisease: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HEART_DISEASE),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HEART_DISEASE),
     type: 'percentile',
-    value: properties.hasOwnProperty(constants.TRAFFIC_PERCENTILE) ?
-      properties[constants.TRAFFIC_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_TRAFFIC_PROX] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_TRAFFIC_PROX] : null,
+    value: properties.hasOwnProperty(constants.HEART_PERCENTILE) ?
+      properties[constants.HEART_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_HEART_DISEASE] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_HEART_DISEASE] : null,
+  };
+  const lifeExpect: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LIFE_EXPECT),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LOW_LIFE_EXPECT),
+    type: 'percentile',
+    value: properties.hasOwnProperty(constants.LIFE_PERCENTILE) ?
+      properties[constants.LIFE_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_LOW_LIFE_EXP] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_LOW_LIFE_EXP] : null,
   };
 
+
   // Housing category
   const historicUnderinvest: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HIST_UNDERINVEST),
@@ -370,15 +379,14 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     type: 'boolean',
     value: properties.hasOwnProperty(constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH) ?
       (properties[constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH] ===
-        constants.HISTORIC_UNDERINVESTMENT_RAW_YES ? true : false) :
-      null,
+        constants.HISTORIC_UNDERINVESTMENT_RAW_YES ? true : false) : null,
     isDisadvagtaged: properties.hasOwnProperty(constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH) &&
-    properties[constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH] ===
-    constants.HISTORIC_UNDERINVESTMENT_RAW_YES ? true : false,
+      properties[constants.HISTORIC_UNDERINVESTMENT_EXCEED_THRESH] ===
+        constants.HISTORIC_UNDERINVESTMENT_RAW_YES ? true : false,
   };
-  const houseBurden: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HOUSE_BURDEN),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HOUSE_BURDEN),
+  const houseCost: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HOUSE_COST),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HOUSE_COST),
     type: 'percentile',
     value: properties.hasOwnProperty(constants.HOUSING_BURDEN_PROPERTY_PERCENTILE) ?
       properties[constants.HOUSING_BURDEN_PROPERTY_PERCENTILE] : null,
@@ -413,6 +421,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       properties[constants.IS_EXCEEDS_THRESH_FOR_LEAD_PAINT_AND_MEDIAN_HOME_VAL] : null,
   };
 
+
   // Pollution categeory
   const abandonMines: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ABANDON_MINES),
@@ -442,6 +451,15 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_HAZARD_WASTE] ?
       properties[constants.IS_EXCEEDS_THRESH_FOR_HAZARD_WASTE] : null,
   };
+  const proxRMP: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.PROX_RMP),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.PROX_RMP),
+    type: 'percentile',
+    value: properties.hasOwnProperty(constants.PROXIMITY_RMP_SITES_PERCENTILE) ?
+      properties[constants.PROXIMITY_RMP_SITES_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_RMP] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_RMP] : null,
+  };
   const proxNPL: indicatorInfo = {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.PROX_NPL),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.PROX_NPL),
@@ -451,15 +469,37 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_SUPERFUND] ?
       properties[constants.IS_EXCEEDS_THRESH_FOR_SUPERFUND] : null,
   };
-  const proxRMP: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.PROX_RMP),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.PROX_RMP),
+
+
+  // Transpotation category
+  const dieselPartMatter: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.DIESEL_PARTICULATE_MATTER),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.DIESEL_PARTICULATE_MATTER),
     type: 'percentile',
-    value: properties.hasOwnProperty(constants.PROXIMITY_RMP_SITES_PERCENTILE) ?
-      properties[constants.PROXIMITY_RMP_SITES_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_RMP] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_RMP] : null,
+    value: properties.hasOwnProperty(constants.DIESEL_MATTER_PERCENTILE) ?
+      properties[constants.DIESEL_MATTER_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_DIESEL_PM] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_DIESEL_PM] : null,
   };
+  const barrierTransport: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.BARRIER_TRANS),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.BARRIER_TRANS),
+    type: 'percentile',
+    value: properties.hasOwnProperty(constants.TRAVEL_DISADV_PERCENTILE) ?
+      properties[constants.TRAVEL_DISADV_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_TRAVEL_DISADV] ?
+      properties[constants.IS_EXCEEDS_THRESH_TRAVEL_DISADV] : null,
+  };
+  const trafficVolume: indicatorInfo = {
+    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.TRAFFIC_VOLUME),
+    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.TRAFFIC_VOLUME),
+    type: 'percentile',
+    value: properties.hasOwnProperty(constants.TRAFFIC_PERCENTILE) ?
+      properties[constants.TRAFFIC_PERCENTILE] : null,
+    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_TRAFFIC_PROX] ?
+      properties[constants.IS_EXCEEDS_THRESH_FOR_TRAFFIC_PROX] : null,
+  };
+
 
   // Water category
   const leakyTanks: indicatorInfo = {
@@ -481,43 +521,6 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       properties[constants.IS_EXCEEDS_THRESH_FOR_WASTEWATER] : null,
   };
 
-  // Health category
-  const asthma: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ASTHMA),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.ASTHMA),
-    type: 'percentile',
-    value: properties.hasOwnProperty(constants.ASTHMA_PERCENTILE) ?
-      properties[constants.ASTHMA_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_ASTHMA] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_ASTHMA] : null,
-  };
-  const diabetes: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.DIABETES),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.DIABETES),
-    type: 'percentile',
-    value: properties.hasOwnProperty(constants.DIABETES_PERCENTILE) ?
-      properties[constants.DIABETES_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_DIABETES] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_DIABETES] : null,
-  };
-  const heartDisease: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HEART_DISEASE),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HEART_DISEASE),
-    type: 'percentile',
-    value: properties.hasOwnProperty(constants.HEART_PERCENTILE) ?
-      properties[constants.HEART_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_HEART_DISEASE] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_HEART_DISEASE] : null,
-  };
-  const lifeExpect: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.LIFE_EXPECT),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.LOW_LIFE_EXPECT),
-    type: 'percentile',
-    value: properties.hasOwnProperty(constants.LIFE_PERCENTILE) ?
-      properties[constants.LIFE_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_FOR_LOW_LIFE_EXP] ?
-      properties[constants.IS_EXCEEDS_THRESH_FOR_LOW_LIFE_EXP] : null,
-  };
 
   // Workforce dev category
   const lingIso: indicatorInfo = {
@@ -601,7 +604,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     {
       id: 'clean-energy',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_ENERGY),
-      indicators: [energyBurden, pm25],
+      indicators: [energyCost, pm25],
       socioEcIndicators: [lowInc],
       isDisadvagtaged: properties[constants.IS_ENERGY_FACTOR_DISADVANTAGED] ?
         properties[constants.IS_ENERGY_FACTOR_DISADVANTAGED] : null,
@@ -611,21 +614,21 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
         properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
     {
-      id: 'clean-transport',
-      titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_TRANSPORT),
-      indicators: [dieselPartMatter, barrierTransport, trafficVolume],
+      id: 'health-burdens',
+      titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.HEALTH_BURDEN),
+      indicators: [asthma, diabetes, heartDisease, lifeExpect],
       socioEcIndicators: [lowInc],
-      isDisadvagtaged: properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED] ?
-        properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED] : null,
-      isExceed1MoreBurden: properties[constants.IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS] ?
-        properties[constants.IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS] : null,
+      isDisadvagtaged: properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED] ?
+        properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED] : null,
+      isExceed1MoreBurden: properties[constants.IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS] ?
+        properties[constants.IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS] : null,
       isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
         properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
     {
       id: 'sustain-house',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.SUSTAIN_HOUSE),
-      indicators: [historicUnderinvest, houseBurden, lackGreenSpace, lackPlumbing, leadPaint],
+      indicators: [historicUnderinvest, houseCost, lackGreenSpace, lackPlumbing, leadPaint],
       socioEcIndicators: [lowInc],
       isDisadvagtaged: properties[constants.IS_HOUSING_FACTOR_DISADVANTAGED] ?
         properties[constants.IS_HOUSING_FACTOR_DISADVANTAGED] : null,
@@ -646,6 +649,18 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
         properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
+    {
+      id: 'clean-transport',
+      titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_TRANSPORT),
+      indicators: [dieselPartMatter, barrierTransport, trafficVolume],
+      socioEcIndicators: [lowInc],
+      isDisadvagtaged: properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED] ?
+        properties[constants.IS_TRANSPORT_FACTOR_DISADVANTAGED] : null,
+      isExceed1MoreBurden: properties[constants.IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS] ?
+        properties[constants.IS_TRANSPORT_EXCEED_ONE_OR_MORE_INDICATORS] : null,
+      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
+        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
+    },
     {
       id: 'clean-water',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.CLEAN_WATER),
@@ -658,18 +673,6 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
       isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
         properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
-    {
-      id: 'health-burdens',
-      titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.HEALTH_BURDEN),
-      indicators: [asthma, diabetes, heartDisease, lifeExpect],
-      socioEcIndicators: [lowInc],
-      isDisadvagtaged: properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED] ?
-        properties[constants.IS_HEALTH_FACTOR_DISADVANTAGED] : null,
-      isExceed1MoreBurden: properties[constants.IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS] ?
-        properties[constants.IS_HEALTH_EXCEED_ONE_OR_MORE_INDICATORS] : null,
-      isExceedBothSocioBurdens: properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] ?
-        properties[constants.IS_EXCEED_BOTH_SOCIO_INDICATORS] : null,
-    },
     {
       id: 'work-dev',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.WORK_DEV),
@@ -710,7 +713,7 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
 
     // eslint-disable-next-line max-len
     categories = categories.filter((category) => category.id === 'work-dev' || category.id === 'clean-energy' || category.id === 'leg-pollute' || category.id === 'sustain-house');
-    categories[1].indicators = [houseBurden];
+    categories[1].indicators = [houseCost];
     categories[3].indicators = [lowMedInc, unemploy, poverty];
   }
 
@@ -741,12 +744,6 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
     title: <Category name={category.titleText} isDisadvantaged={category.isDisadvagtaged} />,
     content: (
       <>
-        {/* Exceeds one or more burdens */}
-        <ExceedBurden
-          text={EXPLORE_COPY.SIDE_PANEL_SPACERS.EXCEED_ONE_OR_MORE}
-          isBurdened={category.isExceed1MoreBurden}
-        />
-
         {/* Indicators - filters then map */}
         {category.indicators
             .filter(indicatorFilter(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HIST_UNDERINVEST))
diff --git a/client/src/components/AreaDetail/areaDetail.module.scss b/client/src/components/AreaDetail/areaDetail.module.scss
index 5906a67a0..890df4acb 100644
--- a/client/src/components/AreaDetail/areaDetail.module.scss
+++ b/client/src/components/AreaDetail/areaDetail.module.scss
@@ -10,7 +10,7 @@ $sidePanelLabelFontColor: #171716;
 }
 
 .versionInfo {
-  padding: .5rem 1rem .5rem 1.2rem;
+  padding: 2rem 1rem 2rem 1.2rem;
   text-align: center;
   font-size: medium;
   color: #A0A3A3;
@@ -113,14 +113,11 @@ $sidePanelLabelFontColor: #171716;
 }
 
 .categorySpacer {
-  @include u-bg('gray-cool-3');
-
   @include typeset('sans', '2xs', 2);
   @include u-text('bold'); 
 
-  margin: 0 -20px 1rem -20px;
-  @include u-padding-top(2);
-  @include u-padding-bottom(2);
+  margin-left: -20px;
+  @include u-padding-top(1);
+  @include u-padding-bottom(1);
   @include u-padding-left(2.5);
-  
 }
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index bf25cf635..d2bced89c 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -258,14 +258,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
         hidden=""
         id="work-dev"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -274,7 +266,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
             <div>
               Low median income
               <div>
-                Median income calculated as a percent of the area’s median income
+                Comparison of income in the tract to incomes in the area
               </div>
             </div>
             <div>
@@ -287,12 +279,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -316,7 +303,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
             <div>
               Unemployment
               <div>
-                Number of unemployed people as a percentage of the labor force
+                Number of unemployed people as a part of the labor force
               </div>
             </div>
             <div>
@@ -329,12 +316,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -359,8 +341,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
               Poverty
               <div>
                 
-      Percent of a census tract's population in households where the household income is at or below 100% 
-      of the Federal poverty level 
+      Share of people in households where the income is at or below 100% of the Federal poverty level 
     
               </div>
             </div>
@@ -374,12 +355,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -404,22 +380,19 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
         >
           <div>
             <div>
-              High school degree non-attainment
+              High school education
               <div>
                 
-      Percent of people ages 25 years or older whose education level is less than a high school diploma 
+      Percent of people ages 25 years or older who did not graduate high school 
     
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -432,7 +405,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
       </div>
     </div>
     <div>
-      Methodology version 0.1
+      Methodology version 1.0
     </div>
   </aside>
 </DocumentFragment>
@@ -696,14 +669,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="climate-change"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -712,18 +677,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Expected agriculture loss rate
               <div>
-                Economic loss rate to agricultural value resulting from natural hazards each year
+                Economic loss to agricultural value resulting from natural hazards each year
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -741,18 +703,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Expected building loss rate
               <div>
-                Economic loss rate to agricultural value resulting from natural hazards each year
+                Economic loss to agricultural value resulting from natural hazards each year
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -771,19 +730,16 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Expected population loss rate
               <div>
                 
-      Rate of fatalities and injuries resulting from natural hazards each year
+      Fatalities and injuries resulting from natural hazards each year
     
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -799,7 +755,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Future flood risk
+              Projected flood risk
               <div>
                 
       Projected risk to properties from floods from tides, rain, riverine and storm surges in 30 years
@@ -808,13 +764,10 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -830,7 +783,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Future wildfire risk
+              Projected wildfire risk
               <div>
                 
       Projected risk to properties from wildfire from fire fuels, weather, humans, and fire movement
@@ -839,13 +792,10 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -867,7 +817,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -881,12 +831,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -915,7 +860,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Clean energy and energy efficiency
+              Energy
             </div>
             <div
               class=""
@@ -929,34 +874,23 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="clean-energy"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
         >
           <div>
             <div>
-              Energy burden
+              Energy cost
               <div>
                 Average annual energy costs divided by household income
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -974,18 +908,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               PM2.5 in the air
               <div>
-                Fine inhalable particles, 2.5 micrometers or smaller
+                Level of inhalable particles, 2.5 micrometers or smaller
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1007,7 +938,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -1021,12 +952,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1047,15 +973,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         class="usa-accordion__heading"
       >
         <button
-          aria-controls="clean-transport"
+          aria-controls="health-burdens"
           aria-expanded="false"
           class="usa-accordion__button"
-          data-testid="accordionButton_clean-transport"
+          data-testid="accordionButton_health-burdens"
           type="button"
         >
           <div>
             <div>
-              Clean transit
+              Health
             </div>
             <div
               class=""
@@ -1065,38 +991,55 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
       </h4>
       <div
         class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_clean-transport"
+        data-testid="accordionItem_health-burdens"
         hidden=""
-        id="clean-transport"
+        id="health-burdens"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
           <div>
-            No
+            <div>
+              Asthma
+              <div>
+                Share of people who have been told they have asthma
+              </div>
+            </div>
+            <div>
+              <div>
+                <div>
+                  --
+                </div>
+                <div />
+              </div>
+              <div>
+                <div>
+                  missing data
+                </div>
+              </div>
+            </div>
           </div>
-        </div>
+        </li>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
         >
           <div>
             <div>
-              Diesel particulate matter exposure
+              Diabetes
               <div>
-                Diesel exhaust in the air
+                
+      Share of people ages 18 years and older who have diabetes
+    
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1112,20 +1055,17 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Transportation barriers
+              Heart disease
               <div>
-                Cost and time spent on transportation
+                Share of people ages 18 years and older who have been told they have heart disease
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1141,20 +1081,17 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Traffic proximity and volume
+              Low life expectancy
               <div>
-                Count of vehicles at major roads within 500 meters
+                Average number of years a person can expect to live
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1176,7 +1113,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -1190,12 +1127,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1224,7 +1156,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Sustainable housing
+              Housing
             </div>
             <div
               class=""
@@ -1238,23 +1170,16 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="sustain-house"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
         >
           <div>
             <div>
-              Housing cost burden
+              Housing cost
               <div>
-                Low income households spending more than 30% of income on housing
+                Share of households making less than 80% of the area median family income and spending more than 30% of income on housing
+    
               </div>
             </div>
             <div>
@@ -1267,12 +1192,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1296,18 +1216,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Lack of green space
               <div>
-                Amount of non-crop land covered with artificial materials like pavement and concrete
+                Share of land covered with artificial materials like concrete or pavement and crop land
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1330,13 +1247,10 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1355,19 +1269,16 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Lead paint
               <div>
                 
-      Percentile of number of homes built before 1960 that are not among the most expensive
+      Share of homes that are not very expensive and are likely to have lead paint
     
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1389,7 +1300,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -1403,12 +1314,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1451,14 +1357,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="leg-pollute"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -1467,18 +1365,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Abandoned mine lands
               <div>
-                Presence of an abandoned land mine within the tract
+                Presence of an abandoned mine lands within the tract
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1494,20 +1389,17 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Formerly Used Defense Sites (FUDS)
+              Formerly Used Defense Sites
               <div>
                 Presence of a Formerly Used Defense Site within the tract
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1530,13 +1422,10 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1552,20 +1441,17 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Proximity to National Priorities List (NPL) sites
+              Proximity to Superfund sites
               <div>
-                Proposed or listed NPL (Superfund) sites within 5 kilometers
+                Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1581,20 +1467,17 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Proximity to Risk Management Plan (RMP) facilities
+              Proximity to Risk Management Plan facilities
               <div>
-                RMP facilities within 5 kilometers
+                Count of Risk Management Plan facilities within 5 kilometers
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1616,7 +1499,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -1630,12 +1513,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1656,15 +1534,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         class="usa-accordion__heading"
       >
         <button
-          aria-controls="clean-water"
+          aria-controls="clean-transport"
           aria-expanded="false"
           class="usa-accordion__button"
-          data-testid="accordionButton_clean-water"
+          data-testid="accordionButton_clean-transport"
           type="button"
         >
           <div>
             <div>
-              Clean water and wastewater infrastructure
+              Transportation
             </div>
             <div
               class=""
@@ -1674,38 +1552,53 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
       </h4>
       <div
         class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_clean-water"
+        data-testid="accordionItem_clean-transport"
         hidden=""
-        id="clean-water"
+        id="clean-transport"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
+        <li
+          data-cy="indicatorBox"
+          data-testid="indicator-box"
+        >
           <div>
-            No
+            <div>
+              Diesel particulate matter exposure
+              <div>
+                Amount of diesel exhaust in the air
+              </div>
+            </div>
+            <div>
+              <div>
+                <div>
+                  --
+                </div>
+                <div />
+              </div>
+              <div>
+                <div>
+                  missing data
+                </div>
+              </div>
+            </div>
           </div>
-        </div>
+        </li>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
         >
           <div>
             <div>
-              Leaking underground storage tanks
+              Transportation barriers
               <div>
-                Count of leaking underground storage tanks when compared to all underground storage tanks
+                Average of relative cost and time spent on transportation
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1721,20 +1614,17 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Wastewater discharge
+              Traffic proximity and volume
               <div>
-                Toxic concentrations at stream segments within 500 meters
+                Count of vehicles at major roads within 500 meters
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1756,7 +1646,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -1770,12 +1660,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1796,15 +1681,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         class="usa-accordion__heading"
       >
         <button
-          aria-controls="health-burdens"
+          aria-controls="clean-water"
           aria-expanded="false"
           class="usa-accordion__button"
-          data-testid="accordionButton_health-burdens"
+          data-testid="accordionButton_clean-water"
           type="button"
         >
           <div>
             <div>
-              Health burdens
+              Water
             </div>
             <div
               class=""
@@ -1814,99 +1699,28 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
       </h4>
       <div
         class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_health-burdens"
+        data-testid="accordionItem_clean-water"
         hidden=""
-        id="health-burdens"
+        id="clean-water"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Asthma
-              <div>
-                Weighted percent of people who have been told they have asthma
-              </div>
-            </div>
-            <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
         >
           <div>
             <div>
-              Diabetes
+              Leaking underground storage tanks
               <div>
-                
-      Weighted percent of people ages 18 years and older who have diabetes other than 
-      diabetes during pregnancy
+                Formula that counts leaking underground storage tanks and number of all underground storage tanks within 1500 feet
     
               </div>
             </div>
             <div>
-              <div>
-                <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
-              </div>
               <div>
                 <div>
-                  missing data
+                  --
                 </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Heart disease
-              <div>
-                People ages 18 years and older who have been told they have heart disease
-              </div>
-            </div>
-            <div>
-              <div>
                 <div />
-                <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
-                </div>
               </div>
               <div>
                 <div>
@@ -1922,20 +1736,17 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              Low life expectancy
+              Wastewater discharge
               <div>
-                Average number of years a person can expect to live
+                Modeled toxic concentrations at parts of streams within 500 meters
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -1957,7 +1768,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -1971,12 +1782,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2019,14 +1825,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="work-dev"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -2036,7 +1834,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Linguistic isolation
               <div>
                 
-      Percent of households where no one over the age 14 speaks English well
+    Share of households where no one over the age 14 speaks English well
     
               </div>
             </div>
@@ -2050,12 +1848,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2079,18 +1872,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Low median income
               <div>
-                Median income calculated as a percent of the area’s median income
+                Comparison of income in the tract to incomes in the area
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2108,7 +1898,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             <div>
               Unemployment
               <div>
-                Number of unemployed people as a percentage of the labor force
+                Number of unemployed people as a part of the labor force
               </div>
             </div>
             <div>
@@ -2121,12 +1911,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2151,8 +1936,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
               Poverty
               <div>
                 
-      Percent of a census tract's population in households where the household income is at or below 100% 
-      of the Federal poverty level 
+      Share of people in households where the income is at or below 100% of the Federal poverty level 
     
               </div>
             </div>
@@ -2166,12 +1950,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2196,10 +1975,10 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         >
           <div>
             <div>
-              High school degree non-attainment
+              High school education
               <div>
                 
-      Percent of people ages 25 years or older whose education level is less than a high school diploma 
+      Percent of people ages 25 years or older who did not graduate high school 
     
               </div>
             </div>
@@ -2210,12 +1989,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
                     98%
                   </span>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2256,14 +2030,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         hidden=""
         id="test"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -2279,13 +2045,10 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2313,13 +2076,10 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2332,7 +2092,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
       </div>
     </div>
     <div>
-      Methodology version 0.1
+      Methodology version 1.0
     </div>
   </aside>
 </DocumentFragment>
@@ -2582,7 +2342,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              Clean energy and energy efficiency
+              Energy
             </div>
             <div
               class=""
@@ -2596,34 +2356,23 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         hidden=""
         id="clean-energy"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
         >
           <div>
             <div>
-              Energy burden
+              Energy cost
               <div>
                 Average annual energy costs divided by household income
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2641,18 +2390,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             <div>
               PM2.5 in the air
               <div>
-                Fine inhalable particles, 2.5 micrometers or smaller
+                Level of inhalable particles, 2.5 micrometers or smaller
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2674,7 +2420,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -2688,12 +2434,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2722,7 +2463,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              Sustainable housing
+              Housing
             </div>
             <div
               class=""
@@ -2736,23 +2477,16 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         hidden=""
         id="sustain-house"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
         >
           <div>
             <div>
-              Housing cost burden
+              Housing cost
               <div>
-                Low income households spending more than 30% of income on housing
+                Share of households making less than 80% of the area median family income and spending more than 30% of income on housing
+    
               </div>
             </div>
             <div>
@@ -2765,12 +2499,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2798,7 +2527,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -2812,12 +2541,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2860,14 +2584,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         hidden=""
         id="leg-pollute"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -2876,18 +2592,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             <div>
               Abandoned mine lands
               <div>
-                Presence of an abandoned land mine within the tract
+                Presence of an abandoned mine lands within the tract
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2903,20 +2616,17 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              Formerly Used Defense Sites (FUDS)
+              Formerly Used Defense Sites
               <div>
                 Presence of a Formerly Used Defense Site within the tract
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2939,13 +2649,10 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2961,20 +2668,17 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              Proximity to National Priorities List (NPL) sites
+              Proximity to Superfund sites
               <div>
-                Proposed or listed NPL (Superfund) sites within 5 kilometers
+                Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -2990,20 +2694,17 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              Proximity to Risk Management Plan (RMP) facilities
+              Proximity to Risk Management Plan facilities
               <div>
-                RMP facilities within 5 kilometers
+                Count of Risk Management Plan facilities within 5 kilometers
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -3025,7 +2726,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
               Low income
               <div>
                 
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     
               </div>
             </div>
@@ -3039,12 +2740,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -3087,14 +2783,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         hidden=""
         id="work-dev"
       >
-        <div>
-          <div>
-            At or above at least one threshold?
-          </div>
-          <div>
-            No
-          </div>
-        </div>
         <li
           data-cy="indicatorBox"
           data-testid="indicator-box"
@@ -3103,18 +2791,15 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             <div>
               Low median income
               <div>
-                Median income calculated as a percent of the area’s median income
+                Comparison of income in the tract to incomes in the area
               </div>
             </div>
             <div>
               <div>
-                <div />
                 <div>
-                  <img
-                    alt="an icon to represent data is unavailable"
-                    src="test-file-stub"
-                  />
+                  --
                 </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -3132,7 +2817,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
             <div>
               Unemployment
               <div>
-                Number of unemployed people as a percentage of the labor force
+                Number of unemployed people as a part of the labor force
               </div>
             </div>
             <div>
@@ -3145,12 +2830,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -3175,8 +2855,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
               Poverty
               <div>
                 
-      Percent of a census tract's population in households where the household income is at or below 100% 
-      of the Federal poverty level 
+      Share of people in households where the income is at or below 100% of the Federal poverty level 
     
               </div>
             </div>
@@ -3190,12 +2869,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     th
                   </sup>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the down arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -3220,10 +2894,10 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         >
           <div>
             <div>
-              High school degree non-attainment
+              High school education
               <div>
                 
-      Percent of people ages 25 years or older whose education level is less than a high school diploma 
+      Percent of people ages 25 years or older who did not graduate high school 
     
               </div>
             </div>
@@ -3234,12 +2908,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
                     98%
                   </span>
                 </div>
-                <div>
-                  <img
-                    alt="an icon for the up arrow"
-                    src="test-file-stub"
-                  />
-                </div>
+                <div />
               </div>
               <div>
                 <div>
@@ -3256,7 +2925,7 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
       </div>
     </div>
     <div>
-      Methodology version 0.1
+      Methodology version 1.0
     </div>
   </aside>
 </DocumentFragment>
diff --git a/client/src/components/Category/Category.module.scss b/client/src/components/Category/Category.module.scss
index d06ffca3d..4abb87918 100644
--- a/client/src/components/Category/Category.module.scss
+++ b/client/src/components/Category/Category.module.scss
@@ -7,4 +7,13 @@
     .category {
         flex-basis: 80%;
     }
-}
\ No newline at end of file
+}
+
+.disCategoryContainer {
+    display: flex;
+    justify-content: space-between;
+
+    .category {
+        flex-basis: 80%;
+    }
+}
diff --git a/client/src/components/Category/Category.module.scss.d.ts b/client/src/components/Category/Category.module.scss.d.ts
index 9eafab431..174616bcf 100644
--- a/client/src/components/Category/Category.module.scss.d.ts
+++ b/client/src/components/Category/Category.module.scss.d.ts
@@ -2,7 +2,7 @@ declare namespace CategoryNamespace {
     export interface ICategoryScss {
         categoryContainer: string;
         category:string;
-        disadvantageDot: string;
+        disCategoryContainer: string;
     }
   }
 
diff --git a/client/src/components/Category/Category.tsx b/client/src/components/Category/Category.tsx
index 9200088dd..f3d501981 100644
--- a/client/src/components/Category/Category.tsx
+++ b/client/src/components/Category/Category.tsx
@@ -8,8 +8,32 @@ interface ICategory {
     isDisadvantaged: boolean | null;
 }
 
+/**
+ * This component controls the Categories on the side panel.
+ *
+ * The category will be styled differently differently depending on
+ * if the category is disadvantaged or not. The JSX in the return
+ * statement is identical however in the global CSS file, we
+ * override the disadvantaged case with a psuedo-selector (:has) that
+ * is new. In order to fallback gracefully for browsers that do
+ * not yet support the ":has" psuedo selector, this redundant JSX
+ * will allow the disadvantaged case show the older category styling
+ * while browsers that do support the ":has" psuedo selector will
+ * render the newer category style.
+ *
+ * @param {string} name
+ * @param {boolean} isDisadvagtaged
+ * @return {JSX.Element}
+ */
 const Category = ({name, isDisadvantaged}:ICategory) => {
-  return (
+  return isDisadvantaged ? (
+    <div className={styles.disCategoryContainer}>
+      <div className={styles.category}>
+        {name}
+      </div>
+      <DisadvantageDot isDisadvantaged={isDisadvantaged}/>
+    </div>
+  ) : (
     <div className={styles.categoryContainer}>
       <div className={styles.category}>
         {name}
@@ -18,5 +42,4 @@ const Category = ({name, isDisadvantaged}:ICategory) => {
     </div>
   );
 };
-
 export default Category;
diff --git a/client/src/components/DisadvantageDot/DisadvantageDot.module.scss b/client/src/components/DisadvantageDot/DisadvantageDot.module.scss
index 848804ab2..5d77c58a3 100644
--- a/client/src/components/DisadvantageDot/DisadvantageDot.module.scss
+++ b/client/src/components/DisadvantageDot/DisadvantageDot.module.scss
@@ -1,4 +1,5 @@
 @use '../../styles/design-system.scss' as *;
+@import "../utils.scss";
 
 .disadvantagedDotSmall {
     @include u-circle('105');
@@ -12,7 +13,7 @@
     @include u-circle(4);
     margin: 2.3rem 1.5rem 2rem 0;
     // opacity: .6;
-    border: 3px solid #1A4480;
+    border: 3px solid $disadvantagedDotColor;
     
     //Maintain aspect ratio as screen width decreases
     flex: 1 0 2rem;
diff --git a/client/src/components/Indicator/Indicator.module.scss b/client/src/components/Indicator/Indicator.module.scss
index 2f6dbade8..af2cd6bd2 100644
--- a/client/src/components/Indicator/Indicator.module.scss
+++ b/client/src/components/Indicator/Indicator.module.scss
@@ -1,6 +1,11 @@
 @use '../../styles/design-system.scss' as *;
 @import "../utils.scss";
 
+@mixin indicatorPadding {
+  @include u-padding-left("05");
+  @include u-padding-right("05");
+}
+
 @mixin indicator {
   display: flex;
   flex-direction: column;
@@ -19,12 +24,11 @@
     }
     
     .indicatorName {
-      // flex: 0 1 77%;
-      flex-basis: 60%;
+      flex-basis: 55%;
       display: flex;
       flex-direction: column;
       @include typeset('sans', '2xs', 2);
-      @include u-text('medium'); 
+      @include u-text('bold'); 
       
       .indicatorDesc {
         @include typeset('sans', '3xs', 2); 
@@ -40,14 +44,23 @@
     .indicatorValueCol {
       display: flex;
       flex-direction: column;
+      @include typeset('sans', '2xs', 2);
+      @include u-text('bold'); 
+      width: 40%;
 
       .indicatorValueRow {
         display: flex;
         align-self: end;
 
         .indicatorValue {
-          margin-left: 2.2rem;
-        } 
+          @include indicatorPadding();
+        }
+        
+        .disIndicatorValue {
+          @include indicatorPadding();
+          color: white;
+          background-color: $disadvantagedDotColor;
+        }
 
         .indicatorArrow {
           margin-bottom: -.375rem;
@@ -59,18 +72,18 @@
 
           }
           .unavailable {
-            opacity: .2;
+            opacity: .6;
           }
         }
       }
       
       .indicatorValueSubText{
-        display: flex;
-        flex-direction: column;
-        align-self: flex-end;
+        // display: flex;
+        // flex-direction: column;
+        // align-self: flex-start;
         text-align: right;
-        @include u-width(8);
-        @include typeset('sans', '3xs', 2);
+        // @include u-width(8);
+        @include typeset('sans', 'micro', 2);
         @include u-text('thin'); 
       }
     }
@@ -81,31 +94,5 @@
 //Indicator box styles
 .indicatorBoxMain {
   @include indicator;
+  @include u-color('gray-warm-90');
 }
-
-.disadvantagedIndicator {
-  @include indicator;
-  @include u-bg('blue-warm-10');
-
-  // A darker bg color:
-  // background-color: #D2DAE3;
-
-  // Add a border
-  // border: 1px solid #1A4480;
-
-  margin: 0 -20px 1px -20px;
-  @include u-padding-left(2.5);
-  @include u-padding-right(2.5);
-
-
-  // Overwrite indicator mixin with bolder fonts for disadv. indicator 
-  .indicatorRow {
-    .indicatorName {
-      @include u-text('bold'); 
-      
-      .indicatorDesc {
-        @include u-text('normal'); 
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/client/src/components/Indicator/Indicator.module.scss.d.ts b/client/src/components/Indicator/Indicator.module.scss.d.ts
index 6d10859d7..9a8e43f2c 100644
--- a/client/src/components/Indicator/Indicator.module.scss.d.ts
+++ b/client/src/components/Indicator/Indicator.module.scss.d.ts
@@ -7,6 +7,7 @@ declare namespace IndicatorNamespace {
       indicatorValueCol:string;
       indicatorValueRow:string;
       indicatorValue:string;
+      disIndicatorValue:string;
       indicatorSuperscript:string;
       indicatorArrow:string;
       unavailable:string;
diff --git a/client/src/components/Indicator/Indicator.test.tsx b/client/src/components/Indicator/Indicator.test.tsx
index f648d80ea..9e072aced 100644
--- a/client/src/components/Indicator/Indicator.test.tsx
+++ b/client/src/components/Indicator/Indicator.test.tsx
@@ -1,11 +1,9 @@
 import * as React from 'react';
-import {render, screen} from '@testing-library/react';
+import {render} from '@testing-library/react';
 import {LocalizedComponent} from '../../test/testHelpers';
-import Indicator, {IndicatorValueIcon, IndicatorValueSubText, IndicatorValue} from './Indicator';
+import Indicator, {IndicatorValueSubText, IndicatorValue} from './Indicator';
 import {indicatorInfo} from '../AreaDetail/AreaDetail';
 
-import * as EXPLORE_COPY from '../../data/copy/explore';
-
 describe('rendering of the Indicator', () => {
   it('checks if component renders', () => {
     const highSchool:indicatorInfo = {
@@ -46,76 +44,19 @@ describe('rendering of the Indicator', () => {
   });
 });
 
-describe('test rendering of Indicator value icons', () => {
-  it('renders the up arrow when value is above threshold', () => {
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <IndicatorValueIcon
-            type='percent'
-            value={90}
-            isAboveThresh={true}
-          />
-        </LocalizedComponent>,
-    );
-    expect(asFragment()).toMatchSnapshot();
-    screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.ARROW_UP.defaultMessage);
-  });
-  it('renders the down arrow when the value is above the threshold', () => {
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <IndicatorValueIcon
-            type='percentile'
-            value={13}
-            isAboveThresh={false}
-          />
-        </LocalizedComponent>,
-    );
-    expect(asFragment()).toMatchSnapshot();
-    screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.ARROW_DOWN.defaultMessage);
-  });
-
-  it('renders the down arrow when the value is zero', () => {
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <IndicatorValueIcon
-            type='percentile'
-            value={0}
-            isAboveThresh={false}
-          />
-        </LocalizedComponent>,
-    );
-    expect(asFragment()).toMatchSnapshot();
-    screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.ARROW_DOWN.defaultMessage);
-  });
-
-  it('renders the unavailable icon when the value is a boolean null', () => {
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <IndicatorValueIcon
-            type='boolean'
-            value={null}
-            isAboveThresh={false}
-          />
-        </LocalizedComponent>,
-    );
-    expect(asFragment()).toMatchSnapshot();
-    screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE.defaultMessage);
-  });
-
-  it('renders the unavailable icon when the value is a percentile null', () => {
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <IndicatorValueIcon
-            type='percentile'
-            value={null}
-            isAboveThresh={false}
-          />
-        </LocalizedComponent>,
-    );
-    expect(asFragment()).toMatchSnapshot();
-    screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE.defaultMessage);
-  });
-});
+// describe('test rendering of Indicator value icons', () => {
+//   it('renders the unavailable icon when the value is null', () => {
+//     const {asFragment} = render(
+//         <LocalizedComponent>
+//           <IndicatorValueIcon
+//             value={null}
+//           />
+//         </LocalizedComponent>,
+//     );
+//     expect(asFragment()).toMatchSnapshot();
+//     screen.getByAltText(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE.defaultMessage);
+//   });
+// });
 
 describe('test rendering of Indicator value sub-text', () => {
   it('renders the "above 90 percentile"', () => {
diff --git a/client/src/components/Indicator/Indicator.tsx b/client/src/components/Indicator/Indicator.tsx
index efbc2a05e..63883b415 100644
--- a/client/src/components/Indicator/Indicator.tsx
+++ b/client/src/components/Indicator/Indicator.tsx
@@ -8,20 +8,14 @@ import * as constants from '../../data/constants';
 import * as EXPLORE_COPY from '../../data/copy/explore';
 
 // @ts-ignore
-import downArrow from '/node_modules/uswds/dist/img/usa-icons/arrow_downward.svg';
-// @ts-ignore
-import upArrow from '/node_modules/uswds/dist/img/usa-icons/arrow_upward.svg';
-// @ts-ignore
-import unAvailable from '/node_modules/uswds/dist/img/usa-icons/do_not_disturb.svg';
+// import unAvailable from '/node_modules/uswds/dist/img/usa-icons/error_outline.svg';
 
 interface IIndicator {
   indicator: indicatorInfo,
 }
 
 interface IIndicatorValueIcon {
-  type: indicatorType,
   value: number | null,
-  isAboveThresh: boolean,
 };
 
 interface IIndicatorValueSubText {
@@ -37,31 +31,18 @@ interface IIndicatorValue {
 }
 
 /**
- * This component will determine what indicator's icon should be (arrowUp, arrowDown or unavailable) and
- * return the appropriate JSX.
+ * This component will determine what indicator's icon should be. ATM there are no icons to show, however
+ * this may change and so leaving a place holder function here for easy change in the future
  *
- * @param {number | null} props
+ * @param {number | null} value
  * @return {JSX.Element}
  */
-export const IndicatorValueIcon = ({type, value, isAboveThresh}: IIndicatorValueIcon) => {
-  const intl = useIntl();
-
-  if (value == null) {
-    return <img className={styles.unavailable}
-      src={unAvailable}
-      alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE)}
-    />;
-  } else if (type === 'percent' || type === 'percentile') {
-    return isAboveThresh ?
-      <img
-        src={upArrow}
-        alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.ARROW_UP)}
-      /> :
-      <img
-        src={downArrow}
-        alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.ARROW_DOWN)}
-      />;
-  } else return <></>;
+export const IndicatorValueIcon = ({value}: IIndicatorValueIcon) => {
+  return value === null ? <></> : <></>;
+  // <img className={styles.unavailable}
+  //   src={unAvailable}
+  //   alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE)}
+  // />
 };
 
 /**
@@ -155,7 +136,7 @@ export const superscriptOrdinal = (indicatorValueWithSuffix:string) => {
 export const IndicatorValue = ({type, displayStat}:IIndicatorValue) => {
   const intl = useIntl();
 
-  if (displayStat === null) return <React.Fragment></React.Fragment>;
+  if (displayStat === null) return <>{constants.MISSING_DATA_STRING}</>;
 
   if (type === 'percent' || type === 'percentile') {
     // In this case we will show no value and an icon only
@@ -228,7 +209,7 @@ const Indicator = ({indicator}:IIndicator) => {
 
   return (
     <li
-      className={indicator.isDisadvagtaged ? styles.disadvantagedIndicator : styles.indicatorBoxMain}
+      className={styles.indicatorBoxMain}
       data-cy={'indicatorBox'}
       data-testid='indicator-box'>
       <div className={styles.indicatorRow}>
@@ -246,7 +227,9 @@ const Indicator = ({indicator}:IIndicator) => {
           <div className={styles.indicatorValueRow}>
 
             {/* Indicator value */}
-            <div className={styles.indicatorValue}>
+            <div className={indicator.isDisadvagtaged ?
+              styles.disIndicatorValue : styles.indicatorValue}
+            >
               <IndicatorValue
                 type={indicator.type}
                 displayStat={displayStat}
@@ -256,9 +239,7 @@ const Indicator = ({indicator}:IIndicator) => {
             {/* Indicator icon - up arrow, down arrow, or unavailable */}
             <div className={styles.indicatorArrow}>
               <IndicatorValueIcon
-                type={indicator.type}
                 value={displayStat}
-                isAboveThresh={isAboveThresh}
               />
             </div>
           </div>
diff --git a/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap b/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
index 4e44d9f50..27cbe6f0b 100644
--- a/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
+++ b/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
@@ -20,12 +20,7 @@ exports[`rendering of the Indicator checks if component renders 1`] = `
               97%
             </span>
           </div>
-          <div>
-            <img
-              alt="an icon for the up arrow"
-              src="test-file-stub"
-            />
-          </div>
+          <div />
         </div>
         <div>
           <div>
@@ -62,12 +57,7 @@ exports[`rendering of the Indicator checks if the flooring function works 1`] =
               42%
             </span>
           </div>
-          <div>
-            <img
-              alt="an icon for the up arrow"
-              src="test-file-stub"
-            />
-          </div>
+          <div />
         </div>
         <div>
           <div>
@@ -99,13 +89,10 @@ exports[`renders value correctly for Former defense sites checks if it renders n
       </div>
       <div>
         <div>
-          <div />
           <div>
-            <img
-              alt="an icon to represent data is unavailable"
-              src="test-file-stub"
-            />
+            --
           </div>
+          <div />
         </div>
         <div>
           <div>
@@ -187,13 +174,10 @@ exports[`renders value correctly for abandoned land mines checks if it renders n
       </div>
       <div>
         <div>
-          <div />
           <div>
-            <img
-              alt="an icon to represent data is unavailable"
-              src="test-file-stub"
-            />
+            --
           </div>
+          <div />
         </div>
         <div>
           <div>
@@ -275,13 +259,10 @@ exports[`renders value correctly for historic underinvest. checks if it renders
       </div>
       <div>
         <div>
-          <div />
           <div>
-            <img
-              alt="an icon to represent data is unavailable"
-              src="test-file-stub"
-            />
+            --
           </div>
+          <div />
         </div>
         <div>
           <div>
@@ -348,51 +329,6 @@ exports[`renders value correctly for historic underinvest. checks if it renders
 </DocumentFragment>
 `;
 
-exports[`test rendering of Indicator value icons renders the down arrow when the value is above the threshold 1`] = `
-<DocumentFragment>
-  <img
-    alt="an icon for the down arrow"
-    src="test-file-stub"
-  />
-</DocumentFragment>
-`;
-
-exports[`test rendering of Indicator value icons renders the down arrow when the value is zero 1`] = `
-<DocumentFragment>
-  <img
-    alt="an icon for the down arrow"
-    src="test-file-stub"
-  />
-</DocumentFragment>
-`;
-
-exports[`test rendering of Indicator value icons renders the unavailable icon when the value is a boolean null 1`] = `
-<DocumentFragment>
-  <img
-    alt="an icon to represent data is unavailable"
-    src="test-file-stub"
-  />
-</DocumentFragment>
-`;
-
-exports[`test rendering of Indicator value icons renders the unavailable icon when the value is a percentile null 1`] = `
-<DocumentFragment>
-  <img
-    alt="an icon to represent data is unavailable"
-    src="test-file-stub"
-  />
-</DocumentFragment>
-`;
-
-exports[`test rendering of Indicator value icons renders the up arrow when value is above threshold 1`] = `
-<DocumentFragment>
-  <img
-    alt="an icon for the up arrow"
-    src="test-file-stub"
-  />
-</DocumentFragment>
-`;
-
 exports[`test rendering of Indicator value sub-text renders missing data  1`] = `
 <DocumentFragment>
   <div>
@@ -429,7 +365,11 @@ exports[`test rendering of Indicator value sub-text renders the "below 90 percen
 </DocumentFragment>
 `;
 
-exports[`test that the unit suffix renders correctly renders correctly when the value is a null 1`] = `<DocumentFragment />`;
+exports[`test that the unit suffix renders correctly renders correctly when the value is a null 1`] = `
+<DocumentFragment>
+  --
+</DocumentFragment>
+`;
 
 exports[`test that the unit suffix renders correctly renders correctly when the value is a percent 1`] = `
 <DocumentFragment>
diff --git a/client/src/components/utils.scss b/client/src/components/utils.scss
index ee393ff2d..112cd6bc5 100644
--- a/client/src/components/utils.scss
+++ b/client/src/components/utils.scss
@@ -6,10 +6,10 @@
 */
 
 //Styles associated with the side panel
-$sidePanelBorderColor: #f2f2f2;
+$sidePanelBorderColor: #F2F2F2;
 $sidePanelBorder: 2px solid $sidePanelBorderColor;
-$mobileBreakpoint: 400px;
-$featureSelectBorderColor: #00bde3;
+$mobileBreakpoint: 400px; // Todo replace with USWDS breakpoint
+$disadvantagedDotColor: #1A4480;
 $additionalCardsBGColor: #FAFAFA;
 $sidePanelLabelFontColor: #171716;
 
@@ -21,6 +21,6 @@ $sidePanelLabelFontColor: #171716;
   
 
 //Styles with Dataset container
-$datasetContainerColor: #eef6fb;
-$headingFontColor: #122e51;
-$j40AlertWarningColor: #faf3d1;
+$datasetContainerColor: #EEF6FB;
+$headingFontColor: #122E51;
+$j40AlertWarningColor: #FAF3D1;
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index 42728f4b4..7224b6f2e 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -25,6 +25,8 @@ export type J40Properties = { [key: string]: any };
 
 // ****** SIDE PANEL BACKEND SIGNALS ***********
 
+export const MISSING_DATA_STRING = '--';
+
 // Tribal signals
 export const TRIBAL_ID = 'tribalId';
 export const LAND_AREA_NAME = 'landAreaName';
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index ef7864478..1ea020ecb 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -293,7 +293,13 @@ export const SIDE_PANEL_VERION = {
     defaultMessage={ 'Methodology version {version}'}
     description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the methodology version number`}
     values= {{
-      version: <FormattedNumber value={METHODOLOGY_COPY.VERSION_NUMBER}/>,
+      /**
+       * FormattedNumber currently renders 1.0 as 1. When the version number has a decimal point add back the
+       * Formatted Message component. Using toFixed will render the desire, however it returns a string which
+       * is unacceptable by the value prop of FormattedNumber.
+       */
+      // version: <FormattedNumber value={METHODOLOGY_COPY.VERSION_NUMBER} style="decimal"/>,
+      version: METHODOLOGY_COPY.VERSION_NUMBER,
     }}
   />,
 };
@@ -495,20 +501,20 @@ export const SIDE_PANEL_CATEGORY = defineMessages({
   },
   CLEAN_ENERGY: {
     id: 'explore.map.page.side.panel.indicator.title.clean.energy',
-    defaultMessage: 'Clean energy and energy efficiency',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Clean, efficient energy title
+    defaultMessage: 'Energy',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Energy title
 `,
   },
-  CLEAN_TRANSPORT: {
-    id: 'explore.map.page.side.panel.indicator.title.clean.transport',
-    defaultMessage: 'Clean transit',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Clean transportation title
+  HEALTH_BURDEN: {
+    id: 'explore.map.page.side.panel.indicator.title.health.burden',
+    defaultMessage: 'Health',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Healt title
 `,
   },
   SUSTAIN_HOUSE: {
     id: 'explore.map.page.side.panel.indicator.title.sustain.house',
-    defaultMessage: 'Sustainable housing',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Sustainable housing title
+    defaultMessage: 'Housing',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing title
 `,
   },
   LEG_POLLUTE: {
@@ -517,16 +523,16 @@ export const SIDE_PANEL_CATEGORY = defineMessages({
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Legacy pollution title
 `,
   },
-  CLEAN_WATER: {
-    id: 'explore.map.page.side.panel.indicator.title.clean.water',
-    defaultMessage: 'Clean water and wastewater infrastructure',
-    description: `Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show Clean water and waste title
+  CLEAN_TRANSPORT: {
+    id: 'explore.map.page.side.panel.indicator.title.clean.transport',
+    defaultMessage: 'Transportation',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Transportation title
 `,
   },
-  HEALTH_BURDEN: {
-    id: 'explore.map.page.side.panel.indicator.title.health.burden',
-    defaultMessage: 'Health burdens',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Health burdens title
+  CLEAN_WATER: {
+    id: 'explore.map.page.side.panel.indicator.title.clean.water',
+    defaultMessage: 'Water',
+    description: `Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show Water title
 `,
   },
   WORK_DEV: {
@@ -544,6 +550,7 @@ export const SIDE_PANEL_CATEGORY = defineMessages({
 });
 
 export const SIDE_PANEL_INDICATORS = defineMessages({
+  // Climate Change
   EXP_AG_LOSS: {
     id: 'explore.map.page.side.panel.indicator.exp.ag.loss',
     defaultMessage: 'Expected agriculture loss rate',
@@ -561,12 +568,12 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
   },
   FLOODING: {
     id: 'explore.map.page.side.panel.indicator.flooding',
-    defaultMessage: 'Future flood risk',
+    defaultMessage: 'Projected flood risk',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show flood risk`,
   },
   WILDFIRE: {
     id: 'explore.map.page.side.panel.indicator.wildfire',
-    defaultMessage: 'Future wildfire risk',
+    defaultMessage: 'Projected wildfire risk',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show wildfire risk`,
   },
   LOW_INCOME: {
@@ -578,50 +585,51 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
     defaultMessage: 'Higher education non-enrollment',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Higher ed degree achievement rate`,
   },
-  ENERGY_BURDEN: {
+
+  // Energy
+  ENERGY_COST: {
     id: 'explore.map.page.side.panel.indicator.energyBurden',
-    defaultMessage: 'Energy burden',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Energy burden`,
+    defaultMessage: 'Energy cost',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Energy cost`,
   },
   PM_2_5: {
     id: 'explore.map.page.side.panel.indicator.pm25',
     defaultMessage: 'PM2.5 in the air',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show PM2.5 in the air`,
   },
-  DIESEL_PARTICULATE_MATTER: {
-    id: 'explore.map.page.side.panel.indicator.dieselPartMatter',
-    defaultMessage: 'Diesel particulate matter exposure',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Diesel particulate matter exposure`,
-  },
-  BARRIER_TRANS: {
-    id: 'explore.map.page.side.panel.indicator.barrier.transport',
-    defaultMessage: 'Transportation barriers',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show transportation barriers`,
+
+  // Health
+  ASTHMA: {
+    id: 'explore.map.page.side.panel.indicator.asthma',
+    defaultMessage: 'Asthma',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Asthma`,
   },
-  TRAFFIC_VOLUME: {
-    id: 'explore.map.page.side.panel.indicator.trafficVolume',
-    defaultMessage: 'Traffic proximity and volume',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Traffic proximity and volume`,
+  DIABETES: {
+    id: 'explore.map.page.side.panel.indicator.diabetes',
+    defaultMessage: 'Diabetes',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Diabetes`,
   },
-  LEAD_PAINT: {
-    id: 'explore.map.page.side.panel.indicator.leadPaint',
-    defaultMessage: 'Lead paint',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lead paint`,
+  HEART_DISEASE: {
+    id: 'explore.map.page.side.panel.indicator.heartDisease',
+    defaultMessage: 'Heart disease',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Heart disease`,
   },
-  MED_HOME_VAL: {
-    id: 'explore.map.page.side.panel.indicator.med.home.val',
-    defaultMessage: 'Median home value',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost burden`,
+  LIFE_EXPECT: {
+    id: 'explore.map.page.side.panel.indicator.lifeExpect',
+    defaultMessage: 'Low life expectancy',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Low life expectancy`,
   },
+
+  // Housing
   HIST_UNDERINVEST: {
     id: 'explore.map.page.side.panel.indicator.historic.underinvest',
     defaultMessage: 'Historic underinvestment',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Historic underinvestment`,
   },
-  HOUSE_BURDEN: {
-    id: 'explore.map.page.side.panel.indicator.houseBurden',
-    defaultMessage: 'Housing cost burden',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost burden`,
+  HOUSE_COST: {
+    id: 'explore.map.page.side.panel.indicator.house.cost',
+    defaultMessage: 'Housing cost',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost`,
   },
   LACK_GREEN_SPACE: {
     id: 'explore.map.page.side.panel.indicator.lack.green.space',
@@ -633,6 +641,18 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
     defaultMessage: 'Lack of plumbing',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lack of plumbing`,
   },
+  LEAD_PAINT: {
+    id: 'explore.map.page.side.panel.indicator.leadPaint',
+    defaultMessage: 'Lead paint',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lead paint`,
+  },
+  MED_HOME_VAL: {
+    id: 'explore.map.page.side.panel.indicator.med.home.val',
+    defaultMessage: 'Median home value',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost burden`,
+  },
+
+  // Legacy Pollution
   ABANDON_MINES: {
     id: 'explore.map.page.side.panel.indicator.abandon.mines',
     defaultMessage: 'Abandoned mine lands',
@@ -640,24 +660,43 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
   },
   FORMER_DEF_SITES: {
     id: 'explore.map.page.side.panel.indicator.former.def.sites',
-    defaultMessage: 'Formerly Used Defense Sites (FUDS)',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Formerly Used Defense Sites (FUDS)`,
+    defaultMessage: 'Formerly Used Defense Sites',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Formerly Used Defense Sites`,
   },
   PROX_HAZ: {
     id: 'explore.map.page.side.panel.indicator.prox.haz',
     defaultMessage: 'Proximity to hazardous waste facilities',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Proximity to hazardous waste facilities`,
   },
+  PROX_RMP: {
+    id: 'explore.map.page.side.panel.indicator.prox.rmp',
+    defaultMessage: 'Proximity to Risk Management Plan facilities',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Count of proposed or listed RMP`,
+  },
   PROX_NPL: {
     id: 'explore.map.page.side.panel.indicator.prox.npl',
-    defaultMessage: 'Proximity to National Priorities List (NPL) sites',
+    defaultMessage: 'Proximity to Superfund sites',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Count of proposed or listed NPL `,
   },
-  PROX_RMP: {
-    id: 'explore.map.page.side.panel.indicator.prox.rmp',
-    defaultMessage: 'Proximity to Risk Management Plan (RMP) facilities',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Count of proposed or listed RMP`,
+
+  // Transportation
+  DIESEL_PARTICULATE_MATTER: {
+    id: 'explore.map.page.side.panel.indicator.dieselPartMatter',
+    defaultMessage: 'Diesel particulate matter exposure',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Diesel particulate matter exposure`,
+  },
+  BARRIER_TRANS: {
+    id: 'explore.map.page.side.panel.indicator.barrier.transport',
+    defaultMessage: 'Transportation barriers',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show transportation barriers`,
+  },
+  TRAFFIC_VOLUME: {
+    id: 'explore.map.page.side.panel.indicator.trafficVolume',
+    defaultMessage: 'Traffic proximity and volume',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Traffic proximity and volume`,
   },
+
+  // Water
   LEAKY_TANKS: {
     id: 'explore.map.page.side.panel.indicator.leaky.tanks',
     defaultMessage: 'Leaking underground storage tanks',
@@ -668,51 +707,35 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
     defaultMessage: 'Wastewater discharge',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Wastewater discharge`,
   },
-  ASTHMA: {
-    id: 'explore.map.page.side.panel.indicator.asthma',
-    defaultMessage: 'Asthma',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Asthma`,
-  },
-  DIABETES: {
-    id: 'explore.map.page.side.panel.indicator.diabetes',
-    defaultMessage: 'Diabetes',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Diabetes`,
-  },
-  HEART_DISEASE: {
-    id: 'explore.map.page.side.panel.indicator.heartDisease',
-    defaultMessage: 'Heart disease',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Heart disease`,
-  },
-  LIFE_EXPECT: {
-    id: 'explore.map.page.side.panel.indicator.lifeExpect',
-    defaultMessage: 'Low life expectancy',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Low life expectancy`,
+
+  // Workforce development
+  LING_ISO: {
+    id: 'explore.map.page.side.panel.indicator.ling.iso',
+    defaultMessage: 'Linguistic isolation',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Linguistic isolation`,
   },
   LOW_MED_INC: {
     id: 'explore.map.page.side.panel.indicator.low.med.income',
     defaultMessage: 'Low median income',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Low median income`,
   },
-  LING_ISO: {
-    id: 'explore.map.page.side.panel.indicator.ling.iso',
-    defaultMessage: 'Linguistic isolation',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Linguistic isolation`,
+  POVERTY: {
+    id: 'explore.map.page.side.panel.indicator.poverty',
+    defaultMessage: 'Poverty',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Unemployment`,
   },
   UNEMPLOY: {
     id: 'explore.map.page.side.panel.indicator.unemploy',
     defaultMessage: 'Unemployment',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Unemployment`,
   },
-  POVERTY: {
-    id: 'explore.map.page.side.panel.indicator.poverty',
-    defaultMessage: 'Poverty',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Unemployment`,
-  },
   HIGH_SCL: {
     id: 'explore.map.page.side.panel.indicator.high.school',
-    defaultMessage: 'High school degree non-attainment',
+    defaultMessage: 'High school education',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show High school degree achievement rate`,
   },
+
+  // Testing
   ADJ: {
     id: 'explore.map.page.side.panel.indicator.adjacency',
     defaultMessage: 'Adjacency',
@@ -772,23 +795,23 @@ export const SIDE_PANEL_VALUES = {
 };
 
 export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
+  // Climate change
   EXP_AG_LOSS: {
     id: 'explore.map.page.side.panel.indicator.description.exp.ag.loss',
-    defaultMessage: 'Economic loss rate to agricultural value resulting from natural hazards each year',
+    defaultMessage: 'Economic loss to agricultural value resulting from natural hazards each year',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Economic loss rate to agriculture resulting from natural hazards
     `,
-
   },
   EXP_BLD_LOSS: {
     id: 'explore.map.page.side.panel.indicator.description.exp.bld.loss',
-    defaultMessage: 'Economic loss rate to agricultural value resulting from natural hazards each year',
+    defaultMessage: 'Economic loss to agricultural value resulting from natural hazards each year',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side 
     panel will show an indicator description of Economic loss rate to buildings resulting from natural hazards`,
   },
   EXP_POP_LOSS: {
     id: 'explore.map.page.side.panel.indicator.description.exp.pop.loss',
     defaultMessage: `
-      Rate of fatalities and injuries resulting from natural hazards each year
+      Fatalities and injuries resulting from natural hazards each year
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Economic loss rate to the population in fatalities and 
       injuries resulting from natural hazards`,
@@ -810,9 +833,9 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   LOW_INCOME: {
     id: 'explore.map.page.side.panel.indicator.description.low.income',
     defaultMessage: `
-      Household income is less than or equal to twice the federal poverty level 
+     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Household income is less than or equal to twice the federal poverty level`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description ofPeople in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed`,
   },
   HIGH_ED: {
     id: 'explore.map.page.side.panel.indicator.description.high.ed',
@@ -823,71 +846,79 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of the census tract's population 15 or older not 
       enrolled in college, university, or graduate school`,
   },
-  ENERGY_BURDEN: {
-    id: 'explore.map.page.side.panel.indicator.description.energyBurden',
+
+  // Energy
+  ENERGY_COST: {
+    id: 'explore.map.page.side.panel.indicator.description.energy.cost',
     defaultMessage: 'Average annual energy costs divided by household income',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Energy costs divided by household income`,
   },
   PM_2_5: {
     id: 'explore.map.page.side.panel.indicator.description.pm25',
-    defaultMessage: 'Fine inhalable particles, 2.5 micrometers or smaller',
+    defaultMessage: 'Level of inhalable particles, 2.5 micrometers or smaller',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Fine inhalable particles, 2.5 micrometers and smaller`,
   },
 
-  DIESEL_PARTICULATE_MATTER: {
-    id: 'explore.map.page.side.panel.indicator.description.dieselPartMatter',
-    defaultMessage: 'Diesel exhaust in the air',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Diesel exhaust in the air`,
-  },
-  BARRIER_TRANS: {
-    id: 'explore.map.page.side.panel.indicator.description.barrierTrans',
-    defaultMessage: 'Cost and time spent on transportation',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Cost and time spent on transportation`,
-  },
-  TRAFFIC_VOLUME: {
-    id: 'explore.map.page.side.panel.indicator.description.trafficVolume',
-    defaultMessage: 'Count of vehicles at major roads within 500 meters',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of vehicles at major roads within 500 meters`,
+  // Health
+  ASTHMA: {
+    id: 'explore.map.page.side.panel.indicator.description.asthma',
+    defaultMessage: 'Share of people who have been told they have asthma',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people who have been told they have asthma`,
   },
-
-  LEAD_PAINT: {
-    id: 'explore.map.page.side.panel.indicator.description.leadPaint',
+  DIABETES: {
+    id: 'explore.map.page.side.panel.indicator.description.diabetes',
     defaultMessage: `
-      Percentile of number of homes built before 1960 that are not among the most expensive
+      Share of people ages 18 years and older who have diabetes
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Pre-1960 housing`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people ages 18 years and older who have diabetes`,
   },
-  MED_HOME_VAL: {
-    id: 'explore.map.page.side.panel.indicator.description.med.home.val',
-    defaultMessage: 'Median home value in area',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Median home value in area`,
-
+  HEART_DISEASE: {
+    id: 'explore.map.page.side.panel.indicator.description.heartDisease',
+    defaultMessage: `Share of people ages 18 years and older who have been told they have heart disease`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people ages 18 years and older who have been told they have heart disease`,
   },
+  LOW_LIFE_EXPECT: {
+    id: 'explore.map.page.side.panel.indicator.description.lifeExpect',
+    defaultMessage: 'Average number of years a person can expect to live',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Average number of years of life a person can expect to live`,
+  },
+
+  // Housing
   HIST_UNDERINVEST: {
     id: 'explore.map.page.side.panel.indicator.description.historic.underinvestment',
     defaultMessage: 'Census tracts with historically high barriers to accessing home loans',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Census tracts with historically high barriers to accessing home loans`,
   },
-  HOUSE_BURDEN: {
-    id: 'explore.map.page.side.panel.indicator.description.houseBurden',
-    defaultMessage: 'Low income households spending more than 30% of income on housing',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing`,
+  HOUSE_COST: {
+    id: 'explore.map.page.side.panel.indicator.description.house.cost',
+    defaultMessage: `Share of households making less than 80% of the area median family income and spending more than 30% of income on housing
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of households making less than 80% of the area median family income and spending more than 30% of income on housing`,
   },
   LACK_GREEN_SPACE: {
     id: 'explore.map.page.side.panel.indicator.description.lack.green.space',
-    defaultMessage: 'Amount of non-crop land covered with artificial materials like pavement and concrete',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Amount of non-crop land covered with artificial materials like pavement and concrete`,
+    defaultMessage: 'Share of land covered with artificial materials like concrete or pavement and crop land',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Share of land covered with artificial materials like concrete or pavement and crop land`,
   },
   LACK_PLUMBING: {
     id: 'explore.map.page.side.panel.indicator.description.lack.plumbing',
     defaultMessage: 'Share of homes without indoor kitchens or plumbing',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes without indoor kitchens or plumbing`,
   },
+  LEAD_PAINT: {
+    id: 'explore.map.page.side.panel.indicator.description.leadPaint',
+    defaultMessage: `
+      Share of homes that are not very expensive and are likely to have lead paint
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes that are not very expensive and are likely to have lead paint   
+    `,
+  },
 
+  // Legacy Pollution
   ABANDON_MINES: {
     id: 'explore.map.page.side.panel.indicator.description.abandon.mines',
-    defaultMessage: 'Presence of an abandoned land mine within the tract',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned land mine within the tract`,
+    defaultMessage: 'Presence of an abandoned mine lands within the tract',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned mine lands within the tract`,
   },
   FORMER_DEF_SITES: {
     id: 'explore.map.page.side.panel.indicator.description.former.def.sites',
@@ -899,88 +930,83 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
     defaultMessage: 'Count of hazardous waste facilities within 5 kilometers',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of hazardous waste facilities within 5 kilometers`,
   },
+  PROX_RMP: {
+    id: 'explore.map.page.side.panel.indicator.description.prox.rmp',
+    defaultMessage: 'Count of Risk Management Plan facilities within 5 kilometers',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of Risk Management Plan facilities within 5 kilometers`,
+  },
   PROX_NPL: {
     id: 'explore.map.page.side.panel.indicator.description.prox.npl',
-    defaultMessage: 'Proposed or listed NPL (Superfund) sites within 5 kilometers',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Proposed or listed NPL (Superfund) sites within 5 kilometers`,
+    defaultMessage: `Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers`,
   },
-  PROX_RMP: {
-    id: 'explore.map.page.side.panel.indicator.description.prox.rmp',
-    defaultMessage: 'RMP facilities within 5 kilometers',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Risk Management Plan facilities within 5 kilometers`,
+
+  // Transportation
+  DIESEL_PARTICULATE_MATTER: {
+    id: 'explore.map.page.side.panel.indicator.description.dieselPartMatter',
+    defaultMessage: 'Amount of diesel exhaust in the air',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Diesel exhaust in the air`,
+  },
+  BARRIER_TRANS: {
+    id: 'explore.map.page.side.panel.indicator.description.barrierTrans',
+    defaultMessage: 'Average of relative cost and time spent on transportation',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Cost and time spent on transportation`,
+  },
+  TRAFFIC_VOLUME: {
+    id: 'explore.map.page.side.panel.indicator.description.trafficVolume',
+    defaultMessage: 'Count of vehicles at major roads within 500 meters',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of vehicles at major roads within 500 meters`,
   },
 
+  // Water
   LEAKY_TANKS: {
     id: 'explore.map.page.side.panel.indicator.description.leaky.tanks',
-    defaultMessage: `Count of leaking underground storage tanks when compared to all underground storage tanks`,
+    defaultMessage: `Formula that counts leaking underground storage tanks and number of all underground storage tanks within 1500 feet
+    `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of leaky storage tanks`,
   },
   WASTE_WATER: {
     id: 'explore.map.page.side.panel.indicator.description.wasteWater',
-    defaultMessage: 'Toxic concentrations at stream segments within 500 meters',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Toxic concentrations at stream segments within 500 meters`,
+    defaultMessage: 'Modeled toxic concentrations at parts of streams within 500 meters',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Modeled toxic concentrations at parts of streams within 500 meters`,
   },
 
-  ASTHMA: {
-    id: 'explore.map.page.side.panel.indicator.description.asthma',
-    defaultMessage: 'Weighted percent of people who have been told they have asthma',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Number of people who have been told they have asthma`,
-  },
-  DIABETES: {
-    id: 'explore.map.page.side.panel.indicator.description.diabetes',
+
+  // Workforce development
+  LING_ISO: {
+    id: 'explore.map.page.side.panel.indicator.description.ling.iso',
     defaultMessage: `
-      Weighted percent of people ages 18 years and older who have diabetes other than 
-      diabetes during pregnancy
+    Share of households where no one over the age 14 speaks English well
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of People ages 18 years and older who have diabetes other than 
-      diabetes during pregnancy`,
-  },
-  HEART_DISEASE: {
-    id: 'explore.map.page.side.panel.indicator.description.heartDisease',
-    defaultMessage: `People ages 18 years and older who have been told they have heart disease`,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Weighted percent of people ages 18 years and older who have 
-    been told they have heart disease`,
-  },
-  LOW_LIFE_EXPECT: {
-    id: 'explore.map.page.side.panel.indicator.description.lifeExpect',
-    defaultMessage: 'Average number of years a person can expect to live',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Average number of years of life a person can expect to live`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of households where no one over the age 14 speaks English well`,
   },
-
   LOW_MED_INCOME: {
     id: 'explore.map.page.side.panel.indicator.description.low.med.income',
-    defaultMessage: 'Median income calculated as a percent of the area’s median income',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Median income calculated as a percent of the area’s median income`,
+    defaultMessage: 'Comparison of income in the tract to incomes in the area',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Comparison of income in the tract to incomes in the area`,
   },
-  LING_ISO: {
-    id: 'explore.map.page.side.panel.indicator.description.ling.iso',
+  POVERTY: {
+    id: 'explore.map.page.side.panel.indicator.description.poverty',
     defaultMessage: `
-      Percent of households where no one over the age 14 speaks English well
+      Share of people in households where the income is at or below 100% of the Federal poverty level 
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Households in which no one age 14 and over speaks English only or also speaks a language other than English`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people in households where the income is at or below 100% of the Federal poverty level`,
   },
   UNEMPLOY: {
     id: 'explore.map.page.side.panel.indicator.description.unemploy',
-    defaultMessage: 'Number of unemployed people as a percentage of the labor force',
+    defaultMessage: 'Number of unemployed people as a part of the labor force',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side 
-    panel will show an indicator description of Number of unemployed people as a percentage of the labor force`,
-  },
-  POVERTY: {
-    id: 'explore.map.page.side.panel.indicator.description.poverty',
-    defaultMessage: `
-      Percent of a census tract's population in households where the household income is at or below 100% 
-      of the Federal poverty level 
-    `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of individuals in households where the household income is at or below 100% of the federal poverty level`,
+    panel will show an indicator description of Number of unemployed people as a part of the labor force`,
   },
   HIGH_SKL: {
     id: 'explore.map.page.side.panel.indicator.description.high.school',
     defaultMessage: `
-      Percent of people ages 25 years or older whose education level is less than a high school diploma 
+      Percent of people ages 25 years or older who did not graduate high school 
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of people ages 25 years or older whose education level 
-      is less than a high school diploma`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of people ages 25 years or older who did not graduate high school`,
   },
+
+  // Testing
   ADJ: {
     id: 'explore.map.page.side.panel.indicator.description.ling.iso',
     defaultMessage: `
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index 79b624c5d..ab2379f2c 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -4,7 +4,7 @@ import {defineMessages} from 'react-intl';
 import {FormattedMessage} from 'gatsby-plugin-intl';
 import {boldFn, linkFn, simpleLink} from './common';
 
-export const VERSION_NUMBER = 0.1;
+export const VERSION_NUMBER = (1.0).toFixed(1);
 
 export const PAGE = defineMessages({
   TILE: {
diff --git a/client/src/images/sidePanelIcons/accordion-minus.svg b/client/src/images/sidePanelIcons/accordion-minus.svg
new file mode 100644
index 000000000..40554225f
--- /dev/null
+++ b/client/src/images/sidePanelIcons/accordion-minus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M19 13H5v-2h14v2z" fill="white"/></svg>
\ No newline at end of file
diff --git a/client/src/images/sidePanelIcons/accordion-plus.svg b/client/src/images/sidePanelIcons/accordion-plus.svg
new file mode 100644
index 000000000..66e3c50d8
--- /dev/null
+++ b/client/src/images/sidePanelIcons/accordion-plus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" fill="white"/></svg>
\ No newline at end of file
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index e5134ed5d..423a8e804 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -572,39 +572,39 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show transportation barriers"
   },
   "explore.map.page.side.panel.indicator.description.abandon.mines": {
-    "defaultMessage": "Presence of an abandoned land mine within the tract",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned land mine within the tract"
+    "defaultMessage": "Presence of an abandoned mine lands within the tract",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned mine lands within the tract"
   },
   "explore.map.page.side.panel.indicator.description.asthma": {
-    "defaultMessage": "Weighted percent of people who have been told they have asthma",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Number of people who have been told they have asthma"
+    "defaultMessage": "Share of people who have been told they have asthma",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people who have been told they have asthma"
   },
   "explore.map.page.side.panel.indicator.description.barrierTrans": {
-    "defaultMessage": "Cost and time spent on transportation",
+    "defaultMessage": "Average of relative cost and time spent on transportation",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Cost and time spent on transportation"
   },
   "explore.map.page.side.panel.indicator.description.diabetes": {
-    "defaultMessage": "Weighted percent of people ages 18 years and older who have diabetes other than diabetes during pregnancy",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of People ages 18 years and older who have diabetes other than \n      diabetes during pregnancy"
+    "defaultMessage": "Share of people ages 18 years and older who have diabetes",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people ages 18 years and older who have diabetes"
   },
   "explore.map.page.side.panel.indicator.description.dieselPartMatter": {
-    "defaultMessage": "Diesel exhaust in the air",
+    "defaultMessage": "Amount of diesel exhaust in the air",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Diesel exhaust in the air"
   },
-  "explore.map.page.side.panel.indicator.description.energyBurden": {
+  "explore.map.page.side.panel.indicator.description.energy.cost": {
     "defaultMessage": "Average annual energy costs divided by household income",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Energy costs divided by household income"
   },
   "explore.map.page.side.panel.indicator.description.exp.ag.loss": {
-    "defaultMessage": "Economic loss rate to agricultural value resulting from natural hazards each year",
+    "defaultMessage": "Economic loss to agricultural value resulting from natural hazards each year",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Economic loss rate to agriculture resulting from natural hazards\n    "
   },
   "explore.map.page.side.panel.indicator.description.exp.bld.loss": {
-    "defaultMessage": "Economic loss rate to agricultural value resulting from natural hazards each year",
+    "defaultMessage": "Economic loss to agricultural value resulting from natural hazards each year",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side \n    panel will show an indicator description of Economic loss rate to buildings resulting from natural hazards"
   },
   "explore.map.page.side.panel.indicator.description.exp.pop.loss": {
-    "defaultMessage": "Rate of fatalities and injuries resulting from natural hazards each year",
+    "defaultMessage": "Fatalities and injuries resulting from natural hazards each year",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Economic loss rate to the population in fatalities and \n      injuries resulting from natural hazards"
   },
   "explore.map.page.side.panel.indicator.description.flooding": {
@@ -616,39 +616,39 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of a Formerly Used Defense Site within the tract"
   },
   "explore.map.page.side.panel.indicator.description.heartDisease": {
-    "defaultMessage": "People ages 18 years and older who have been told they have heart disease",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Weighted percent of people ages 18 years and older who have \n    been told they have heart disease"
+    "defaultMessage": "Share of people ages 18 years and older who have been told they have heart disease",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people ages 18 years and older who have been told they have heart disease"
   },
   "explore.map.page.side.panel.indicator.description.high.ed": {
     "defaultMessage": "Percent of the census tract's population 15 or older not enrolled in college, university, or graduate school",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of the census tract's population 15 or older not \n      enrolled in college, university, or graduate school"
   },
   "explore.map.page.side.panel.indicator.description.high.school": {
-    "defaultMessage": "Percent of people ages 25 years or older whose education level is less than a high school diploma",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of people ages 25 years or older whose education level \n      is less than a high school diploma"
+    "defaultMessage": "Percent of people ages 25 years or older who did not graduate high school",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of people ages 25 years or older who did not graduate high school"
   },
   "explore.map.page.side.panel.indicator.description.historic.underinvestment": {
     "defaultMessage": "Census tracts with historically high barriers to accessing home loans",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing"
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Census tracts with historically high barriers to accessing home loans"
   },
-  "explore.map.page.side.panel.indicator.description.houseBurden": {
-    "defaultMessage": "Low income households spending more than 30% of income on housing",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Low income households spending more than 30% of income housing"
+  "explore.map.page.side.panel.indicator.description.house.cost": {
+    "defaultMessage": "Share of households making less than 80% of the area median family income and spending more than 30% of income on housing",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of households making less than 80% of the area median family income and spending more than 30% of income on housing"
   },
   "explore.map.page.side.panel.indicator.description.lack.green.space": {
-    "defaultMessage": "Amount of non-crop land covered with artificial materials like pavement and concrete",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Amount of non-crop land covered with artificial materials like pavement and concrete"
+    "defaultMessage": "Share of land covered with artificial materials like concrete or pavement and crop land",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Share of land covered with artificial materials like concrete or pavement and crop land"
   },
   "explore.map.page.side.panel.indicator.description.lack.plumbing": {
     "defaultMessage": "Share of homes without indoor kitchens or plumbing",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes without indoor kitchens or plumbing"
   },
   "explore.map.page.side.panel.indicator.description.leadPaint": {
-    "defaultMessage": "Percentile of number of homes built before 1960 that are not among the most expensive",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Pre-1960 housing"
+    "defaultMessage": "Share of homes that are not very expensive and are likely to have lead paint",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes that are not very expensive and are likely to have lead paint   \n    "
   },
   "explore.map.page.side.panel.indicator.description.leaky.tanks": {
-    "defaultMessage": "Count of leaking underground storage tanks when compared to all underground storage tanks",
+    "defaultMessage": "Formula that counts leaking underground storage tanks and number of all underground storage tanks within 1500 feet",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of leaky storage tanks"
   },
   "explore.map.page.side.panel.indicator.description.lifeExpect": {
@@ -660,48 +660,44 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator about adjacency"
   },
   "explore.map.page.side.panel.indicator.description.low.income": {
-    "defaultMessage": "Household income is less than or equal to twice the federal poverty level",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Household income is less than or equal to twice the federal poverty level"
+    "defaultMessage": "People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description ofPeople in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed"
   },
   "explore.map.page.side.panel.indicator.description.low.med.income": {
-    "defaultMessage": "Median income calculated as a percent of the area’s median income",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Median income calculated as a percent of the area’s median income"
-  },
-  "explore.map.page.side.panel.indicator.description.med.home.val": {
-    "defaultMessage": "Median home value in area",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Median home value in area"
+    "defaultMessage": "Comparison of income in the tract to incomes in the area",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Comparison of income in the tract to incomes in the area"
   },
   "explore.map.page.side.panel.indicator.description.pm25": {
-    "defaultMessage": "Fine inhalable particles, 2.5 micrometers or smaller",
+    "defaultMessage": "Level of inhalable particles, 2.5 micrometers or smaller",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Fine inhalable particles, 2.5 micrometers and smaller"
   },
   "explore.map.page.side.panel.indicator.description.poverty": {
-    "defaultMessage": "Percent of a census tract's population in households where the household income is at or below 100% of the Federal poverty level",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of individuals in households where the household income is at or below 100% of the federal poverty level"
+    "defaultMessage": "Share of people in households where the income is at or below 100% of the Federal poverty level",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people in households where the income is at or below 100% of the Federal poverty level"
   },
   "explore.map.page.side.panel.indicator.description.prox.haz": {
     "defaultMessage": "Count of hazardous waste facilities within 5 kilometers",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of hazardous waste facilities within 5 kilometers"
   },
   "explore.map.page.side.panel.indicator.description.prox.npl": {
-    "defaultMessage": "Proposed or listed NPL (Superfund) sites within 5 kilometers",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Proposed or listed NPL (Superfund) sites within 5 kilometers"
+    "defaultMessage": "Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers"
   },
   "explore.map.page.side.panel.indicator.description.prox.rmp": {
-    "defaultMessage": "RMP facilities within 5 kilometers",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Risk Management Plan facilities within 5 kilometers"
+    "defaultMessage": "Count of Risk Management Plan facilities within 5 kilometers",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of Risk Management Plan facilities within 5 kilometers"
   },
   "explore.map.page.side.panel.indicator.description.trafficVolume": {
     "defaultMessage": "Count of vehicles at major roads within 500 meters",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of vehicles at major roads within 500 meters"
   },
   "explore.map.page.side.panel.indicator.description.unemploy": {
-    "defaultMessage": "Number of unemployed people as a percentage of the labor force",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side \n    panel will show an indicator description of Number of unemployed people as a percentage of the labor force"
+    "defaultMessage": "Number of unemployed people as a part of the labor force",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side \n    panel will show an indicator description of Number of unemployed people as a part of the labor force"
   },
   "explore.map.page.side.panel.indicator.description.wasteWater": {
-    "defaultMessage": "Toxic concentrations at stream segments within 500 meters",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Toxic concentrations at stream segments within 500 meters"
+    "defaultMessage": "Modeled toxic concentrations at parts of streams within 500 meters",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Modeled toxic concentrations at parts of streams within 500 meters"
   },
   "explore.map.page.side.panel.indicator.description.wildfire": {
     "defaultMessage": "Projected risk to properties from wildfire from fire fuels, weather, humans, and fire movement",
@@ -716,8 +712,8 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Diesel particulate matter exposure"
   },
   "explore.map.page.side.panel.indicator.energyBurden": {
-    "defaultMessage": "Energy burden",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Energy burden"
+    "defaultMessage": "Energy cost",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Energy cost"
   },
   "explore.map.page.side.panel.indicator.exp.ag.loss": {
     "defaultMessage": "Expected agriculture loss rate",
@@ -732,12 +728,12 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show population loss rate"
   },
   "explore.map.page.side.panel.indicator.flooding": {
-    "defaultMessage": "Future flood risk",
+    "defaultMessage": "Projected flood risk",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show flood risk"
   },
   "explore.map.page.side.panel.indicator.former.def.sites": {
-    "defaultMessage": "Formerly Used Defense Sites (FUDS)",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Formerly Used Defense Sites (FUDS)"
+    "defaultMessage": "Formerly Used Defense Sites",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Formerly Used Defense Sites"
   },
   "explore.map.page.side.panel.indicator.heartDisease": {
     "defaultMessage": "Heart disease",
@@ -748,16 +744,16 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Higher ed degree achievement rate"
   },
   "explore.map.page.side.panel.indicator.high.school": {
-    "defaultMessage": "High school degree non-attainment",
+    "defaultMessage": "High school education",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show High school degree achievement rate"
   },
   "explore.map.page.side.panel.indicator.historic.underinvest": {
     "defaultMessage": "Historic underinvestment",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Historic underinvestment"
   },
-  "explore.map.page.side.panel.indicator.houseBurden": {
-    "defaultMessage": "Housing cost burden",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost burden"
+  "explore.map.page.side.panel.indicator.house.cost": {
+    "defaultMessage": "Housing cost",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing cost"
   },
   "explore.map.page.side.panel.indicator.imp.flg": {
     "defaultMessage": "Impute flag",
@@ -816,40 +812,40 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Proximity to hazardous waste facilities"
   },
   "explore.map.page.side.panel.indicator.prox.npl": {
-    "defaultMessage": "Proximity to National Priorities List (NPL) sites",
+    "defaultMessage": "Proximity to Superfund sites",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Count of proposed or listed NPL "
   },
   "explore.map.page.side.panel.indicator.prox.rmp": {
-    "defaultMessage": "Proximity to Risk Management Plan (RMP) facilities",
+    "defaultMessage": "Proximity to Risk Management Plan facilities",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Count of proposed or listed RMP"
   },
   "explore.map.page.side.panel.indicator.title.clean.energy": {
-    "defaultMessage": "Clean energy and energy efficiency",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Clean, efficient energy title\n"
+    "defaultMessage": "Energy",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Energy title\n"
   },
   "explore.map.page.side.panel.indicator.title.clean.transport": {
-    "defaultMessage": "Clean transit",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Clean transportation title\n"
+    "defaultMessage": "Transportation",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Transportation title\n"
   },
   "explore.map.page.side.panel.indicator.title.clean.water": {
-    "defaultMessage": "Clean water and wastewater infrastructure",
-    "description": "Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show Clean water and waste title\n"
+    "defaultMessage": "Water",
+    "description": "Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show Water title\n"
   },
   "explore.map.page.side.panel.indicator.title.climate": {
     "defaultMessage": "Climate change",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Climate change title\n"
   },
   "explore.map.page.side.panel.indicator.title.health.burden": {
-    "defaultMessage": "Health burdens",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Health burdens title\n"
+    "defaultMessage": "Health",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Healt title\n"
   },
   "explore.map.page.side.panel.indicator.title.legacy.pollution": {
     "defaultMessage": "Legacy pollution",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Legacy pollution title\n"
   },
   "explore.map.page.side.panel.indicator.title.sustain.house": {
-    "defaultMessage": "Sustainable housing",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Sustainable housing title\n"
+    "defaultMessage": "Housing",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Housing title\n"
   },
   "explore.map.page.side.panel.indicator.title.testing": {
     "defaultMessage": "Testing",
@@ -904,7 +900,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Wastewater discharge"
   },
   "explore.map.page.side.panel.indicator.wildfire": {
-    "defaultMessage": "Future wildfire risk",
+    "defaultMessage": "Projected wildfire risk",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show wildfire risk"
   },
   "explore.map.page.side.panel.info.alt.text.icon1": {
diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss
index 62469d652..a687c278c 100644
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@@ -18,25 +18,32 @@ There are 3 things that should be included in this file:
 // 3. Include or point to your project's custom Sass
 /* 
   Instead of having a separate file for these styles, all styles are being placed here.
-  - Global styles
-  - Layout styles
-    -- Main content styles
-    -- Footer styles
-  - Component styles
-    -- Map styles
-    -- Demographics styles
-    -- Public Event styles
-    -- About styles
-    -- Summary box
-*/
 
+  Ideally, this file should only hold styles for when we need to override the USWDS component 
+  or the Trusswork component. J40 component styles should be contained in it's own component styles.
+
+  - GLOBAL STYLES
+  - MAIN CONTENT STYLES
+  - FOOTER STYLES
+  - MAP STYLES
+  - ACCORDION STYLES
+  - DEMOGRAPHICS STYLES
+  - PUBLIC EVENT STYLES
+  - ABOUT CARD STYLES
+  - SUMMARY BOX STYLES
+*/
 
 
 
-/***************** GLOBAL STYLES **************************************************************/
+/* 
+******************************
+*      GLOBAL STYLES
+****************************** 
+*/
 
 $primary-color: #112f4e;  // Used for header font color - selection color is #005EA2
 $j40-blue-background-color: #e7f2f5;  // Hex value of 'blue-cool-5'
+$disadvantaged-color-side-panel: #1a4480;
 
 // The j40-element mixin is used to create any font element. E.g. <h1>, <p> tags, etc.
 // Arguments to the mixins must be tokens from USWDS
@@ -97,12 +104,6 @@ p.flush {
   @include j40-element('lg', 2, 'bold', 0 );
 }
 
-/***************** LAYOUT STYLES **************************************************************
-This section will outline styles for components that are on each page. These 
-components include:
-
-- main content styles
-- footer styles
 
 
 /* 
@@ -184,14 +185,6 @@ li[class*='datasetCard-module'] .usa-link--external::after {
 }
 
 
-
-/***************** COMPONENT STYLES **************************************************************
-This section will outline styles that are component specific
-
-- map
-- timeline
-- about
-
 /* 
 ******************************
 *      MAP STYLES
@@ -359,16 +352,34 @@ Beacon - the beacon's color (*-location-dot) and proximity animation (::before),
 }
 
 
-.usa-accordion__content {
-  padding-bottom: 0;
-}
-
 //As per Mikel Maron's (MapBox advocate) suggestion to use svg data URI override:
 a.mapboxgl-ctrl-logo { 
   background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='88' height='23' viewBox='0 0 88 23' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' fill-rule='evenodd'%3E %3Cdefs%3E %3Cpath id='logo' d='M11.5 2.25c5.105 0 9.25 4.145 9.25 9.25s-4.145 9.25-9.25 9.25-9.25-4.145-9.25-9.25 4.145-9.25 9.25-9.25zM6.997 15.983c-.051-.338-.828-5.802 2.233-8.873a4.395 4.395 0 013.13-1.28c1.27 0 2.49.51 3.39 1.42.91.9 1.42 2.12 1.42 3.39 0 1.18-.449 2.301-1.28 3.13C12.72 16.93 7 16 7 16l-.003-.017zM15.3 10.5l-2 .8-.8 2-.8-2-2-.8 2-.8.8-2 .8 2 2 .8z'/%3E %3Cpath id='text' d='M50.63 8c.13 0 .23.1.23.23V9c.7-.76 1.7-1.18 2.73-1.18 2.17 0 3.95 1.85 3.95 4.17s-1.77 4.19-3.94 4.19c-1.04 0-2.03-.43-2.74-1.18v3.77c0 .13-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V8.23c0-.12.1-.23.23-.23h1.4zm-3.86.01c.01 0 .01 0 .01-.01.13 0 .22.1.22.22v7.55c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V15c-.7.76-1.69 1.19-2.73 1.19-2.17 0-3.94-1.87-3.94-4.19 0-2.32 1.77-4.19 3.94-4.19 1.03 0 2.02.43 2.73 1.18v-.75c0-.12.1-.23.23-.23h1.4zm26.375-.19a4.24 4.24 0 00-4.16 3.29c-.13.59-.13 1.19 0 1.77a4.233 4.233 0 004.17 3.3c2.35 0 4.26-1.87 4.26-4.19 0-2.32-1.9-4.17-4.27-4.17zM60.63 5c.13 0 .23.1.23.23v3.76c.7-.76 1.7-1.18 2.73-1.18 1.88 0 3.45 1.4 3.84 3.28.13.59.13 1.2 0 1.8-.39 1.88-1.96 3.29-3.84 3.29-1.03 0-2.02-.43-2.73-1.18v.77c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V5.23c0-.12.1-.23.23-.23h1.4zm-34 11h-1.4c-.13 0-.23-.11-.23-.23V8.22c.01-.13.1-.22.23-.22h1.4c.13 0 .22.11.23.22v.68c.5-.68 1.3-1.09 2.16-1.1h.03c1.09 0 2.09.6 2.6 1.55.45-.95 1.4-1.55 2.44-1.56 1.62 0 2.93 1.25 2.9 2.78l.03 5.2c0 .13-.1.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.8 0-1.46.7-1.59 1.62l.01 4.68c0 .13-.11.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.85 0-1.54.79-1.6 1.8v4.5c0 .13-.1.23-.23.23zm53.615 0h-1.61c-.04 0-.08-.01-.12-.03-.09-.06-.13-.19-.06-.28l2.43-3.71-2.39-3.65a.213.213 0 01-.03-.12c0-.12.09-.21.21-.21h1.61c.13 0 .24.06.3.17l1.41 2.37 1.4-2.37a.34.34 0 01.3-.17h1.6c.04 0 .08.01.12.03.09.06.13.19.06.28l-2.37 3.65 2.43 3.7c0 .05.01.09.01.13 0 .12-.09.21-.21.21h-1.61c-.13 0-.24-.06-.3-.17l-1.44-2.42-1.44 2.42a.34.34 0 01-.3.17zm-7.12-1.49c-1.33 0-2.42-1.12-2.42-2.51 0-1.39 1.08-2.52 2.42-2.52 1.33 0 2.42 1.12 2.42 2.51 0 1.39-1.08 2.51-2.42 2.52zm-19.865 0c-1.32 0-2.39-1.11-2.42-2.48v-.07c.02-1.38 1.09-2.49 2.4-2.49 1.32 0 2.41 1.12 2.41 2.51 0 1.39-1.07 2.52-2.39 2.53zm-8.11-2.48c-.01 1.37-1.09 2.47-2.41 2.47s-2.42-1.12-2.42-2.51c0-1.39 1.08-2.52 2.4-2.52 1.33 0 2.39 1.11 2.41 2.48l.02.08zm18.12 2.47c-1.32 0-2.39-1.11-2.41-2.48v-.06c.02-1.38 1.09-2.48 2.41-2.48s2.42 1.12 2.42 2.51c0 1.39-1.09 2.51-2.42 2.51z'/%3E %3C/defs%3E %3Cmask id='clip'%3E %3Crect x='0' y='0' width='100%25' height='100%25' fill='white'/%3E %3Cuse xlink:href='%23logo'/%3E %3Cuse xlink:href='%23text'/%3E %3C/mask%3E %3Cg id='outline' opacity='0.3' stroke='%23000' stroke-width='3'%3E %3Ccircle mask='url(/studio-manual/assets/%23clip)' cx='11.5' cy='11.5' r='9.25'/%3E %3Cuse xlink:href='%23text' mask='url(/studio-manual/assets/%23clip)'/%3E %3C/g%3E %3Cg id='fill' opacity='0.9' fill='%23fff'%3E %3Cuse xlink:href='%23logo'/%3E %3Cuse xlink:href='%23text'/%3E %3C/g%3E %3C/svg%3E") !important;
 };
 
 
+/* 
+******************************
+*      ACCORDION STYLES
+****************************** 
+*/
+.usa-accordion__content {
+  padding-bottom: 0;
+}
+
+// The following two styles will only work in browsers that support the ":has" selector
+button.usa-accordion__button:has(div[class*="disCategoryContainer"])  {
+  background-color: $disadvantaged-color-side-panel;
+  background-image: url("../images/sidePanelIcons/accordion-plus.svg");
+
+  div[class*="disCategoryContainer"]{
+    color: white;
+  }
+}
+button.usa-accordion__button[aria-expanded=true]:has(div[class*="disCategoryContainer"])  {
+  background-image: url("../images/sidePanelIcons/accordion-minus.svg");
+}
+
 /* 
 ******************************
 *      DEMOGRAPHICS STYLES

From eeb7d07c408d67bbbb3b97071a938f8ff2668d1a Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Thu, 15 Sep 2022 17:30:48 -0700
Subject: [PATCH 064/130] Add USVI and GU to map

- remove shortcuts on mobile
---
 client/src/components/J40Map.tsx              |  4 ++--
 .../src/components/territoryFocusControl.tsx  | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index 6b946643b..6c02019be 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -397,7 +397,6 @@ const J40Map = ({location}: IJ40Interface) => {
           onLoad={onLoad}
           onTransitionStart={onTransitionStart}
           onTransitionEnd={onTransitionEnd}
-
           ref={mapRef}
           data-cy={'reactMapGL'}
         >
@@ -461,7 +460,8 @@ const J40Map = ({location}: IJ40Interface) => {
 
           {/* This is the third row overlayed on the map, it will show shortcut buttons to
           pan/zoom to US territories */}
-          <TerritoryFocusControl onClick={onClick}/>
+          { windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+            <TerritoryFocusControl onClick={onClick}/> }
 
           {/* Enable fullscreen pop-up behind a feature flag */}
           {('fs' in flags && detailViewData && !transitionInProgress) && (
diff --git a/client/src/components/territoryFocusControl.tsx b/client/src/components/territoryFocusControl.tsx
index 5911fb9f0..7f0f02057 100644
--- a/client/src/components/territoryFocusControl.tsx
+++ b/client/src/components/territoryFocusControl.tsx
@@ -30,10 +30,10 @@ const TerritoryFocusControl = ({onClick}: ITerritoryFocusControl) => {
       short: intl.formatMessage(EXPLORE_COPY.MAP.PR_SHORT),
       long: intl.formatMessage(EXPLORE_COPY.MAP.PR_LONG),
     },
-    // {
-    //   short: intl.formatMessage(EXPLORE_COPY.MAP.GU_SHORT),
-    //   long: intl.formatMessage(EXPLORE_COPY.MAP.GU_LONG),
-    // },
+    {
+      short: intl.formatMessage(EXPLORE_COPY.MAP.GU_SHORT),
+      long: intl.formatMessage(EXPLORE_COPY.MAP.GU_LONG),
+    },
     {
       short: intl.formatMessage(EXPLORE_COPY.MAP.AS_SHORT),
       long: intl.formatMessage(EXPLORE_COPY.MAP.AS_LONG),
@@ -42,10 +42,10 @@ const TerritoryFocusControl = ({onClick}: ITerritoryFocusControl) => {
       short: intl.formatMessage(EXPLORE_COPY.MAP.MP_SHORT),
       long: intl.formatMessage(EXPLORE_COPY.MAP.MP_LONG),
     },
-    // {
-    //   short: intl.formatMessage(EXPLORE_COPY.MAP.VI_SHORT),
-    //   long: intl.formatMessage(EXPLORE_COPY.MAP.VI_LONG),
-    // },
+    {
+      short: intl.formatMessage(EXPLORE_COPY.MAP.VI_SHORT),
+      long: intl.formatMessage(EXPLORE_COPY.MAP.VI_LONG),
+    },
   ];
   // the offset for this array should map the territories variable
   const territoriesIconClassName = [
@@ -53,10 +53,10 @@ const TerritoryFocusControl = ({onClick}: ITerritoryFocusControl) => {
     'mapboxgl-ctrl-zoom-to-ak',
     'mapboxgl-ctrl-zoom-to-hi',
     'mapboxgl-ctrl-zoom-to-pr',
-    // 'mapboxgl-ctrl-zoom-to-gu',
+    'mapboxgl-ctrl-zoom-to-gu',
     'mapboxgl-ctrl-zoom-to-as',
     'mapboxgl-ctrl-zoom-to-mp',
-    // 'mapboxgl-ctrl-zoom-to-vi',
+    'mapboxgl-ctrl-zoom-to-vi',
   ];
 
   return (

From 5633d0f86ea3ea1da575486962b5abb417bac1b6 Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Wed, 21 Sep 2022 13:39:54 -0700
Subject: [PATCH 065/130] Fix all link colors, prevent logo from wrapping,
 update non-selected side-panel (#1908)

* Update links colors

- Language links
- Download links
- Simple links
- External links
- Side panel demographics links
- return to top links
- update snapshots

* Fix wrapping on logo title

- remove beta pill

* Update un-selected side panel copy (desktop)

- two icons are needed

* Remove icons on mobile view

* Remove the pub. eng. button on all pages

* Add usa-link class to all links

- will create consiste visible state on all links

* Remove tribal toggle

- remove tribal layer from feature flag and make it default
---
 .../src/components/AreaDetail/AreaDetail.tsx  | 153 +++++++--------
 .../__snapshots__/areaDetail.test.tsx.snap    |  54 +++---
 .../__snapshots__/Categories.test.tsx.snap    |  38 ++++
 .../__snapshots__/CategoryCard.test.tsx.snap  |   5 +
 .../src/components/DatasetContainer/index.tsx |   2 +-
 .../datasetContainer.test.tsx.snap            |   1 +
 .../components/DownloadLink/DownloadLink.tsx  |   2 +-
 .../__snapshots__/DownloadLink.test.tsx.snap  |   1 +
 .../GovernmentBanner.test.tsx.snap            |   2 +
 .../__snapshots__/howYouCanHelp.test.tsx.snap |   1 +
 .../__snapshots__/J40Footer.spec.tsx.snap     |   2 +-
 .../J40Header/J40Header.module.scss           |  18 +-
 client/src/components/J40Header/J40Header.tsx |   9 +-
 .../__snapshots__/J40Header.test.tsx.snap     |  16 +-
 client/src/components/J40Map.tsx              |  43 +---
 .../components/Language/Language.module.scss  |   4 +-
 client/src/components/Language/Language.tsx   |   2 +-
 .../__snapshots__/Language.test.tsx.snap      |   2 +
 .../LinkTypeWrapper/LinkTypeWrapper.tsx       |   2 +-
 .../linkTypeWrapper.test.tsx.snap             |   1 +
 .../SidePanelInfo/SidePanelInfo.module.scss   |  14 +-
 .../SidePanelInfo/SidePanelInfo.tsx           | 114 ++++++++---
 .../__snapshots__/SidePanelInfo.test.tsx.snap | 128 ++++++++----
 .../components/SubPageNav/SubPageNav.test.tsx |   8 +-
 .../TractDemographics.module.scss             |   4 +-
 .../TractDemographics/TractDemographics.tsx   |   8 +-
 .../TractDemographics.test.tsx.snap           |  42 ++--
 .../__snapshots__/mapInfoPanel.test.tsx.snap  | 128 ++++++++----
 client/src/components/mapInfoPanel.tsx        |  17 +-
 client/src/data/copy/common.tsx               |  11 +-
 client/src/data/copy/explore.tsx              | 183 ++++++++++++++----
 client/src/data/getOSBaseMap.tsx              | 121 +-----------
 client/src/data/tribalToggleLayerOSMap.tsx    | 111 +++++++++++
 client/src/intl/en.json                       | 114 +++++++----
 client/src/pages/about.tsx                    |   2 -
 client/src/pages/contact.tsx                  |   2 -
 client/src/pages/downloads.tsx                |   2 -
 client/src/pages/index.tsx                    |   2 -
 client/src/pages/methodology.tsx              |   2 -
 .../tests/__snapshots__/about.test.tsx.snap   |  41 +---
 .../tests/__snapshots__/contact.test.tsx.snap |  40 +---
 .../__snapshots__/downloads.test.tsx.snap     |  42 +---
 .../freqAskedQuestions.test.tsx.snap          |  18 +-
 .../__snapshots__/methodology.test.tsx.snap   |  78 ++++----
 .../__snapshots__/publicEng.test.tsx.snap     |  18 +-
 .../techSupportDoc.test.tsx.snap              |  18 +-
 46 files changed, 915 insertions(+), 711 deletions(-)
 create mode 100644 client/src/data/tribalToggleLayerOSMap.tsx

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index a505ef36e..cddfdb277 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -23,7 +23,6 @@ import mailIcon from '/node_modules/uswds/dist/img/usa-icons/mail_outline.svg';
 interface IAreaDetailProps {
   properties: constants.J40Properties,
   hash: string[],
-  isCensusLayerSelected: boolean,
 }
 
 /**
@@ -106,7 +105,7 @@ export const indicatorFilter = (label:MessageDescriptor) => {
  * @param {IAreaDetailProps} {}
  * @return {void}
  */
-const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps) => {
+const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
   const intl = useIntl();
 
   // console.log the properties of the census that is selected:
@@ -118,7 +117,6 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   const countyName = properties[constants.COUNTY_NAME] ? properties[constants.COUNTY_NAME] : "N/A";
   const stateName = properties[constants.STATE_NAME] ? properties[constants.STATE_NAME] : "N/A";
   const sidePanelState = properties[constants.SIDE_PANEL_STATE];
-  const landAreaName = properties[constants.LAND_AREA_NAME];
 
   const isCommunityFocus = score >= constants.SCORE_BOUNDARY_THRESHOLD;
 
@@ -775,92 +773,81 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
   return (
     <aside className={styles.areaDetailContainer} data-cy={'aside'}>
       {
-        isCensusLayerSelected ? (
-          <>
-            {/* Tract Info */}
-            <TractInfo
-              blockGroup={blockGroup}
-              countyName={countyName}
-              stateName={stateName}
-              population={population}
-              sidePanelState={properties[constants.SIDE_PANEL_STATE]}
-            />
-
-            {/* Demographics */}
-            <TractDemographics properties={properties}/>
-
-            {/* Disadvantaged? */}
-            <div className={styles.categorization}>
-
-              {/* Questions asking if disadvantaged? */}
-              <div className={styles.isInFocus}>
-                {EXPLORE_COPY.COMMUNITY.IS_FOCUS}
-              </div>
-
-              {/* YES with Dot or NO with no Dot  */}
-              <div className={styles.communityOfFocus}>
-                {isCommunityFocus ?
-                  <>
-                    <h3>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>
-                    <DisadvantageDot isDisadvantaged={isCommunityFocus} />
-                  </> :
-                  <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>
-                }
-              </div>
-
-              {/* Number of categories exceeded */}
-              <div className={styles.showCategoriesExceed}>
-                {EXPLORE_COPY.numberOfCategoriesExceeded(properties[constants.COUNT_OF_CATEGORIES_DISADV])}
-              </div>
-
-              {/* Number of thresholds exceeded */}
-              {/* <div className={styles.showThresholdExceed}>
-                {EXPLORE_COPY.numberOfThresholdsExceeded(properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS])}
-              </div> */}
-
-              {/* Send Feedback button */}
-              <a
-                className={styles.sendFeedbackLink}
-                // The mailto string must be on a single line otherwise the email does not display subject and body
-                href={`
-                mailto:${COMMON_COPY.FEEDBACK_EMAIL}?subject=${feedbackEmailSubject}&body=${feedbackEmailBody}
-                `}
-                target={"_blank"}
-                rel="noreferrer"
+        <>
+          {/* Tract Info */}
+          <TractInfo
+            blockGroup={blockGroup}
+            countyName={countyName}
+            stateName={stateName}
+            population={population}
+            sidePanelState={properties[constants.SIDE_PANEL_STATE]}
+          />
+
+          {/* Demographics */}
+          <TractDemographics properties={properties}/>
+
+          {/* Disadvantaged? */}
+          <div className={styles.categorization}>
+
+            {/* Questions asking if disadvantaged? */}
+            <div className={styles.isInFocus}>
+              {EXPLORE_COPY.COMMUNITY.IS_FOCUS}
+            </div>
+
+            {/* YES with Dot or NO with no Dot  */}
+            <div className={styles.communityOfFocus}>
+              {isCommunityFocus ?
+                <>
+                  <h3>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>
+                  <DisadvantageDot isDisadvantaged={isCommunityFocus} />
+                </> :
+                <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>
+              }
+            </div>
+
+            {/* Number of categories exceeded */}
+            <div className={styles.showCategoriesExceed}>
+              {EXPLORE_COPY.numberOfCategoriesExceeded(properties[constants.COUNT_OF_CATEGORIES_DISADV])}
+            </div>
+
+            {/* Number of thresholds exceeded */}
+            {/* <div className={styles.showThresholdExceed}>
+              {EXPLORE_COPY.numberOfThresholdsExceeded(properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS])}
+            </div> */}
+
+            {/* Send Feedback button */}
+            <a
+              className={styles.sendFeedbackLink}
+              // The mailto string must be on a single line otherwise the email does not display subject and body
+              href={`
+              mailto:${COMMON_COPY.FEEDBACK_EMAIL}?subject=${feedbackEmailSubject}&body=${feedbackEmailBody}
+              `}
+              target={"_blank"}
+              rel="noreferrer"
+            >
+              <Button
+                type="button"
+                className={styles.sendFeedbackBtn}
               >
-                <Button
-                  type="button"
-                  className={styles.sendFeedbackBtn}
-                >
-                  <div className={styles.buttonContainer}>
-                    <div className={styles.buttonText}>
-                      {EXPLORE_COPY.COMMUNITY.SEND_FEEDBACK.TITLE}
-                    </div>
-                    <img
-                      className={styles.buttonImage}
-                      src={mailIcon}
-                      alt={intl.formatMessage(EXPLORE_COPY.COMMUNITY.SEND_FEEDBACK.IMG_ICON.ALT_TAG)}
-                    />
+                <div className={styles.buttonContainer}>
+                  <div className={styles.buttonText}>
+                    {EXPLORE_COPY.COMMUNITY.SEND_FEEDBACK.TITLE}
                   </div>
-                </Button>
-              </a>
-            </div>
-          </>
-        ) : (
-          <ul className={styles.censusRow}>
-            <li>
-              <span className={styles.censusLabel}>
-                {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_TRIBAL_INFO.LAND_AREA_NAME)}
-              </span>
-              <span className={styles.censusText}>{` ${landAreaName}`}</span>
-            </li>
-          </ul>
-        )
+                  <img
+                    className={styles.buttonImage}
+                    src={mailIcon}
+                    alt={intl.formatMessage(EXPLORE_COPY.COMMUNITY.SEND_FEEDBACK.IMG_ICON.ALT_TAG)}
+                  />
+                </div>
+              </Button>
+            </a>
+          </div>
+        </>
       }
 
 
       {/* All category accordions in this component */}
-      {isCensusLayerSelected && <Accordion multiselectable={true} items={categoryItems} />}
+      {<Accordion multiselectable={true} items={categoryItems} />}
 
       {/* Methodology version */}
       <div className={styles.versionInfo}>
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index d2bced89c..b9ad863f1 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -51,15 +51,16 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
       <h6>
         Race / Ethnicity
         <span>
-          (
-          <button
+          ( 
+          <a
             aria-controls="race-panel"
             aria-expanded="false"
+            class="usa-link"
             id="race-header"
             tabindex="0"
           >
             show
-          </button>
+          </a>
           <img
             alt="expand icon"
             src="test-file-stub"
@@ -140,15 +141,16 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
       <h6>
         Age
         <span>
-          (
-          <button
+          ( 
+          <a
             aria-controls="age-panel"
             aria-expanded="false"
+            class="usa-link"
             id="age-header"
             tabindex="0"
           >
             show
-          </button>
+          </a>
           <img
             alt="expand icon"
             src="test-file-stub"
@@ -202,11 +204,11 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
       </div>
       <a
         href="
-                mailto:Screeningtool-Support@omb.eop.gov?subject=
+              mailto:Screeningtool-Support@omb.eop.gov?subject=
     Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
   &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
     
-                "
+              "
         rel="noreferrer"
         target="_blank"
       >
@@ -462,15 +464,16 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
       <h6>
         Race / Ethnicity
         <span>
-          (
-          <button
+          ( 
+          <a
             aria-controls="race-panel"
             aria-expanded="false"
+            class="usa-link"
             id="race-header"
             tabindex="0"
           >
             show
-          </button>
+          </a>
           <img
             alt="expand icon"
             src="test-file-stub"
@@ -551,15 +554,16 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
       <h6>
         Age
         <span>
-          (
-          <button
+          ( 
+          <a
             aria-controls="age-panel"
             aria-expanded="false"
+            class="usa-link"
             id="age-header"
             tabindex="0"
           >
             show
-          </button>
+          </a>
           <img
             alt="expand icon"
             src="test-file-stub"
@@ -613,11 +617,11 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
       </div>
       <a
         href="
-                mailto:Screeningtool-Support@omb.eop.gov?subject=
+              mailto:Screeningtool-Support@omb.eop.gov?subject=
     Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
   &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
     
-                "
+              "
         rel="noreferrer"
         target="_blank"
       >
@@ -2149,15 +2153,16 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
       <h6>
         Race / Ethnicity
         <span>
-          (
-          <button
+          ( 
+          <a
             aria-controls="race-panel"
             aria-expanded="false"
+            class="usa-link"
             id="race-header"
             tabindex="0"
           >
             show
-          </button>
+          </a>
           <img
             alt="expand icon"
             src="test-file-stub"
@@ -2238,15 +2243,16 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
       <h6>
         Age
         <span>
-          (
-          <button
+          ( 
+          <a
             aria-controls="age-panel"
             aria-expanded="false"
+            class="usa-link"
             id="age-header"
             tabindex="0"
           >
             show
-          </button>
+          </a>
           <img
             alt="expand icon"
             src="test-file-stub"
@@ -2300,11 +2306,11 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
       </div>
       <a
         href="
-                mailto:Screeningtool-Support@omb.eop.gov?subject=
+              mailto:Screeningtool-Support@omb.eop.gov?subject=
     Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
   &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
     
-                "
+              "
         rel="noreferrer"
         target="_blank"
       >
diff --git a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
index d414c3da7..58c63e413 100644
--- a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
+++ b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
@@ -43,18 +43,21 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          at or above the 90th percentile for 
         <a
+          class="usa-link"
           href="#exp-agr-loss-rate"
         >
           expected agriculture loss rate
         </a>
          OR 
         <a
+          class="usa-link"
           href="#exp-bld-loss-rate"
         >
           expected building loss rate
         </a>
          OR 
         <a
+          class="usa-link"
           href="#exp-pop-loss-rate"
         >
           expected population loss rate
@@ -68,12 +71,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          is at or above the 65th percentile for 
         <a
+          class="usa-link"
           href="#low-income"
         >
           low income
         </a>
          AND 80% or more of individuals 15 or older are not enrolled in 
         <a
+          class="usa-link"
           href="#high-ed-enroll-rate"
         >
           higher education
@@ -102,12 +107,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          at or above the 90th percentile for 
         <a
+          class="usa-link"
           href="#energy-burden"
         >
           energy burden
         </a>
          OR 
         <a
+          class="usa-link"
           href="#pm-25"
         >
           PM2.5 in the air
@@ -121,12 +128,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          is at or above the 65th percentile for 
         <a
+          class="usa-link"
           href="#low-income"
         >
           low income
         </a>
          AND 80% or more of individuals 15 or older are not enrolled in 
         <a
+          class="usa-link"
           href="#high-ed-enroll-rate"
         >
           higher education
@@ -157,12 +166,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          at or above the 90th percentile for 
         <a
+          class="usa-link"
           href="#diesel-pm"
         >
           diesel particulate matter exposure
         </a>
          or 
         <a
+          class="usa-link"
           href="#traffic-vol"
         >
           traffic proximity and volume
@@ -178,12 +189,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          is at or above the 65th percentile for 
         <a
+          class="usa-link"
           href="#low-income"
         >
           low income
         </a>
          AND 80% or more of individuals 15 or older are not enrolled in 
         <a
+          class="usa-link"
           href="#high-ed-enroll-rate"
         >
           higher education
@@ -212,18 +225,21 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          at or above the 90th percentile for 
         <a
+          class="usa-link"
           href="#lead-paint"
         >
           lead paint
         </a>
          AND 
         <a
+          class="usa-link"
           href="#median-home"
         >
           median home value
         </a>
          is at or less than the 90th percentile OR at or above the 90th percentile for the 
         <a
+          class="usa-link"
           href="#house-burden"
         >
           housing cost burden
@@ -237,12 +253,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          is at or above the 65th percentile for 
         <a
+          class="usa-link"
           href="#low-income"
         >
           low income
         </a>
          AND 80% or more of individuals 15 or older are not enrolled in 
         <a
+          class="usa-link"
           href="#high-ed-enroll-rate"
         >
           higher education
@@ -271,18 +289,21 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          at or above the 90th percentile for 
         <a
+          class="usa-link"
           href="#prox-haz"
         >
           proximity to hazardous waste facilities
         </a>
          OR 
         <a
+          class="usa-link"
           href="#prox-npl"
         >
           proximity to National Priorities List (NPL) sites
         </a>
          OR 
         <a
+          class="usa-link"
           href="#prox-rmp"
         >
           proximity to Risk Management Plan (RMP) facilities
@@ -296,12 +317,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          is at or above the 65th percentile for 
         <a
+          class="usa-link"
           href="#low-income"
         >
           low income
         </a>
          AND 80% or more of individuals 15 or older are not enrolled in 
         <a
+          class="usa-link"
           href="#high-ed-enroll-rate"
         >
           higher education
@@ -330,6 +353,7 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          at or above the 90th percentile for 
         <a
+          class="usa-link"
           href="#waste-water"
         >
           wastewater discharge
@@ -343,12 +367,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          is at or above the 65th percentile for 
         <a
+          class="usa-link"
           href="#low-income"
         >
           low income
         </a>
          AND 80% or more of individuals 15 or older are not enrolled in 
         <a
+          class="usa-link"
           href="#high-ed-enroll-rate"
         >
           higher education
@@ -377,24 +403,28 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          at or above the 90th percentile for 
         <a
+          class="usa-link"
           href="#asthma"
         >
           asthma
         </a>
          OR 
         <a
+          class="usa-link"
           href="#diabetes"
         >
           diabetes
         </a>
          OR 
         <a
+          class="usa-link"
           href="#heart-disease"
         >
           heart disease
         </a>
          OR 
         <a
+          class="usa-link"
           href="#life-exp"
         >
           low life expectancy
@@ -408,12 +438,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          is at or above the 65th percentile for 
         <a
+          class="usa-link"
           href="#low-income"
         >
           low income
         </a>
          AND 80% or more of individuals 15 or older are not enrolled in 
         <a
+          class="usa-link"
           href="#high-ed-enroll-rate"
         >
           higher education
@@ -442,24 +474,28 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          at or above the 90th percentile for 
         <a
+          class="usa-link"
           href="#low-med-inc"
         >
           low median income
         </a>
          as a percentage of area median income OR 
         <a
+          class="usa-link"
           href="#ling-iso"
         >
           linguistic isolation
         </a>
          OR 
         <a
+          class="usa-link"
           href="#unemploy"
         >
           unemployment
         </a>
          OR percentage of individuals in households at or below 100% Federal 
         <a
+          class="usa-link"
           href="#poverty"
         >
           poverty
@@ -473,12 +509,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </strong>
          10% or more of adults 25 or older have not attained a 
         <a
+          class="usa-link"
           href="#high-school"
         >
           high school degree
         </a>
          AND 80% or more of individuals 15 or older are not enrolled in 
         <a
+          class="usa-link"
           href="#high-ed-enroll-rate"
         >
           higher education
diff --git a/client/src/components/CategoryCard/__snapshots__/CategoryCard.test.tsx.snap b/client/src/components/CategoryCard/__snapshots__/CategoryCard.test.tsx.snap
index 38c8bc959..b3bf5e4bf 100644
--- a/client/src/components/CategoryCard/__snapshots__/CategoryCard.test.tsx.snap
+++ b/client/src/components/CategoryCard/__snapshots__/CategoryCard.test.tsx.snap
@@ -21,18 +21,21 @@ exports[`rendering of the CategoryCard checks if component renders 1`] = `
       </strong>
        at or above the 90th percentile for 
       <a
+        class="usa-link"
         href="#exp-agr-loss-rate"
       >
         expected agriculture loss rate
       </a>
        OR 
       <a
+        class="usa-link"
         href="#exp-bld-loss-rate"
       >
         expected building loss rate
       </a>
        OR 
       <a
+        class="usa-link"
         href="#exp-pop-loss-rate"
       >
         expected population loss rate
@@ -46,12 +49,14 @@ exports[`rendering of the CategoryCard checks if component renders 1`] = `
       </strong>
        is at or above the 65th percentile for 
       <a
+        class="usa-link"
         href="#low-income"
       >
         low income
       </a>
        AND 80% or more of individuals 15 or older are not enrolled in 
       <a
+        class="usa-link"
         href="#high-ed-enroll-rate"
       >
         higher education
diff --git a/client/src/components/DatasetContainer/index.tsx b/client/src/components/DatasetContainer/index.tsx
index f5954e71b..52104ffd8 100644
--- a/client/src/components/DatasetContainer/index.tsx
+++ b/client/src/components/DatasetContainer/index.tsx
@@ -44,7 +44,7 @@ const DatasetContainer = () => {
           </Grid>
 
           <div className={styles.returnToTop}>
-            <Link to={PAGES_ENDPOINTS.METHODOLOGY}>
+            <Link className={'usa-link'} to={PAGES_ENDPOINTS.METHODOLOGY}>
               {METHODOLOGY_COPY.RETURN_TO_TOP.LINK}
             </Link>
           </div>
diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
index 441b94a27..f41cc2b19 100644
--- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
+++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
@@ -1377,6 +1377,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       </div>
       <div>
         <a
+          class="usa-link"
           href="/en/methodology"
         >
           Return to top
diff --git a/client/src/components/DownloadLink/DownloadLink.tsx b/client/src/components/DownloadLink/DownloadLink.tsx
index 0dec1ecb1..93d2749d7 100644
--- a/client/src/components/DownloadLink/DownloadLink.tsx
+++ b/client/src/components/DownloadLink/DownloadLink.tsx
@@ -27,7 +27,7 @@ const DownloadLink = ({href, linkText}:IDownloadLink) => {
   }
   return (
     <>
-      <a href={href} download>{linkText}</a>
+      <a href={href} className={`usa-link`} download>{linkText}</a>
       <img
         className={styles.downloadIcon}
         src={fileDownloadIcon}
diff --git a/client/src/components/DownloadLink/__snapshots__/DownloadLink.test.tsx.snap b/client/src/components/DownloadLink/__snapshots__/DownloadLink.test.tsx.snap
index 57a1c021e..6c19ee5b5 100644
--- a/client/src/components/DownloadLink/__snapshots__/DownloadLink.test.tsx.snap
+++ b/client/src/components/DownloadLink/__snapshots__/DownloadLink.test.tsx.snap
@@ -3,6 +3,7 @@
 exports[`rendering of the DownloadLink disadvantaged checks if component renders 1`] = `
 <DocumentFragment>
   <a
+    class="usa-link"
     download=""
     href="https://google.com"
   >
diff --git a/client/src/components/GovernmentBanner/__snapshots__/GovernmentBanner.test.tsx.snap b/client/src/components/GovernmentBanner/__snapshots__/GovernmentBanner.test.tsx.snap
index 43e2a7a40..0265cbf85 100644
--- a/client/src/components/GovernmentBanner/__snapshots__/GovernmentBanner.test.tsx.snap
+++ b/client/src/components/GovernmentBanner/__snapshots__/GovernmentBanner.test.tsx.snap
@@ -141,11 +141,13 @@ exports[`rendering of the GovernmentBanner checks if component renders 1`] = `
           src="test-file-stub"
         />
         <a
+          class="usa-link"
           href="#"
         >
           English
         </a>
         <a
+          class="usa-link"
           href="#"
         >
           Español
diff --git a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
index e94d6bb38..b72aea622 100644
--- a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
+++ b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
@@ -10,6 +10,7 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl
       <li>
         View the 
         <a
+          class="usa-link"
           href="/en/methodology"
         >
           Methodology & data
diff --git a/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap b/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap
index 51884a48e..45f40f930 100644
--- a/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap
+++ b/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap
@@ -79,7 +79,7 @@ exports[`J40Footer renders correctly 1`] = `
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="footer-link-first-child"
+                    class="usa-link footer-link-first-child"
                     href="/en/public-engagement"
                   >
                     Engagement calendar
diff --git a/client/src/components/J40Header/J40Header.module.scss b/client/src/components/J40Header/J40Header.module.scss
index f9b397634..0802b5af9 100644
--- a/client/src/components/J40Header/J40Header.module.scss
+++ b/client/src/components/J40Header/J40Header.module.scss
@@ -18,22 +18,8 @@
     @include u-display("flex");
     @include u-flex-direction("column");
     @include typeset("sans", 8, 3);
-  }
-
-  .title2BetaPill {
-    @include u-display("flex");
-  }
-
-  .betaPill {
-    @include u-display("inline-block");
-    @include u-bg("yellow-20v");
-    @include u-radius(1);
-    @include u-padding-left(2);
-    @include u-padding-right(2);
-    @include u-padding-top('05');
-    @include u-margin-left(1);
-    @include u-font("body", "2xs");
-    @include u-text('bold')
+    max-width: 270px;
+    min-width: 218px;
   }
 
   .navLinks {
diff --git a/client/src/components/J40Header/J40Header.tsx b/client/src/components/J40Header/J40Header.tsx
index e8a87b665..43d07bd27 100644
--- a/client/src/components/J40Header/J40Header.tsx
+++ b/client/src/components/J40Header/J40Header.tsx
@@ -36,7 +36,6 @@ const J40Header = () => {
 
   // Logo text
   const logoLine1 = intl.formatMessage(COMMON_COPY.HEADER.TITLE_LINE_1);
-  const logoLine2 = intl.formatMessage(COMMON_COPY.HEADER.TITLE_LINE_2);
 
   /**
    * State variable to control the toggling of mobile menu button
@@ -203,17 +202,13 @@ const J40Header = () => {
 
           {/* Logo */}
           <Grid col={1}>
-            <img className={styles.logo} src={siteLogo} alt={`${logoLine1} ${logoLine2}`} />
+            <img className={styles.logo} src={siteLogo} alt={`${logoLine1}`} />
           </Grid>
 
           {/* Logo Title */}
           <Grid col={6}>
             <div className={styles.logoTitle}>
-              <div>{logoLine1}</div>
-              <div className={styles.title2BetaPill}>
-                <div> {logoLine2} </div>
-                <div className={styles.betaPill}>BETA</div>
-              </div>
+              {logoLine1}
             </div>
           </Grid>
 
diff --git a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
index 47473272f..b2adf1deb 100644
--- a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
+++ b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
@@ -146,11 +146,13 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
             src="test-file-stub"
           />
           <a
+            class="usa-link"
             href="#"
           >
             English
           </a>
           <a
+            class="usa-link"
             href="#"
           >
             Español
@@ -194,17 +196,7 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
           data-testid="grid"
         >
           <div>
-            <div>
-              Climate and Economic Justice
-            </div>
-            <div>
-              <div>
-                 Screening Tool 
-              </div>
-              <div>
-                BETA
-              </div>
-            </div>
+            Climate and Economic Justice Screening Tool
           </div>
         </div>
         <div
@@ -315,11 +307,13 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
                       src="test-file-stub"
                     />
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       English
                     </a>
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       Español
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index 6c02019be..40adad80f 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -29,7 +29,6 @@ import MapInfoPanel from './mapInfoPanel';
 import MapSearch from './MapSearch';
 import MapTractLayers from './MapTractLayers/MapTractLayers';
 import MapTribalLayer from './MapTribalLayers/MapTribalLayers';
-import LayerSelector from './LayerSelector';
 import TerritoryFocusControl from './territoryFocusControl';
 import {getOSBaseMap} from '../data/getOSBaseMap';
 
@@ -86,11 +85,6 @@ const J40Map = ({location}: IJ40Interface) => {
   const [transitionInProgress, setTransitionInProgress] = useState<boolean>(false);
   const [geolocationInProgress, setGeolocationInProgress] = useState<boolean>(false);
   const [isMobileMapState, setIsMobileMapState] = useState<boolean>(false);
-  const [censusSelected, setCensusSelected] = useState<boolean>(true);
-
-  // In order to detect that the layer has been toggled (between census and tribal),
-  // this state variable will hold that information
-  const [layerToggled, setLayerToggled] = useState<boolean>(false);
   const {width: windowWidth} = useWindowSize();
 
   /**
@@ -176,8 +170,6 @@ const J40Map = ({location}: IJ40Interface) => {
     } else {
       // This else clause will fire when the ID is null or empty. This is the case where the map is clicked
 
-      setLayerToggled(false);
-
       // @ts-ignore
       const feature = event.features && event.features[0];
 
@@ -324,7 +316,7 @@ const J40Map = ({location}: IJ40Interface) => {
     setGeolocationInProgress(true);
   };
 
-  const mapBoxBaseLayer = 'tl' in flags ? `mapbox://styles/justice40/cl2qimpi2000014qeb1egpox8` : `mapbox://styles/justice40/cl5mp95tu000k14lpl21spgny`;
+  const mapBoxBaseLayer = `mapbox://styles/justice40/cl2qimpi2000014qeb1egpox8`;
 
   return (
     <>
@@ -364,7 +356,7 @@ const J40Map = ({location}: IJ40Interface) => {
           // ****** Map state props: ******
           // http://visgl.github.io/react-map-gl/docs/api-reference/interactive-map#map-state
           {...viewport}
-          mapStyle={process.env.MAPBOX_STYLES_READ_TOKEN ? mapBoxBaseLayer : getOSBaseMap(censusSelected)}
+          mapStyle={process.env.MAPBOX_STYLES_READ_TOKEN ? mapBoxBaseLayer : getOSBaseMap()}
           width="100%"
           // Ajusting this height with a conditional statement will not render the map on staging.
           // The reason for this issue is unknown. Consider styling the parent container via SASS.
@@ -379,13 +371,10 @@ const J40Map = ({location}: IJ40Interface) => {
           dragRotate={false}
           touchRotate={false}
           // eslint-disable-next-line max-len
-          interactiveLayerIds={censusSelected ?
+          interactiveLayerIds={
             [
               constants.HIGH_ZOOM_LAYER_ID,
               constants.PRIORITIZED_HIGH_ZOOM_LAYER_ID,
-            ] : [
-              constants.TRIBAL_LAYER_ID,
-              constants.TRIBAL_ALASKA_POINTS_LAYER_ID,
             ]
           }
 
@@ -401,18 +390,10 @@ const J40Map = ({location}: IJ40Interface) => {
           data-cy={'reactMapGL'}
         >
 
-          {/* Load either the Tribal layer or Census layer depending on the censusSelected state variable */}
-          {
-            censusSelected ?
-              <MapTractLayers
-                selectedFeature={selectedFeature}
-                selectedFeatureId={selectedFeatureId}
-              /> :
-              <MapTribalLayer
-                selectedFeature={selectedFeature}
-                selectedFeatureId={selectedFeatureId}
-              />
-          }
+          <MapTractLayers
+            selectedFeature={selectedFeature}
+            selectedFeatureId={selectedFeatureId}
+          />
 
           {/* This is the first overlayed row on the map: Search and Geolocation */}
           <div className={styles.mapHeaderRow}>
@@ -442,13 +423,6 @@ const J40Map = ({location}: IJ40Interface) => {
               </div>
             </div>
 
-            {/* This will allow to select between the census tract layer and the tribal lands layer */}
-            <LayerSelector
-              censusSelected={censusSelected}
-              setCensusSelected={setCensusSelected}
-              setLayerToggled={setLayerToggled}
-            />
-
           </div>
 
           {/* This is the second row overlayed on the map, it will add the navigation controls
@@ -478,7 +452,6 @@ const J40Map = ({location}: IJ40Interface) => {
               <AreaDetail
                 properties={detailViewData.properties}
                 hash={zoomLatLngHash}
-                isCensusLayerSelected={censusSelected}
               />
             </Popup>
           )}
@@ -493,8 +466,6 @@ const J40Map = ({location}: IJ40Interface) => {
           featureProperties={detailViewData?.properties}
           selectedFeatureId={selectedFeature?.id}
           hash={zoomLatLngHash}
-          isCensusLayerSelected={censusSelected}
-          layerToggled={layerToggled}
         />
       </Grid>
     </>
diff --git a/client/src/components/Language/Language.module.scss b/client/src/components/Language/Language.module.scss
index ff9b181d7..c7b86a395 100644
--- a/client/src/components/Language/Language.module.scss
+++ b/client/src/components/Language/Language.module.scss
@@ -11,13 +11,11 @@
   .languageLink {
     @include u-display("inline-block");
     @include u-margin-left(1.5);
+    
     cursor: pointer;
     font-size: .8rem; // government banner text size not a token
     @include u-padding-top('2px');
     
-    &:hover {
-      text-decoration-line: underline;
-    }
   }
 }
 
diff --git a/client/src/components/Language/Language.tsx b/client/src/components/Language/Language.tsx
index d99ad7383..68b9cfea4 100644
--- a/client/src/components/Language/Language.tsx
+++ b/client/src/components/Language/Language.tsx
@@ -29,7 +29,7 @@ const Language = ({isDesktop}:ILanguageProps) => {
           languages.map((language: React.Key | null | undefined) => (
             <a
               href="#"
-              className={styles.languageLink}
+              className={styles.languageLink ? `usa-link ${styles.languageLink}` : `usa-link`}
               key={language}
               onClick={() => changeLocale(language)}
             >
diff --git a/client/src/components/Language/__snapshots__/Language.test.tsx.snap b/client/src/components/Language/__snapshots__/Language.test.tsx.snap
index 6942eecf0..435ced894 100644
--- a/client/src/components/Language/__snapshots__/Language.test.tsx.snap
+++ b/client/src/components/Language/__snapshots__/Language.test.tsx.snap
@@ -10,11 +10,13 @@ exports[`rendering of the Language component on mobile checks if component rende
       src="test-file-stub"
     />
     <a
+      class="usa-link"
       href="#"
     >
       English
     </a>
     <a
+      class="usa-link"
       href="#"
     >
       Español
diff --git a/client/src/components/LinkTypeWrapper/LinkTypeWrapper.tsx b/client/src/components/LinkTypeWrapper/LinkTypeWrapper.tsx
index a2fa0b4f2..6f20f7c21 100644
--- a/client/src/components/LinkTypeWrapper/LinkTypeWrapper.tsx
+++ b/client/src/components/LinkTypeWrapper/LinkTypeWrapper.tsx
@@ -41,7 +41,7 @@ const LinkTypeWrapper = (props:ILinkTypeWrapper) => {
   if (props.internal) {
     return (
       <Link to={`${url}`}
-        className={props.className}
+        className={props.className ? `usa-link ${props.className}` : `usa-link`}
       >
         {props.linkText}
       </Link>
diff --git a/client/src/components/LinkTypeWrapper/__snapshots__/linkTypeWrapper.test.tsx.snap b/client/src/components/LinkTypeWrapper/__snapshots__/linkTypeWrapper.test.tsx.snap
index 55659d6c7..40428c408 100644
--- a/client/src/components/LinkTypeWrapper/__snapshots__/linkTypeWrapper.test.tsx.snap
+++ b/client/src/components/LinkTypeWrapper/__snapshots__/linkTypeWrapper.test.tsx.snap
@@ -28,6 +28,7 @@ exports[`testing all link types tests external links same tab 1`] = `
 exports[`testing all link types tests internal links 1`] = `
 <DocumentFragment>
   <a
+    class="usa-link"
     href="/en/methodology"
   >
     test link text
diff --git a/client/src/components/SidePanelInfo/SidePanelInfo.module.scss b/client/src/components/SidePanelInfo/SidePanelInfo.module.scss
index 310f212d0..4d9a81473 100644
--- a/client/src/components/SidePanelInfo/SidePanelInfo.module.scss
+++ b/client/src/components/SidePanelInfo/SidePanelInfo.module.scss
@@ -9,19 +9,17 @@
 
   .sidePanelInfoTitle {
     @include u-padding-top(2);
-    font-size: x-large;
-    line-height: 1.9rem;
+    font-size: large;
+    font-weight: 600;
   }
-
+  
   .sidePanelInfoHeading {
     @include u-padding-top(2);
-    font-size: x-large;
-    // line-height: 1.9rem;
+    font-size: large;
+    font-weight: 600;
   }
   
   .sidePanelInfoIcon {
-    @include u-height(5);
-    @include u-margin-top(4);
-    @include u-margin-bottom(-2)
+    @include u-height(2);
   }
 }
diff --git a/client/src/components/SidePanelInfo/SidePanelInfo.tsx b/client/src/components/SidePanelInfo/SidePanelInfo.tsx
index cf43d108b..94156642a 100644
--- a/client/src/components/SidePanelInfo/SidePanelInfo.tsx
+++ b/client/src/components/SidePanelInfo/SidePanelInfo.tsx
@@ -1,58 +1,120 @@
 import React from 'react';
 import {useIntl} from 'gatsby-plugin-intl';
+import {useWindowSize} from 'react-use';
 
 // @ts-ignore
-import puzzle from '../../images/sidePanelIcons/puzzle.svg';
+import plusIcon from '/node_modules/uswds/dist/img/usa-icons/add.svg';
 // @ts-ignore
-import bellCurve from '../../images/sidePanelIcons/bellCurve.svg';
+import searchIcon from '/node_modules/uswds/dist/img/usa-icons/search.svg';
 // @ts-ignore
-import pieChart from '../../images/sidePanelIcons/pieChart.svg';
+import locateIcon from '/node_modules/uswds/dist/img/usa-icons/my_location.svg';
 // @ts-ignore
-import upDown from '../../images/sidePanelIcons/upDown.svg';
+import puzzleIcon from '../../images/sidePanelIcons/puzzle.svg';
+// @ts-ignore
+import bellCurveIcon from '../../images/sidePanelIcons/bellCurve.svg';
+// @ts-ignore
+import pieChartIcon from '../../images/sidePanelIcons/pieChart.svg';
+// @ts-ignore
+import notAvailIcon from '/node_modules/uswds/dist/img/usa-icons/do_not_disturb.svg';
 
 import * as styles from './SidePanelInfo.module.scss';
+import * as constants from '../../data/constants';
 import * as EXPLORE_COPY from '../../data/copy/explore';
 
 const SidePanelInfo = () => {
   const intl = useIntl();
+  const {width: windowWidth} = useWindowSize();
 
   return (
     <aside className={styles.sidePanelInfoContainer}>
 
+      {/* Heading 1 */}
       <header tabIndex={0} className={styles.sidePanelInfoTitle}>
-        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.TITLE)}
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.HEADING1)}
       </header>
+
+      {/* Paragraph 1 */}
       <p tabIndex={0}>
-        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA1)}
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA1_PART1)}
+        {
+          windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={plusIcon}
+            alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.PLUS)}
+          />
+        }
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA1_PART2)}
+        {
+          windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={searchIcon}
+            alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.SEARCH)}
+          />
+        }
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA1_PART3)}
+        {
+          windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={locateIcon}
+            alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.LOCATE)}
+          />
+        }
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA1_PART4)}
+        {
+          windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={notAvailIcon}
+            alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.MOUSE)}
+          />
+        }
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA1_PART5)}
       </p>
+
+      {/* Heading 2 */}
       <p tabIndex={0} className={styles.sidePanelInfoHeading}>
-        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.HEADING1)}
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.HEADING2)}
       </p>
-      <img tabIndex={0} className={styles.sidePanelInfoIcon}
-        src={puzzle}
-        alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.ALT_TEXT_ICON1)}
-      />
+
+      {/* Paragraph 2 */}
       <p tabIndex={0}>
-        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA2)}
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA2_PART1)}
+        {
+          windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={puzzleIcon}
+            alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.TRACT)}
+          />
+        }
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA2_PART2)}
       </p>
-      <img tabIndex={0} className={styles.sidePanelInfoIcon}
-        src={bellCurve}
-        alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.ALT_TEXT_ICON2)}
-      />
+
+      {/* Paragraph 3 */}
       <p tabIndex={0}>
-        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA3)}
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA3_PART1)}
+        {
+          windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={notAvailIcon}
+            alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.DAC_CIRCLE)}
+          />
+        }
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA3_PART2)}
       </p>
-      <img tabIndex={0} className={styles.sidePanelInfoIcon}
-        src={pieChart}
-        alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.ALT_TEXT_ICON3)}
-      />
+
+      {/* Paragraph 4 */}
       <p tabIndex={0}>
-        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA4)}
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA4_PART1)}
+        {
+          windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={bellCurveIcon}
+            alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.BELL_CURVE)}
+          />
+        }
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA4_PART2)}
+        {
+          windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={pieChartIcon}
+            alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.PIE_CHART)}
+          />
+        }
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA4_PART3)}
       </p>
-      <img tabIndex={0} className={styles.sidePanelInfoIcon}
-        src={upDown}
-        alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.ALT_TEXT_ICON4)}
-      />
+
+      {/* Paragraph 5 */}
       <p tabIndex={0}>
         {EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE_PARA5}
       </p>
diff --git a/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap b/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap
index 5754d52f1..31a0edbbb 100644
--- a/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap
+++ b/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap
@@ -6,76 +6,134 @@ exports[`rendering of the component expects the render to match snapshot 1`] = `
     <header
       tabindex="0"
     >
-      Things to know
+      
+      How to use the map:
+    
     </header>
     <p
       tabindex="0"
     >
       
-      This tool identifies communities that are marginalized, underserved, and overburdened by pollution. These communities are located in census tracts that are at or above the thresholds in one or more of eight categories of criteria.
+      Zoom in
+    
+      <img
+        alt="
+      a plus icon indicating that the user can zoom in
+    *"
+        src="test-file-stub"
+        tabindex="0"
+      />
+      
+      , search
+    
+      <img
+        alt="
+      a magnifying glass icon informing the user can search
+    "
+        src="test-file-stub"
+        tabindex="0"
+      />
+      
+      , or locate yourself 
+    
+      <img
+        alt="
+      a gps icon informing the user can locate
+    "
+        src="test-file-stub"
+        tabindex="0"
+      />
+      
+      and select
+    
+      <img
+        alt="
+      a mouse arrow icon informing the user can use the mouse
+    "
+        src="test-file-stub"
+        tabindex="0"
+      />
+      
+      to see information about any census tract
     
     </p>
     <p
       tabindex="0"
     >
       
-      Zoom in or search and select to see data about any census tract of interest
+     Things to know:
     
     </p>
-    <img
-      alt="
-      An icon that has depicts pieces of a block selected mimicking the census block census tracts
-    "
-      src="test-file-stub"
-      tabindex="0"
-    />
     <p
       tabindex="0"
     >
       
-      The tool uses census tracts that represent about 4,000 people, which is the smallest unit of geography for which consistent data can be displayed on the map.
+      The tool uses census tracts
     
-    </p>
-    <img
-      alt="
-      An icon that a bell curve or gaussian distribution
+      <img
+        alt="
+      a tract icon informing the user of census tracts
     "
-      src="test-file-stub"
-      tabindex="0"
-    />
+        src="test-file-stub"
+        tabindex="0"
+      />
+      
+    . Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation.
+    
+    </p>
     <p
       tabindex="0"
     >
       
-      The tool ranks each census tract using percentiles that show how much burden each tract experiences relative to all other tracts, for each criterion.
+      Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color
     
-    </p>
-    <img
-      alt="
-      An icon that depicts a part of pie chart being removed
+      <img
+        alt="
+      a blue circle icon informing the user of what a disadvantaged community is depicted as
     "
-      src="test-file-stub"
-      tabindex="0"
-    />
+        src="test-file-stub"
+        tabindex="0"
+      />
+      
+      on the map. This color is an opacity. This is so information about the map can be seen.
+    
+    </p>
     <p
       tabindex="0"
     >
       
-      Percentages are used for certain variables, i.e. those relating to high school achievement rate and to the share of individuals not currently enrolled in higher education.
+      The tool uses percentiles
     
-    </p>
-    <img
-      alt="
-      An icon that has an up arrow and a down arrow
+      <img
+        alt="
+      An icon that a bell curve or gaussian distribution
     "
-      src="test-file-stub"
-      tabindex="0"
-    />
+        src="test-file-stub"
+        tabindex="0"
+      />
+      
+      , percentages 
+    
+      <img
+        alt="
+      An icon that depicts a part of pie chart being removed
+    "
+        src="test-file-stub"
+        tabindex="0"
+      />
+      
+      , or a simple yes/no to indicate how much burden the communities are experiencing in each tract. 
+    
+    </p>
     <p
       tabindex="0"
     >
       
-    Thresholds for each category determine if a tract should be identified as disadvantaged because it has exceeded a certain value for the relevant indicators.
+    The tool also uses thresholds. If the tract meets or exceeds the threshold of any climate, environmental, or other burden 
+      <strong>
+        AND
+      </strong>
+       it meets the threshold for the associated socioeconomic burden, then communites in the tract are considered disadvantaged.
   
     </p>
   </aside>
diff --git a/client/src/components/SubPageNav/SubPageNav.test.tsx b/client/src/components/SubPageNav/SubPageNav.test.tsx
index 48e525167..bd6667034 100644
--- a/client/src/components/SubPageNav/SubPageNav.test.tsx
+++ b/client/src/components/SubPageNav/SubPageNav.test.tsx
@@ -16,8 +16,8 @@ describe('rendering of the SubPageNav', () => {
 
     const firstLink = container.querySelector(`.usa-sidenav li:nth-child(${firstLinkActive}) a`);
     const secondLink = container.querySelector(`.usa-sidenav li:nth-child(${secondLinkIndex}) a`);
-    expect(firstLink?.className).toBe('usa-current');
-    expect(secondLink?.className).not.toBe('usa-current');
+    expect(firstLink?.className).toBe('usa-link usa-current');
+    expect(secondLink?.className).not.toBe('usa-link usa-current');
   });
 
   it('checks if the second link is active', () => {
@@ -29,7 +29,7 @@ describe('rendering of the SubPageNav', () => {
 
     const firstLink = container.querySelector(`.usa-sidenav li:nth-child(${firstLinkActive}) a`);
     const secondLink = container.querySelector(`.usa-sidenav li:nth-child(${secondLinkIndex}) a`);
-    expect(secondLink?.className).toBe('usa-current');
-    expect(firstLink?.className).not.toBe('usa-current');
+    expect(secondLink?.className).toBe('usa-link usa-current');
+    expect(firstLink?.className).not.toBe('usa-link usa-current');
   });
 });
diff --git a/client/src/components/TractDemographics/TractDemographics.module.scss b/client/src/components/TractDemographics/TractDemographics.module.scss
index 2ba7bfca2..ee6dd345f 100644
--- a/client/src/components/TractDemographics/TractDemographics.module.scss
+++ b/client/src/components/TractDemographics/TractDemographics.module.scss
@@ -23,7 +23,7 @@
         @include u-margin-top(.5);
     }
     .demographicHeading {
-        @include u-margin-top(.5);
+        @include u-margin-top(1);
         font-size: .875rem;
         
         span{
@@ -37,7 +37,6 @@
     
             //emulate a link
             cursor:pointer;
-            color:blue;
             text-decoration:underline;
     
             min-width: 45px;
@@ -47,7 +46,6 @@
         .showHideIcon{
             vertical-align: middle;
             height: 1rem;
-            margin-left: -8px;
             filter: invert(8%) sepia(90%) saturate(7490%) hue-rotate(247deg) brightness(105%) contrast(143%);
 
             &:hover{
diff --git a/client/src/components/TractDemographics/TractDemographics.tsx b/client/src/components/TractDemographics/TractDemographics.tsx
index 9cb56278f..07ec72ff7 100644
--- a/client/src/components/TractDemographics/TractDemographics.tsx
+++ b/client/src/components/TractDemographics/TractDemographics.tsx
@@ -39,9 +39,9 @@ const J40AccordionItem = ({id, title, children}:IJ40AccordionItem) => {
       <h6 className={styles.demographicHeading}>
         {title}
         <span>
-          {'('}
-          <button
-            className={styles.showHideText}
+          {'( '}
+          <a
+            className={styles.showHideText ? `usa-link ${styles.showHideText}` : `usa-link`}
             id={`${id}-header`}
             aria-controls={`${id}-panel`}
             aria-expanded={isExpanded}
@@ -49,7 +49,7 @@ const J40AccordionItem = ({id, title, children}:IJ40AccordionItem) => {
             tabIndex={0}
           >
             {isExpanded ? 'hide' : 'show'}
-          </button>
+          </a>
           { isExpanded ?
           <img
             className={styles.showHideIcon}
diff --git a/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
index 9e3b5d498..c303a465c 100644
--- a/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
+++ b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
@@ -9,15 +9,16 @@ exports[`rendering of TractDemographics component does it render a tract in Alas
     <h6>
       Race / Ethnicity
       <span>
-        (
-        <button
+        ( 
+        <a
           aria-controls="race-panel"
           aria-expanded="false"
+          class="usa-link"
           id="race-header"
           tabindex="0"
         >
           show
-        </button>
+        </a>
         <img
           alt="expand icon"
           src="test-file-stub"
@@ -98,15 +99,16 @@ exports[`rendering of TractDemographics component does it render a tract in Alas
     <h6>
       Age
       <span>
-        (
-        <button
+        ( 
+        <a
           aria-controls="age-panel"
           aria-expanded="false"
+          class="usa-link"
           id="age-header"
           tabindex="0"
         >
           show
-        </button>
+        </a>
         <img
           alt="expand icon"
           src="test-file-stub"
@@ -157,15 +159,16 @@ exports[`rendering of TractDemographics component does it render a tract in Amer
     <h6>
       Race / Ethnicity
       <span>
-        (
-        <button
+        ( 
+        <a
           aria-controls="race-panel"
           aria-expanded="false"
+          class="usa-link"
           id="race-header"
           tabindex="0"
         >
           show
-        </button>
+        </a>
         <img
           alt="expand icon"
           src="test-file-stub"
@@ -246,15 +249,16 @@ exports[`rendering of TractDemographics component does it render a tract in Amer
     <h6>
       Age
       <span>
-        (
-        <button
+        ( 
+        <a
           aria-controls="age-panel"
           aria-expanded="false"
+          class="usa-link"
           id="age-header"
           tabindex="0"
         >
           show
-        </button>
+        </a>
         <img
           alt="expand icon"
           src="test-file-stub"
@@ -305,15 +309,16 @@ exports[`rendering of TractDemographics component does it render a tract in NYC
     <h6>
       Race / Ethnicity
       <span>
-        (
-        <button
+        ( 
+        <a
           aria-controls="race-panel"
           aria-expanded="false"
+          class="usa-link"
           id="race-header"
           tabindex="0"
         >
           show
-        </button>
+        </a>
         <img
           alt="expand icon"
           src="test-file-stub"
@@ -394,15 +399,16 @@ exports[`rendering of TractDemographics component does it render a tract in NYC
     <h6>
       Age
       <span>
-        (
-        <button
+        ( 
+        <a
           aria-controls="age-panel"
           aria-expanded="false"
+          class="usa-link"
           id="age-header"
           tabindex="0"
         >
           show
-        </button>
+        </a>
         <img
           alt="expand icon"
           src="test-file-stub"
diff --git a/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap b/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap
index 37c82a480..d6e28b4d4 100644
--- a/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap
+++ b/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap
@@ -11,76 +11,134 @@ exports[`simulate app starting up, no click on map should match the snapshot of
       <header
         tabindex="0"
       >
-        Things to know
+        
+      How to use the map:
+    
       </header>
       <p
         tabindex="0"
       >
         
-      This tool identifies communities that are marginalized, underserved, and overburdened by pollution. These communities are located in census tracts that are at or above the thresholds in one or more of eight categories of criteria.
+      Zoom in
+    
+        <img
+          alt="
+      a plus icon indicating that the user can zoom in
+    *"
+          src="test-file-stub"
+          tabindex="0"
+        />
+        
+      , search
+    
+        <img
+          alt="
+      a magnifying glass icon informing the user can search
+    "
+          src="test-file-stub"
+          tabindex="0"
+        />
+        
+      , or locate yourself 
+    
+        <img
+          alt="
+      a gps icon informing the user can locate
+    "
+          src="test-file-stub"
+          tabindex="0"
+        />
+        
+      and select
+    
+        <img
+          alt="
+      a mouse arrow icon informing the user can use the mouse
+    "
+          src="test-file-stub"
+          tabindex="0"
+        />
+        
+      to see information about any census tract
     
       </p>
       <p
         tabindex="0"
       >
         
-      Zoom in or search and select to see data about any census tract of interest
+     Things to know:
     
       </p>
-      <img
-        alt="
-      An icon that has depicts pieces of a block selected mimicking the census block census tracts
-    "
-        src="test-file-stub"
-        tabindex="0"
-      />
       <p
         tabindex="0"
       >
         
-      The tool uses census tracts that represent about 4,000 people, which is the smallest unit of geography for which consistent data can be displayed on the map.
+      The tool uses census tracts
     
-      </p>
-      <img
-        alt="
-      An icon that a bell curve or gaussian distribution
+        <img
+          alt="
+      a tract icon informing the user of census tracts
     "
-        src="test-file-stub"
-        tabindex="0"
-      />
+          src="test-file-stub"
+          tabindex="0"
+        />
+        
+    . Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation.
+    
+      </p>
       <p
         tabindex="0"
       >
         
-      The tool ranks each census tract using percentiles that show how much burden each tract experiences relative to all other tracts, for each criterion.
+      Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color
     
-      </p>
-      <img
-        alt="
-      An icon that depicts a part of pie chart being removed
+        <img
+          alt="
+      a blue circle icon informing the user of what a disadvantaged community is depicted as
     "
-        src="test-file-stub"
-        tabindex="0"
-      />
+          src="test-file-stub"
+          tabindex="0"
+        />
+        
+      on the map. This color is an opacity. This is so information about the map can be seen.
+    
+      </p>
       <p
         tabindex="0"
       >
         
-      Percentages are used for certain variables, i.e. those relating to high school achievement rate and to the share of individuals not currently enrolled in higher education.
+      The tool uses percentiles
     
-      </p>
-      <img
-        alt="
-      An icon that has an up arrow and a down arrow
+        <img
+          alt="
+      An icon that a bell curve or gaussian distribution
     "
-        src="test-file-stub"
-        tabindex="0"
-      />
+          src="test-file-stub"
+          tabindex="0"
+        />
+        
+      , percentages 
+    
+        <img
+          alt="
+      An icon that depicts a part of pie chart being removed
+    "
+          src="test-file-stub"
+          tabindex="0"
+        />
+        
+      , or a simple yes/no to indicate how much burden the communities are experiencing in each tract. 
+    
+      </p>
       <p
         tabindex="0"
       >
         
-    Thresholds for each category determine if a tract should be identified as disadvantaged because it has exceeded a certain value for the relevant indicators.
+    The tool also uses thresholds. If the tract meets or exceeds the threshold of any climate, environmental, or other burden 
+        <strong>
+          AND
+        </strong>
+         it meets the threshold for the associated socioeconomic burden, then communites in the tract are considered disadvantaged.
   
       </p>
     </aside>
diff --git a/client/src/components/mapInfoPanel.tsx b/client/src/components/mapInfoPanel.tsx
index c0ec06876..60e9c121a 100644
--- a/client/src/components/mapInfoPanel.tsx
+++ b/client/src/components/mapInfoPanel.tsx
@@ -7,8 +7,6 @@ interface IMapInfoPanelProps {
     featureProperties: { [key:string]: string | number } | undefined,
     selectedFeatureId: string | number | undefined
     hash: string[],
-    isCensusLayerSelected: boolean,
-    layerToggled: boolean, // indicates if census layer or tribal layer has been toggled
   }
 
 const MapInfoPanel = ({
@@ -16,23 +14,18 @@ const MapInfoPanel = ({
   featureProperties,
   selectedFeatureId,
   hash,
-  isCensusLayerSelected,
-  layerToggled,
 }:IMapInfoPanelProps) => {
   return (
     <div className={className} >
-      {/* The tertiary conditional statement below will control the side panel state. Currently
+      {/*
+      The tertiary conditional statement below will control the side panel state. Currently
       there are two states, namely showing the AreaDetail or SidePanelInfo. When a feature
-      is selected, on - for example - the census tract layer, and if the Tribal Layer is the selected
-      the Side Panel should revert back to the SidePanelInfo.
-
-      A new boolean called layerToggle captures that a layer has been selected and to render
-      the SidePanelInfo component */}
-      {(featureProperties && selectedFeatureId && !layerToggled) ?
+      is selected, show the AreaDetail. When not selected show SidePanelInfo
+       */}
+      {(featureProperties && selectedFeatureId) ?
           <AreaDetail
             properties={featureProperties}
             hash={hash}
-            isCensusLayerSelected={isCensusLayerSelected}
           /> :
           <SidePanelInfo />
       }
diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx
index 0e28b248c..11492f8c7 100644
--- a/client/src/data/copy/common.tsx
+++ b/client/src/data/copy/common.tsx
@@ -20,7 +20,7 @@ export interface IDefineMessage {
  * */
 export const italicFn = (str:string) => <i>{str}</i>;
 export const boldFn = (str:string) => <strong>{str}</strong>;
-export const simpleLink = (href:string) => (str:string) => <a href={href}>{str}</a>;
+export const simpleLink = (href:string) => (str:string) => <a className={'usa-link'} href={href}>{str}</a>;
 // export const downloadLink = (href:string) => (str:string) => <a href={href} download>{str}</a>;
 export const downloadLink = (href:string) => (str:string) => <DownloadLink href={href} linkText={str} />;
 // eslint-disable-next-line max-len
@@ -101,13 +101,8 @@ export const ALERTS = {
 export const HEADER = defineMessages({
   TITLE_LINE_1: {
     id: 'common.pages.header.title.line1',
-    defaultMessage: `Climate and Economic Justice`,
-    description: 'Navigate to the about page. This is Title in nav header line 1 of 2',
-  },
-  TITLE_LINE_2: {
-    id: 'common.pages.header.title.line2',
-    defaultMessage: `Screening Tool`,
-    description: 'Navigate to the about page. This is Title in nav header line 2 of 2',
+    defaultMessage: `Climate and Economic Justice Screening Tool`,
+    description: 'Navigate to the about page. This is Title in nav header',
   },
   ABOUT: {
     id: 'common.pages.header.about',
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 1ea020ecb..2b50b1ea2 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -207,86 +207,185 @@ export const MAP = defineMessages({
 });
 
 
-// Side Panel copy
+// Side Panel non-selected state copy
 export const SIDE_PANEL_INITIAL_STATE = defineMessages({
-  TITLE: {
-    id: 'explore.map.page.side.panel.info.title',
-    defaultMessage: 'Things to know',
-    description: 'introductory text of ways to use the map',
+  HEADING1: {
+    id: 'explore.map.page.side.panel.info.heading1',
+    defaultMessage: `
+      How to use the map:
+    `,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the first heading of the non-selected side panel',
   },
-  PARA1: {
-    id: 'explore.map.page.side.panel.info.para1',
+  PARA1_PART1: {
+    id: 'explore.map.page.side.panel.info.para.1.part.1',
     defaultMessage: `
-      This tool identifies communities that are marginalized, underserved, and overburdened by pollution. These communities are located in census tracts that are at or above the thresholds in one or more of eight categories of criteria.
+      Zoom in
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the first paragraph of this side panel`,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Zoom in',
   },
-  HEADING1: {
-    id: 'explore.map.page.side.panel.info.heading1',
+  PARA1_PART2: {
+    id: 'explore.map.page.side.panel.info.para.1.part.2',
     defaultMessage: `
-      Zoom in or search and select to see data about any census tract of interest
+      , search
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the first paragraph of this side panel`,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show search',
   },
-  PARA2: {
-    id: 'explore.map.page.side.panel.info.para2',
+  PARA1_PART3: {
+    id: 'explore.map.page.side.panel.info.para.1.part.2',
     defaultMessage: `
-      The tool uses census tracts that represent about 4,000 people, which is the smallest unit of geography for which consistent data can be displayed on the map.
+      , or locate yourself 
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the second paragraph of this side panel`,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show or locate yourself',
   },
-  PARA3: {
-    id: 'explore.map.page.side.panel.info.para3',
+  PARA1_PART4: {
+    id: 'explore.map.page.side.panel.info.para.1.part.4',
     defaultMessage: `
-      The tool ranks each census tract using percentiles that show how much burden each tract experiences relative to all other tracts, for each criterion.
+      and select
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the third paragraph of this side panel`,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show and select',
   },
-  PARA4: {
-    id: 'explore.map.page.side.panel.info.para4',
+  PARA1_PART5: {
+    id: 'explore.map.page.side.panel.info.para.1.part.5',
     defaultMessage: `
-      Percentages are used for certain variables, i.e. those relating to high school achievement rate and to the share of individuals not currently enrolled in higher education.
+      to see information about any census tract
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the forth paragraph of this side panel`,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show to see information about any census tract',
   },
-  ALT_TEXT_ICON1: {
-    id: 'explore.map.page.side.panel.info.alt.text.icon1',
+  HEADING2: {
+    id: 'explore.map.page.side.panel.info.heading2',
     defaultMessage: `
-      An icon that has depicts pieces of a block selected mimicking the census block census tracts
+     Things to know:
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the first icon in this side panel`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know:`,
   },
-  ALT_TEXT_ICON2: {
-    id: 'explore.map.page.side.panel.info.alt.text.icon2',
+  PARA2_PART1: {
+    id: 'explore.map.page.side.panel.info.para.2.part.1',
     defaultMessage: `
-      An icon that a bell curve or gaussian distribution
+      The tool uses census tracts
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the second icon in this side panel`,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show The tool uses census tracts',
   },
-  ALT_TEXT_ICON3: {
-    id: 'explore.map.page.side.panel.info.alt.text.icon3',
+  PARA2_PART2: {
+    id: 'explore.map.page.side.panel.info.para.2.part.2',
     defaultMessage: `
-      An icon that depicts a part of pie chart being removed
+    . Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation.
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the third icon in this side panel`,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation.',
   },
-  ALT_TEXT_ICON4: {
-    id: 'explore.map.page.side.panel.info.alt.text.icon4',
+  PARA3_PART1: {
+    id: 'explore.map.page.side.panel.info.para.3.part.1',
     defaultMessage: `
-      An icon that has an up arrow and a down arrow
+      Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the forth icon in this side panel`,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color',
+  },
+  PARA3_PART2: {
+    id: 'explore.map.page.side.panel.info.para.3.part.2',
+    defaultMessage: `
+      on the map. This color is an opacity. This is so information about the map can be seen.
+    `,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show on the map. This color is an opacity. This is so information about the map can be seen.',
+  },
+  PARA4_PART1: {
+    id: 'explore.map.page.side.panel.info.para.4.part.1',
+    defaultMessage: `
+      The tool uses percentiles
+    `,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show The tool uses percentiles',
+  },
+  PARA4_PART2: {
+    id: 'explore.map.page.side.panel.info.para.4.part.2',
+    defaultMessage: `
+      , percentages 
+    `,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show percentages',
+  },
+  PARA4_PART3: {
+    id: 'explore.map.page.side.panel.info.para.4.part.3',
+    defaultMessage: `
+      , or a simple yes/no to indicate how much burden the communities are experiencing in each tract. 
+    `,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show or a simple yes/no to indicate how much burden the communities are experiencing in each tract.',
   },
 });
 
 export const SIDE_PANEL_INITIAL_STATE_PARA5 = <FormattedMessage
   id={'explore.map.page.side.panel.info.para5'}
   defaultMessage={ `
-    Thresholds for each category determine if a tract should be identified as disadvantaged because it has exceeded a certain value for the relevant indicators.
+    The tool also uses thresholds. If the tract meets or exceeds the threshold of any climate, environmental, or other burden <bold>AND</bold> it meets the threshold for the associated socioeconomic burden, then communites in the tract are considered disadvantaged.
   `}
   description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the fifth paragraph of this side pane`}
+  values={{
+    bold: COMMON_COPY.boldFn,
+  }}
 />;
 
+export const SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT = defineMessages({
+  PLUS: {
+    id: 'explore.map.page.side.panel.info.alt.text.icon.plus',
+    defaultMessage: `
+      a plus icon indicating that the user can zoom in
+    *`,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a plus icon indicating that the user can zoom in`,
+  },
+  SEARCH: {
+    id: 'explore.map.page.side.panel.info.alt.text.icon.search',
+    defaultMessage: `
+      a magnifying glass icon informing the user can search
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a magnifying glass icon informing the user can search`,
+  },
+  LOCATE: {
+    id: 'explore.map.page.side.panel.info.alt.text.icon.locate',
+    defaultMessage: `
+      a gps icon informing the user can locate
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a gps icon informing the user can locate`,
+  },
+  MOUSE: {
+    id: 'explore.map.page.side.panel.info.alt.text.icon.mouse',
+    defaultMessage: `
+      a mouse arrow icon informing the user can use the mouse
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a mouse arrow icon informing the user can use the mouse`,
+  },
+  TRACT: {
+    id: 'explore.map.page.side.panel.info.alt.text.icon.tract',
+    defaultMessage: `
+      a tract icon informing the user of census tracts
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a tract icon informing the user of census tracts`,
+  },
+  DAC_CIRCLE: {
+    id: 'explore.map.page.side.panel.info.alt.text.icon.dac.circle',
+    defaultMessage: `
+      a blue circle icon informing the user of what a disadvantaged community is depicted as
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a blue circle icon informing the user of what a disadvantaged community is depicted as`,
+  },
+  BELL_CURVE: {
+    id: 'explore.map.page.side.panel.info.alt.text.icon.bell',
+    defaultMessage: `
+      An icon that a bell curve or gaussian distribution
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that a bell curve or gaussian distribution`,
+  },
+  PIE_CHART: {
+    id: 'explore.map.page.side.panel.info.alt.text.icon.pie',
+    defaultMessage: `
+      An icon that depicts a part of pie chart being removed
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that depicts a part of pie chart being removed`,
+  },
+  UP_ARROW: {
+    id: 'explore.map.page.side.panel.info.alt.text.icon.up.arrow',
+    defaultMessage: `
+      An icon that has an up arrow and a down arrow
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that has an up arrow and a down arrow`,
+  },
+});
+
 export const SIDE_PANEL_VERION = {
   TITLE: <FormattedMessage
     id={'explore.map.page.side.panel.version.title'}
diff --git a/client/src/data/getOSBaseMap.tsx b/client/src/data/getOSBaseMap.tsx
index f43c50123..7477c370a 100644
--- a/client/src/data/getOSBaseMap.tsx
+++ b/client/src/data/getOSBaseMap.tsx
@@ -1,8 +1,6 @@
 import {Style} from 'maplibre-gl';
 
 import {featureURLForTilesetName} from '../components/MapTractLayers/MapTractLayers';
-import {tribalURL} from '../components/MapTribalLayers/MapTribalLayers';
-
 import * as constants from '../data/constants';
 
 // *********** OPEN SOURCE BASE MAP CONSTANTS  ***************
@@ -29,128 +27,15 @@ const cartoLightBaseLayer = {
 // *********** OPEN SOURCE STATIC MAP STYLES  ***************
 /**
  * This function will be called when there is no MapBox token found. This function will
- * return the open source base map along with styles for the chosen source. We currently
- * have two sources, either the census tracts or the tribal layer.
+ * return the open source base map along with styles for the chosen source.
  * *
  * This function returns a Style in accordance to JSON spec of MapBox
  * https://docs.mapbox.com/mapbox-gl-js/style-spec/
  *
- * @param {boolean} censusSelected
  * @return {Style}
  */
-export const getOSBaseMap = (
-    censusSelected: boolean,
-) : Style => {
-  return !censusSelected ? {
-
-    /**
-     * Tribal Source
-     */
-    'version': 8,
-
-    /**
-     * Map Sources
-     * */
-    'sources': {
-
-      /**
-       * The base map source source allows us to define where the tiles can be fetched from.
-       */
-      [constants.BASE_MAP_SOURCE_NAME]: {
-        'type': 'raster',
-        'tiles': cartoLightBaseLayer.noLabels,
-        'minzoom': constants.GLOBAL_MIN_ZOOM,
-        'maxzoom': constants.GLOBAL_MAX_ZOOM,
-      },
-
-      /**
-       * Tribal source
-       */
-      [constants.TRIBAL_SOURCE_NAME]: {
-        'type': 'vector',
-        'promoteId': constants.TRIBAL_ID,
-        'tiles': [tribalURL()],
-        'minzoom': constants.TRIBAL_MIN_ZOOM,
-        'maxzoom': constants.TRIBAL_MAX_ZOOM,
-      },
-
-      // The labels source:
-      'labels': {
-        'type': 'raster',
-        'tiles': cartoLightBaseLayer.labelsOnly,
-      },
-    },
-
-
-    /**
-     * Tribal Layers
-     */
-    'layers': [
-
-      // The baseMapLayer
-      {
-        'id': constants.BASE_MAP_LAYER_ID,
-        'source': constants.BASE_MAP_SOURCE_NAME,
-        'type': 'raster',
-        'minzoom': constants.GLOBAL_MIN_ZOOM,
-        'maxzoom': constants.GLOBAL_MAX_ZOOM,
-      },
-
-      /**
-      * Tribal layer
-      */
-      {
-        'id': constants.TRIBAL_LAYER_ID,
-        'source': constants.TRIBAL_SOURCE_NAME,
-        'source-layer': constants.TRIBAL_SOURCE_LAYER,
-        'type': 'fill',
-        'paint': {
-          'fill-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
-          'fill-opacity': constants.HIGH_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY,
-        },
-        'minzoom': constants.TRIBAL_MIN_ZOOM,
-        'maxzoom': constants.TRIBAL_MAX_ZOOM,
-      },
-
-      /**
-      * Tribal layer - controls the border between features
-      */
-      {
-        'id': constants.FEATURE_BORDER_LAYER_ID,
-        'source': constants.TRIBAL_SOURCE_NAME,
-        'source-layer': constants.TRIBAL_SOURCE_LAYER,
-        'type': 'line',
-        'paint': {
-          'line-color': constants.FEATURE_BORDER_COLOR,
-          'line-width': constants.FEATURE_BORDER_WIDTH,
-          'line-opacity': constants.FEATURE_BORDER_OPACITY},
-        'minzoom': constants.TRIBAL_MIN_ZOOM,
-        'maxzoom': constants.TRIBAL_MAX_ZOOM,
-      },
-
-      /**
-      * Alaska layer
-      */
-      {
-        'id': constants.TRIBAL_ALASKA_POINTS_LAYER_ID,
-        'source': constants.TRIBAL_SOURCE_NAME,
-        'source-layer': constants.TRIBAL_SOURCE_LAYER,
-        'type': 'circle',
-        'filter': ['==', ['geometry-type'], 'Point'],
-        'paint': {
-          'circle-radius': constants.TRIBAL_ALASKA_CIRCLE_RADIUS,
-          'circle-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
-          'circle-opacity': constants.HIGH_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY,
-          'circle-stroke-color': constants.FEATURE_BORDER_COLOR,
-          'circle-stroke-width': constants.ALAKSA_POINTS_STROKE_WIDTH,
-          'circle-stroke-opacity': constants.FEATURE_BORDER_OPACITY,
-        },
-        'minzoom': constants.TRIBAL_MIN_ZOOM,
-        'maxzoom': constants.TRIBAL_MAX_ZOOM,
-      },
-    ],
-  } :
-  {
+export const getOSBaseMap = (): Style => {
+  return {
     'version': 8,
 
     /**
diff --git a/client/src/data/tribalToggleLayerOSMap.tsx b/client/src/data/tribalToggleLayerOSMap.tsx
new file mode 100644
index 000000000..e768d82de
--- /dev/null
+++ b/client/src/data/tribalToggleLayerOSMap.tsx
@@ -0,0 +1,111 @@
+/**
+ * This file holds the tribal layer styling for the OS map in case we want to add the toggle back.
+ */
+// const tribal:any = {
+//   /**
+//    * Tribal Source
+//    */
+//   'version': 8,
+
+//   /**
+//    * Map Sources
+//    * */
+//   'sources': {
+
+//     /**
+//      * The base map source source allows us to define where the tiles can be fetched from.
+//      */
+//     [constants.BASE_MAP_SOURCE_NAME]: {
+//       'type': 'raster',
+//       'tiles': cartoLightBaseLayer.noLabels,
+//       'minzoom': constants.GLOBAL_MIN_ZOOM,
+//       'maxzoom': constants.GLOBAL_MAX_ZOOM,
+//     },
+
+//     /**
+//      * Tribal source
+//      */
+//     [constants.TRIBAL_SOURCE_NAME]: {
+//       'type': 'vector',
+//       'promoteId': constants.TRIBAL_ID,
+//       'tiles': [tribalURL()],
+//       'minzoom': constants.TRIBAL_MIN_ZOOM,
+//       'maxzoom': constants.TRIBAL_MAX_ZOOM,
+//     },
+
+//     // The labels source:
+//     'labels': {
+//       'type': 'raster',
+//       'tiles': cartoLightBaseLayer.labelsOnly,
+//     },
+//   },
+
+
+//   /**
+//    * Tribal Layers
+//    */
+//   'layers': [
+
+//     // The baseMapLayer
+//     {
+//       'id': constants.BASE_MAP_LAYER_ID,
+//       'source': constants.BASE_MAP_SOURCE_NAME,
+//       'type': 'raster',
+//       'minzoom': constants.GLOBAL_MIN_ZOOM,
+//       'maxzoom': constants.GLOBAL_MAX_ZOOM,
+//     },
+
+//     /**
+//     * Tribal layer
+//     */
+//     {
+//       'id': constants.TRIBAL_LAYER_ID,
+//       'source': constants.TRIBAL_SOURCE_NAME,
+//       'source-layer': constants.TRIBAL_SOURCE_LAYER,
+//       'type': 'fill',
+//       'paint': {
+//         'fill-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
+//         'fill-opacity': constants.HIGH_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY,
+//       },
+//       'minzoom': constants.TRIBAL_MIN_ZOOM,
+//       'maxzoom': constants.TRIBAL_MAX_ZOOM,
+//     },
+
+//     /**
+//     * Tribal layer - controls the border between features
+//     */
+//     {
+//       'id': constants.FEATURE_BORDER_LAYER_ID,
+//       'source': constants.TRIBAL_SOURCE_NAME,
+//       'source-layer': constants.TRIBAL_SOURCE_LAYER,
+//       'type': 'line',
+//       'paint': {
+//         'line-color': constants.FEATURE_BORDER_COLOR,
+//         'line-width': constants.FEATURE_BORDER_WIDTH,
+//         'line-opacity': constants.FEATURE_BORDER_OPACITY},
+//       'minzoom': constants.TRIBAL_MIN_ZOOM,
+//       'maxzoom': constants.TRIBAL_MAX_ZOOM,
+//     },
+
+//     /**
+//     * Alaska layer
+//     */
+//     {
+//       'id': constants.TRIBAL_ALASKA_POINTS_LAYER_ID,
+//       'source': constants.TRIBAL_SOURCE_NAME,
+//       'source-layer': constants.TRIBAL_SOURCE_LAYER,
+//       'type': 'circle',
+//       'filter': ['==', ['geometry-type'], 'Point'],
+//       'paint': {
+//         'circle-radius': constants.TRIBAL_ALASKA_CIRCLE_RADIUS,
+//         'circle-color': constants.PRIORITIZED_FEATURE_FILL_COLOR,
+//         'circle-opacity': constants.HIGH_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY,
+//         'circle-stroke-color': constants.FEATURE_BORDER_COLOR,
+//         'circle-stroke-width': constants.ALAKSA_POINTS_STROKE_WIDTH,
+//         'circle-stroke-opacity': constants.FEATURE_BORDER_OPACITY,
+//       },
+//       'minzoom': constants.TRIBAL_MIN_ZOOM,
+//       'maxzoom': constants.TRIBAL_MAX_ZOOM,
+//     },
+//   ],
+// };
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 423a8e804..f04a26818 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -224,12 +224,8 @@
     "description": "Navigate to the about page. This is Header navigate item to the public eng page"
   },
   "common.pages.header.title.line1": {
-    "defaultMessage": "Climate and Economic Justice",
-    "description": "Navigate to the about page. This is Title in nav header line 1 of 2"
-  },
-  "common.pages.header.title.line2": {
-    "defaultMessage": "Screening Tool",
-    "description": "Navigate to the about page. This is Title in nav header line 2 of 2"
+    "defaultMessage": "Climate and Economic Justice Screening Tool",
+    "description": "Navigate to the about page. This is Title in nav header"
   },
   "common.pages.header.tsd": {
     "defaultMessage": "Technical Support Document",
@@ -903,50 +899,98 @@
     "defaultMessage": "Projected wildfire risk",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show wildfire risk"
   },
-  "explore.map.page.side.panel.info.alt.text.icon1": {
-    "defaultMessage": "An icon that has depicts pieces of a block selected mimicking the census block census tracts",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the first icon in this side panel"
-  },
-  "explore.map.page.side.panel.info.alt.text.icon2": {
+  "explore.map.page.side.panel.info.alt.text.icon.bell": {
     "defaultMessage": "An icon that a bell curve or gaussian distribution",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the second icon in this side panel"
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that a bell curve or gaussian distribution"
+  },
+  "explore.map.page.side.panel.info.alt.text.icon.dac.circle": {
+    "defaultMessage": "a blue circle icon informing the user of what a disadvantaged community is depicted as",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a blue circle icon informing the user of what a disadvantaged community is depicted as"
+  },
+  "explore.map.page.side.panel.info.alt.text.icon.locate": {
+    "defaultMessage": "a gps icon informing the user can locate",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a gps icon informing the user can locate"
+  },
+  "explore.map.page.side.panel.info.alt.text.icon.mouse": {
+    "defaultMessage": "a mouse arrow icon informing the user can use the mouse",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a mouse arrow icon informing the user can use the mouse"
   },
-  "explore.map.page.side.panel.info.alt.text.icon3": {
+  "explore.map.page.side.panel.info.alt.text.icon.pie": {
     "defaultMessage": "An icon that depicts a part of pie chart being removed",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the third icon in this side panel"
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that depicts a part of pie chart being removed"
   },
-  "explore.map.page.side.panel.info.alt.text.icon4": {
+  "explore.map.page.side.panel.info.alt.text.icon.plus": {
+    "defaultMessage": "a plus icon indicating that the user can zoom in *",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a plus icon indicating that the user can zoom in"
+  },
+  "explore.map.page.side.panel.info.alt.text.icon.search": {
+    "defaultMessage": "a magnifying glass icon informing the user can search",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a magnifying glass icon informing the user can search"
+  },
+  "explore.map.page.side.panel.info.alt.text.icon.tract": {
+    "defaultMessage": "a tract icon informing the user of census tracts",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a tract icon informing the user of census tracts"
+  },
+  "explore.map.page.side.panel.info.alt.text.icon.up.arrow": {
     "defaultMessage": "An icon that has an up arrow and a down arrow",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the forth icon in this side panel"
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that has an up arrow and a down arrow"
   },
   "explore.map.page.side.panel.info.heading1": {
-    "defaultMessage": "Zoom in or search and select to see data about any census tract of interest",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the first paragraph of this side panel"
+    "defaultMessage": "How to use the map:",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the first heading of the non-selected side panel"
+  },
+  "explore.map.page.side.panel.info.heading2": {
+    "defaultMessage": "Things to know:",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know:"
   },
-  "explore.map.page.side.panel.info.para1": {
-    "defaultMessage": "This tool identifies communities that are marginalized, underserved, and overburdened by pollution. These communities are located in census tracts that are at or above the thresholds in one or more of eight categories of criteria.",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the first paragraph of this side panel"
+  "explore.map.page.side.panel.info.para.1.part.1": {
+    "defaultMessage": "Zoom in",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Zoom in"
   },
-  "explore.map.page.side.panel.info.para2": {
-    "defaultMessage": "The tool uses census tracts that represent about 4,000 people, which is the smallest unit of geography for which consistent data can be displayed on the map.",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the second paragraph of this side panel"
+  "explore.map.page.side.panel.info.para.1.part.2": {
+    "defaultMessage": ", or locate yourself",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show or locate yourself"
   },
-  "explore.map.page.side.panel.info.para3": {
-    "defaultMessage": "The tool ranks each census tract using percentiles that show how much burden each tract experiences relative to all other tracts, for each criterion.",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the third paragraph of this side panel"
+  "explore.map.page.side.panel.info.para.1.part.4": {
+    "defaultMessage": "and select",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show and select"
   },
-  "explore.map.page.side.panel.info.para4": {
-    "defaultMessage": "Percentages are used for certain variables, i.e. those relating to high school achievement rate and to the share of individuals not currently enrolled in higher education.",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the forth paragraph of this side panel"
+  "explore.map.page.side.panel.info.para.1.part.5": {
+    "defaultMessage": "to see information about any census tract",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show to see information about any census tract"
+  },
+  "explore.map.page.side.panel.info.para.2.part.1": {
+    "defaultMessage": "The tool uses census tracts",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show The tool uses census tracts"
+  },
+  "explore.map.page.side.panel.info.para.2.part.2": {
+    "defaultMessage": ". Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation.",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation."
+  },
+  "explore.map.page.side.panel.info.para.3.part.1": {
+    "defaultMessage": "Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color"
+  },
+  "explore.map.page.side.panel.info.para.3.part.2": {
+    "defaultMessage": "on the map. This color is an opacity. This is so information about the map can be seen.",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show on the map. This color is an opacity. This is so information about the map can be seen."
+  },
+  "explore.map.page.side.panel.info.para.4.part.1": {
+    "defaultMessage": "The tool uses percentiles",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show The tool uses percentiles"
+  },
+  "explore.map.page.side.panel.info.para.4.part.2": {
+    "defaultMessage": ", percentages",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show percentages"
+  },
+  "explore.map.page.side.panel.info.para.4.part.3": {
+    "defaultMessage": ", or a simple yes/no to indicate how much burden the communities are experiencing in each tract.",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show or a simple yes/no to indicate how much burden the communities are experiencing in each tract."
   },
   "explore.map.page.side.panel.info.para5": {
-    "defaultMessage": "Thresholds for each category determine if a tract should be identified as disadvantaged because it has exceeded a certain value for the relevant indicators.",
+    "defaultMessage": "The tool also uses thresholds. If the tract meets or exceeds the threshold of any climate, environmental, or other burden <bold>AND</bold> it meets the threshold for the associated socioeconomic burden, then communites in the tract are considered disadvantaged.",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the fifth paragraph of this side pane"
   },
-  "explore.map.page.side.panel.info.title": {
-    "defaultMessage": "Things to know",
-    "description": "introductory text of ways to use the map"
-  },
   "explore.map.page.side.panel.is.community.of.focus": {
     "defaultMessage": "Identified as disadvantaged?",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show asking IF the communities is focused on"
diff --git a/client/src/pages/about.tsx b/client/src/pages/about.tsx
index baf8229e0..a07104602 100644
--- a/client/src/pages/about.tsx
+++ b/client/src/pages/about.tsx
@@ -5,7 +5,6 @@ import AboutCard from '../components/AboutCard/AboutCard';
 import AboutCardsContainer from '../components/AboutCard/AboutCardsContainer';
 import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
-import PublicEngageButton from '../components/PublicEngageButton';
 
 import * as ABOUT_COPY from '../data/copy/about';
 import * as COMMON_COPY from '../data/copy/common';
@@ -42,7 +41,6 @@ const AboutPage = ({location}: IAboutPageProps) => {
 
         <section className={'page-heading'}>
           <h1 data-cy={'about-page-heading'}>{intl.formatMessage(ABOUT_COPY.PAGE.HEADING)}</h1>
-          <PublicEngageButton />
         </section>
 
         {/* Section 1 */}
diff --git a/client/src/pages/contact.tsx b/client/src/pages/contact.tsx
index 4cb386e2e..bd420a1f9 100644
--- a/client/src/pages/contact.tsx
+++ b/client/src/pages/contact.tsx
@@ -6,7 +6,6 @@ import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
 import LinkTypeWrapper from '../components/LinkTypeWrapper';
 import RequestForInfo from '../components/RequestForInfo';
-import PublicEngageButton from '../components/PublicEngageButton';
 
 import * as CONTACT_COPY from '../data/copy/contact';
 import * as COMMON_COPY from '../data/copy/common';
@@ -24,7 +23,6 @@ const ContactPage = ({location}: IContactPageProps) => {
 
         <section className={'page-heading'}>
           <h1>{intl.formatMessage(CONTACT_COPY.PAGE_INTRO.PAGE_HEADING)}</h1>
-          <PublicEngageButton />
         </section>
 
         <Grid row gap={6}>
diff --git a/client/src/pages/downloads.tsx b/client/src/pages/downloads.tsx
index 7c8bc3e52..7b116c70b 100644
--- a/client/src/pages/downloads.tsx
+++ b/client/src/pages/downloads.tsx
@@ -4,7 +4,6 @@ import {useIntl} from 'gatsby-plugin-intl';
 
 import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
-import PublicEngageButton from '../components/PublicEngageButton';
 import SubPageNav from '../components/SubPageNav';
 import {useWindowSize} from 'react-use';
 
@@ -25,7 +24,6 @@ const DownloadsPage = ({location}: IDownloadsPageProps) => {
 
         <section className={'page-heading'}>
           <h1>{intl.formatMessage(DOWNLOADS_COPY.PAGE_INTRO.PAGE_HEADING1)}</h1>
-          <PublicEngageButton />
         </section>
 
         <Grid row gap className={'j40-mb5-mt3'}>
diff --git a/client/src/pages/index.tsx b/client/src/pages/index.tsx
index 7388238a8..ab18854a8 100644
--- a/client/src/pages/index.tsx
+++ b/client/src/pages/index.tsx
@@ -6,7 +6,6 @@ import HowYouCanHelp from '../components/HowYouCanHelp';
 import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
 import MapWrapper from '../components/MapWrapper';
-import PublicEngageButton from '../components/PublicEngageButton';
 
 import * as EXPLORE_COPY from '../data/copy/explore';
 
@@ -26,7 +25,6 @@ const ExporeToolPage = ({location}: IMapPageProps) => {
 
       <section className={'page-heading'}>
         <h1>{intl.formatMessage(EXPLORE_COPY.PAGE_INTRO.PAGE_HEADING)}</h1>
-        <PublicEngageButton />
       </section>
 
       <Grid row gap className={'j40-mb5-mt3'}>
diff --git a/client/src/pages/methodology.tsx b/client/src/pages/methodology.tsx
index 7a13d839e..34538b632 100644
--- a/client/src/pages/methodology.tsx
+++ b/client/src/pages/methodology.tsx
@@ -7,7 +7,6 @@ import DatasetContainer from '../components/DatasetContainer';
 import J40MainGridContainer from '../components/J40MainGridContainer';
 import MethodologyFormula from '../components/MethodologyFormula';
 import Layout from '../components/layout';
-import PublicEngageButton from '../components/PublicEngageButton';
 import SubPageNav from '../components/SubPageNav';
 import {useWindowSize} from 'react-use';
 
@@ -29,7 +28,6 @@ const IndexPage = ({location}: MethodPageProps) => {
 
         <section className={'page-heading'}>
           <h1>{intl.formatMessage(METHODOLOGY_COPY.PAGE.HEADING)}</h1>
-          <PublicEngageButton />
         </section>
 
         <Grid row gap className={'j40-mb5-mt3'}>
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index 0734b65a6..5356da6ae 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -146,11 +146,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             src="test-file-stub"
           />
           <a
+            class="usa-link"
             href="#"
           >
             English
           </a>
           <a
+            class="usa-link"
             href="#"
           >
             Español
@@ -194,17 +196,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="grid"
         >
           <div>
-            <div>
-              Climate and Economic Justice
-            </div>
-            <div>
-              <div>
-                 Screening Tool 
-              </div>
-              <div>
-                BETA
-              </div>
-            </div>
+            Climate and Economic Justice Screening Tool
           </div>
         </div>
         <div
@@ -315,11 +307,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       src="test-file-stub"
                     />
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       English
                     </a>
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       Español
@@ -348,27 +342,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         >
           About
         </h1>
-        <div>
-          <a
-            href="/en/public-engagement"
-          >
-            <button
-              class="usa-button"
-              data-testid="button"
-              type="button"
-            >
-              <div>
-                <img
-                  alt="an icon that represents a calendar"
-                  src="test-file-stub"
-                />
-                <div>
-                  Public engagement
-                </div>
-              </div>
-            </button>
-          </a>
-        </div>
       </section>
       <div
         class="grid-row grid-gap-lg j40-aboutcard-container "
@@ -607,6 +580,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     class="j40-aboutcard-sm-link"
                   >
                     <a
+                      class="usa-link"
                       href="/en/methodology"
                     >
                       Methodology & data
@@ -661,6 +635,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     class="j40-aboutcard-sm-link"
                   >
                     <a
+                      class="usa-link"
                       href="/en/"
                     >
                       Explore the map
@@ -888,7 +863,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="footer-link-first-child"
+                    class="usa-link footer-link-first-child"
                     href="/en/public-engagement"
                   >
                     Engagement calendar
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index cf4e404c5..068a8e719 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -146,11 +146,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             src="test-file-stub"
           />
           <a
+            class="usa-link"
             href="#"
           >
             English
           </a>
           <a
+            class="usa-link"
             href="#"
           >
             Español
@@ -194,17 +196,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="grid"
         >
           <div>
-            <div>
-              Climate and Economic Justice
-            </div>
-            <div>
-              <div>
-                 Screening Tool 
-              </div>
-              <div>
-                BETA
-              </div>
-            </div>
+            Climate and Economic Justice Screening Tool
           </div>
         </div>
         <div
@@ -315,11 +307,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       src="test-file-stub"
                     />
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       English
                     </a>
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       Español
@@ -346,27 +340,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <h1>
           Contact
         </h1>
-        <div>
-          <a
-            href="/en/public-engagement"
-          >
-            <button
-              class="usa-button"
-              data-testid="button"
-              type="button"
-            >
-              <div>
-                <img
-                  alt="an icon that represents a calendar"
-                  src="test-file-stub"
-                />
-                <div>
-                  Public engagement
-                </div>
-              </div>
-            </button>
-          </a>
-        </div>
       </section>
       <div
         class="grid-row grid-gap-6"
@@ -400,6 +373,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       To provide feedback about a specific census tract, either select the send feedback button after
       selecting a census tract on the 
             <a
+              class="usa-link"
               href="/en/"
             >
               Explore the map
@@ -535,7 +509,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="footer-link-first-child"
+                    class="usa-link footer-link-first-child"
                     href="/en/public-engagement"
                   >
                     Engagement calendar
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index 4e06dc5d3..a0b90795d 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -146,11 +146,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             src="test-file-stub"
           />
           <a
+            class="usa-link"
             href="#"
           >
             English
           </a>
           <a
+            class="usa-link"
             href="#"
           >
             Español
@@ -194,17 +196,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="grid"
         >
           <div>
-            <div>
-              Climate and Economic Justice
-            </div>
-            <div>
-              <div>
-                 Screening Tool 
-              </div>
-              <div>
-                BETA
-              </div>
-            </div>
+            Climate and Economic Justice Screening Tool
           </div>
         </div>
         <div
@@ -315,11 +307,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       src="test-file-stub"
                     />
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       English
                     </a>
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       Español
@@ -346,27 +340,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <h1>
           Downloads
         </h1>
-        <div>
-          <a
-            href="/en/public-engagement"
-          >
-            <button
-              class="usa-button"
-              data-testid="button"
-              type="button"
-            >
-              <div>
-                <img
-                  alt="an icon that represents a calendar"
-                  src="test-file-stub"
-                />
-                <div>
-                  Public engagement
-                </div>
-              </div>
-            </button>
-          </a>
-        </div>
       </section>
       <div
         class="grid-row grid-gap j40-mb5-mt3"
@@ -386,6 +359,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             
       
             <a
+              class="usa-link"
               download=""
               href="//"
             >
@@ -400,6 +374,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </p>
           <p>
             <a
+              class="usa-link"
               download=""
               href="//"
             >
@@ -413,6 +388,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </p>
           <p>
             <a
+              class="usa-link"
               download=""
               href="//"
             >
@@ -533,7 +509,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="footer-link-first-child"
+                    class="usa-link footer-link-first-child"
                     href="/en/public-engagement"
                   >
                     Engagement calendar
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 6e63debcc..eaf43ab89 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -146,11 +146,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             src="test-file-stub"
           />
           <a
+            class="usa-link"
             href="#"
           >
             English
           </a>
           <a
+            class="usa-link"
             href="#"
           >
             Español
@@ -194,17 +196,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="grid"
         >
           <div>
-            <div>
-              Climate and Economic Justice
-            </div>
-            <div>
-              <div>
-                 Screening Tool 
-              </div>
-              <div>
-                BETA
-              </div>
-            </div>
+            Climate and Economic Justice Screening Tool
           </div>
         </div>
         <div
@@ -315,11 +307,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       src="test-file-stub"
                     />
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       English
                     </a>
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       Español
@@ -428,7 +422,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="footer-link-first-child"
+                    class="usa-link footer-link-first-child"
                     href="/en/public-engagement"
                   >
                     Engagement calendar
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 1594619a5..40f8e4fc5 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -146,11 +146,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             src="test-file-stub"
           />
           <a
+            class="usa-link"
             href="#"
           >
             English
           </a>
           <a
+            class="usa-link"
             href="#"
           >
             Español
@@ -194,17 +196,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="grid"
         >
           <div>
-            <div>
-              Climate and Economic Justice
-            </div>
-            <div>
-              <div>
-                 Screening Tool 
-              </div>
-              <div>
-                BETA
-              </div>
-            </div>
+            Climate and Economic Justice Screening Tool
           </div>
         </div>
         <div
@@ -315,11 +307,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       src="test-file-stub"
                     />
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       English
                     </a>
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       Español
@@ -346,27 +340,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <h1>
           Methodology
         </h1>
-        <div>
-          <a
-            href="/en/public-engagement"
-          >
-            <button
-              class="usa-button"
-              data-testid="button"
-              type="button"
-            >
-              <div>
-                <img
-                  alt="an icon that represents a calendar"
-                  src="test-file-stub"
-                />
-                <div>
-                  Public engagement
-                </div>
-              </div>
-            </button>
-          </a>
-        </div>
       </section>
       <div
         class="grid-row grid-gap j40-mb5-mt3"
@@ -471,18 +444,21 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            at or above the 90th percentile for 
           <a
+            class="usa-link"
             href="#exp-agr-loss-rate"
           >
             expected agriculture loss rate
           </a>
            OR 
           <a
+            class="usa-link"
             href="#exp-bld-loss-rate"
           >
             expected building loss rate
           </a>
            OR 
           <a
+            class="usa-link"
             href="#exp-pop-loss-rate"
           >
             expected population loss rate
@@ -496,12 +472,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            is at or above the 65th percentile for 
           <a
+            class="usa-link"
             href="#low-income"
           >
             low income
           </a>
            AND 80% or more of individuals 15 or older are not enrolled in 
           <a
+            class="usa-link"
             href="#high-ed-enroll-rate"
           >
             higher education
@@ -530,12 +508,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            at or above the 90th percentile for 
           <a
+            class="usa-link"
             href="#energy-burden"
           >
             energy burden
           </a>
            OR 
           <a
+            class="usa-link"
             href="#pm-25"
           >
             PM2.5 in the air
@@ -549,12 +529,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            is at or above the 65th percentile for 
           <a
+            class="usa-link"
             href="#low-income"
           >
             low income
           </a>
            AND 80% or more of individuals 15 or older are not enrolled in 
           <a
+            class="usa-link"
             href="#high-ed-enroll-rate"
           >
             higher education
@@ -585,12 +567,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            at or above the 90th percentile for 
           <a
+            class="usa-link"
             href="#diesel-pm"
           >
             diesel particulate matter exposure
           </a>
            or 
           <a
+            class="usa-link"
             href="#traffic-vol"
           >
             traffic proximity and volume
@@ -606,12 +590,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            is at or above the 65th percentile for 
           <a
+            class="usa-link"
             href="#low-income"
           >
             low income
           </a>
            AND 80% or more of individuals 15 or older are not enrolled in 
           <a
+            class="usa-link"
             href="#high-ed-enroll-rate"
           >
             higher education
@@ -640,18 +626,21 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            at or above the 90th percentile for 
           <a
+            class="usa-link"
             href="#lead-paint"
           >
             lead paint
           </a>
            AND 
           <a
+            class="usa-link"
             href="#median-home"
           >
             median home value
           </a>
            is at or less than the 90th percentile OR at or above the 90th percentile for the 
           <a
+            class="usa-link"
             href="#house-burden"
           >
             housing cost burden
@@ -665,12 +654,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            is at or above the 65th percentile for 
           <a
+            class="usa-link"
             href="#low-income"
           >
             low income
           </a>
            AND 80% or more of individuals 15 or older are not enrolled in 
           <a
+            class="usa-link"
             href="#high-ed-enroll-rate"
           >
             higher education
@@ -699,18 +690,21 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            at or above the 90th percentile for 
           <a
+            class="usa-link"
             href="#prox-haz"
           >
             proximity to hazardous waste facilities
           </a>
            OR 
           <a
+            class="usa-link"
             href="#prox-npl"
           >
             proximity to National Priorities List (NPL) sites
           </a>
            OR 
           <a
+            class="usa-link"
             href="#prox-rmp"
           >
             proximity to Risk Management Plan (RMP) facilities
@@ -724,12 +718,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            is at or above the 65th percentile for 
           <a
+            class="usa-link"
             href="#low-income"
           >
             low income
           </a>
            AND 80% or more of individuals 15 or older are not enrolled in 
           <a
+            class="usa-link"
             href="#high-ed-enroll-rate"
           >
             higher education
@@ -758,6 +754,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            at or above the 90th percentile for 
           <a
+            class="usa-link"
             href="#waste-water"
           >
             wastewater discharge
@@ -771,12 +768,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            is at or above the 65th percentile for 
           <a
+            class="usa-link"
             href="#low-income"
           >
             low income
           </a>
            AND 80% or more of individuals 15 or older are not enrolled in 
           <a
+            class="usa-link"
             href="#high-ed-enroll-rate"
           >
             higher education
@@ -805,24 +804,28 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            at or above the 90th percentile for 
           <a
+            class="usa-link"
             href="#asthma"
           >
             asthma
           </a>
            OR 
           <a
+            class="usa-link"
             href="#diabetes"
           >
             diabetes
           </a>
            OR 
           <a
+            class="usa-link"
             href="#heart-disease"
           >
             heart disease
           </a>
            OR 
           <a
+            class="usa-link"
             href="#life-exp"
           >
             low life expectancy
@@ -836,12 +839,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            is at or above the 65th percentile for 
           <a
+            class="usa-link"
             href="#low-income"
           >
             low income
           </a>
            AND 80% or more of individuals 15 or older are not enrolled in 
           <a
+            class="usa-link"
             href="#high-ed-enroll-rate"
           >
             higher education
@@ -870,24 +875,28 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            at or above the 90th percentile for 
           <a
+            class="usa-link"
             href="#low-med-inc"
           >
             low median income
           </a>
            as a percentage of area median income OR 
           <a
+            class="usa-link"
             href="#ling-iso"
           >
             linguistic isolation
           </a>
            OR 
           <a
+            class="usa-link"
             href="#unemploy"
           >
             unemployment
           </a>
            OR percentage of individuals in households at or below 100% Federal 
           <a
+            class="usa-link"
             href="#poverty"
           >
             poverty
@@ -901,12 +910,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </strong>
            10% or more of adults 25 or older have not attained a 
           <a
+            class="usa-link"
             href="#high-school"
           >
             high school degree
           </a>
            AND 80% or more of individuals 15 or older are not enrolled in 
           <a
+            class="usa-link"
             href="#high-ed-enroll-rate"
           >
             higher education
@@ -2292,6 +2303,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         </div>
         <div>
           <a
+            class="usa-link"
             href="/en/methodology"
           >
             Return to top
@@ -2377,7 +2389,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="footer-link-first-child"
+                    class="usa-link footer-link-first-child"
                     href="/en/public-engagement"
                   >
                     Engagement calendar
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index 0b7ab9f22..5c06d3ce1 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -146,11 +146,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             src="test-file-stub"
           />
           <a
+            class="usa-link"
             href="#"
           >
             English
           </a>
           <a
+            class="usa-link"
             href="#"
           >
             Español
@@ -194,17 +196,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="grid"
         >
           <div>
-            <div>
-              Climate and Economic Justice
-            </div>
-            <div>
-              <div>
-                 Screening Tool 
-              </div>
-              <div>
-                BETA
-              </div>
-            </div>
+            Climate and Economic Justice Screening Tool
           </div>
         </div>
         <div
@@ -315,11 +307,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       src="test-file-stub"
                     />
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       English
                     </a>
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       Español
@@ -1026,7 +1020,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="footer-link-first-child"
+                    class="usa-link footer-link-first-child"
                     href="/en/public-engagement"
                   >
                     Engagement calendar
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index 1a485e4d2..d1c5e5693 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -146,11 +146,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             src="test-file-stub"
           />
           <a
+            class="usa-link"
             href="#"
           >
             English
           </a>
           <a
+            class="usa-link"
             href="#"
           >
             Español
@@ -194,17 +196,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="grid"
         >
           <div>
-            <div>
-              Climate and Economic Justice
-            </div>
-            <div>
-              <div>
-                 Screening Tool 
-              </div>
-              <div>
-                BETA
-              </div>
-            </div>
+            Climate and Economic Justice Screening Tool
           </div>
         </div>
         <div
@@ -315,11 +307,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       src="test-file-stub"
                     />
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       English
                     </a>
                     <a
+                      class="usa-link"
                       href="#"
                     >
                       Español
@@ -428,7 +422,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="footer-link-first-child"
+                    class="usa-link footer-link-first-child"
                     href="/en/public-engagement"
                   >
                     Engagement calendar

From 8f4b1b6df16aea6b4228baaf88c99bd3e46da9bd Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Fri, 23 Sep 2022 20:05:36 -0700
Subject: [PATCH 066/130] Update copy on Explore the Map page (#1915)

* Add Explore the Data box

* Update explore page description

- Remove paragraph under map

* Update territories copy

- Remove How you can help

* Update Whitehouse footer icon

* Correct heading order to pass a11y

* Remove beta pill in Beta Banner
- update snapshots

* Update explore page description
- remove color key

* revert image back to eagle seal

* Update release date variable name

* Add Impute, Adj and tribal signals to side panel

* Remove test category

- move send feedback button outside of categorization div
- left justify send feedback button
- update snapshots

* Update links in the territories paragraph on explore page

* Update tribal lands copy on explore page

* Align geolocate icon on desktop and mobile

* Add inverted style to YES

- update snapshots
---
 .../src/components/AreaDetail/AreaDetail.tsx  | 218 ++++++------
 .../AreaDetail/areaDetail.module.scss         |  63 ++--
 .../AreaDetail/areaDetail.module.scss.d.ts    |   2 +
 .../__snapshots__/areaDetail.test.tsx.snap    | 311 +++++++++---------
 .../BetaBanner/BetaBanner.module.scss         |  13 -
 .../src/components/BetaBanner/BetaBanner.tsx  |  13 +-
 .../__snapshots__/BetaBanner.test.tsx.snap    |  14 +-
 .../ExploreDataBox/ExploreDataBox.module.scss |   6 +
 .../ExploreDataBox.module.scss.d.ts           |  12 +
 .../ExploreDataBox/ExploreDataBox.test.tsx    |  15 +
 .../ExploreDataBox/ExploreDataBox.tsx         |  36 ++
 .../ExploreDataBox.test.tsx.snap              |  43 +++
 client/src/components/ExploreDataBox/index.ts |   2 +
 .../__snapshots__/J40Header.test.tsx.snap     |  14 +-
 client/src/components/J40Map.module.scss      |  30 +-
 client/src/components/J40Map.tsx              |  34 +-
 client/src/data/constants.tsx                 |   2 +
 client/src/data/copy/common.tsx               |  29 +-
 client/src/data/copy/explore.tsx              | 104 +++---
 client/src/images/wh.webp                     | Bin 0 -> 16548 bytes
 client/src/intl/en.json                       |  44 +--
 client/src/pages/index.tsx                    |  35 +-
 .../tests/__snapshots__/about.test.tsx.snap   |  14 +-
 .../tests/__snapshots__/contact.test.tsx.snap |  14 +-
 .../__snapshots__/downloads.test.tsx.snap     |  14 +-
 .../freqAskedQuestions.test.tsx.snap          |  14 +-
 .../__snapshots__/methodology.test.tsx.snap   |  14 +-
 .../__snapshots__/publicEng.test.tsx.snap     |  14 +-
 .../techSupportDoc.test.tsx.snap              |  14 +-
 29 files changed, 620 insertions(+), 518 deletions(-)
 create mode 100644 client/src/components/ExploreDataBox/ExploreDataBox.module.scss
 create mode 100644 client/src/components/ExploreDataBox/ExploreDataBox.module.scss.d.ts
 create mode 100644 client/src/components/ExploreDataBox/ExploreDataBox.test.tsx
 create mode 100644 client/src/components/ExploreDataBox/ExploreDataBox.tsx
 create mode 100644 client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap
 create mode 100644 client/src/components/ExploreDataBox/index.ts
 create mode 100644 client/src/images/wh.webp

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index cddfdb277..49299ca1b 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -7,7 +7,6 @@ import {Accordion, Button} from '@trussworks/react-uswds';
 // Components:
 import Category from '../Category';
 import TractDemographics from '../TractDemographics';
-import DisadvantageDot from '../DisadvantageDot';
 import Indicator from '../Indicator';
 import TractInfo from '../TractInfo';
 
@@ -98,6 +97,27 @@ export const indicatorFilter = (label:MessageDescriptor) => {
 };
 
 
+/**
+ * Function to calculate the tribal area percentage value to display when a tract is selected
+ *
+ * @param {number} tribalPercentRaw
+ * @return {string}
+ */
+export const getTribalPercentValue = (tribalPercentRaw: number) => {
+  if (tribalPercentRaw === undefined) {
+    return ` 0 %`;
+  }
+
+  if (tribalPercentRaw === 0) {
+    // test tract = #9.03/42.9242/-98.8015
+    return ` less than 1%`;
+  }
+
+  if (tribalPercentRaw && tribalPercentRaw > 0) {
+    return ` ${tribalPercentRaw*100} %`;
+  }
+};
+
 /**
  * This is the main component. It will render the entire side panel and show the details
  * of the area/feature that is selected.
@@ -560,26 +580,6 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
     threshold: 10,
   };
 
-  // Temp adding to workforce category
-  const adjacency: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.ADJ),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.ADJ),
-    type: 'percentile',
-    value: properties.hasOwnProperty(constants.ADJACENCY_PERCENTILE) ?
-      properties[constants.ADJACENCY_PERCENTILE] : null,
-    isDisadvagtaged: properties[constants.ADJACENCY_EXCEEDS_THRESH] ?
-      properties[constants.ADJACENCY_EXCEEDS_THRESH] : null,
-  };
-  const imputeFlag: indicatorInfo = {
-    label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.IMP_FLG),
-    description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.IMP_FLG),
-    type: 'boolean',
-    value: properties.hasOwnProperty(constants.IMPUTE_FLAG) ?
-      (properties[constants.IMPUTE_FLAG] == '0' ? false : true) : null,
-    isDisadvagtaged: false,
-  };
-
-
   /**
    * Aggregate indicators based on categories
    *
@@ -683,15 +683,6 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
       isExceedBothSocioBurdens: properties[constants.IS_WORKFORCE_EXCEED_BOTH_SOCIO_INDICATORS] ?
         properties[constants.IS_WORKFORCE_EXCEED_BOTH_SOCIO_INDICATORS] : null,
     },
-    {
-      id: 'test',
-      titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.TEST),
-      indicators: [adjacency],
-      socioEcIndicators: [imputeFlag],
-      isDisadvagtaged: null,
-      isExceed1MoreBurden: null,
-      isExceedBothSocioBurdens: null,
-    },
   ];
 
 
@@ -772,86 +763,115 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
 
   return (
     <aside className={styles.areaDetailContainer} data-cy={'aside'}>
-      {
-        <>
-          {/* Tract Info */}
-          <TractInfo
-            blockGroup={blockGroup}
-            countyName={countyName}
-            stateName={stateName}
-            population={population}
-            sidePanelState={properties[constants.SIDE_PANEL_STATE]}
-          />
-
-          {/* Demographics */}
-          <TractDemographics properties={properties}/>
-
-          {/* Disadvantaged? */}
-          <div className={styles.categorization}>
-
-            {/* Questions asking if disadvantaged? */}
-            <div className={styles.isInFocus}>
-              {EXPLORE_COPY.COMMUNITY.IS_FOCUS}
-            </div>
+      {/* Tract Info */}
+      <TractInfo
+        blockGroup={blockGroup}
+        countyName={countyName}
+        stateName={stateName}
+        population={population}
+        sidePanelState={properties[constants.SIDE_PANEL_STATE]}
+      />
+
+      {/* Demographics */}
+      <TractDemographics properties={properties}/>
+
+      {/* Disadvantaged? */}
+      <div className={styles.categorization}>
+
+        {/* Questions asking if disadvantaged? */}
+        <div className={styles.isInFocus}>
+          {EXPLORE_COPY.COMMUNITY.IS_FOCUS}
+        </div>
 
-            {/* YES with Dot or NO with no Dot  */}
-            <div className={styles.communityOfFocus}>
-              {isCommunityFocus ?
-                <>
-                  <h3>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>
-                  <DisadvantageDot isDisadvantaged={isCommunityFocus} />
-                </> :
-                <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>
-              }
-            </div>
+        {/* YES with Dot or NO with no Dot  */}
+        <div className={styles.communityOfFocus}>
+          {isCommunityFocus ?
+            <h3 className={styles.invert}>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3> :
+            <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>
+          }
+        </div>
 
-            {/* Number of categories exceeded */}
-            <div className={styles.showCategoriesExceed}>
-              {EXPLORE_COPY.numberOfCategoriesExceeded(properties[constants.COUNT_OF_CATEGORIES_DISADV])}
-            </div>
+        {/* Number of categories exceeded */}
+        <div className={styles.showCategoriesExceed}>
+          {EXPLORE_COPY.numberOfCategoriesExceeded(properties[constants.COUNT_OF_CATEGORIES_DISADV])}
+        </div>
+      </div>
 
-            {/* Number of thresholds exceeded */}
-            {/* <div className={styles.showThresholdExceed}>
-              {EXPLORE_COPY.numberOfThresholdsExceeded(properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS])}
-            </div> */}
-
-            {/* Send Feedback button */}
-            <a
-              className={styles.sendFeedbackLink}
-              // The mailto string must be on a single line otherwise the email does not display subject and body
-              href={`
-              mailto:${COMMON_COPY.FEEDBACK_EMAIL}?subject=${feedbackEmailSubject}&body=${feedbackEmailBody}
-              `}
-              target={"_blank"}
-              rel="noreferrer"
-            >
-              <Button
-                type="button"
-                className={styles.sendFeedbackBtn}
-              >
-                <div className={styles.buttonContainer}>
-                  <div className={styles.buttonText}>
-                    {EXPLORE_COPY.COMMUNITY.SEND_FEEDBACK.TITLE}
-                  </div>
-                  <img
-                    className={styles.buttonImage}
-                    src={mailIcon}
-                    alt={intl.formatMessage(EXPLORE_COPY.COMMUNITY.SEND_FEEDBACK.IMG_ICON.ALT_TAG)}
-                  />
-                </div>
-              </Button>
-            </a>
+      {/* Send Feedback button */}
+      <a
+        className={styles.sendFeedbackLink}
+        // The mailto string must be on a single line otherwise the email does not display subject and body
+        href={`
+          mailto:${COMMON_COPY.FEEDBACK_EMAIL}?subject=${feedbackEmailSubject}&body=${feedbackEmailBody}
+          `}
+        target={"_blank"}
+        rel="noreferrer"
+      >
+        <Button
+          type="button"
+          className={styles.sendFeedbackBtn}
+        >
+          <div className={styles.buttonContainer}>
+            <div className={styles.buttonText}>
+              {EXPLORE_COPY.COMMUNITY.SEND_FEEDBACK.TITLE}
+            </div>
+            <img
+              className={styles.buttonImage}
+              src={mailIcon}
+              alt={intl.formatMessage(EXPLORE_COPY.COMMUNITY.SEND_FEEDBACK.IMG_ICON.ALT_TAG)}
+            />
           </div>
-        </>
-      }
+        </Button>
+      </a>
+
+      {/* TEMP FOR CEQ - Imputed income, adjacency and tribal info */}
+      <div className={styles.testSignals}>
+        <div>
+          <span>
+            Income imputed?
+          </span>
+          <span>
+            {properties[constants.IMPUTE_FLAG] ? ' YES' : ' NO'}
+          </span>
+        </div>
+
+        <div>
+          <span>
+            Adjacency indicator?
+          </span>
+          <span>
+            {properties[constants.ADJACENCY_EXCEEDS_THRESH] ? ' YES' : ' NO'}
+          </span>
+        </div>
 
+        <div>
+          <span>
+            Tribal lands?
+          </span>
+          <span>
+            {getTribalPercentValue(properties[constants.TRIBAL_AREAS_PERCENTAGE])}
+          </span>
+        </div>
+
+        <div>
+          <span>
+            Tribal count?
+          </span>
+          <span>
+            {
+              properties[constants.TRIBAL_AREAS_COUNT] ?
+              ` ${properties[constants.TRIBAL_AREAS_COUNT]}` : ` 0`
+            }
+          </span>
+        </div>
+      </div>
 
       {/* All category accordions in this component */}
       {<Accordion multiselectable={true} items={categoryItems} />}
 
       {/* Methodology version */}
       <div className={styles.versionInfo}>
-        {EXPLORE_COPY.SIDE_PANEL_VERION.TITLE}
+        {EXPLORE_COPY.SIDE_PANEL_VERSION.TITLE}
       </div>
     </aside>
   );
diff --git a/client/src/components/AreaDetail/areaDetail.module.scss b/client/src/components/AreaDetail/areaDetail.module.scss
index 890df4acb..c25b70baf 100644
--- a/client/src/components/AreaDetail/areaDetail.module.scss
+++ b/client/src/components/AreaDetail/areaDetail.module.scss
@@ -41,6 +41,13 @@ $sidePanelLabelFontColor: #171716;
       margin-top: 0;
       margin-bottom: 0;
     }
+
+    h3.invert {
+      background-color: $disadvantagedDotColor;
+      color: white;
+      @include u-padding-left('05');
+      @include u-padding-right('05');
+    }
   }
 
   .showCategoriesExceed {
@@ -48,41 +55,38 @@ $sidePanelLabelFontColor: #171716;
     @include u-margin-top('05');
   }
 
-  // .showThresholdExceed {
-  //   font-size: small;
-  //   @include u-margin-top('05');
-  // }
-
-  .sendFeedbackLink {
-    @include u-margin-top(2);
+}
 
-    .sendFeedbackBtn{
-      @include u-text("blue-70v");
-      @include u-bg("yellow-20v");
-      height: 40px; 
-      
-      &:hover {
-        @include u-bg("yellow-20");
-        @include u-text("gray-90");
-      }
+.sendFeedbackLink {
+  @include u-margin-top(2);
+  @include u-margin-left(2);
+  @include u-margin-bottom(2);
+
+  .sendFeedbackBtn{
+    @include u-text("blue-70v");
+    @include u-bg("yellow-20v");
+    height: 40px; 
+    
+    &:hover {
+      @include u-bg("yellow-20");
+      @include u-text("gray-90");
+    }
 
-      .buttonContainer{
-        display: flex;
+    .buttonContainer{
+      display: flex;
 
-        .buttonText{
-          @include u-margin-right(1);
-        }
+      .buttonText{
+        @include u-margin-right(1);
+      }
 
-        .buttonImage{
-          width: 21px;
-          margin-top: -3px;
+      .buttonImage{
+        width: 21px;
+        margin-top: -3px;
 
-          filter: invert(13%) sepia(76%) saturate(5142%) hue-rotate(192deg) brightness(80%) contrast(106%);
-        }
+        filter: invert(13%) sepia(76%) saturate(5142%) hue-rotate(192deg) brightness(80%) contrast(106%);
       }
     }
   }
-
 }
 
 //Census row styles
@@ -121,3 +125,8 @@ $sidePanelLabelFontColor: #171716;
   @include u-padding-bottom(1);
   @include u-padding-left(2.5);
 }
+
+.testSignals{
+  padding-left: 1rem;
+  padding-bottom: 1rem;
+}
diff --git a/client/src/components/AreaDetail/areaDetail.module.scss.d.ts b/client/src/components/AreaDetail/areaDetail.module.scss.d.ts
index 1d3251f2e..6ac2033c7 100644
--- a/client/src/components/AreaDetail/areaDetail.module.scss.d.ts
+++ b/client/src/components/AreaDetail/areaDetail.module.scss.d.ts
@@ -18,6 +18,8 @@ declare namespace MapModuleScssNamespace {
     buttonText: string;
     buttonImage: string;
     categorySpacer: string;
+    testSignals: string;
+    invert: string;
   }
 }
 
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index b9ad863f1..4979be84f 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -197,37 +197,70 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISL
         <h3>
           YES
         </h3>
-        <div />
       </div>
       <div>
         in 5 categories
       </div>
-      <a
-        href="
-              mailto:Screeningtool-Support@omb.eop.gov?subject=
+    </div>
+    <a
+      href="
+          mailto:Screeningtool-Support@omb.eop.gov?subject=
     Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
   &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
     
-              "
-        rel="noreferrer"
-        target="_blank"
+          "
+      rel="noreferrer"
+      target="_blank"
+    >
+      <button
+        class="usa-button"
+        data-testid="button"
+        type="button"
       >
-        <button
-          class="usa-button"
-          data-testid="button"
-          type="button"
-        >
+        <div>
           <div>
-            <div>
-              Send feedback
-            </div>
-            <img
-              alt="Send feedback"
-              src="test-file-stub"
-            />
+            Send feedback
           </div>
-        </button>
-      </a>
+          <img
+            alt="Send feedback"
+            src="test-file-stub"
+          />
+        </div>
+      </button>
+    </a>
+    <div>
+      <div>
+        <span>
+          Income imputed?
+        </span>
+        <span>
+           NO
+        </span>
+      </div>
+      <div>
+        <span>
+          Adjacency indicator?
+        </span>
+        <span>
+           NO
+        </span>
+      </div>
+      <div>
+        <span>
+          Tribal lands?
+        </span>
+        <span>
+           0 %
+        </span>
+      </div>
+      <div>
+        <span>
+          Tribal count?
+        </span>
+        <span>
+           0
+        </span>
+      </div>
     </div>
     <div
       aria-multiselectable="true"
@@ -610,37 +643,70 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
         <h3>
           YES
         </h3>
-        <div />
       </div>
       <div>
         in 5 categories
       </div>
-      <a
-        href="
-              mailto:Screeningtool-Support@omb.eop.gov?subject=
+    </div>
+    <a
+      href="
+          mailto:Screeningtool-Support@omb.eop.gov?subject=
     Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
   &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
     
-              "
-        rel="noreferrer"
-        target="_blank"
+          "
+      rel="noreferrer"
+      target="_blank"
+    >
+      <button
+        class="usa-button"
+        data-testid="button"
+        type="button"
       >
-        <button
-          class="usa-button"
-          data-testid="button"
-          type="button"
-        >
+        <div>
           <div>
-            <div>
-              Send feedback
-            </div>
-            <img
-              alt="Send feedback"
-              src="test-file-stub"
-            />
+            Send feedback
           </div>
-        </button>
-      </a>
+          <img
+            alt="Send feedback"
+            src="test-file-stub"
+          />
+        </div>
+      </button>
+    </a>
+    <div>
+      <div>
+        <span>
+          Income imputed?
+        </span>
+        <span>
+           NO
+        </span>
+      </div>
+      <div>
+        <span>
+          Adjacency indicator?
+        </span>
+        <span>
+           NO
+        </span>
+      </div>
+      <div>
+        <span>
+          Tribal lands?
+        </span>
+        <span>
+           0 %
+        </span>
+      </div>
+      <div>
+        <span>
+          Tribal count?
+        </span>
+        <span>
+           0
+        </span>
+      </div>
     </div>
     <div
       aria-multiselectable="true"
@@ -2008,92 +2074,6 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for NAT
           </div>
         </li>
       </div>
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="test"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_test"
-          type="button"
-        >
-          <div>
-            <div>
-              Testing
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_test"
-        hidden=""
-        id="test"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Adjacency
-              <div>
-                
-      Adjacency percentile?
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Impute flag
-              <div>
-                
-      A flag to inform imputation?
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
     </div>
     <div>
       Methodology version 1.0
@@ -2299,37 +2279,70 @@ exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUE
         <h3>
           YES
         </h3>
-        <div />
       </div>
       <div>
         in 5 categories
       </div>
-      <a
-        href="
-              mailto:Screeningtool-Support@omb.eop.gov?subject=
+    </div>
+    <a
+      href="
+          mailto:Screeningtool-Support@omb.eop.gov?subject=
     Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
   &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
     
-              "
-        rel="noreferrer"
-        target="_blank"
+          "
+      rel="noreferrer"
+      target="_blank"
+    >
+      <button
+        class="usa-button"
+        data-testid="button"
+        type="button"
       >
-        <button
-          class="usa-button"
-          data-testid="button"
-          type="button"
-        >
+        <div>
           <div>
-            <div>
-              Send feedback
-            </div>
-            <img
-              alt="Send feedback"
-              src="test-file-stub"
-            />
+            Send feedback
           </div>
-        </button>
-      </a>
+          <img
+            alt="Send feedback"
+            src="test-file-stub"
+          />
+        </div>
+      </button>
+    </a>
+    <div>
+      <div>
+        <span>
+          Income imputed?
+        </span>
+        <span>
+           NO
+        </span>
+      </div>
+      <div>
+        <span>
+          Adjacency indicator?
+        </span>
+        <span>
+           NO
+        </span>
+      </div>
+      <div>
+        <span>
+          Tribal lands?
+        </span>
+        <span>
+           0 %
+        </span>
+      </div>
+      <div>
+        <span>
+          Tribal count?
+        </span>
+        <span>
+           0
+        </span>
+      </div>
     </div>
     <div
       aria-multiselectable="true"
diff --git a/client/src/components/BetaBanner/BetaBanner.module.scss b/client/src/components/BetaBanner/BetaBanner.module.scss
index f74458ff7..24702bbf8 100644
--- a/client/src/components/BetaBanner/BetaBanner.module.scss
+++ b/client/src/components/BetaBanner/BetaBanner.module.scss
@@ -4,7 +4,6 @@
   @include u-bg("gray-cool-2");
 
   .betaBanner {
-    @include u-display("flex");
     @include u-height(3);
     max-width: 70.25rem; // Needs this exact value to align with GovBanner
     @include u-font("body", "3xs");
@@ -22,17 +21,5 @@
       @include u-height(6);
     }
 
-    .betaPillIcon {
-      @include u-bg("yellow-20v");
-      @include u-height(1);
-      @include u-width(2);
-      @include u-radius("2px");
-      @include u-margin-right(1);
-      margin-top: 0.4rem; //Needs this exact value for vertical alignment
-    }
-
-    .betaHeading {
-      @include u-text("bold");
-    }
   }
 }
diff --git a/client/src/components/BetaBanner/BetaBanner.tsx b/client/src/components/BetaBanner/BetaBanner.tsx
index 1e7ab85e0..4d397d36a 100644
--- a/client/src/components/BetaBanner/BetaBanner.tsx
+++ b/client/src/components/BetaBanner/BetaBanner.tsx
@@ -1,24 +1,13 @@
 import React from 'react';
-import {useIntl} from 'gatsby-plugin-intl';
 
 import * as COMMON_COPY from '../../data/copy/common';
 import * as styles from './BetaBanner.module.scss';
 
 const BetaBanner = () => {
-  const intl = useIntl();
-
   return (
     <div className={styles.betaBannerContainer}>
       <div className={styles.betaBanner}>
-        <div className={styles.betaPillIcon}></div>
-        <div>
-          <span className={styles.betaHeading}>
-            {intl.formatMessage(COMMON_COPY.BETA_BANNER.TITLE)}{' '}
-          </span>
-          <span>
-            {intl.formatMessage(COMMON_COPY.BETA_BANNER.INFO)}
-          </span>
-        </div>
+        {COMMON_COPY.BETA_BANNER_CONTENT}
       </div>
     </div>
   );
diff --git a/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap b/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
index cbc3f79f8..2db53c031 100644
--- a/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
+++ b/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
@@ -4,16 +4,10 @@ exports[`rendering of the BetaBanner checks if component renders 1`] = `
 <DocumentFragment>
   <div>
     <div>
-      <div />
-      <div>
-        <span>
-          This is a beta site. 
-        </span>
-        <span>
-          It is an early, in-progress version of the tool with limited datasets that will 
-    be regularly updated.
-        </span>
-      </div>
+      <strong>
+        This site has been updated.
+      </strong>
+       The current version of the site is 1.0 that was released on Oct 25, 2022
     </div>
   </div>
 </DocumentFragment>
diff --git a/client/src/components/ExploreDataBox/ExploreDataBox.module.scss b/client/src/components/ExploreDataBox/ExploreDataBox.module.scss
new file mode 100644
index 000000000..bd8551e3b
--- /dev/null
+++ b/client/src/components/ExploreDataBox/ExploreDataBox.module.scss
@@ -0,0 +1,6 @@
+@use '../../styles/design-system.scss' as *;
+
+.fileDownIcon{
+    margin-bottom: -4px;
+    @include u-padding-left(1);
+}
diff --git a/client/src/components/ExploreDataBox/ExploreDataBox.module.scss.d.ts b/client/src/components/ExploreDataBox/ExploreDataBox.module.scss.d.ts
new file mode 100644
index 000000000..01bdf2fdd
--- /dev/null
+++ b/client/src/components/ExploreDataBox/ExploreDataBox.module.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace ExploreDataBoxNamespace {
+    export interface IExploreDataBoxScss {
+      fileDownIcon: string;
+    }
+  }
+
+declare const ExploreDataBoxScssModule: ExploreDataBoxNamespace.IExploreDataBoxScss & {
+    /** WARNING: Only available when "css-loader" is used without "style-loader" or "mini-css-extract-plugin" */
+    locals: ExploreDataBoxNamespace.IExploreDataBoxScss;
+  };
+
+  export = ExploreDataBoxScssModule;
diff --git a/client/src/components/ExploreDataBox/ExploreDataBox.test.tsx b/client/src/components/ExploreDataBox/ExploreDataBox.test.tsx
new file mode 100644
index 000000000..b6c89a4c7
--- /dev/null
+++ b/client/src/components/ExploreDataBox/ExploreDataBox.test.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import {render} from '@testing-library/react';
+import {LocalizedComponent} from '../../test/testHelpers';
+import ExploreDataBox from './ExploreDataBox';
+
+describe('rendering of ExploreDataBox Component', () => {
+  const {asFragment} = render(
+      <LocalizedComponent>
+        <ExploreDataBox />
+      </LocalizedComponent>,
+  );
+  it('checks if component renders', () => {
+    expect(asFragment()).toMatchSnapshot();
+  });
+});
diff --git a/client/src/components/ExploreDataBox/ExploreDataBox.tsx b/client/src/components/ExploreDataBox/ExploreDataBox.tsx
new file mode 100644
index 000000000..352bbdfb9
--- /dev/null
+++ b/client/src/components/ExploreDataBox/ExploreDataBox.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import {SummaryBox, SummaryBoxContent, SummaryBoxHeading} from '@trussworks/react-uswds';
+import {useIntl} from 'gatsby-plugin-intl';
+
+import * as EXPLORE_COPY from '../../data/copy/explore';
+
+import * as styles from './ExploreDataBox.module.scss';
+
+// @ts-ignore
+import fileDownIcon from '/node_modules/uswds/dist/img/usa-icons/file_download.svg';
+
+
+export interface IExploreDataBoxProps {}
+
+const ExploreDataBox = ({}: IExploreDataBoxProps) => {
+  const intl = useIntl();
+
+  return (
+    <SummaryBox>
+
+      <SummaryBoxHeading headingLevel='h2'>
+        {intl.formatMessage(EXPLORE_COPY.EXPLORE_DATA_BOX.TITLE)}
+        <img tabIndex={0} className={styles.fileDownIcon} src={fileDownIcon}
+          alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.PLUS)}
+        />
+      </SummaryBoxHeading>
+
+      <SummaryBoxContent>
+        <p>{EXPLORE_COPY.EXPLORE_DATA_BOX_BODY}</p>
+      </SummaryBoxContent>
+
+    </SummaryBox>
+  );
+};
+
+export default ExploreDataBox;
diff --git a/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap b/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap
new file mode 100644
index 000000000..0bd884513
--- /dev/null
+++ b/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap
@@ -0,0 +1,43 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`rendering of ExploreDataBox Component checks if component renders 1`] = `
+<DocumentFragment>
+  <div
+    class="usa-summary-box"
+    data-testid="summary-box"
+  >
+    <div
+      class="usa-summary-box__body"
+    >
+      <h2
+        class="usa-summary-box__heading"
+      >
+        Get the data
+        <img
+          alt="
+      a plus icon indicating that the user can zoom in
+    *"
+          src="test-file-stub"
+          tabindex="0"
+        />
+      </h2>
+      <div
+        class="usa-summary-box__text"
+      >
+        <p>
+          
+    Download the data with documentation and shapefiles, from the 
+          <a
+            class="usa-link"
+            href="/en/downloads"
+          >
+            downloads
+          </a>
+           page
+  
+        </p>
+      </div>
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/client/src/components/ExploreDataBox/index.ts b/client/src/components/ExploreDataBox/index.ts
new file mode 100644
index 000000000..34236e9dc
--- /dev/null
+++ b/client/src/components/ExploreDataBox/index.ts
@@ -0,0 +1,2 @@
+import ExploreDataBox from './ExploreDataBox';
+export default ExploreDataBox;
diff --git a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
index b2adf1deb..46de256cd 100644
--- a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
+++ b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
@@ -162,16 +162,10 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
     </div>
     <div>
       <div>
-        <div />
-        <div>
-          <span>
-            This is a beta site. 
-          </span>
-          <span>
-            It is an early, in-progress version of the tool with limited datasets that will 
-    be regularly updated.
-          </span>
-        </div>
+        <strong>
+          This site has been updated.
+        </strong>
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
diff --git a/client/src/components/J40Map.module.scss b/client/src/components/J40Map.module.scss
index f9388d08c..2f020172f 100644
--- a/client/src/components/J40Map.module.scss
+++ b/client/src/components/J40Map.module.scss
@@ -11,20 +11,30 @@
   .mapHeaderRow{
     @include u-display("flex");
     @include u-padding-left(1.5);
-    justify-content: space-between;
-    
+
+    @include at-media-max("mobile-lg") {
+      flex-direction: column;
+
+      @include u-padding-right(1.5);
+
+      .geolocateBox {
+        align-self: flex-end;
+      }
+
+      .geolocateBox > div {
+        right: 13px;
+      }
+    }
+
+
     .geolocateBox {
-      // flex: 1 2 47%;
-      // align-self: flex-end;
-      // margin-bottom: 30px;
-      // margin-left: 1rem;
       margin-top: 6px;
+      @include u-margin-left(1);
 
       .geolocateMessage {
         visibility: visible;
         background-color: white;
         margin-bottom: 3px;
-        max-width: fit-content;
       }
       
       .geolocateMessageHide {
@@ -33,9 +43,7 @@
         margin-bottom: 3px;
       }
 
-      .geolocateIcon{
-        // align-self: flex-end;
-      }
+
     }
   }
 
@@ -66,7 +74,5 @@
 .j40Map {
   @include at-media-max("desktop") {
     height: 55vh;
-    @include u-margin-top(7); // Allow for tribal toggle to appear above map on screens < 1024
   }
-
 }
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index 40adad80f..21a9774b5 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -401,26 +401,24 @@ const J40Map = ({location}: IJ40Interface) => {
 
             {/* Geolocate Icon */}
             <div className={styles.geolocateBox}>
-              {windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
-              <div
-                className={
+              {
+                windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG - 1 &&
+                <div className={
                   (geolocationInProgress && !isGeolocateLocked) ?
                   styles.geolocateMessage :
-                  styles.geolocateMessageHide}
-              >
-                {intl.formatMessage(EXPLORE_COPY.MAP.GEOLOC_MSG_LOCATING)}
-              </div>}
-
-              <div>
-                <GeolocateControl
-                  positionOptions={{enableHighAccuracy: true}}
-                  onGeolocate={onGeolocate}
-                  onClick={onClickGeolocate}
-                  trackUserLocation={windowWidth < constants.USWDS_BREAKPOINTS.MOBILE_LG}
-                  showUserHeading={windowWidth < constants.USWDS_BREAKPOINTS.MOBILE_LG}
-                  disabledLabel={intl.formatMessage(EXPLORE_COPY.MAP.GEOLOC_MSG_DISABLED)}
-                />
-              </div>
+                  styles.geolocateMessageHide
+                }>
+                  {intl.formatMessage(EXPLORE_COPY.MAP.GEOLOC_MSG_LOCATING)}
+                </div>
+              }
+              <GeolocateControl
+                positionOptions={{enableHighAccuracy: true}}
+                onGeolocate={onGeolocate}
+                onClick={onClickGeolocate}
+                trackUserLocation={windowWidth < constants.USWDS_BREAKPOINTS.MOBILE_LG}
+                showUserHeading={windowWidth < constants.USWDS_BREAKPOINTS.MOBILE_LG}
+                disabledLabel={intl.formatMessage(EXPLORE_COPY.MAP.GEOLOC_MSG_DISABLED)}
+              />
             </div>
 
           </div>
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index 7224b6f2e..ef75809bf 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -30,6 +30,8 @@ export const MISSING_DATA_STRING = '--';
 // Tribal signals
 export const TRIBAL_ID = 'tribalId';
 export const LAND_AREA_NAME = 'landAreaName';
+export const TRIBAL_AREAS_PERCENTAGE = 'TA_PERC';
+export const TRIBAL_AREAS_COUNT = 'TA_COUNT';
 
 // Set the threshold percentile used by most indicators in the side panel
 export const DEFAULT_THRESHOLD_PERCENTILE = 90;
diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx
index 11492f8c7..08f2096a5 100644
--- a/client/src/data/copy/common.tsx
+++ b/client/src/data/copy/common.tsx
@@ -28,21 +28,24 @@ export const linkFn = (to:string | IDefineMessage, isInternal:boolean, isOpenNew
 
 export const FEEDBACK_EMAIL = 'Screeningtool-Support@omb.eop.gov';
 
+export const METH_1_0_RELEASE_DATE = new Date(2022, 9, 25, 11, 59, 59); // Oct 25
+
 
 // Beta Banner
-export const BETA_BANNER = defineMessages({
-  TITLE: {
-    id: 'common.pages.banner.beta.title',
-    defaultMessage: 'This is a beta site.',
-    description: 'Navigate to the about page. This is the main title of the beta banner',
-  },
-  INFO: {
-    id: 'common.pages.banner.beta.info',
-    defaultMessage: `It is an early, in-progress version of the tool with limited datasets that will 
-    be regularly updated.`,
-    description: 'Navigate to the about page. This is the main info of the beta banner',
-  },
-});
+export const BETA_BANNER_CONTENT = <FormattedMessage
+  id={'common.pages.alerts.banner.beta.content'}
+  defaultMessage={`<bold1>This site has been updated.</bold1> The current version of the site is 1.0 that was released on {relDate}`}
+  description={`Alert body that appears on landing page.`}
+  values={{
+    bold1: boldFn,
+    relDate: <FormattedDate
+      value={METH_1_0_RELEASE_DATE}
+      year="numeric"
+      month="short"
+      day="numeric"
+    />,
+  }}
+/>;
 
 export const TSD = defineMessages({
   URL: {
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 2b50b1ea2..cda1f8425 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -13,6 +13,8 @@ export const EXPLORE_PAGE_LINKS = {
   TRIBAL_ACTION_PLAN: `https://www.whitehouse.gov/wp-content/uploads/2022/01/CEQ-Tribal-Consultation-Plan-04.26.2021.pdf`,
   TRIBAL_WHITEHOUSE: `https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/26/memorandum-on-tribal-consultation-and-strengthening-nation-to-nation-relationships/`,
   TRIBAL_FED_REGISTER: `https://www.federalregister.gov/documents/2000/11/09/00-29003/consultation-and-coordination-with-indian-tribal-governments`,
+  CENSUS_15_19: `https://www.census.gov/programs-surveys/decennial-census/data.html`,
+  DECENNIAL: `https://www.census.gov/programs-surveys/decennial-census/data.html`,
 };
 
 export const PAGE_INTRO = defineMessages({
@@ -28,18 +30,26 @@ export const PAGE_INTRO = defineMessages({
   },
 });
 
-export const PAGE_DESCRIPTION = <FormattedMessage
-  id={'explore.map.page.description.text'}
+export const PAGE_DESCRIPTION1 = <FormattedMessage
+  id={'explore.map.page.description.1'}
   defaultMessage={`
-    Use the map to see communities that are identified as disadvantaged. The map uses 
-    publicly-available, nationally-consistent datasets. Learn more about 
-    the methodology and datasets that were used to identify disadvantaged communities
-    in the current version of the map on the <link1>Methodology & data</link1> page.
-    `}
-  description={'On the explore the map page, the description of the page'}
-  values={{
-    link1: COMMON_COPY.linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
-  }}
+    Overburdened and underserved census tracts are highlighted as being disadvantaged on the map. The map also highlights areas within Federally-recognized Tribal reservations. These areas are also considered disadvantaged.
+  `}
+  description={'On the explore the map page, the first description of the page'}
+  // values={{
+  //   link1: COMMON_COPY.linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
+  // }}
+/>;
+
+export const PAGE_DESCRIPTION2 = <FormattedMessage
+  id={'explore.map.page.description.2'}
+  defaultMessage={`
+    Zooming and selecting shows information about each census tract or tribal area. Change the selection to see information about tribal land areas.
+  `}
+  description={'On the explore the map page, the fifth description of the page'}
+  // values={{
+  //   link1: COMMON_COPY.linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
+  // }}
 />;
 
 export const LEGEND = defineMessages({
@@ -59,6 +69,25 @@ export const LEGEND = defineMessages({
   },
 });
 
+// Explore the data box
+export const EXPLORE_DATA_BOX = defineMessages({
+  TITLE: {
+    id: 'explore.map.page.explore.data.box.title',
+    defaultMessage: 'Get the data',
+    description: 'On the explore the map page, a summary box title of Get the data',
+  },
+});
+
+export const EXPLORE_DATA_BOX_BODY = <FormattedMessage
+  id={'explore.map.page.explore.data.box.body'}
+  defaultMessage={ `
+    Download the data with documentation and shapefiles, from the <link1>downloads</link1> page
+  `}
+  description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the fifth paragraph of this side pane`}
+  values={{
+    link1: COMMON_COPY.linkFn(PAGES_ENDPOINTS.DOWNLOADS, true, false),
+  }}
+/>;
 
 // Map
 export const MAP = defineMessages({
@@ -386,7 +415,7 @@ export const SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT = defineMessages({
   },
 });
 
-export const SIDE_PANEL_VERION = {
+export const SIDE_PANEL_VERSION = {
   TITLE: <FormattedMessage
     id={'explore.map.page.side.panel.version.title'}
     defaultMessage={ 'Methodology version {version}'}
@@ -1181,49 +1210,39 @@ export const DOWNLOAD_DRAFT = {
 export const NOTE_ON_TERRITORIES = {
   INTRO: <FormattedMessage
     id={'explore.map.page.under.map.note.on.territories.intro'}
-    defaultMessage={`A note on the U.S. territories`}
+    defaultMessage={`U.S. territories note`}
     description={`Navigate to the explore the map page. Under the map, you will see territories intro text`}
   />,
   PARA_1: <FormattedMessage
     id={'explore.map.page.under.map.note.on.territories.para.1'}
     defaultMessage={`
-      The data sources described on the <link1>Methodology & data</link1> page are used to 
-      identify disadvantaged communities in all fifty states and the District of Columbia. However, not all 
-      of these data sources are currently available for the U.S. territories.
+      Puerto Rico: The <link1>U.S. Census Bureau's American Community Survey data</link1> from 2015 - 2019
+      are used for all fields in the workforce development category except for linguistic isolation. Linguistic isolation was removed based on feedback during the beta period. Proximity to National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, traffic proximity and volume, diesel particulate matter exposure, energy cost and housing cost were added for Puerto Rico in the 1.0 version.
     `}
     description={`Navigate to the explore the map page. Under the map, you will see territories paragraph 1`}
     values={{
-      link1: COMMON_COPY.linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
+      link1: COMMON_COPY.linkFn(EXPLORE_PAGE_LINKS.CENSUS_15_19, false, true),
     }}
   />,
   PARA_2: <FormattedMessage
     id={'explore.map.page.under.map.note.on.territories.para.2'}
     defaultMessage={`
-      For Puerto Rico, the Census Bureau’s American Community Survey data from 2015-2019 are used for higher 
-      ed enrollment rate and all the other fields in the Training and Workforce Development category 
-      to identify disadvantaged communities. Data in the other categories are unavailable at this 
-      time.
-    `}
+    American Samoa and the Northern Mariana Islands: The <link1>Decennial Census data</link1> from 2010 are used. The CEJST uses the following data for these territories: unemployment, poverty, low median income, and high school education. These burdens are in the workforce Development category.
+  `}
     description={`Navigate to the explore the map page. Under the map, you will see territories paragraph 2`}
+    values={{
+      link1: COMMON_COPY.linkFn(EXPLORE_PAGE_LINKS.DECENNIAL, false, true),
+    }}
   />,
   PARA_3: <FormattedMessage
     id={'explore.map.page.under.map.note.on.territories.para.3'}
     defaultMessage={`
-      For American Samoa and the Northern Mariana Islands, the data used to identify 
-      disadvantaged communities are from the 2010 Decennial Census, the last reported data from the 
-      U.S. Census Bureau. Available data for these territories includes unemployment, poverty,  
-      low median income, and high school degree achievement rate fields in the Training and 
-      Workforce Development category.
+    Guam and the U.S. Virgin Islands: Some <link1>Decennial Census data</link1> from 2010 are used. They show burdens in the workforce development category. The data includes: Unemployment, poverty, low median income, and high school education.
     `}
     description={`Navigate to the explore the map page. Under the map, you will see territories paragraph 3`}
-  />,
-  PARA_4: <FormattedMessage
-    id={'explore.map.page.under.map.note.on.territories.para.4'}
-    defaultMessage={`
-      Work is currently underway to identify disadvantaged communities and update the 
-      map accordingly for Guam and the U.S. Virgin Islands.
-        `}
-    description={`Navigate to the explore the map page. Under the map, you will see territories paragraph 4`}
+    values={{
+      link1: COMMON_COPY.linkFn(EXPLORE_PAGE_LINKS.DECENNIAL, false, true),
+    }}
   />,
 };
 
@@ -1236,22 +1255,9 @@ export const NOTE_ON_TRIBAL_NATIONS = {
   PARA_1: <FormattedMessage
     id={'explore.map.page.under.map.note.on.tribal.nations.para.1'}
     defaultMessage={`
-      The map covers all U.S. census tracts, including those located within Tribal Nations, to the extent 
-      that data is available (see our <link1>Methodology & data</link1> page for more information). CEQ 
-      is engaging in consultation and coordination with Tribal Nations on the beta version of the map 
-      to provide Tribal Nations with meaningful opportunities for input, consistent with CEQ’s <link2>
-      Action Plan for Consultation and Coordination with Tribal Nations</link2>,
-      President Biden’s <link3>Memorandum on Tribal Consultation and Strengthening 
-      Nation-to-Nation Consultation</link3>, and <link4>Executive Order 13175 on Consultation and 
-      Coordination With Indian Tribal Governments</link4>.
+      To honor the Administration's commitment to the Federal trust responsibility to Tribal Nations, areas within the boundaries of Federally recognized Tribes, including Alaska Native villages, are designated as disadvantaged. In some areas, like rural Alaska, this includes Tribal areas that are smaller than a census tract. 
     `}
     description={`Navigate to the explore the map page. Under the map, you will see tribal nations paragraph 1`}
-    values={{
-      link1: COMMON_COPY.linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
-      link2: COMMON_COPY.linkFn(EXPLORE_PAGE_LINKS.TRIBAL_ACTION_PLAN, false, true),
-      link3: COMMON_COPY.linkFn(EXPLORE_PAGE_LINKS.TRIBAL_WHITEHOUSE, false, true),
-      link4: COMMON_COPY.linkFn(EXPLORE_PAGE_LINKS.TRIBAL_FED_REGISTER, false, true),
-    }}
   />,
 };
 
diff --git a/client/src/images/wh.webp b/client/src/images/wh.webp
new file mode 100644
index 0000000000000000000000000000000000000000..78349f1f152a6829a8e85c6479c111a344510324
GIT binary patch
literal 16548
zcmV)<K!v|jNk&GTKmY(&MM6+kP&iDGKmY(Q|G|F{RSVm;jU-Y1mp%JkbZJCPfPdNY
zRhM@?JnQXAuXi1~XwlLA&{`#x%7qj?9B4$6VPSTx&=L)lgEUoHwv|c~N7kh>)+=q@
zX1}@i743Q9dRPvRTl$xn=l@?W%gO%}++pQx-F3y*9o7y@cXx+Bz;*BL?oRakT@3X+
z-}Bfx2kYNm;>^_Ts(2>u?n|4B-9fvcw^`y2alOUFM{rgacj+o_&5C%ioi$WEy@(v#
z-JutePSI7dv&CU&2ajjuU`uy7@urBU{{h_LpcB^)?(Q176!G-pZgE(qYPu?}O;zLW
z4w1&~Qrwyq?(8C65D)I|I^3yr<RC*+Tz2jbH>qC4(^N&io5o%56kSs{<(>zZm3uGZ
z=|$vharZ-UYbvgdyE~jkJiUlC?(Xm`;-1{b-Q6wjf)@ixlG615KZ?Ya5W|5aNv0jm
zXMfwazXW9a*EWL8%G_N_DAO|E&ZcF)&h6aY-F<TIex-zScXyX^?ia$zT*65RlMsG<
z6QKS1|8;j8>7N;Qe4IMWapTl!nBy=rxDAuT%*<47%FGakVqC^hnOugXb`3+m@6Y}H
z{chjCa}PX%#bJ-ma;&6kMp2H=j8%-h)LF0U-NEJm0Ec;;p{%S(#pHA?=Sie!PG)+x
z!#uN0k5*?HA{CUa<Ss;xPRCVhspKfF-L*96WoA0h7QM_n5cRk^s)sC3)kIdJvujPV
z6zM$jGV>#*vot(jMJgroM6q<Xk-X(Psubl>G|cm8`L~Q--YDg4j~uz6Y~-axF1VGL
z$%~Jfd50(Rs&?1I;OetUP8(&I(uy7}=K1nQ`Yi8e<!r6W%Bid#WqNN)mdeexj+V*V
zhs+Q845fKsDISVDmZeDLy2naoY1mn2W@aAd%$`{<Sh)+ioyr=tJj=t6md-vyDGUIV
z@&BPRGP6St1ORAZeT68J?2)}!jygq=BsEr0#v2=`Lk_Q;dICg*|0Db#;r|H#NBBR&
z{}KL=@PCB=Bm5uX|D%l;aYZ~47SSV#$Ur0qDMhN+jf_PmBU6#385tSC8f24Hq&6cX
z1DOv@9Xv1*7`|@A*b^iLi3h?n5nsgKS%ff%H=+a5kOE{hG8<Wg>_HA87m!=XJ>(f;
zLEa%B5FYu3G*(605fS-=bbGyCL_r`GQN3O-AOnBO%8=Hoh>(MPLf#-RN{|Q04dfDX
z1lfhuM<c@l<NT5ESj5^n6IwG;Iry5F+E(CO#i;a6r63X_yG>TUiS&At%QlrBRT23%
zQG`R*A>)x^BsSg&;zu-qYb@fAXp#QN#FGY26d|2%gj_CwSUX*=NSB$qY~&2E2^f1^
zT?hPg<3pD7!4G)0F$u{)21g_2hlvTY)(3NtM|F_pNcmh>-o{+S)>&ZXCLvkC&}d{I
zat--{{ByC6mM*vgV9FRzPmt*Bu!9fKAfd-KPhbmj3V0S%7RkDt8nbrb9I&ew^{+49
zLFWVFC;P7zkXOi$GL!WkP)na|gvcG_z~GZY4mHaPCm?eNp0}xFKyk4_bSDGtG02Ht
z%pY;IEC(21ADf97fW<v1Wn)^lp^ScK=7t<tfOYOzUL09mJIc*Q){FwqbO6X%IpFPg
zM1?bvyj~!t(Uh_gPFeOV0ki8zB7KgfMw6Bd?0J}+ARA|I)I>+I@Rc{}DDtftSqR*T
zOEuYOyHewTYsgAqpyS8yS$gl6o$7V5F?V@WimEIgarRq|8i4U2!HY+B<goG2LAFh;
z>xF&?j1SOXS?`f24X~X!!joS2nmvvcKfnUzz&hYT8QYVk=ZS1tch?;!AtbFPaHA?~
zws!$G_zmm+mURhQt9$r$eX-SCqVq%b&_fT)Kh&}&Cw)1G>7j=nR(w2NFcGbri>>w9
z(r-u%J}YJhnk!WK`9g=t<Q6{Bip7zvtzH$BW0macbTdm|p+${EtF_cz6&lE`TGC+N
zaZ*WKl<9Y+`9mrGRFXemasE=AyA<PZMcUgf-O??&v63tMkUmc<-O?@H(!AWQSa->l
zt3-b}Yw7+_ChjT<i*whJdw;U&BFwkt7SR(+osrHqvkG>t?qQzA;B#SDanzKa3J7#?
zgge=j6(h}F*1*dXz^gzTR*)w#boUJ#5Yzg<Y04FE&mw!G4JtHLTGhvqTRgaNQUT_b
zuleKypS<9cCw%4(iVM)RKy$9O%hlT4wB}4}m!to<za03}7+4tR0gB3{Q9_<HU-Qb}
zyj(k}+_0%S&gx2?R$6KCBi7LlL|dO&GQSV=4GZMtT|x53%#lGrTr`m72|FqP263+p
zEF6cM)!zCBN8UoL=UdkN9Nn;E701=tVHVm`EmFmO?p1)BBCPa1(C2AYq?0PZRjp~z
zT&*l(raIn%h|$*cZ0Q}7RaH-KQ3jG6>xl5R5h;G(I99i3W$^fsXe&6rb{DtEk!qPr
z^_NzqVNtw0g+!lq-sY35LR{6AJ1tRVF(cOA;#PR5E-$gpk9ZY8o|t)46Fjc<g&hoy
zE<PH$l8z9o*NXt_e3q56=T#TnGfh=t)=J_kRet7WfIfds0p_Pfcd96?YRiLWs<42T
zS=x%MoLy^sw#!q1{BY!^9%iI-^*Im#TOi{Gi%MCwncu@wW~9|tnzgd9=yj63;o}Vc
zP?0**nr`9t5vCGc)RG5nwZbwNw;CoqeMnB2xj1gc3Gohsc%X82QGmiK?M_T9Ii7{}
zR2``|y6=MRE2IV$vorm7(n9S|_LBUmwlr8sORem<qRIy|q5!`(G)a&B7Y1CBk-)29
zBr9I@rXcfpYq>}#i)n>Q72%>l^P|!NO@oSFW2`E~{FEOyLoZ{6*7Ys%JP8zqcg&H&
z*IM|G`|LTZa4fwT2P@yZ0^Y}(pKVo#SjOare!_z7Pb?Ia`J12e!sg#BYjF|Rd~Mx|
zfp7JU>Hwnm*livpt$Iu(E8S!**S5k<EqR7^P<5DPM`1b-`=~O`TA<2OXUM~$*7gu5
zzHww;6`+5}E(<42Yr)fIh5KK_wQZ~=DxJGzcgoLvG$>r{@_|=`>e590y4G+VUIgM7
zv%3gcmr!VT`IDxV=w@Y`tc*R2=&8DMrySf|n=uMstHRymlC`DY!bfUVOdOF{%)!J7
z0tSy=Wwo(9zz12;KX-NPSa?qj82R+hK|`TzkjS-tloxg_Qza>{n1hJ0`t{jQfPEXw
zmm<W<O`yN7XIaU1HCcsJE<rIsp{=nl5ic#&O6SYt@gw?{ykT~wA{!7kWEX{y_}+gu
zD_49UNteBR&DTm86z+fSao*5sFSbE3CEyD)r)L1MfTP`G0pZcW8$@NrdKF;UrO(i_
zm5-Zz%m;;i$l02%!tqyk9sFT4u1ZqazCi-#IVCSEHtKS>uVpG#6=#K*AJh)c!#ygC
zt2SC`w|abGc9+caPVAUxp4yBMkrf+vfjw7wTomnYx~N^u6O`;##94@L7&GDtbLy1F
zP-v%EYevlJCM$Hq9|~M==>!_p4z-i9Le9fHYD}Z$Y#(13AfWvQflzzI-<_JsA6BM!
z1+4d*R&xn;(e84&prLkDQ>44KSSxYY`z?liU}i)Dc1+H1XIO|YP>#G{Wo~zk*VfTu
zYEFYf?E|&1ecj^HCzo`?%D@Ze(Eua6V^@TbEZ{&2D^bk6qT^}16{?OiKd8O^9u<ex
z{911Lo7%uP@q&ZEp`Li`2Y~(I1-n^^|EJ@{)RkJL;wdC*e^n*;OTD?%@eb(mfz24C
zwzA(&0P@ye%u0NPCC-?;IJvgD!5?amor9L5g0NZaOhn}YbMl6OYJ0%y&JU*p#J2Y?
zK<dSeL>Yc(ra|p<*nHqsHtrTVQqviUoUyBPTG^JtvvS9<V77gNZogrT*D>Fg%Z1u+
zH%@A@)>eBRQ*p-Z%3FS{W#|^a;$pVB7;goevMt8nG^j0qjXma0%o(#6;S$2eEq;>A
zX4~5YZoJe|8K8FEzIcCWhJ@uGpABcsPdv<S8#O>z9%*KqdlBe2H(F}B>`^<f1zL&z
z)KF>sFzz_D*;g}UFL&)z^0KWBSH-RdOCyyPYWI!PHd-59GsYPQCyE$D#w)(cM<B#D
zHcHrXt30!oR!|wJ1zP0BYGV!0;h!T$D7|{N!3wW@j%;h2wLIGrW~>nRLgit8_S1GR
z^yi-&W}Xp}95zzr#*oK0Hd@oQEn=i93M&^{L1m&tRbjS-5gFD$N4zOyXs%(h5EiK4
z6x-O}uH3~*KJY?i<4N7c$r48-HAiWwUHy22WF^e5lx@61rs_x?H}-}~NKN5Zsyz>4
zaKns9-+&nUZ;1ZF8O}=FdVI*f(%PeP(m80?)-qMr|4rPm3A}r~u;H;n-{<lasKlw5
zx&0Y%>kpHm@=^=52#X!Db$!Hy3r5J>dym2KSFUq;3N+%hJ25<ZO=;i)6jW~J2}%uV
z<Y80hTriu+vC4iU<C|*_g2biK>aQb2E>wONZ7=&;-NiUz^J0&|XI%W_L0*~6rDOXm
zFz-0hMP;Z(FBv@x#0571Sb*_`Mg`C;9Qnbv6xaR`^}L*9fXY$LJe|}W2|2i6ZVxik
zZ%pE+w<)&i^0%*?u*=IRs65?j8F*-ab0%DH8L}>9KmevYfXT}?^rnD)w@!sPVNt27
z1=<H*k627N;09)dXf31R2cm~OZKfA9ce0p4MnPq(<{~jtbHHxk!dU#q!ut6sxtU&E
z({uDQBPwGfH&4QpChXWmZUI?gLowGxw&hCLQ*D~5P&w-Yv})s|!xa$OF&B-;G7xh`
zENnx6vxh;YZ8G1{JqyGEM**eAq5edKY%pCjRrvYNw5Gg4EYQ3fE{*kz$p&1peuLlx
zsw*<R%?gjFg0Qhe<!;#fJHXnYY8n|wt=eY<3J0IV^p1<@iAhlTyN&sYy*`IHqCWy1
z=QQEbzi@OJ)35P4TBA}NR0f~lDb+{ENaH*Kd%X)I)9;Je`^~08<**iL?``GmVaM&M
zq<39v4>8Yj!U0vNEY>+n{G7}<b;<e$6#pGU%(C26b`2_zleu<}C$|z=aa8>}7M^59
zChzSr=WY}f!q%>><jOvh2_r<aHd|pG4`Iept8P@U{D=|wz~s|3Tw4Yxh|9svqkCZA
z@5vt81!#f@vDP#gi5bVNI;2xb&WSL!HwDE#j!RHb7+0NUYyGy#yLniLJ1~0-B-ES+
zrQso8^ASRtTGF74OE6>P%hbZU1SBUiwg1kyC#E$DCL$uEgezvxl2@c@s<|({n{<~Z
z4V2cb!UpruN|kZ3yiFOh;sq~WkJg7gU}}@QD;*CyD6EJ`OdNZfY4jG;V*&?tO2SLV
zEUdUBOMhY)?WVH)Z+nh~!b@`Ntsr#Jp$I3%cVYz)aH-FF)14Iunb@;HfeW%fD4=E9
zxZpv|-+s2@RRAJ3=Lq=gODC&)nRxx*w78jY<0KStpFsd&wnH>b#K}Jlxa&!{iF788
zH+Udaa$)3sI{R2N5x1w3M@Q<f$i&@>X(2rm2$f!Tf3#0W9}N?6RQ-sxZUDhCOzgC<
zktx{xps=embp#Q%d^`Jo_R#7Uf{63hrx)2j?IQA`phb^_3We7zG?*I?<tNE5HnV!R
zWqbfbk;W57fxw#fqxA4KL|hcB4~4)!pqFWFqU)jn^Xtky&_}znaMyUP{mbPZ-zwPE
z!RAx~DKNkNEIoV;kvT!cRS!P=<tdOhN^Gs#U0gBlf&xyWnF9*ug3Y7d$=R^sl&A7&
zpZ_iVSYn%{qa7&4pBx0AkhV*;)D<~28_q$D2%~wKqZqSs`lw~%&K{L$s43oGG8(c$
z)C~dAS{J_Qvl3HrrN>jUKP5xqZTEF99I3y16=<j_2~RKUT>vJGD9x7BHf!*1VjJn9
z!lKaD0_~&~hSio|;fSK8`8YM^(LCKl<siV&ZorF)OxRp_SksWiip(~4ow<Vo+b)0m
ziqKGP1U4tBgWYgNVU@&Kcp+9BCjGHtL>#V`Wdo;78jla@T_vpSQ}nWsky$kpISCwf
zNi))5ZMnrmzVH%WSWoVRV#6~kr(Hf^VG5HvzI-AS(z@m2s_%`h^&up?&C1xbke2Gx
zmHTlJTDomeL7z=9I;>gs=R}g&T=R@5p!0!OJ*BhE$#rpwsS=Rn_tC)$G*>GN?}^_h
zi73s}FZVF5v`VRX5LlRPkt30l2?KonT9pNyK!{1tT$H=T5>DH0t(R7FiBKjabweLI
zM=5wJ#QwO1Pog62t-;bdvm_#NoO0}H;!Gu|oN28jcbb%q`O}D2n|#R3lVMU{F;N)X
z<pEk@<}pF1%jf7#K_dAmTBY}JsM=G{Y;O7weRK#}CLR_xQcvQ~#0L^B{daY-mZ>zd
znSo$J{8bl9K*4UHHl#%elMutChrV)D@TRFaFUY<$h-ez9g0LDsB}p~%_>tTp%EgUy
z&=AqIaQo<EM|qhKBH}YQR2px|mnSih)P0XVpETL?s1Ate(kLlXaeY{g;={U2XB{6Q
z;k;Y-YtX$Rr<gS7VrBvredvK##1yv&QX3p!C1Ih1ArF7BrLE9(2}rVjmy9iOgpPAd
zh=`$&(qs{KwYG2b+j=YYGO{TmCfY?Ct<d?Q^eiP1ZRi`O?&-9{A#S^&+G=kF#<>el
zZ>6zX(-8n#pzVN$=a{8IO9o_`z}Kemw6xMnE3N)II6cLr-|TC+D&nG@p1QNGlhpUo
z@nW8Bw$OHn2EM=c*YfK{AR?k18Py}G5YafoM2jD>9FmC0*OF%>d~mZO+@r=c+H%}}
zxt!ytpb$)SiZn=frT%M9Cli_UJq%)?@X+k=oSwrL#}Dps<MI1-BB?pXJ3)3`M6@q6
z>~_%krUo@6sZ;&5m#iwzJ|`mLW{>jx<5)=|Q7`x4cR5)>=4af)bGZ=%L4dQmRTBQY
z?r2W4fI{Nfw+aQ|p@v{w=MDpbzzFyA?BUm=8j)n9)g0n<GoDm~h}KvB68m;cKw!g!
ztG=#gNl1Z+s4CPvDhaDa^;i}OL}V4t!=c{vmp}~OJPFG=4C9AQhQhE_;g4mvx&<IX
z=ms^$>Iot+Wtw(IMi+%(6=6mU(?sg>U@cQA*L@Z3Z%x$NS}!7!WW&sBezql!Nb&B1
zh^RA^TRbdiWb}xwzfW3I9z}Ku3L;{l@GC#A^fn?%)?4&U%y|jZV*TZH$JKKp+1s4~
zdx3yvw`IeE&jc`NOV*Ix6bS<Mih@L(>OxBxkzlT@wC58Hl%6Du+l{uY#Whk|BikXy
z8mbh3a-TaL?!f;c4u6`upGmYpL&P{cTSSlDW++KS{yyKCO7({feyU5O8P5Jb1PhM7
z?9CXlKnS@Jt0n&B1FcM%x$fLS#i}#<eBwmLyv>J^R{_F}_QggRqoS~Smjm07)bt(>
z)hZPZm;n)Wit@KU7dBF>zJw8RYqE}KIez1{7A629j*|8VENw-`vXMX}{<H=5Om%TI
zW1Ld))Lg9`KSvfe_Gw>9MjgdtP-`0W$AVJ_@7Iv7&yGnKKVvEdqXk;6sn_qI;Eqoq
z8<WJJbZ^%h`EMNTk95UY8j@^uwAXf=adi;Uv>e<GAGkjw;-Pu&#f-!dH-m`Iw3cLo
zkGEo`CYM0u<nbYo+$xpI!Odrl+)K+;`nFCij8B(xP;e)k`5uY~Pr9I%v0{PH!(60x
z_>pQrBGJ1xRJ6}L8bSS?P75?i$tD79@EI02W3{Bgp8KjOtmfBq7fK(6r0%tm(kL4@
zNh}bt0Q;&v^_DzB?>aN_)#UfZP?vxgdqjL4xsJEA5sD;%i1fQ=Y$-Ez*=>b9_%<g@
zE$xR{NOGpNBAs;nH$uSFb(NmI0>WGB;$SQo`2$S%X+{?Ef+?f)X{T@;u0Adx%Y1tw
z4odFpC43O0cu`QajX!h#@CsCG8Faju*j6M_d?T5cIzp!oZ5kHsEZn%;3lE#xNhBUy
z>aX)#;-5fAgP80*xxU!DPGji<iB4O8&X%aMk<V)Od7G-W+tfGlAx+g`A_*PJ!rc)8
zqHO?F#CE4OVZq}-qO}5Gdcl-Ni|C0AsCe@>%1r^L`a~$zm3jCjiW2HQoTFUa=w6~s
zze(zgq}qf#^DjOWB5LBKI$jKtOQYv(t(7h?lqn(xILguo_k*W0A*t=nz<lB;vP)1L
z%EQgq>Q~Q*s81>QIXgc-!1}*w2vp1lFKNPptA#Wo77<9gx!7Gg2nX|b{RX?wp09bi
z^}BjYtD_xwM<m%~-On;prfTEN8WHV-_p;!TSuH!f2|#iiYK9-MqX3AAVQf2DOwcrv
z$g2P|4IgvlWZQP1d&^v*XvaFYkidsa$s`Ae*N93?8MP&<n4wU}aGK_+a==8{YR|o2
zy_!qdkYuBj=j%R#F(R6|#X}>d_Q*Fza(;bnw_GoU*@r!%rZD?+lWp}v#BRkTfr!5A
zXx(3A;zSkW!gkMsLUj)rS#YzKCLn=DB$HkbD!6!c=AJZz45lUHsmJy<m!72B+{I-M
z7)XN{HhCST7k#FwM3Q^Mqdix1P3Qv=apDn9)b8TaOCrj=N+$ZRE=@A%Ad~dBuc*-X
zZkZrrtR^7y5t$;=Js2n?gKEO06{=*F`o&6c7ik%;^(Ei6qezk?outoHCq+aIK6t=;
z_aYGaBscg?U0-7HBQjA)M6{1Q;E}s#%tQjw<UOBi2iuZnKhYCrmD+f1T${qO=zcw7
zVZp#`E$GhLnb2@!!y%`W>H4(K<41aiyv;{f;uma`8f#)Cu^~xa?=!VfE1&o0pHx>@
zca|&fbTbLFkWW-}^0%t%Qa@BkUEPp=B2N@Ult5%+)!%O@Cv0?863sG5&ktT(Rr$1&
zafLr&1``$tU#PwpLZ+rtyyc3*3ONnEz@A(Cw<*v=6FA&!mE0TojF08<+g_{0={$c(
zio_fN73c(<;oeh<3=pZ3rMk;gAk2s<$3|{btbl!_lupN;@gjT7i-H&+ggp2fwY}ZT
zQy^}N!ru#Ubg23F+^U#(^kFTPOWlg;<39SMZ<9M5CL99>#Cp}XjlH-iPGZWDfom&`
zFhZTVGr4kUra?v+!Hfs?(OCe594b)R2_Qd+VZ3s26P6<%zo3<bjL}=J6<M=-IFyuE
zS=tOe;S{oVyckacNt(kS&P(pcTi)?W$@r>II0eJoRA5#2=W1i`&jARh?N7>dZMVV{
zvOeMcNO_mN+((#~-1)XbSC^0yubrNmLgp18N>boB$j{OB8E{Td)CFje#V!VxnKB@M
zR=7RZTA;~X2JZAE4Uo!M=EFym)Y195WT#rwwMmK*!I<TrQ(&jKdEtlqB~-OVIekgZ
zlQ5aFtk(6FmXs4|Rrtdtce3-xlhp3wtc+!zlV_$29Vw9kLem4BRh5OjVuoW?7&geG
zTS3`(lwQ(OXQXf|q0GTo&4i>@0`epOG)Y^zHe@-G0{i3uX){!N6-nnunKf@(N`nFU
zcN9s|Tqyg`<QeulC<87Ti>f|^3H@jCBQSQc%Ii|xKWISW%)e#4DS!c@Afo|WH6iCH
zR{tE&hytTP`zi-Fiu(i&h%>F-{LvWj91B#GjmQ+cO~R{)c^gG0y8~vH6!>~%D+_li
zCFNa~yyDzx8cEAOOfDuu(>ZAKZ8>vE3+fr!4E7_Xy-mq-u9cRl<S41V%`phZH=Jcj
zGs2>DeJYA}5%l(pHN5hq3;_p_b+=tGVIs-#`Ua5MuZ^TW9N1f8;IdbF2>+5CJKlkT
zgm1=gW+_SUj04EJ+k{f)e;{`Y1DAVGYkP=^q{Pc#)BrLM%DXqv{f{N!D(dkA_gKC-
zQ)uKBiIy^pBvrJOStO}x&Bzu>s)>>CH4#a&C|b%)($kueD~cpp6fI>Id54itl}3PA
zEY%=sNGrkQ*N;3?7V`<)phCk00Igg#HH!&Ooc4-6di`|*7qCVx<$y~rg80bS!mZ@t
zP<N&<AAKrWj$DL^pSNb~c^5#IgMJGPML!46(<nR|<UvkP9<SY_l9}B$6V{n~yfG-z
zpGtNIg}I&0$ujc2I|kU>V*t(mfp1cVUf=u&=;yU*c!ZN|m>?ZVQAu<$!CT%eZxm_R
z?f8YQ{UcXgSG!xL(sSv<_IRJ5%K>A$rQwak`eG0iBg@r+cmv0nuqPLw@j^Ak{98`3
z9z7|@u!F@V(X>W|6TVQF7X#)$EJ?ZnKJL{5BYt%@>IL-N?-D`#R{HomeQmZ@67eRm
zd)pKQjNB?z#c-ERU>?(f7ujBw6!>@Tw=VH+%?WsTUyO!GTB6D?vLWDL?er8Q^{u1<
z>29TA!JqB!&gcUH@@dd&K$tO<60G=me52rr8-nWS=^<0Rd=m9su>qDI4waSF5@sZx
zB6Alf{JE^56Ci(pscI-h)-mDydLfSBNz>W#^~fsg(L}%;2VgVbo=XYPe;aDn@8raS
z$SNxX*ExDrfM{n#;8<H8X!!BSZ{D=t>I3{uuV#LB?*ahgw@f8A{cO}yTEfMR7_%OO
ziqgCZ6e^seEh`-Oqj^s@vN3Q22~`0S|6~NKxUOG;{QRwDG^VpD=5mr2?|kg;!cdxc
zQ)<Q@4rM6q#1k@8M@t~>VpXR_AVsSM8h<dCUj{LVL3!53SiTtD4^Q-WvIX}PV0~g*
z@`|uq(V+loUXqoE<8k6c*X*#A)+G~%N8$R`7Ti({+{3gK7eZ<Y^dALzd|9vi0XjO&
zQbx#-UygU^b6EYuYR!XRtVpj-!!ONo9zZrOU!b^x4G{z#f=^dFp`qw#z}S}jiZ_?f
zVMEH$)y3{ikq-XU{KDBT&ESd<R&j`LI>8*i`BbMx)@MbcU<1eDS@0|jo-9dm34kgu
z%Gk!*1icBhKe`L)DF%po?UvG(&+^|#Kd4OzcXaI!HdGoL_y*Y+nHg3Z!V%=CD6F&#
z_dbv|XwGO15R*q~BP8hNVk65(*Pg!1OMpX(pqFh(YFC#?2y*IgbKs6PBdK;nQsbH?
z8~%>!D;;oCRj`#M-dt+6x;d)c(e}Zcwq?>>tu$O4+XrvjmX-PDz*E|Q{9SBw&?!9&
z1Tx>v=AailG|2JNn}c3jUw(?Rw;mV(PYM(kp1nMAQs<z_M=Q1?f;VFW+WC2dTb4R!
z2+(x4BZBwh7~!rZy}&I?ZTZy64pzF~O#-eyjfQ8^eaZeb3HWO_PXd$hy-otIF%F)M
z)k=?RL~x(?1A5sZMubk##U(%&t2``5gt|+UGlL@5lm;V0tB8x4<i~pFma+lueOB1y
zg7S=hHp<6o-XwxY)(72mK=SyY)nCU12!8P^lk|N7$t{xwy9xwXjEiQgz@(-$3V`5h
z(_}wPvV}%)rMP$;R?{PRxY0mk2SD(opnxibo_>il0*Y~11ZR{VykT?MOhm7+jk)Ee
zsk`*#<ey#~_J%zv18Cd3D<s*E3>wQ_n!%R+<&th*(r+!D?4?}U2Q22}FbQ@uAcGp>
z=rNhpS$fG~)uh>eSj_?3-oT)L{Cz<IJTL{?O-|5Iy9G@>FDHTi;i=?kYkIOVQmL?N
zfGY3MVdUh(=eh*sC)|Yy+K<x5mq|&|>1IGivxkN}_1UFK>Xf9$-=FMo7fA+5a$Z{|
zS2cnLayJ{dm0?S}^x>*@t$}3QzAY>N2ZT6Ol@@70Ip&=vpqEMrGO8u@KwI!45GZOx
zxdFQPSaP)YX&7WE4B-%x*R7a-o1E~9*>mfVvT-vdfj_PXQi8_@QN*7Dx#iig<VV<|
z@PU+(GMT!%G%|yH!EdByqK@eTG|1u4ua+Uyl19h}broTug8Yi6s-R{?=^$F5ExacP
z-gvEnW+!+%Jq3C-f-kUVTp9&3w7wiAkH!EnDGa$paL8YdfL_I1{dK@n52w6Qu7Ie@
zFjEPJri$Qma`h}t-b9rZ9$}iimv*iM_NTPaj69@KS$&RS`Qvl4JX;^+A(Br~>q7*B
z<9D)jzH9Q3?mjCD$f!zinNF5#YEfQrxQZH2D#7-R7dTnAtGl4pErdKbQm&|B0wTfF
zJ6Ue}stKA<RJCMzb9g}~%QDVVo(U{eR24v$*UDKqSx%#2f|`n&o>!jLJJn2maCX1_
z<8<RhfQ;}$u-@#YtnG2=+{H;qNKbZUSwI2X(%sO!0=Bikp?SKG1<`4h3LLz!A?ybw
z9ZZH0#y*R{5D1VhiaJNPy#MTkTAZ4pnl(gqK10yG2c*7oCXmwsJ}YGI`t$p<fYPDV
z4*wn5`AhL9gl=*8;;d_tJjxG2=mX`{B59&Fc7)J>y_8y1>v^Um5FDmwP~6uGx@0#O
z1GPqgZS0<qw23zfnsNe!y2ZoU<!Uza5L&UKkbMLP@-%o}wXFU+DvJvQkE{=RdPz7w
zXieYIKY}NU1S%sOK!KLYf?WkDaFT-|Ib;A(;Q#NLq_#W=4GP@P%~3rvf`=OowDT_k
z!bw3ro1di9FL6ddF%ApDb{8jCr%QkwQPhxK^7gm3@IY$mnlU>LZkn#&2{`y0^3d<*
zv|$D{sHW#&>;Q`G(g`Xk3OK_@d&KG=whP#q%t0S2Niz{>taHOQo)}aX?m%zZTe7-K
z$CZ2VVAfZL4WmH?{Qo^u{ng~)()=z4C}T1Hk{s&B-ExC&@l)ScY6<?-$znj`JZ5s}
z7%}8(Kd(LvgQAthRu)s)Xeo436(9A=cmT|Zsw2m;VRmReJtJn@{Xc?3j3*bpDH`O2
zq9*8;_b?gcNDR7|k=S_6dGO&HEseo*PsQSBZ>sV*d#0tVh#re$%}{@CRT>v%h1~}`
z;K3$*3KnDCLe+6H{+<$Y)eO~+_m~HN=4XyD+sI8<L0!l6J~w}dU;p(dI=fw*H>hDF
zn=$(yaOk+^EdJL5Tc-Bht0K<qCOBO?J@X_iY`S2gp8@MBy^IgZ;?h6w&mGuqf>+z}
zi^<#DVX$JA-LoHg5e-+(u91feFqwgYX~@ua@gGtIiJk>o>2}@2!2>uXJ5R2*TCQg&
z5hT8k*>62x^U~6qGp!+_7H9!{_uaDy5}n3+!dpM7Mq^ftzdhl5@G5}F%=Y>Jfh+s4
zHn2m~=*;ZeNW<98ZH`)MsdY7FjkhZNaT*sF2>e#$7KIP~{LGK37MXVeUZvB;oM2nl
zXg$<Z9ke?!L=hoklz^v;oF^z2VbM+}<nHUQoupAjkcs(<wx`coRH&tuM1OFGs8K|S
z7-iK=1lwLn3p=zk9@Vv#zQGF_iSm?G&XAQY$UE_&<fZ402SBL1Fc}om-?ykX&P-A2
z-3Hr%UIJ;B5wFP}p}W2iB;2jMH*1uB<)1Wt0yehpbMMzUAhhj0rn}DPZ<1<#KMuQl
zexyzWq&D@Tzf9EdA$&RJ-*WS^H<TV|b7}Me57|yn9SWglnQQ<L@VheY8Kn=kuRoI+
z;Fxr?2o11+meZG~bw87A=Cl-rEJh@G@qWI%JlAh8#h>6?f%N{-uLpeiojOVLqM&Ji
z%30wjgxq5Z?sPriFqg5BX}#aHOSM`ZWZq$PZ8GlSvIf=RwsxN%Kg{c`Jj`m(gWa+^
zr6#*6vw5N$_@V0or#<EU0M_=9zTL$MeEX>ZBlUmq>j970@nQf8A7^~{9ld2aveuVv
z+Q?!>&GSs;Q4vm(mr$!>;(p-o12Rrv_;L<25&`4g^ZmeWAl+Q-o&tkoq;!%g_N;2P
zTKzcZm$5;jhHL9nC)Xe%#<{>PJ`S6@HC7<A7SWNl2<r_D|F#JMTzV1c2?E2%%mHAp
z2G>?Hm(4wRMJ+#-pk#lN7ey<Ht-Ldx)e0p$B)M$!B(R|+&`ULJ#IryQ#-k`8=d%e8
zEH7LCj#<HHHUhn5R%jco6dz>X;S6L2ce)uH&_T08+oZxHGu!PDvw_e0=1BUe05_AN
zbce&%Upj1dX<eeuw@bc*T2!Z#6+GTZAYYlXLdWy?Z6Lk2sgM==9({q<@@xwmsjSc^
zJ(@fXVj~;Uo1my;KpF}Dq`V~kgVx{{Tg9^&Ko4aNop?ylJ}+(!cAtCkK>ynsI&qb8
z!R()WWP5N+ySdFl;y!hLK0+M^3Bsg}H}<iTU%o~?;s_eC2Jim(pc%Gh4Rs01t$_BJ
z!5X^R?+tp^JzGOn9jt&n)m=JiWSf4HqOy>01m}>KlsAvytFr+W?=J`q`%Iw0&K(w^
zuMOrF4+xIQ?5005f}eC06t+W*0>aPx<(ZuIBL}2@S(BGhkN>=Ic`vC!Xc8GdCqi|m
z2E9;7gl4#A(3sf~nymfB$<t|^WJ9`R6;+6QBG{O`gbMEhG>D%L7h?oEGAO`&djXWO
zH7cA3^3*TvNerNLpq%NLHC2UO8$jl_WAhHPqPVI75q=eoml~5@T9#Otq^oRWgY|gE
z)021J9~~0*@Vf!UeZ8P^ag!9}Nf}NJO4S8pAYV7>0NK$-<!K2k=3M~U5K$<590Xl3
zAun{kY>+vF61d;*0Z9=QL{q1QyufOhAaLxbhRhO*nYy|(GJ|Y&dg5~HQv925DuZtC
zOzQ5?aKc2TJahAPsrVis7PbU7ydzKu8xW-fxz8N}8}(!jd9Kv*G>0e~@<w5Z*(Fae
z53R_{04X3ldwSSY+zcdmY*@sf0*To#EcI}Z$i(iHeL>!Fq3YS;;fVQ3`OtOJrGsdJ
zw(y>S(QZMr6TF?C0=<72z3}&dG*bnAIr7sLV<bCpPGQv%Ro+!!s@?H-PIRIlRiJ(S
zO!v8WqUz#k7VXG3<tyqVD6g<FxaGBYA$G@yvsIsNmKPab-9T-*aX0NqmzpL3Mk);H
zkMzph#H^euH`f({V^CN;Aj!M%Pj;sK)_gZ150L;?VFKXgr5)H);<B75z1!c~2Fp*3
zRT^?h9uJ`lPLxqz9zowbsWhaPpq1NkqTKDo33`v%D-9_o_?o>wMsS||R^6|WhY(VY
zSSt<C0p0TW{Tp|htnDdT{_MLblpb3|@NO+RO}4eap>qU?rLy7*5su*g&sslnm*Ni)
zyOgl4CxQgBQ6#^z0=kx{0@|EVc%CmOK)60D4zL9#67=CbS{46L#WTc#{JU;02Al3H
zNEzeOurE9bByB`kZUe~AU;TBk+nFxpk^4k;>i+w$AgmJQx~4&1uOC*=Hk&bIVLwNA
zV2FM1u=R?iwmbmYI>PP<be_^$-2ycCmXKiK<Yj)%F<}RMiW74U%H#dI+SvO1gc@?(
zr!%cVjPE-O=wkv>O*anm_>tPnz#cNn`}YU>2M9I(0nF|wmmTD{c4$1KIVw|?$^~e#
z>`hILW3j5cbRr{kqGx>1RM%$>!CW(e25@a9&=@Oc59n$S1^TK3x*ABD&}RmqeZ`QM
zm)if@0>MXoh*19e#zF9L_oIfc8LKF)5FEs_K%je&gyVzyodCfTMFRZ|5ZW<2@AeS<
zGN(jUQyx6qe(KDf<j)vnKjFt<l`S+VaGo`&rbqB_qk)z*BLP78Q9%J!pvL#3^dRZ>
zA5{{zyEu6n?D-QQFOWnP0N#k1fY*7y+H%tx_S;~CCHru;>eJ2gBEzfSo*Q@L#|%_A
zDZ2$}Pvi?QA#$id1%70@o8VDK>J;hl^AiM-<wA`}4)BBE{s-$6xrav}Kz;zFssPv-
z5uD!DOjLQjjTQnt&Km)pF9h_4J6-`$)Mc$u2=Kr*pk0QLdik9qyU8=|x8&mtFE2el
z-+oK23}@kOSp^LN-pua<B^^8j^gTWWXadi69#a4BjwGG;e9uGb=fA8<8f8M{*~hEG
zH!V{hpYx=YCr<833}7b_<W&H3s3&Fc4-&JOgPlas<mOU`-dX|3YSm~?@_uaPrB;pR
zqz187vobLUKY%63=+NfS2QUHgZC<t1suwP)nHH~FYSjx@$wLsB0M~z22w*hQPQcsL
zU7<WhD~VPfXjv#oeyy-81jwIZ3UvbEqoLUIa}0wc4muFK<!mO6v~_(XI;+mM&oQUe
z!~7ELV;O*MOeeWA)R*5W0`O^1_7Ogu0Qr)olKwxtNsxb)d`XpVUkda;X1qJ8JJ?tV
zcK0#$-AQeKbN9$<yb~^GQBp79-sv)};81rbb?Slk#s32|Qw900K24l!g-6NH`3dBu
zEn28`m?;De_m(e;b+RGU{Aa`WFP{Ph>YsZ~mX8optr{fox(QBiGNuCLmFL@Xeu44R
zQMFEmm-P$mcrk5IK{nGyYD2AFK+lZnSNgjx;MA#l8ON{mv%Al|JhUQATpDF@Gu8)!
zO%<vJVHQo0R=diy5Fi)Xi3xDsf-GhxsJ>Qu6JWT_N$?#eOtJ2!d)QvXeDb`Ff_O)2
z_0HEX78BsFH$>IJ<{V9cV}}+d-y|gy_Fbqq!7YzZ?`w_1okfxqigm_jtKdjL!(TLE
znwF_Fjv+y(Rd2d1+#x*H9jVi8ilG1IeG;1c?S>r$HLo-*QYcuLpzven9*;#}0>vuw
z#S!qPdgZQ2duxAlU0y=5CJja4wO-p^93#+Vnufry{{TV8FVacy(VMJ-dam>!KG3&9
zdubLsW3K?B-__+M6l^wr{16YvLxg|@@KurcPl|5Ew4a$d8-WzM(F>n5#mi4>12bIm
z2&o_E{P3Y|AGY)D@hSjp&9flsDfb(JDcmKD2rsM~sSR@$)c}o}R*p0i&=ZU+Y^b|`
zN3pPxx-pV5$7$3ux6@NmNydYHbL`eO1H~@=k>GJ-Z+Auv+k+S^H5Ck*;?Rwkno8L4
zUY#RQ+=9L=-HEBKUXpEbBSNxH;6w;^uoV(K20th#3*-b4DAer#5JV=RRbN+d;q{cB
z1mbR|GCd#37ZE;rna{%z!%}3lr7D5wkQ)?q-egx?QCsdGv8-@;Lfsx<Dbh_5G_tT+
z#tIF@aDQqWEy}T4;*1R>>!L>Nk!5mR%!~~r`z1`s@O+)F9~mr823hA*nLv`4O+i6~
zjb1p0KhcH;a!lTGIGKBs$?)F8$v)oaGdx3^vp_xp$wKXjJ+diC(aptNTS?GpTY2C+
zcLD}(z#LYc0J0FC;yu`2vBc1siDBwoh5AEtGzr9{AD@#KIr;a~RT~9n=`XcH&BWPn
zUj@5F7Qih_1H{ZWML=Ezn($w65xKBC*46eVr@$iBojWlVY9g-u94RL;bk9|2p|9^0
z6tucLG2lRN7t}KfY@H7o9R*~pL4F^xyjXzI1c9UlDU7D@eZ>qnvy2%cmc>AU(8iYo
zu27I;_ohOjC*^=ceYs`Br0=;JA&{(-p`flAyLF*3ZaY1txQBKDnt*U+AHR=SBGSez
ztpHpn=%Nt+@yr6jK5z3;+%7>u;b{HUMHVK)Wed$*d<+GV`_$72gAdkbFDdTByfwjK
z5iB*a%)51=ou2>nlB|{;k17l{M~YkTQwxT1Jsirr04%(~2A_tA;VzqG@}JY!6%!n4
za7SX9w{)SUK4fkg1-<20v$$dbEznMxgIId2gf&H!+Ymq$mg5X_#RB67G+~lhC^U9v
zNGAnzr`m1+-o3Q~==Uo=nlZSsPBAGU*Do{|*+(;nW83`jgW{XyK9(W$`|q|YzF`Qg
zevWC8U4HFBLV<52+|iCJKD+<GFG_<5OBdRkzi>ARAN-pmf|9S-&JV?;-lqy_kO2IF
z6EwWc9m>aklzJJ)PD9gKBv5E^K46GRBhepRrNsM(E!EQ2i8QV!`I;pBm1a*udX3kb
zwbIVG-rR~rOaTd49u^v%-B~~(p_J9<iItMhqN+Gs%_WGbImbew*@Ip%LL~Gs7ttu^
zUSKE0wmnN1+U-ZidTE?G*nt#EIkS#-fEZ6!Xt`&|G?XR2N(uL0Gi6~kqXJD6fG#hM
zg#0gdB%Fh$bPGA2qsRt%g+vQ&2bg{%tu&OlWh(tcCEHf_mXX*-A(df`6Nu}7rqIx!
z&lN|hHuE=F%d-*N(wgx?^Rp0hkcQU$9nY1w`6$swxok9I8(cJ?720nh@xUV&4Sm<{
zwLnvz4Y~S<5nF_cPC)3P|HY9;B5ry|#yuQn=X<M6>;+Q%x*)8D_koD7?0rV(5F1@@
z5A{otMic}V<_o>79wg$!{uAu<w8if`z~=Y6^)Yd<dPwMIE^;DB#8<bo^A_i)^inl&
zaBl%7b|V+QM(C%7=#fh%5r6UJj;iFczwB(7*xl9yzm5ohzeh;Lr}<nu%B>gQCsQX5
z+Anl9j0}yU;`NB7p4w4r9dab1E?aW{h0a=Is7ghdKhMlct3-`a!{fJ!tV)6L{TKSX
za73b_c&7=ZQA#<}TDEf}Ce|s)OrgiVX?dxrJ2CAktwtGDxP4^OC)UNtI*%?1#1q+f
zGF0SQ45MAO63UIc?OUH%7q1uy6#8s^%{h9h$mTU)z0#>n+;zGcCt~eJPE9Ufr-X$B
zt~f|VCKvk$N~TKV>VAxfwK=1Uw1j>aoTHbD#6dS6+D>_No<?geoJg$AKg$)m4!ADb
zq$2Vp&}LG^QWnj40Dr{XT_INJJmNb?FB$1iTVY%&iC&=H#n}+^;2hg1bRS{g)JsP6
zmB!ZsO$l^8Us^xY2M1o+QhfP{cJ*F58g@S+l|C7o|Mk<ObI-AIz7T*`cUByv6W1@6
z#jixM{-)#!wB_e(hRMweA8!d`7(c;cG9p?v6Bo~^#Ide8EV_9Z*)aI*Az>Kfn{B}c
z6z@?cQQ8!4rO)%0iNmr90*=B!hLGC!*nq^PuF!y1N*SGRx`YwaCk~NDWNExGl%8S6
z*npe@p5iK$FmblF;^Uc|I0PDN#0!HN8bd`JkWuV!_%}4lmJ~Y;XF?pdr-^uBIK$VD
zd_jngXu}HXnz7UAC{=W><&Ahz5OL_LIM=W+qFFsKZ9wEr0nxwU#7YyZ(VtwOxO4;0
zzD5|-?187)f}A35Er~`cVwa@O+`Aud0uYxewc98RYoCFYRc%2OZr0CYp#;$aWxzX3
zPn>?l?*ab8z{bxL;f=W<r<C_=rt}yt$U7!(ksk|>6^7P>q+Ff?#h42s{lI<Z35rs~
zy4p0a&JH`NMQ-B$3a}RjH~+Ow^S(JDlXZP$_J`6@T3AGw>p@M3Q+E$0X9?r`u`f@7
z{I$-?1rf#D^cXry2`$iya8md0g}4RiBTl-UFvOl!mjH@wh+@3OZ94}|>EKY9ebkl*
zV>%JH?q!d`BMfpFNkI-FvW;k0OJ0%c(&VH{hD6n+(N5R(5#ku3AtNdM7sfd&Bh^Oa
zf7pHBzJoHMOx*2sus1>+m)7jMFw})eX`+pY{P(=X5y`GJ2y~j1UIZepM>xqsVX&=>
zysu&#5gD!J+k!;a0!;~Enxgq8`0^@%NE{~*xw0jUcc|V((?&$pHDkS}HP+_MT#UN~
z@kN}Qzz1M@p)lsdU2zLGBl=+tl}3sFWUP%-m5Qe(sTPp9PpO?C412ecxrw$To2jpA
z7;9~sL8*A?@h;4X`<!UNR~Yzk0>XK1MwB@2;9p)_mZFVT2-vNdi2LFp-?~Q_dMoz9
zs@jgovp^$_UAo_Cw{+a%;poxyiHGTxaxG!>t?V8oBV;oYEi>=D$~a4Ip=}x^Lj_^g
z?&98uiAbEgiYs*86850A<k0|<&3ugN;ZVUou}e_2Mb^RV&Yg_gB|a7-mR=MJI}x!4
zBB%FcrUHnJ2HwwziR`pH`I^_9O_MODXE6{TT~9WxHCw`dj75x#p1u-@yeOzE#-g9D
zFKtco+H-H=Bk>`<2|&C=dI$b3ofP(Ecb30wMGzTIH*ix_8(l}6V(?JCpUUG$42ho)
zG|a9GyR-k5N0F=uBGKQIENyWAU!@I+^>;q=>aQcScL9i>fOw%}2@AV)eK)u%ml7nd
z>sgwhS|3Acfu@Zx4xQ?%rX#*0RCZrU!fq`b!<15$Le!lYcDuDOSD`&fmaq9-<lVKu
zxlqL0vQK_JpRi|h>qTxLl2VAg3J@)NwzB-jOz`POINdXhWJA35uDw#9g`I05I%F~M
z$y5pvt?yd`MsKJzdbJR8pSRB38>ol%J(Ebhbs?`hFc!bCe?2SDNLLP#)0Vnm;w5j|
zwUdOIbFFOeT22x-ws!%D$B57YMDG#yaVQhn1a!I-Lqvv&_j!ny8bb@TSb{2+Me=%U
zr~SnZ)|-<^{6#3L3KHrQc68Pc=XsSQIpC{*%*bXML6mINKyGn&m`S4$zrAt)*&ShT
zuX%cjL1htjCx+X6;Rkn%hvX`OW9rI2`lvAtdb*45#6&zVF8bk*7xs7pvaZOjEF!Y$
z@)Ap&k(Q}6<S;)$u;gQ2+o>TA)MIyXiDMDpgQG##Ac=lqp9A&@PqlWp!idPf$B)c3
zeG4R1mnPXK792O~+g+Ndr(GF)1~nx97ga+NpIO-NzBU4-<4~NB-HK^#54q=4^)$q`
z1w@jawMvD7@A>H+MdH63cvPwKGYk73VPYrQ)>Kn*L}c;+nG^2u8b4g{kk%Fs3e3U6
z1!yioapP{mt}*wCqk0x70m-3Rydk7GHY^-~p2e>|2I*Fw^e1`beyUEhwAl}pGnT?}
z(CurIajS`wAkzjVxeY$qzrMInI1E>gtXq33psK{jQ1`r~5gERgG>EyKN$yKg7>rtk
zlS;+YoHeI`dO{C}+B(Uvs|<O7Y+1Y|9EnyNn;0-6xK!g~mT+gE{yv^RSk-an77zDu
zzna$Jk*@Hx?sKns5`OhTXX@FB<oe0#3_jBm4#(WP$tZHGNTT7oKH_Vm$JnvGI7Zm@
zZGoMgH`u}9jHiDK&Dp~E#p~Yk&dgghzZd%mZ@A89oHD%=$+>$p)o;Dee&LV|0pUn>
zZRC%-j!H30>ewSii#x}jdOBDy5q_Jg+|B%^`?!&MbE~J9oHSxL4;w7@)+ZN9{=I!)
z_4*!NI4-RaphapE5y@1URME(bKvw#RqxKebxrga^Gn;v~221OByC@kCuC3(f^kyd=
z^{I7LDi@%cPNt<53kwSidyV8|78Vv3TA-PlTB%eypZay2G)|%nfr|I1a^r5IFM7E9
zUh;}O!KK&#O;M+E^rQ?~j70J&n#D0yvO|cqaCG|nJ>WQ?6Cn*?>3>VnA}*hO@o#F8
zBQ@k@_V(=#6Fz+S@E@sv$ya{f@ZrOse{XwhwUve(@+ISc)QG-3ek3FLjLnvcZg6HE
z;TZKJx?uuGMw6mJiamM3bq1dm77kQTQoREnjn{5)FL)I59CWvZqt%K{8UwHm;q3yX
zamcF%`sZ50A?uG{-+1bz8avmfkPFMNoNEaOt`&}-*|c&}f-VE*@}@l5zusR#IA1t`
zeScN6LR_k8s9Y`ORrpUNr%*VMJu4sPn{EgZyauU(Cqo_}rh119XoSN#Tp2OeSp7K4
z3{NTYYW2~8@mv9W;h^@HL-aF4W<PeE+pxHRFN+3d&ur!8`Y#;XmM=Cdsm5JI84ok6
z2f)n5XT|!2W8BKOx(-x+^lKr_Eft#vzyzeS&qgfGj;HJS`Id0BTV0=7wMDNT_)s<3
z)Gb$X)Pm1w$i3*v)%%45zt2gNtcGkG_(Y@1Or3EhKUv9L0K1~6mXs@;f&SdFT-kVl
zh2?9HCd#b~W@=I2Cm0QkL<*9!!@{Zfa`8wYpkMs84-=>dxDtR5YE}d3Z#(4bOFk|n
zWh_@88y3#Wm-7Iwx!FJ{lC@-HX`LzMc};*^u1J@<(jr~1NSE0{#VH|&dcWj;uP-YX
zaQFE0h4Zuki0{cTtDNH;OJV>asy*ptWu?X5pxd;W=?;36OH)$QKRc@8-%WImA6;|s
zlLVr3g|pWxKth*3SD<<fH9oKUv{qcF2R#68ObNKN_L7p465w5;#FCPdl8H`fN^R{y
z4;H=R^1l~dqlx<a4J5WP-Y=Zgo`QnzWM*b&KKp)2)lbjZc=LHy)_y%D9GkH@{>$s`
F2LRRR)|3DM

literal 0
HcmV?d00001

diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index f04a26818..8b89d2250 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -99,6 +99,10 @@
     "defaultMessage": "Download new <link1>technical support</link1> and other documentation and <link2>send feedback</link2>.",
     "description": "Alert title that appears at the top of pages."
   },
+  "common.pages.alerts.banner.beta.content": {
+    "defaultMessage": "<bold1>This site has been updated.</bold1> The current version of the site is 1.0 that was released on {relDate}",
+    "description": "Alert body that appears on landing page."
+  },
   "common.pages.alerts.census.tract.title": {
     "defaultMessage": "Additional documentation now available",
     "description": "Navigate to any page. This the title of the alert that informs the user that new census tract information is available"
@@ -111,14 +115,6 @@
     "defaultMessage": "Public comment period extended",
     "description": "Alert title that appears on landing page."
   },
-  "common.pages.banner.beta.info": {
-    "defaultMessage": "It is an early, in-progress version of the tool with limited datasets that will be regularly updated.",
-    "description": "Navigate to the about page. This is the main info of the beta banner"
-  },
-  "common.pages.banner.beta.title": {
-    "defaultMessage": "This is a beta site.",
-    "description": "Navigate to the about page. This is the main title of the beta banner"
-  },
   "common.pages.console.error.stage.url": {
     "defaultMessage": "Please check stage_hash value. It must be a 4 digit decimal value / 40 digit hexadecimal value",
     "description": "Navigate to the about page. This is console error staging URL"
@@ -323,9 +319,21 @@
     "defaultMessage": "Downloads",
     "description": "Navigate to the Downloads page, this will be the page title text"
   },
-  "explore.map.page.description.text": {
-    "defaultMessage": "Use the map to see communities that are identified as disadvantaged. The map uses publicly-available, nationally-consistent datasets. Learn more about the methodology and datasets that were used to identify disadvantaged communities in the current version of the map on the <link1>Methodology & data</link1> page.",
-    "description": "On the explore the map page, the description of the page"
+  "explore.map.page.description.1": {
+    "defaultMessage": "Overburdened and underserved census tracts are highlighted as being disadvantaged on the map. The map also highlights areas within Federally-recognized Tribal reservations. These areas are also considered disadvantaged.",
+    "description": "On the explore the map page, the first description of the page"
+  },
+  "explore.map.page.description.2": {
+    "defaultMessage": "Zooming and selecting shows information about each census tract or tribal area. Change the selection to see information about tribal land areas.",
+    "description": "On the explore the map page, the fifth description of the page"
+  },
+  "explore.map.page.explore.data.box.body": {
+    "defaultMessage": "Download the data with documentation and shapefiles, from the <link1>downloads</link1> page",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the fifth paragraph of this side pane"
+  },
+  "explore.map.page.explore.data.box.title": {
+    "defaultMessage": "Get the data",
+    "description": "On the explore the map page, a summary box title of Get the data"
   },
   "explore.map.page.heading.text": {
     "defaultMessage": "Explore the map",
@@ -1052,31 +1060,27 @@
     "description": "Navigate to the explore the map page. Under the map, you will see RFI is expired"
   },
   "explore.map.page.under.map.note.on.territories.intro": {
-    "defaultMessage": "A note on the U.S. territories",
+    "defaultMessage": "U.S. territories note",
     "description": "Navigate to the explore the map page. Under the map, you will see territories intro text"
   },
   "explore.map.page.under.map.note.on.territories.para.1": {
-    "defaultMessage": "The data sources described on the <link1>Methodology & data</link1> page are used to identify disadvantaged communities in all fifty states and the District of Columbia. However, not all of these data sources are currently available for the U.S. territories.",
+    "defaultMessage": "Puerto Rico: The <link1>U.S. Census Bureau's American Community Survey data</link1> from 2015 - 2019 are used for all fields in the workforce development category except for linguistic isolation. Linguistic isolation was removed based on feedback during the beta period. Proximity to National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, traffic proximity and volume, diesel particulate matter exposure, energy cost and housing cost were added for Puerto Rico in the 1.0 version.",
     "description": "Navigate to the explore the map page. Under the map, you will see territories paragraph 1"
   },
   "explore.map.page.under.map.note.on.territories.para.2": {
-    "defaultMessage": "For Puerto Rico, the Census Bureau’s American Community Survey data from 2015-2019 are used for higher ed enrollment rate and all the other fields in the Training and Workforce Development category to identify disadvantaged communities. Data in the other categories are unavailable at this time.",
+    "defaultMessage": "American Samoa and the Northern Mariana Islands: The <link1>Decennial Census data</link1> from 2010 are used. The CEJST uses the following data for these territories: unemployment, poverty, low median income, and high school education. These burdens are in the workforce Development category.",
     "description": "Navigate to the explore the map page. Under the map, you will see territories paragraph 2"
   },
   "explore.map.page.under.map.note.on.territories.para.3": {
-    "defaultMessage": "For American Samoa and the Northern Mariana Islands, the data used to identify disadvantaged communities are from the 2010 Decennial Census, the last reported data from the U.S. Census Bureau. Available data for these territories includes unemployment, poverty, low median income, and high school degree achievement rate fields in the Training and Workforce Development category.",
+    "defaultMessage": "Guam and the U.S. Virgin Islands: Some <link1>Decennial Census data</link1> from 2010 are used. They show burdens in the workforce development category. The data includes: Unemployment, poverty, low median income, and high school education.",
     "description": "Navigate to the explore the map page. Under the map, you will see territories paragraph 3"
   },
-  "explore.map.page.under.map.note.on.territories.para.4": {
-    "defaultMessage": "Work is currently underway to identify disadvantaged communities and update the map accordingly for Guam and the U.S. Virgin Islands.",
-    "description": "Navigate to the explore the map page. Under the map, you will see territories paragraph 4"
-  },
   "explore.map.page.under.map.note.on.tribal.nations.intro": {
     "defaultMessage": "A note on Tribal Nations",
     "description": "Navigate to the explore the map page. Under the map, you will see tribal nations intro text"
   },
   "explore.map.page.under.map.note.on.tribal.nations.para.1": {
-    "defaultMessage": "The map covers all U.S. census tracts, including those located within Tribal Nations, to the extent that data is available (see our <link1>Methodology & data</link1> page for more information). CEQ is engaging in consultation and coordination with Tribal Nations on the beta version of the map to provide Tribal Nations with meaningful opportunities for input, consistent with CEQ’s <link2> Action Plan for Consultation and Coordination with Tribal Nations</link2>, President Biden’s <link3>Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation</link3>, and <link4>Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments</link4>.",
+    "defaultMessage": "To honor the Administration's commitment to the Federal trust responsibility to Tribal Nations, areas within the boundaries of Federally recognized Tribes, including Alaska Native villages, are designated as disadvantaged. In some areas, like rural Alaska, this includes Tribal areas that are smaller than a census tract.",
     "description": "Navigate to the explore the map page. Under the map, you will see tribal nations paragraph 1"
   },
   "fab.survey.text": {
diff --git a/client/src/pages/index.tsx b/client/src/pages/index.tsx
index ab18854a8..fb11b8ba4 100644
--- a/client/src/pages/index.tsx
+++ b/client/src/pages/index.tsx
@@ -2,10 +2,10 @@ import React from 'react';
 import {useIntl} from 'gatsby-plugin-intl';
 import {Grid} from '@trussworks/react-uswds';
 
-import HowYouCanHelp from '../components/HowYouCanHelp';
+import ExploreDataBox from '../components/ExploreDataBox';
+import J40Map from '../components/J40Map';
 import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
-import MapWrapper from '../components/MapWrapper';
 
 import * as EXPLORE_COPY from '../data/copy/explore';
 
@@ -31,10 +31,20 @@ const ExporeToolPage = ({location}: IMapPageProps) => {
 
         {/* Gradually increase width of the Grid as the width decreases from desktop to mobile*/}
         {/* desktop = 7 columns, tablet = 10 columns and mobile = 12 columns (full width) */}
-        <Grid desktop={{col: 7}} tablet={{col: 10}} col={12}>
+        <Grid desktop={{col: 8}} tablet={{col: 10}} col={12}>
           <section>
             <p>
-              {EXPLORE_COPY.PAGE_DESCRIPTION}
+              {EXPLORE_COPY.PAGE_DESCRIPTION1}
+            </p>
+            <p>
+              {EXPLORE_COPY.PAGE_DESCRIPTION2}
+            </p>
+          </section>
+        </Grid>
+        <Grid desktop={{col: 4}} tablet={{col: 10}} col={12}>
+          <section>
+            <p>
+              <ExploreDataBox />
             </p>
           </section>
         </Grid>
@@ -42,7 +52,9 @@ const ExporeToolPage = ({location}: IMapPageProps) => {
     </J40MainGridContainer>
 
     <J40MainGridContainer>
-      <MapWrapper location={location}/>
+      <Grid row>
+        <J40Map location={location}/>
+      </Grid>
     </J40MainGridContainer>
 
     <J40MainGridContainer>
@@ -51,7 +63,6 @@ const ExporeToolPage = ({location}: IMapPageProps) => {
         <p>{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_1}</p>
         <p>{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_2}</p>
         <p>{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_3}</p>
-        <p>{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_4}</p>
       </Grid>
 
       <Grid desktop={{col: 7}} tablet={{col: 10}} col={12}>
@@ -60,16 +71,8 @@ const ExporeToolPage = ({location}: IMapPageProps) => {
       </Grid>
     </J40MainGridContainer>
 
-    <J40MainGridContainer>
-      <Grid row>
-        <Grid col>
-          <section>
-            <HowYouCanHelp/>
-          </section>
-        </Grid>
-      </Grid>
-    </J40MainGridContainer>
-  </Layout>);
+  </Layout>
+  );
 };
 
 export default ExporeToolPage;
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index 5356da6ae..3b3018c62 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -162,16 +162,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     </div>
     <div>
       <div>
-        <div />
-        <div>
-          <span>
-            This is a beta site. 
-          </span>
-          <span>
-            It is an early, in-progress version of the tool with limited datasets that will 
-    be regularly updated.
-          </span>
-        </div>
+        <strong>
+          This site has been updated.
+        </strong>
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index 068a8e719..1d4e9e968 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -162,16 +162,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     </div>
     <div>
       <div>
-        <div />
-        <div>
-          <span>
-            This is a beta site. 
-          </span>
-          <span>
-            It is an early, in-progress version of the tool with limited datasets that will 
-    be regularly updated.
-          </span>
-        </div>
+        <strong>
+          This site has been updated.
+        </strong>
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index a0b90795d..831832b3b 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -162,16 +162,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     </div>
     <div>
       <div>
-        <div />
-        <div>
-          <span>
-            This is a beta site. 
-          </span>
-          <span>
-            It is an early, in-progress version of the tool with limited datasets that will 
-    be regularly updated.
-          </span>
-        </div>
+        <strong>
+          This site has been updated.
+        </strong>
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index eaf43ab89..6134db739 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -162,16 +162,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     </div>
     <div>
       <div>
-        <div />
-        <div>
-          <span>
-            This is a beta site. 
-          </span>
-          <span>
-            It is an early, in-progress version of the tool with limited datasets that will 
-    be regularly updated.
-          </span>
-        </div>
+        <strong>
+          This site has been updated.
+        </strong>
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 40f8e4fc5..73c9d379c 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -162,16 +162,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     </div>
     <div>
       <div>
-        <div />
-        <div>
-          <span>
-            This is a beta site. 
-          </span>
-          <span>
-            It is an early, in-progress version of the tool with limited datasets that will 
-    be regularly updated.
-          </span>
-        </div>
+        <strong>
+          This site has been updated.
+        </strong>
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index 5c06d3ce1..bd5da8b78 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -162,16 +162,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     </div>
     <div>
       <div>
-        <div />
-        <div>
-          <span>
-            This is a beta site. 
-          </span>
-          <span>
-            It is an early, in-progress version of the tool with limited datasets that will 
-    be regularly updated.
-          </span>
-        </div>
+        <strong>
+          This site has been updated.
+        </strong>
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index d1c5e5693..28c82a3ad 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -162,16 +162,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     </div>
     <div>
       <div>
-        <div />
-        <div>
-          <span>
-            This is a beta site. 
-          </span>
-          <span>
-            It is an early, in-progress version of the tool with limited datasets that will 
-    be regularly updated.
-          </span>
-        </div>
+        <strong>
+          This site has been updated.
+        </strong>
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div

From dd83f8d48b529124ed2c77d78ea02178229ea4fb Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Tue, 27 Sep 2022 20:23:42 -0700
Subject: [PATCH 067/130] About page 1.0 (#1933)

* Initial About page

* Update navigation links

- adds hover and current effects
- fits width of each nav link to content

* Add location prop to J40Header

* Fix a11y error on internal links

- remove AboutCard LinkTypeWrapper if url is not specified
- remove gherkin tests on new nav links
- update snapshots

* Fix mobile nav for new nav links

* Add usa-current class to dropdown nav
---
 client/cypress/integration/About.feature      |  30 +-
 client/cypress/integration/AboutLinks.feature |  38 +-
 .../cypress/integration/Methodology.feature   |  30 +-
 client/src/components/AboutCard/AboutCard.tsx |   4 +-
 .../HowYouCanHelp/HowYouCanHelp.tsx           |  13 +-
 .../__snapshots__/howYouCanHelp.test.tsx.snap |  28 +-
 .../J40Header/J40Header.module.scss           |   4 -
 .../components/J40Header/J40Header.test.tsx   |   2 +-
 client/src/components/J40Header/J40Header.tsx | 200 +++++----
 .../__snapshots__/J40Header.test.tsx.snap     |  55 ++-
 .../LinkTypeWrapper/LinkTypeWrapper.tsx       |   3 +-
 .../components/SubPageNav/SubPageNav.test.tsx |  31 +-
 .../src/components/SubPageNav/SubPageNav.tsx  |  76 +++-
 .../__snapshots__/SubPageNav.test.tsx.snap    |  29 ++
 client/src/components/layout.tsx              |   2 +-
 client/src/data/copy/about.tsx                | 243 ++++++-----
 client/src/data/copy/common.tsx               |   2 +-
 client/src/data/copy/explore.tsx              |  32 --
 client/src/intl/en.json                       | 142 +++----
 client/src/pages/about.tsx                    | 124 +++---
 client/src/pages/downloads.tsx                |   8 +-
 client/src/pages/methodology.tsx              |  10 +-
 .../tests/__snapshots__/about.test.tsx.snap   | 393 +++++++++---------
 .../tests/__snapshots__/contact.test.tsx.snap |  55 ++-
 .../__snapshots__/downloads.test.tsx.snap     |  55 ++-
 .../freqAskedQuestions.test.tsx.snap          |  55 ++-
 .../__snapshots__/methodology.test.tsx.snap   |  55 ++-
 .../__snapshots__/publicEng.test.tsx.snap     |  55 ++-
 .../techSupportDoc.test.tsx.snap              |  55 ++-
 client/src/styles/global.scss                 |  32 ++
 30 files changed, 1153 insertions(+), 708 deletions(-)
 create mode 100644 client/src/components/SubPageNav/__snapshots__/SubPageNav.test.tsx.snap

diff --git a/client/cypress/integration/About.feature b/client/cypress/integration/About.feature
index 2b828bc62..322aa3113 100644
--- a/client/cypress/integration/About.feature
+++ b/client/cypress/integration/About.feature
@@ -1,19 +1,19 @@
 Feature: The About page will open from all other pages
   
-  Scenario: About page open when navigating from Methodology page
-    Given I am on the "Methodology" page
-    # When I click on the "About" dropdown in the navigation
-    When I click on the "About" page in the navigation
-    Then I see "About" in the title
+  # Scenario: About page open when navigating from Methodology page
+  #   Given I am on the "Methodology" page
+  #   # When I click on the "About" dropdown in the navigation
+  #   When I click on the "About" dropdown in the navigation
+  #   Then I see "About" in the title
     
-  Scenario: About page open when navigating from Explore the map page
-    Given I am on the "Explore" page
-    # When I click on the "About" dropdown in the navigation
-    When I click on the "About" page in the navigation
-    Then I see "About" in the title
+  # Scenario: About page open when navigating from Explore the map page
+  #   Given I am on the "Explore" page
+  #   # When I click on the "About" dropdown in the navigation
+  #   When I click on the "About" page in the navigation
+  #   Then I see "About" in the title
     
-  Scenario: About page open when navigating from Contact page
-    Given I am on the "Contact" page
-    # When I click on the "About" dropdown in the navigation
-    When I click on the "About" page in the navigation
-    Then I see "About" in the title
+  # Scenario: About page open when navigating from Contact page
+  #   Given I am on the "Contact" page
+  #   # When I click on the "About" dropdown in the navigation
+  #   When I click on the "About" page in the navigation
+  #   Then I see "About" in the title
diff --git a/client/cypress/integration/AboutLinks.feature b/client/cypress/integration/AboutLinks.feature
index 46cf57187..dc149ede0 100644
--- a/client/cypress/integration/AboutLinks.feature
+++ b/client/cypress/integration/AboutLinks.feature
@@ -7,25 +7,25 @@ Feature: All links on About page are functional
   #   And I click on the "Justice40 Initiative" "external" link
   #   Then the link should respond successfully
 
-  Scenario: Federal program officer can find and click on their CTA
-    Given I am on the "About" page
-    When I look for the "Federal program managers" CTA
-    And I click on the "Federal program managers" "internal" link
-    Then I see "Methodology" in the title
+  # Scenario: Federal program officer can find and click on their CTA
+  #   Given I am on the "About" page
+  #   When I look for the "Federal program managers" CTA
+  #   And I click on the "Federal program managers" "internal" link
+  #   Then I see "Methodology" in the title
 
-  Scenario: Community members can find and click on their CTA
-    Given I am on the "About" page
-    When I look for the "Community members" CTA
-    And I click on the "Community members" "internal" link
-    Then I see "Explore the map" in the title
+  # Scenario: Community members can find and click on their CTA
+  #   Given I am on the "About" page
+  #   When I look for the "Community members" CTA
+  #   And I click on the "Community members" "internal" link
+  #   Then I see "Explore the map" in the title
 
-  Scenario: People can find how to Send feedback
-    Given I am on the "About" page
-    When I look for the "Send feedback" CTA
-    Then the link should allow client to send an email to "Screeningtool-Support@omb.eop.gov"
+  # Scenario: People can find how to Send feedback
+  #   Given I am on the "About" page
+  #   When I look for the "Send feedback" CTA
+  #   Then the link should allow client to send an email to "Screeningtool-Support@omb.eop.gov"
 
-  Scenario: Open source community can find and click on their CTA
-    Given I am on the "About" page
-    When I look for the "Join the open source community" CTA
-    And I click on the "Join the open source community" "external" link
-    Then the link should respond successfully
+  # Scenario: Open source community can find and click on their CTA
+  #   Given I am on the "About" page
+  #   When I look for the "Join the open source community" CTA
+  #   And I click on the "Join the open source community" "external" link
+  #   Then the link should respond successfully
diff --git a/client/cypress/integration/Methodology.feature b/client/cypress/integration/Methodology.feature
index 9d8d0dcb1..a118d047f 100644
--- a/client/cypress/integration/Methodology.feature
+++ b/client/cypress/integration/Methodology.feature
@@ -1,19 +1,19 @@
 Feature: The Methodology page will open from all other pages
   
-  Scenario: Methodology page open when navigating from About page
-    Given I am on the "About" page
-    # When I click on the "Methodology" dropdown in the navigation
-    When I click on the "Methodology" page in the navigation
-    Then I see "Methodology" in the title
+  # Scenario: Methodology page open when navigating from About page
+  #   Given I am on the "About" page
+  #   # When I click on the "Methodology" dropdown in the navigation
+  #   When I click on the "Methodology" page in the navigation
+  #   Then I see "Methodology" in the title
 
-  Scenario: Methodology page open when navigating from Explore the map page
-    Given I am on the "Explore" page
-    # When I click on the "Methodology" dropdown in the navigation
-    When I click on the "Methodology" page in the navigation
-    Then I see "Methodology" in the title
+  # Scenario: Methodology page open when navigating from Explore the map page
+  #   Given I am on the "Explore" page
+  #   # When I click on the "Methodology" dropdown in the navigation
+  #   When I click on the "Methodology" page in the navigation
+  #   Then I see "Methodology" in the title
     
-  Scenario: Methodology page open when navigating from Contact page
-    Given I am on the "Contact" page
-    # When I click on the "Methodology" dropdown in the navigation
-    When I click on the "Methodology" page in the navigation
-    Then I see "Methodology" in the title
\ No newline at end of file
+  # Scenario: Methodology page open when navigating from Contact page
+  #   Given I am on the "Contact" page
+  #   # When I click on the "Methodology" dropdown in the navigation
+  #   When I click on the "Methodology" page in the navigation
+  #   Then I see "Methodology" in the title
\ No newline at end of file
diff --git a/client/src/components/AboutCard/AboutCard.tsx b/client/src/components/AboutCard/AboutCard.tsx
index 88aeb96a6..c08d91c9f 100644
--- a/client/src/components/AboutCard/AboutCard.tsx
+++ b/client/src/components/AboutCard/AboutCard.tsx
@@ -59,13 +59,13 @@ const AboutCard = (props: React.PropsWithChildren<AboutCardProps>) => {
               <h3>{props.header}</h3>
               {props.children}
               <div className={'j40-aboutcard-sm-link'}>
-                <LinkTypeWrapper
+                {props.url && <LinkTypeWrapper
                   linkText={props.linkText}
                   internal={props.internal}
                   url={props.url ? props.url : ''}
                   openUrlNewTab={props.openUrlNewTab}
                   // className={'j40-aboutcard-link'}
-                />
+                />}
               </div>
             </Grid>
           </Grid>
diff --git a/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx b/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx
index 0ba4ed465..314335c44 100644
--- a/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx
+++ b/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx
@@ -1,23 +1,26 @@
 import React from 'react';
 
 import * as styles from './howYouCanHelp.module.scss';
-import * as EXPLORE_COPY from '../../data/copy/explore';
+import * as ABOUT_COPY from '../../data/copy/about';
 
 const HowYouCanHelp = () => {
   return (
     <div className={styles.howYouCanHelpContainer}>
       <h2>
-        {EXPLORE_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.HEADING}
+        {ABOUT_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.HEADING}
       </h2>
       <ul className={styles.howYouCanHelpListWrapper}>
         <li className={styles.howYouCanHelpList}>
-          {EXPLORE_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_1}
+          {ABOUT_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_1}
         </li>
         <li className={styles.howYouCanHelpList}>
-          {EXPLORE_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_2}
+          {ABOUT_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_2}
         </li>
         <li className={styles.howYouCanHelpList}>
-          {EXPLORE_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_3}
+          {ABOUT_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_3}
+        </li>
+        <li className={styles.howYouCanHelpList}>
+          {ABOUT_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_4}
         </li>
       </ul>
     </div>
diff --git a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
index b72aea622..6a12b5f7e 100644
--- a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
+++ b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
@@ -8,30 +8,36 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl
     </h2>
     <ul>
       <li>
-        View the 
+        Provide 
         <a
           class="usa-link"
           href="/en/methodology"
         >
-          Methodology & data
+          general feedback
         </a>
-         page and send feedback.
+         on the CEJST website
       </li>
       <li>
-        Use the map to find communities and 
+        Suggest new 
         <a
-          class="usa-link usa-link--external"
-          data-cy=""
-          href="mailto:Screeningtool-Support@omb.eop.gov"
-          rel="noreferrer"
-          target="_blank"
+          class="usa-link"
+          href="/en/methodology"
         >
-          share your feedback
+          data sources
         </a>
         .
       </li>
       <li>
-        The Request for Information on the Federal Register is now closed.
+        Have feedback about a specific census tract? You can either click here or click the “Send Feedback” button on the side-panel of a census tract on the map.
+      </li>
+      <li>
+        Any other questions? Email: 
+        <a
+          class="usa-link"
+          href="/en/methodology"
+        >
+          Screeningtool-Support@omb.eop.gov
+        </a>
       </li>
     </ul>
   </div>
diff --git a/client/src/components/J40Header/J40Header.module.scss b/client/src/components/J40Header/J40Header.module.scss
index 0802b5af9..76e10ac63 100644
--- a/client/src/components/J40Header/J40Header.module.scss
+++ b/client/src/components/J40Header/J40Header.module.scss
@@ -1,9 +1,5 @@
 @use '../../styles/design-system.scss' as *;
 
-// Set nav links color to primary color (1b1b1b)
-.usa-nav__primary > .usa-nav__primary-item > a {
-  @include u-text("gray-90");
-}
 
 .logoNavRow {
   @include u-margin-top(4);
diff --git a/client/src/components/J40Header/J40Header.test.tsx b/client/src/components/J40Header/J40Header.test.tsx
index 64472639a..9df4db050 100644
--- a/client/src/components/J40Header/J40Header.test.tsx
+++ b/client/src/components/J40Header/J40Header.test.tsx
@@ -6,7 +6,7 @@ import J40Header from './J40Header';
 describe('rendering of the J40Header', () => {
   const {asFragment} = render(
       <LocalizedComponent>
-        <J40Header />
+        <J40Header location={location}/>
       </LocalizedComponent>,
   );
 
diff --git a/client/src/components/J40Header/J40Header.tsx b/client/src/components/J40Header/J40Header.tsx
index 43d07bd27..8577bf0fd 100644
--- a/client/src/components/J40Header/J40Header.tsx
+++ b/client/src/components/J40Header/J40Header.tsx
@@ -1,4 +1,4 @@
-import React, {useState} from 'react';
+import React, {useEffect, useState} from 'react';
 import {Link, useIntl} from 'gatsby-plugin-intl';
 import {
   Header,
@@ -18,8 +18,11 @@ import {useWindowSize} from 'react-use';
 import siteLogo from '../../images/j40-logo-v2.png';
 import * as styles from './J40Header.module.scss';
 import * as COMMON_COPY from '../../data/copy/common';
-import {PAGES_ENDPOINTS} from '../../data/constants';
+import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../../data/constants';
 
+interface IJ40Header {
+  location: Location
+}
 /**
  * The J40Header component will control how the header looks for both mobile and desktop
  *
@@ -28,11 +31,14 @@ import {PAGES_ENDPOINTS} from '../../data/constants';
  * 2. Logo and Nav Links Row
  * 3. Any Alerts
  *
+ * @param {Location} location
  * @return {JSX.Element}
  */
-const J40Header = () => {
+const J40Header = ({location}:IJ40Header) => {
   const intl = useIntl();
-  const {width} = useWindowSize();
+
+  // grab last segment of location pathname
+  const [lastSegmentLocation] = location.pathname.split('/').slice(-1);
 
   // Logo text
   const logoLine1 = intl.formatMessage(COMMON_COPY.HEADER.TITLE_LINE_1);
@@ -41,23 +47,61 @@ const J40Header = () => {
    * State variable to control the toggling of mobile menu button
    */
   const [mobileNavOpen, setMobileNavOpen] = useState(false);
-  const toggleMobileNav = (): void =>
+  const toggleMobileNav = (): void => {
+    console.log('mobile opened!');
     setMobileNavOpen((prevOpen) => !prevOpen);
+  };
 
   /**
    * State variable to hold the open/close state of each nav dropdown. This will allow for two
    * dropdown that are being used, each corresponding to an index in the state array:
    *
-   * index 0 = Data & Methodology dropdown (being used)
-   * index 1 = About dropdown (removed for now)
+   * index 0 = Data & Methodology dropdown
+   * index 1 = About dropdown
+   */
+  const [isOpen, setIsOpen] = useState([false, false]);
+
+  /**
+   * When transitioning between anything larger than desktop and anything less than desktop the nav menu
+   * changes from the usual row of nav links (dektop) to the MENU button(mobile). On desktop all nav drop
+   * dropdowns should be closed, while on mobile all nav links should be open.
+   *
+   * The useWindowSize provides the device width and the useEffect allows the side effect (opening/closing
+   * nav links) to occur anytime the device width changes.
+   */
+  const {width} = useWindowSize();
+  useEffect( () => {
+    if (width < USWDS_BREAKPOINTS.DESKTOP) {
+      setIsOpen([true, true]);
+    } else {
+      setIsOpen([false, false]);
+    }
+  }, [width]);
+
+  /**
+   * This toggle function will handle both navigation toggle links (Meth and About).
+   *
+   * @param {number} index
    */
-  const [isOpen, setIsOpen] = useState([true]);
   const onToggle = (index: number): void => {
+    console.log('🚀 ~ file: J40Header.tsx ~ line 57 ~ J40Header ~ isOpen before toggle', isOpen);
+
+    // The setIsOpen is used to toggle the currently selected nav link
     setIsOpen((prevIsOpen) => {
-      const newIsOpen = [true];
+      const newIsOpen = [...isOpen];
       newIsOpen[index] = !prevIsOpen[index];
       return newIsOpen;
     });
+
+    /**
+     * When on desktop only, the dropdown nav links (Meth and About) should close if any of the other ones
+     * are still open. This next set of logic handles that.
+     */
+    if (index === 0 && isOpen[1] === true && width > USWDS_BREAKPOINTS.DESKTOP) {
+      setIsOpen([isOpen[0], false]);
+    } else if (index === 1 && isOpen[0] === true && width > USWDS_BREAKPOINTS.DESKTOP) {
+      setIsOpen([false, isOpen[1]]);
+    }
   };
 
   /**
@@ -89,52 +133,10 @@ const J40Header = () => {
   ];
 
   /**
-   * In the future, we may want to add sub-pages to the About page. This array will
-   * define the sub-pages for the About page.
-   */
-  // const aboutSubNavLinks = [
-  //   <Link
-  //     to={PAGES_ENDPOINTS.ABOUT}
-  //     key={'about'}
-  //     activeClassName="usa-current"
-  //     data-cy={'nav-link-about'}>
-  //     {intl.formatMessage(COMMON_COPY.HEADER.ABOUT)}
-  //   </Link>,
-  //   <Link
-  //     to={PAGES_ENDPOINTS.FAQS}
-  //     key={'faqs'}
-  //     activeClassName="usa-current"
-  //     data-cy={'nav-link-faqs'}>
-  //     {intl.formatMessage(COMMON_COPY.HEADER.FAQs)}
-  //   </Link>,
-  //   <Link
-  //     to={PAGES_ENDPOINTS.PUBLIC_ENG}
-  //     key={'publicEng'}
-  //     activeClassName="usa-current"
-  //     data-cy={'nav-link-public-engagement'}>
-  //     {intl.formatMessage(COMMON_COPY.HEADER.PUBLIC_ENG)}
-  //   </Link>,
-  // ];
-
-
-  /**
-   * This is the array that holds the navigation links and eventually is the one
-   * that is passed to the render function. It only defines Explore, About and
-   * Contact.
-   *
-   * The Methodology & Data link is passed in depending on screen size.
-   *
-   * For mobile: the Methodology & Data link should have sub-pages
-   * For desktop: the Methodology & Data link should NOT have sub-pages
+   * On mobile, the About page should have 3 sub-nav links. This defines
+   * the array that will hold these links
    */
-  const navLinks = [
-    <Link
-      to={PAGES_ENDPOINTS.EXPLORE}
-      key={'explore-map'}
-      activeClassName="usa-current"
-      data-cy={'nav-link-explore-the-map'}>
-      {intl.formatMessage(COMMON_COPY.HEADER.EXPLORE)}
-    </Link>,
+  const aboutPageSubNavLinks = [
     <Link
       to={PAGES_ENDPOINTS.ABOUT}
       key={'about'}
@@ -143,21 +145,33 @@ const J40Header = () => {
       {intl.formatMessage(COMMON_COPY.HEADER.ABOUT)}
     </Link>,
     <Link
-      to={PAGES_ENDPOINTS.CONTACT}
-      key={'contact'}
+      to={PAGES_ENDPOINTS.FAQS}
+      key={'faqs'}
       activeClassName="usa-current"
-      data-cy={'nav-link-contact'}>
-      {intl.formatMessage(COMMON_COPY.HEADER.CONTACT)}
+      data-cy={'nav-link-faqs'}>
+      {intl.formatMessage(COMMON_COPY.HEADER.FAQS)}
+    </Link>,
+    <Link
+      to={PAGES_ENDPOINTS.PUBLIC_ENG}
+      key={'publicEng'}
+      activeClassName="usa-current"
+      data-cy={'nav-link-public-engagement'}>
+      {intl.formatMessage(COMMON_COPY.HEADER.PUBLIC_ENG)}
     </Link>,
-    <div key={'language'}>
-      <Language isDesktop={false}/>
-    </div>,
   ];
 
-  // For mobile: the Methodology & Data link should have sub-pages
-  const MethPageNavWithSubPages = () =>
+  // Methodology & Data Nav component
+  const MethNav = () =>
     <>
+      {/* Add a className of usa-current anytime this component renders when the location of the app is on
+      the Methodology page or the downloads page. This will style the nav link with a bottom border */}
       <NavDropDownButton
+        className={
+          lastSegmentLocation === PAGES_ENDPOINTS.METHODOLOGY.slice(1) ||
+          lastSegmentLocation === PAGES_ENDPOINTS.DOWNLOADS.slice(1) ?
+          'usa-current' :
+          ''
+        }
         key="methDropDown"
         label={intl.formatMessage(COMMON_COPY.HEADER.METHODOLOGY)}
         menuId="methMenu"
@@ -175,18 +189,58 @@ const J40Header = () => {
       </Menu>
     </>;
 
-  // For desktop: the Methodology & Data link should NOT have sub-pages
-  const MethPageNav = () =>
+  // About Nav component
+  const AboutNav = () =>
+    <>
+      {/* Add a className of usa-current anytime this component renders when the location of the app is on
+      the About, FAQS or Public Eng page. This will style the nav link with a bottom border */}
+      <NavDropDownButton
+        className={
+          lastSegmentLocation === PAGES_ENDPOINTS.ABOUT.slice(1) ||
+          lastSegmentLocation === PAGES_ENDPOINTS.FAQS.slice(1) ||
+          lastSegmentLocation === PAGES_ENDPOINTS.PUBLIC_ENG.slice(1) ?
+          'usa-current' :
+          ''
+        }
+        key="aboutDropDown"
+        label={intl.formatMessage(COMMON_COPY.HEADER.ABOUT)}
+        menuId="aboutMenu"
+        isOpen={isOpen[1]}
+        onToggle={(): void => onToggle(1)}
+        data-cy={'nav-dropdown-about'}
+      >
+      </NavDropDownButton>
+      <Menu
+        id='aboutMenu'
+        type='subnav'
+        items={aboutPageSubNavLinks}
+        isOpen={isOpen[1]}
+      >
+      </Menu>
+    </>;
+
+  // Navigation links for app
+  const navLinks = [
     <Link
-      to={PAGES_ENDPOINTS.METHODOLOGY}
-      key={'methodology'}
+      to={PAGES_ENDPOINTS.EXPLORE}
+      key={'explore-map'}
       activeClassName="usa-current"
-      data-cy={'nav-link-methodology'}>
-      {intl.formatMessage(COMMON_COPY.HEADER.METHODOLOGY)}
-    </Link>;
-
-  // Modify navLinks to choose the appropriate Methodology & Data nav link depending on screen size
-  navLinks.splice(1, 0, width > 1024 ? <MethPageNav/> : <MethPageNavWithSubPages/>);
+      data-cy={'nav-link-explore-the-map'}>
+      {intl.formatMessage(COMMON_COPY.HEADER.EXPLORE)}
+    </Link>,
+    <MethNav key="methDropDown"/>,
+    <AboutNav key="aboutDropDown"/>,
+    <Link
+      to={PAGES_ENDPOINTS.CONTACT}
+      key={'contact'}
+      activeClassName="usa-current"
+      data-cy={'nav-link-contact'}>
+      {intl.formatMessage(COMMON_COPY.HEADER.CONTACT)}
+    </Link>,
+    <div key={'language'}>
+      <Language isDesktop={false}/>
+    </div>,
+  ];
 
   return (
     <Header basic={true} role={'banner'}>
diff --git a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
index 46de256cd..1fb2db54d 100644
--- a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
+++ b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
@@ -235,7 +235,7 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
               >
                 <button
                   aria-controls="methMenu"
-                  aria-expanded="true"
+                  aria-expanded="false"
                   class="usa-accordion__button usa-nav__link"
                   data-cy="nav-dropdown-methodology"
                   data-testid="navDropDownButton"
@@ -247,6 +247,7 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
                 </button>
                 <ul
                   class="usa-nav__submenu"
+                  hidden=""
                   id="methMenu"
                 >
                   <li
@@ -274,12 +275,54 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
               <li
                 class="usa-nav__primary-item"
               >
-                <a
-                  data-cy="nav-link-about"
-                  href="/en/about"
+                <button
+                  aria-controls="aboutMenu"
+                  aria-expanded="false"
+                  class="usa-accordion__button usa-nav__link"
+                  data-cy="nav-dropdown-about"
+                  data-testid="navDropDownButton"
+                  type="button"
                 >
-                  About
-                </a>
+                  <span>
+                    About
+                  </span>
+                </button>
+                <ul
+                  class="usa-nav__submenu"
+                  hidden=""
+                  id="aboutMenu"
+                >
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-about"
+                      href="/en/about"
+                    >
+                      About
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
+                    >
+                      Frequently asked questions
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
+                    >
+                      Engagement calendar
+                    </a>
+                  </li>
+                </ul>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/components/LinkTypeWrapper/LinkTypeWrapper.tsx b/client/src/components/LinkTypeWrapper/LinkTypeWrapper.tsx
index 6f20f7c21..590021de9 100644
--- a/client/src/components/LinkTypeWrapper/LinkTypeWrapper.tsx
+++ b/client/src/components/LinkTypeWrapper/LinkTypeWrapper.tsx
@@ -40,7 +40,8 @@ const LinkTypeWrapper = (props:ILinkTypeWrapper) => {
 
   if (props.internal) {
     return (
-      <Link to={`${url}`}
+      <Link
+        to={`${url}`}
         className={props.className ? `usa-link ${props.className}` : `usa-link`}
       >
         {props.linkText}
diff --git a/client/src/components/SubPageNav/SubPageNav.test.tsx b/client/src/components/SubPageNav/SubPageNav.test.tsx
index bd6667034..75b82bb86 100644
--- a/client/src/components/SubPageNav/SubPageNav.test.tsx
+++ b/client/src/components/SubPageNav/SubPageNav.test.tsx
@@ -4,32 +4,15 @@ import {LocalizedComponent} from '../../test/testHelpers';
 import SubPageNav from './SubPageNav';
 
 describe('rendering of the SubPageNav', () => {
-  const firstLinkActive = 1;
-  const secondLinkIndex = 2;
-
-  it('checks if the first link is active', () => {
-    const {container} = render(
-        <LocalizedComponent>
-          <SubPageNav activeSubPageIndex={firstLinkActive}/>
-        </LocalizedComponent>,
-    );
-
-    const firstLink = container.querySelector(`.usa-sidenav li:nth-child(${firstLinkActive}) a`);
-    const secondLink = container.querySelector(`.usa-sidenav li:nth-child(${secondLinkIndex}) a`);
-    expect(firstLink?.className).toBe('usa-link usa-current');
-    expect(secondLink?.className).not.toBe('usa-link usa-current');
-  });
-
-  it('checks if the second link is active', () => {
-    const {container} = render(
+  it('checks SubPageNav renders', () => {
+    const {asFragment} = render(
         <LocalizedComponent>
-          <SubPageNav activeSubPageIndex={secondLinkIndex}/>
+          <SubPageNav endPoints={[
+            '/methodology',
+            '/download',
+          ]}/>
         </LocalizedComponent>,
     );
-
-    const firstLink = container.querySelector(`.usa-sidenav li:nth-child(${firstLinkActive}) a`);
-    const secondLink = container.querySelector(`.usa-sidenav li:nth-child(${secondLinkIndex}) a`);
-    expect(secondLink?.className).toBe('usa-link usa-current');
-    expect(firstLink?.className).not.toBe('usa-link usa-current');
+    expect(asFragment()).toMatchSnapshot();
   });
 });
diff --git a/client/src/components/SubPageNav/SubPageNav.tsx b/client/src/components/SubPageNav/SubPageNav.tsx
index 3f79401cc..754830a64 100644
--- a/client/src/components/SubPageNav/SubPageNav.tsx
+++ b/client/src/components/SubPageNav/SubPageNav.tsx
@@ -9,27 +9,73 @@ import * as COMMON_COPY from '../../data/copy/common';
 // This prop is used to set which sub-page navigation is active
 interface ISubPageNav {
     activeSubPageIndex?: number;
+    endPoints: string[];
 }
-
-const SubPageNav = ({activeSubPageIndex}:ISubPageNav) => {
+/**
+ * This function will take in an endpoint (last segment of the app's URL) and return the appropriate
+ * string to find the i18n label
+ *
+ * @param {string} endPoint
+ * @return {string}
+ */
+const getPageConstant = (endPoint:string) => {
   const intl = useIntl();
 
-  const subPages = [
-    <LinkTypeWrapper
-      key={0}
-      className={activeSubPageIndex === 1 ? 'usa-current' : ''}
-      url={PAGES_ENDPOINTS.METHODOLOGY}
-      internal={true}
-      linkText={intl.formatMessage(COMMON_COPY.HEADER.METHODOLOGY)}
-    />,
+  if (endPoint === PAGES_ENDPOINTS.EXPLORE) {
+    return intl.formatMessage(COMMON_COPY.HEADER['EXPLORE']);
+  } else if (endPoint === PAGES_ENDPOINTS.METHODOLOGY) {
+    return intl.formatMessage(COMMON_COPY.HEADER['METHODOLOGY']);
+  } else if (endPoint == PAGES_ENDPOINTS.DOWNLOADS) {
+    return intl.formatMessage(COMMON_COPY.HEADER['DOWNLOADS']);
+  } else if (endPoint == PAGES_ENDPOINTS.TSD) {
+    return intl.formatMessage(COMMON_COPY.HEADER['TSD']);
+  } else if (endPoint == PAGES_ENDPOINTS.ABOUT) {
+    return intl.formatMessage(COMMON_COPY.HEADER['ABOUT']);
+  } else if (endPoint === PAGES_ENDPOINTS.FAQS) {
+    return intl.formatMessage(COMMON_COPY.HEADER['FAQS']);
+  } else if (endPoint == PAGES_ENDPOINTS.PUBLIC_ENG) {
+    return intl.formatMessage(COMMON_COPY.HEADER['PUBLIC_ENG']);
+  } else if (endPoint == PAGES_ENDPOINTS.CONTACT) {
+    return intl.formatMessage(COMMON_COPY.HEADER['CONTACT']);
+  };
+};
+/**
+ * The main component. It will take in an array of endpoints that the sub-nan should navigate to. It will
+ * also take an optional prop that will determine which sub-nav link should be highlighted when the page
+ * loads. If the activeSubPageIndex is not provided, it will default to the first index to highlight the
+ * first endpoint in the array.
+ *
+ * @param {number} activeSubPageIndex
+ * @param {string[]} endPoints
+ * @return {JSX}
+ */
+const SubPageNav = ({activeSubPageIndex = 0, endPoints}:ISubPageNav) => {
+  const subPages = endPoints.map((endPoint, index) =>
     <LinkTypeWrapper
-      key={1}
-      className={activeSubPageIndex === 2 ? 'usa-current' : ''}
-      url={PAGES_ENDPOINTS.DOWNLOADS}
+      key={index}
+      className={activeSubPageIndex === index ? 'usa-current' : ''}
+      url={endPoint}
       internal={true}
-      linkText={intl.formatMessage(COMMON_COPY.HEADER.DOWNLOADS)}
+      linkText={getPageConstant(endPoint)}
     />,
-  ];
+  );
+
+  // const subPages = [
+  //   <LinkTypeWrapper
+  //     key={0}
+  //     className={activeSubPageIndex === 1 ? 'usa-current' : ''}
+  //     url={PAGES_ENDPOINTS.METHODOLOGY}
+  //     internal={true}
+  //     linkText={intl.formatMessage(COMMON_COPY.HEADER.METHODOLOGY)}
+  //   />,
+  //   <LinkTypeWrapper
+  //     key={1}
+  //     className={activeSubPageIndex === 2 ? 'usa-current' : ''}
+  //     url={PAGES_ENDPOINTS.DOWNLOADS}
+  //     internal={true}
+  //     linkText={intl.formatMessage(COMMON_COPY.HEADER.DOWNLOADS)}
+  //   />,
+  // ];
 
   return (
     <SideNav items={subPages}/>
diff --git a/client/src/components/SubPageNav/__snapshots__/SubPageNav.test.tsx.snap b/client/src/components/SubPageNav/__snapshots__/SubPageNav.test.tsx.snap
new file mode 100644
index 000000000..dc01d8100
--- /dev/null
+++ b/client/src/components/SubPageNav/__snapshots__/SubPageNav.test.tsx.snap
@@ -0,0 +1,29 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`rendering of the SubPageNav checks SubPageNav renders 1`] = `
+<DocumentFragment>
+  <ul
+    class="usa-sidenav"
+    data-testid="sidenav"
+  >
+    <li
+      class="usa-sidenav__item"
+    >
+      <a
+        class="usa-link usa-current"
+        href="/en/methodology"
+      >
+        Methodology & data
+      </a>
+    </li>
+    <li
+      class="usa-sidenav__item"
+    >
+      <a
+        class="usa-link"
+        href="/en/download"
+      />
+    </li>
+  </ul>
+</DocumentFragment>
+`;
diff --git a/client/src/components/layout.tsx b/client/src/components/layout.tsx
index dca28ec93..4aa798957 100644
--- a/client/src/components/layout.tsx
+++ b/client/src/components/layout.tsx
@@ -54,7 +54,7 @@ const Layout = ({children, location, title}: ILayoutProps) => {
       </Helmet>
 
       <URLFlagProvider location={location}>
-        <J40Header />
+        <J40Header location={location}/>
         <main id={'main-content'}>
           {children}
         </main>
diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx
index 8f234a25b..1443b8eb0 100644
--- a/client/src/data/copy/about.tsx
+++ b/client/src/data/copy/about.tsx
@@ -2,149 +2,140 @@
 import React from 'react';
 import {defineMessages} from 'react-intl';
 import {FormattedMessage} from 'gatsby-plugin-intl';
-import {italicFn, linkFn, FEEDBACK_EMAIL} from './common';
+
+import {italicFn, linkFn} from './common';
+import {VERSION_NUMBER} from './methodology';
+import {PAGES_ENDPOINTS} from '../constants';
 
 export const EXEC_ORDER_LINK = 'https://www.federalregister.gov/documents/2021/02/01/2021-02177/tackling-the-climate-crisis-at-home-and-abroad#:~:text=Sec.%20223.%20Justice40,40-percent%20goal.';
 export const FAQS_LINK = 'https://www.whitehouse.gov/wp-content/uploads/2022/02/CEQ-CEJST-QandA.pdf';
 
 export const PAGE = defineMessages({
-  TILE: {
+  TITLE: {
     id: 'about.page.title.text',
     defaultMessage: 'About',
     description: 'Navigate to the About page. This is the about page title text',
   },
-  HEADING: {
-    id: 'about.page.heading.text',
-    defaultMessage: 'About',
-    description: 'Navigate to the About page. This is the first heading',
-  },
-  HEADING_1: {
-    id: 'about.page.heading.1.text',
-    defaultMessage: 'Screening tool',
-    description: 'Navigate to the About page. This is the second heading',
-  },
-  HEADING1_DESCRIPTION2: {
-    id: 'about.page.sub.header.1.text.2',
-    defaultMessage: 'The current version of the tool is in a public beta form and'+
-    ' will be updated based on feedback and research.',
-    description: 'Navigate to the About page. This is first heading description',
-  },
-  HEADING_2: {
-    id: 'about.page.sub.header.2.text',
-    defaultMessage: 'The Justice40 Initiative',
-    description: 'Navigate to the About page. This is the third heading',
-  },
-  HEADING2_DESCRIPTION1: {
-    id: 'about.page.sub.header.2.text.1',
-    defaultMessage: `
-      The tool will provide important information for the Justice40 Initiative. The goal of the 
-      Justice40 Initiative is to provide 40 percent of the overall benefits of certain Federal
-      investments in seven key areas to disadvantaged communities. These seven key areas are: climate 
-      change, clean energy and energy efficiency, clean transit, affordable and sustainable
-      housing, training and workforce development, the remediation and reduction of legacy pollution, 
-      and the development of critical clean water infrastructure.
-    `,
-    description: 'Navigate to the About page. This is the third heading description',
-  },
-  HEADING_3: {
-    id: 'about.page.sub.header.3.text',
-    defaultMessage: 'Still have questions?',
-    description: 'Navigate to the About page. This is the fourth heading',
-  },
-
 });
 
-export const HEADING_1 = {
-  DESCRIPTION_1:
+export const CONTENT = {
+  PARA1:
   <FormattedMessage
-    id={'about.page.sub.header.1.text.1'}
-    description={'Navigate to the About page. This is the second heading description'}
+    id={'about.page.paragraph.1'}
     defaultMessage={`
-    In <link1>Executive Order 14008</link1> on <italictag>Tackling the Climate Crisis at Home and Abroad</italictag>, President Biden directed the Council on Environmental Quality (CEQ) 
-    to create a Climate and Economic Justice Screening Tool. The purpose of the tool is to help
-    Federal agencies identify disadvantaged communities that are marginalized, underserved, and 
-    overburdened by pollution. The current version of the tool provides socioeconomic, environmental, 
-    and climate information to inform decisions that may affect these communities. The 
-    tool identifies disadvantaged communities through publicly-available, nationally-consistent datasets.
+      In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens.
     `}
+    description={'Navigate to the About page. This is the paragraph 1'}
     values={{
       link1: linkFn(EXEC_ORDER_LINK, false, true),
       italictag: italicFn,
     }}
   />,
-};
-export const HEADING_3 = {
-  DESCRIPTION_1:
+  PARA2:
   <FormattedMessage
-    id={'about.page.sub.header.3.text.1'}
-    defaultMessage={`Find answers on the Climate and Economic Justice Screening Tool's <link1>Frequently Asked Questions</link1>.
+    id={'about.page.paragraph.2'}
+    defaultMessage={`
+      Federal agencies will use the tool to help identify disadvantaged communities that will benefit from programs included in <link1>Justice40 Initiative</link1>. The Justice40 Initiative seeks to deliver 40% of the overall benefits of investments in climate, clean energy, and related areas to disadvantaged communities.
     `}
-    description={'Navigate to the About page. This is the second heading description'}
+    description={'Navigate to the About page. This is the paragraph 2'}
     values={{
-      link1: linkFn(FAQS_LINK, false, true),
+      link1: linkFn(EXEC_ORDER_LINK, false, true),
+      italictag: italicFn,
     }}
   />,
-};
-
-export const HEADING_2 = {
-  DESCRIPTION_2:
+  PARA3:
   <FormattedMessage
-    id={'about.page.sub.header.2.text.2'}
-    description={'about page sub header text'}
+    id={'about.page.paragraph.3'}
+    defaultMessage={`
+      Federal agencies should also use the following:
+    `}
+    description={'Navigate to the About page. This is the paragraph 3'}
+  />,
+  LI1:
+  <FormattedMessage
+    id={'about.page.list.item.1'}
+    defaultMessage={`
+      Addendum to the Justice40 Initiative Interim Guidance on Using CEJST
+    `}
+    description={'Navigate to the About page. This is the list item 1'}
+  />,
+  LI2:
+  <FormattedMessage
+    id={'about.page.list.item.2'}
     defaultMessage={`
-    Read more about the Justice40 Initiative in President Biden’s
-    <link1>Executive Order 14008</link1> on <italictag>Tackling the Climate Crisis at Home and Abroad</italictag>.
+      Instructions to Federal Agencies on Using the CEJST
     `}
+    description={'Navigate to the About page. This is the list item 2'}
+  />,
+  PARA4:
+  <FormattedMessage
+    id={'about.page.paragraph.4'}
+    defaultMessage={`
+      CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}.
+    `}
+    description={'Navigate to the About page. This is the paragraph 4'}
     values={{
-      link1: linkFn(EXEC_ORDER_LINK, false, true),
-      italictag: italicFn,
+      version: VERSION_NUMBER,
+    }}
+  />,
+  USE_DATA_PARA:
+  <FormattedMessage
+    id={'about.page.use.data.paragraph'}
+    defaultMessage={`
+      The tool's data is available for <link1>download</link1>. This data can be used to filter by state or county. 
+    `}
+    description={'Navigate to the About page. This is the paragraph 4'}
+    values={{
+      link1: linkFn(PAGES_ENDPOINTS.DOWNLOADS, true, false),
+    }}
+  />,
+  HOW_TO_USE_PARA3:
+  <FormattedMessage
+    id={'about.page.use.data.paragraph'}
+    defaultMessage={`
+    A community is considered to be disadvantaged if it meets the <link1>methodology</link1>.
+    `}
+    description={'Navigate to the About page. This is the paragraph 4'}
+    values={{
+      link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
     }}
   />,
 };
 
-
 export const GITHUB_LINK = 'https://github.com/usds/justice40-tool';
 
-export const HOW_TO_GET_STARTED = defineMessages({
+export const HOW_TO_USE_TOOL = defineMessages({
   TITLE: {
-    id: 'about.page.howToGetStarted.title',
-    defaultMessage: 'How to get started',
-    description: 'Navigate to the About page. This is the sub heading of page',
-  },
-  FEDERAL_PM_HEADING: {
-    id: 'about.page.federal.pm.heading',
-    defaultMessage: 'Federal program managers',
-    description: 'Navigate to the About page. This is the sub heading of page',
-  },
-  FEDERAL_PM_INFO: {
-    id: 'about.page.federal.pm.info',
+    id: 'about.page.how.to.use.tool.title',
+    defaultMessage: 'How to use the tool',
+    description: 'Navigate to the About page. This is the sub heading of How to use the tool',
+  },
+  PARA1: {
+    id: 'about.page.how.to.use.tool.para1',
+    defaultMessage: 'The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tracts match the data that is currently available. The tool also shows Federally-recognized Tribal reservation lands, including Alaskan Native Villages.',
+    description: 'Navigate to the About page. This is the sub heading of How to use the tool paragraph1',
+  },
+  PARA2: {
+    id: 'about.page.how.to.use.tool.para2',
+    defaultMessage: 'The tool ranks most of the burdens using percentiles. Percentiles show how much burden each tract experiences compared to other tracts. Certain burdens use percentages or a simple yes/no.',
+    description: 'Navigate to the About page. This is the sub heading of How to use the tool paragraph1',
+  },
+  USE_MAP_HEADING: {
+    id: 'about.page.use.map.heading',
+    defaultMessage: 'Using the map',
+    description: 'Navigate to the About page. This is the sub heading of Using the map',
+  },
+  USE_MAP_PARA: {
+    id: 'about.page.use.map.para',
     defaultMessage: `
-      Download the tool’s current list of communities, explore data that may be useful to your 
-      program, and provide feedback on the tool.
+      Zoom and select any census tract to see if it is considered disadvantaged.
     `,
-    description: 'Navigate to the About page. This is the sub heading of page',
-  },
-  FEDERAL_PM_LINK_TEXT: {
-    id: 'about.page.federal.pm.link',
-    defaultMessage: 'Methodology & data',
-    description: 'link text to Navigate to the About page. This is the go to methodology page',
+    description: 'Navigate to the About page. This is the paragraph of Using the map',
   },
-  COMMUNITY_MEMBERS_HEADING: {
-    id: 'about.page.community.members.heading',
-    defaultMessage: 'Community members',
-    description: 'Navigate to the About page. This is the sub heading of page',
-  },
-  COMMUNITY_MEMBERS_INFO: {
-    id: 'about.page.community.members.info',
-    defaultMessage: `
-      Explore data about communities across the U.S., including your own, and provide feedback on the tool.
-    `,
-    description: 'Navigate to the About page. This is the sub heading of page',
-  },
-  COMMUNITY_MEMBERS_LINK_TEXT: {
-    id: 'about.page.community.members.link',
-    defaultMessage: 'Explore the map',
-    description: 'link to Navigate to the About page. This is the explore the map page',
+  USE_DATA_HEADING: {
+    id: 'about.page.use.data.heading',
+    defaultMessage: 'Using the data',
+    description: 'Navigate to the About page. This is the sub heading of Using the data',
   },
 });
 
@@ -162,7 +153,7 @@ export const GET_INVOLVED = defineMessages({
   SEND_FEEDBACK_INFO: {
     id: 'about.page.send.feedback.info',
     defaultMessage: `
-      Have ideas about data and information that reflect the experiences and conditions of your community?
+      Have ideas for the tool? Contact the Council on Environmental Quality’s (CEQ).
     `,
     description: 'Navigate to the About page. This is the sending feedback information',
   },
@@ -191,11 +182,45 @@ export const GET_INVOLVED_COMMENTS = {
     id={'about.page.send.feedback.email.link'}
     description={'about page sub header text'}
     defaultMessage={`
-      Email: {email}
+      Contact CEQ
     `}
+  />,
+};
+
+export const HOW_YOU_CAN_HELP_LIST_ITEMS = {
+  HEADING: <FormattedMessage
+    id={'about.page.how.you.can.help.heading'}
+    defaultMessage={`How you can help improve the map`}
+    description={`Navigate to the about page. You will see How you can help`}
+  />,
+  LIST_ITEM_1: <FormattedMessage
+    id={'about.page.how.you.can.help.list.item.1'}
+    defaultMessage={`Provide <link1>general feedback</link1> on the CEJST website`}
+    description={`Navigate to the about page. You will see How you can help list item 1`}
     values={{
-      email: FEEDBACK_EMAIL,
+      link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
+    }}
+  />,
+  LIST_ITEM_2: <FormattedMessage
+    id={'about.page.how.you.can.help.list.item.2'}
+    defaultMessage={`Suggest new <link1>data sources</link1>.`}
+    description={`Navigate to the about page. You will see How you can help list item 2`}
+    values={{
+      link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
+    }}
+  />,
+  LIST_ITEM_3: <FormattedMessage
+    id={'about.page.how.you.can.help.list.item.3'}
+    defaultMessage={`Have feedback about a specific census tract? You can either click here or click the “Send Feedback” button on the side-panel of a census tract on the map.`}
+    description={`Navigate to the about page. You will see How you can help list item 3`}
+  />,
+  LIST_ITEM_4: <FormattedMessage
+    id={'about.page.how.you.can.help.list.item.4'}
+    defaultMessage={`Any other questions? Email: <link1>Screeningtool-Support@omb.eop.gov</link1>`}
+    description={`Navigate to the about page. You will see How you can help list item 3`}
+    values={{
+      link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
     }}
   />,
-};
 
+};
diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx
index 08f2096a5..201eeea0f 100644
--- a/client/src/data/copy/common.tsx
+++ b/client/src/data/copy/common.tsx
@@ -132,7 +132,7 @@ export const HEADER = defineMessages({
     defaultMessage: 'Downloads',
     description: 'Navigate to the about page. This is Header navigate item to the downloads page',
   },
-  FAQs: {
+  FAQS: {
     id: 'common.pages.header.faqs',
     defaultMessage: 'Frequently asked questions',
     description: 'Navigate to the about page. This is Header navigate item to the faqs page',
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index cda1f8425..7edb5a95d 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -1260,35 +1260,3 @@ export const NOTE_ON_TRIBAL_NATIONS = {
     description={`Navigate to the explore the map page. Under the map, you will see tribal nations paragraph 1`}
   />,
 };
-
-export const HOW_YOU_CAN_HELP_LIST_ITEMS = {
-  HEADING: <FormattedMessage
-    id={'explore.map.page.under.map.how.you.can.help.heading'}
-    description={`Navigate to the explore the map page. Under the map, you will see how one can help us improve the map`}
-    defaultMessage={`How you can help improve the map`}
-  />,
-  LIST_ITEM_1: <FormattedMessage
-    id={'explore.map.page.under.map.how.you.can.help.list.item.1'}
-    description={`
-      Navigate to the explore the map page. Under the map, you will see give us feedback on our data and methodology
-    `}
-    defaultMessage={`View the <link1>Methodology & data</link1> page and send feedback.`}
-    values={{
-      link1: COMMON_COPY.linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
-    }}
-  />,
-  LIST_ITEM_2: <FormattedMessage
-    id={'explore.map.page.under.map.how.you.can.help.list.item.2'}
-    description={`Navigate to the explore the map page. Under the map, you will see share your feedback`}
-    defaultMessage={`Use the map to find communities and <link1>share your feedback</link1>.`}
-    values={{
-      link1: COMMON_COPY.linkFn(`mailto:${COMMON_COPY.FEEDBACK_EMAIL}`, false, true),
-    }}
-  />,
-  LIST_ITEM_3: <FormattedMessage
-    id={'explore.map.page.under.map.how.you.can.help.list.item.3'}
-    description={`Navigate to the explore the map page. Under the map, you will see RFI is expired`}
-    defaultMessage={`The Request for Information on the Federal Register is now closed.`}
-  />,
-
-};
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 8b89d2250..e34a77aac 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1,43 +1,39 @@
 {
-  "about.page.community.members.heading": {
-    "defaultMessage": "Community members",
+  "about.page.getInvolved.title": {
+    "defaultMessage": "Get involved",
     "description": "Navigate to the About page. This is the sub heading of page"
   },
-  "about.page.community.members.info": {
-    "defaultMessage": "Explore data about communities across the U.S., including your own, and provide feedback on the tool.",
-    "description": "Navigate to the About page. This is the sub heading of page"
+  "about.page.how.to.use.tool.para1": {
+    "defaultMessage": "The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tracts match the data that is currently available. The tool also shows Federally-recognized Tribal reservation lands, including Alaskan Native Villages.",
+    "description": "Navigate to the About page. This is the sub heading of How to use the tool paragraph1"
   },
-  "about.page.community.members.link": {
-    "defaultMessage": "Explore the map",
-    "description": "link to Navigate to the About page. This is the explore the map page"
+  "about.page.how.to.use.tool.para2": {
+    "defaultMessage": "The tool ranks most of the burdens using percentiles. Percentiles show how much burden each tract experiences compared to other tracts. Certain burdens use percentages or a simple yes/no.",
+    "description": "Navigate to the About page. This is the sub heading of How to use the tool paragraph1"
   },
-  "about.page.federal.pm.heading": {
-    "defaultMessage": "Federal program managers",
-    "description": "Navigate to the About page. This is the sub heading of page"
+  "about.page.how.to.use.tool.title": {
+    "defaultMessage": "How to use the tool",
+    "description": "Navigate to the About page. This is the sub heading of How to use the tool"
   },
-  "about.page.federal.pm.info": {
-    "defaultMessage": "Download the tool’s current list of communities, explore data that may be useful to your program, and provide feedback on the tool.",
-    "description": "Navigate to the About page. This is the sub heading of page"
-  },
-  "about.page.federal.pm.link": {
-    "defaultMessage": "Methodology & data",
-    "description": "link text to Navigate to the About page. This is the go to methodology page"
+  "about.page.how.you.can.help.heading": {
+    "defaultMessage": "How you can help improve the map",
+    "description": "Navigate to the about page. You will see How you can help"
   },
-  "about.page.getInvolved.title": {
-    "defaultMessage": "Get involved",
-    "description": "Navigate to the About page. This is the sub heading of page"
+  "about.page.how.you.can.help.list.item.1": {
+    "defaultMessage": "Provide <link1>general feedback</link1> on the CEJST website",
+    "description": "Navigate to the about page. You will see How you can help list item 1"
   },
-  "about.page.heading.1.text": {
-    "defaultMessage": "Screening tool",
-    "description": "Navigate to the About page. This is the second heading"
+  "about.page.how.you.can.help.list.item.2": {
+    "defaultMessage": "Suggest new <link1>data sources</link1>.",
+    "description": "Navigate to the about page. You will see How you can help list item 2"
   },
-  "about.page.heading.text": {
-    "defaultMessage": "About",
-    "description": "Navigate to the About page. This is the first heading"
+  "about.page.how.you.can.help.list.item.3": {
+    "defaultMessage": "Have feedback about a specific census tract? You can either click here or click the “Send Feedback” button on the side-panel of a census tract on the map.",
+    "description": "Navigate to the about page. You will see How you can help list item 3"
   },
-  "about.page.howToGetStarted.title": {
-    "defaultMessage": "How to get started",
-    "description": "Navigate to the About page. This is the sub heading of page"
+  "about.page.how.you.can.help.list.item.4": {
+    "defaultMessage": "Any other questions? Email: <link1>Screeningtool-Support@omb.eop.gov</link1>",
+    "description": "Navigate to the about page. You will see How you can help list item 3"
   },
   "about.page.join.open.source.info": {
     "defaultMessage": "The tool’s code is open source, which means it is available for the public to view and contribute to it.",
@@ -51,8 +47,32 @@
     "defaultMessage": "Join the open source community",
     "description": "Navigate to the About page. This is the join the community heading"
   },
+  "about.page.list.item.1": {
+    "defaultMessage": "Addendum to the Justice40 Initiative Interim Guidance on Using CEJST",
+    "description": "Navigate to the About page. This is the list item 1"
+  },
+  "about.page.list.item.2": {
+    "defaultMessage": "Instructions to Federal Agencies on Using the CEJST",
+    "description": "Navigate to the About page. This is the list item 2"
+  },
+  "about.page.paragraph.1": {
+    "defaultMessage": "In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens.",
+    "description": "Navigate to the About page. This is the paragraph 1"
+  },
+  "about.page.paragraph.2": {
+    "defaultMessage": "Federal agencies will use the tool to help identify disadvantaged communities that will benefit from programs included in <link1>Justice40 Initiative</link1>. The Justice40 Initiative seeks to deliver 40% of the overall benefits of investments in climate, clean energy, and related areas to disadvantaged communities.",
+    "description": "Navigate to the About page. This is the paragraph 2"
+  },
+  "about.page.paragraph.3": {
+    "defaultMessage": "Federal agencies should also use the following:",
+    "description": "Navigate to the About page. This is the paragraph 3"
+  },
+  "about.page.paragraph.4": {
+    "defaultMessage": "CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}.",
+    "description": "Navigate to the About page. This is the paragraph 4"
+  },
   "about.page.send.feedback.email.link": {
-    "defaultMessage": "Email: {email}",
+    "defaultMessage": "Contact CEQ",
     "description": "about page sub header text"
   },
   "about.page.send.feedback.heading": {
@@ -60,40 +80,28 @@
     "description": "Navigate to the About page. This is the sending feedback heading"
   },
   "about.page.send.feedback.info": {
-    "defaultMessage": "Have ideas about data and information that reflect the experiences and conditions of your community?",
+    "defaultMessage": "Have ideas for the tool? Contact the Council on Environmental Quality’s (CEQ).",
     "description": "Navigate to the About page. This is the sending feedback information"
   },
-  "about.page.sub.header.1.text.1": {
-    "defaultMessage": "In <link1>Executive Order 14008</link1> on <italictag>Tackling the Climate Crisis at Home and Abroad</italictag>, President Biden directed the Council on Environmental Quality (CEQ) to create a Climate and Economic Justice Screening Tool. The purpose of the tool is to help Federal agencies identify disadvantaged communities that are marginalized, underserved, and overburdened by pollution. The current version of the tool provides socioeconomic, environmental, and climate information to inform decisions that may affect these communities. The tool identifies disadvantaged communities through publicly-available, nationally-consistent datasets.",
-    "description": "Navigate to the About page. This is the second heading description"
-  },
-  "about.page.sub.header.1.text.2": {
-    "defaultMessage": "The current version of the tool is in a public beta form and will be updated based on feedback and research.",
-    "description": "Navigate to the About page. This is first heading description"
-  },
-  "about.page.sub.header.2.text": {
-    "defaultMessage": "The Justice40 Initiative",
-    "description": "Navigate to the About page. This is the third heading"
+  "about.page.title.text": {
+    "defaultMessage": "About",
+    "description": "Navigate to the About page. This is the about page title text"
   },
-  "about.page.sub.header.2.text.1": {
-    "defaultMessage": "The tool will provide important information for the Justice40 Initiative. The goal of the Justice40 Initiative is to provide 40 percent of the overall benefits of certain Federal investments in seven key areas to disadvantaged communities. These seven key areas are: climate change, clean energy and energy efficiency, clean transit, affordable and sustainable housing, training and workforce development, the remediation and reduction of legacy pollution, and the development of critical clean water infrastructure.",
-    "description": "Navigate to the About page. This is the third heading description"
+  "about.page.use.data.heading": {
+    "defaultMessage": "Using the data",
+    "description": "Navigate to the About page. This is the sub heading of Using the data"
   },
-  "about.page.sub.header.2.text.2": {
-    "defaultMessage": "Read more about the Justice40 Initiative in President Biden’s <link1>Executive Order 14008</link1> on <italictag>Tackling the Climate Crisis at Home and Abroad</italictag>.",
-    "description": "about page sub header text"
+  "about.page.use.data.paragraph": {
+    "defaultMessage": "A community is considered to be disadvantaged if it meets the <link1>methodology</link1>.",
+    "description": "Navigate to the About page. This is the paragraph 4"
   },
-  "about.page.sub.header.3.text": {
-    "defaultMessage": "Still have questions?",
-    "description": "Navigate to the About page. This is the fourth heading"
+  "about.page.use.map.heading": {
+    "defaultMessage": "Using the map",
+    "description": "Navigate to the About page. This is the sub heading of Using the map"
   },
-  "about.page.sub.header.3.text.1": {
-    "defaultMessage": "Find answers on the Climate and Economic Justice Screening Tool's <link1>Frequently Asked Questions</link1>.",
-    "description": "Navigate to the About page. This is the second heading description"
-  },
-  "about.page.title.text": {
-    "defaultMessage": "About",
-    "description": "Navigate to the About page. This is the about page title text"
+  "about.page.use.map.para": {
+    "defaultMessage": "Zoom and select any census tract to see if it is considered disadvantaged.",
+    "description": "Navigate to the About page. This is the paragraph of Using the map"
   },
   "common.pages.alerts.additional_docs_available.description": {
     "defaultMessage": "Download new <link1>technical support</link1> and other documentation and <link2>send feedback</link2>.",
@@ -1043,22 +1051,6 @@
     "defaultMessage": "<link1>Download the data sources</link1> used in the CEJST (.csv, .xlxs, .pdf that describes how to use the list, and a codebook, {downloadFileSize} unzipped). Last updated: {dateUpdated}.",
     "description": "\n      Navigate to the explore the map page. Under the map, you will see a link that is placed below the \n      map that will download the data packet\n    "
   },
-  "explore.map.page.under.map.how.you.can.help.heading": {
-    "defaultMessage": "How you can help improve the map",
-    "description": "Navigate to the explore the map page. Under the map, you will see how one can help us improve the map"
-  },
-  "explore.map.page.under.map.how.you.can.help.list.item.1": {
-    "defaultMessage": "View the <link1>Methodology & data</link1> page and send feedback.",
-    "description": "\n      Navigate to the explore the map page. Under the map, you will see give us feedback on our data and methodology\n    "
-  },
-  "explore.map.page.under.map.how.you.can.help.list.item.2": {
-    "defaultMessage": "Use the map to find communities and <link1>share your feedback</link1>.",
-    "description": "Navigate to the explore the map page. Under the map, you will see share your feedback"
-  },
-  "explore.map.page.under.map.how.you.can.help.list.item.3": {
-    "defaultMessage": "The Request for Information on the Federal Register is now closed.",
-    "description": "Navigate to the explore the map page. Under the map, you will see RFI is expired"
-  },
   "explore.map.page.under.map.note.on.territories.intro": {
     "defaultMessage": "U.S. territories note",
     "description": "Navigate to the explore the map page. Under the map, you will see territories intro text"
diff --git a/client/src/pages/about.tsx b/client/src/pages/about.tsx
index a07104602..4ad00789e 100644
--- a/client/src/pages/about.tsx
+++ b/client/src/pages/about.tsx
@@ -1,19 +1,20 @@
 import * as React from 'react';
 import {useIntl} from 'gatsby-plugin-intl';
+import {useWindowSize} from 'react-use';
 
 import AboutCard from '../components/AboutCard/AboutCard';
 import AboutCardsContainer from '../components/AboutCard/AboutCardsContainer';
+import {Grid} from '@trussworks/react-uswds';
+import HowYouCanHelp from '../components/HowYouCanHelp';
 import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
+import SubPageNav from '../components/SubPageNav';
 
 import * as ABOUT_COPY from '../data/copy/about';
 import * as COMMON_COPY from '../data/copy/common';
+import * as CONSTANTS from '../data/constants';
 import {PAGES_ENDPOINTS} from '../data/constants';
 
-// @ts-ignore
-import aboutUSMapImg from '../images/about-usmap-1.svg';
-// @ts-ignore
-import aboutJ40Img from '../images/about-j40-1.svg';
 import accountBalanceIcon // @ts-ignore
   from '/node_modules/uswds/dist/img/usa-icons/account_balance.svg';
 
@@ -33,63 +34,58 @@ interface IAboutPageProps {
 // markup
 const AboutPage = ({location}: IAboutPageProps) => {
   const intl = useIntl();
+  const {width} = useWindowSize();
 
   return (
-    <Layout location={location} title={intl.formatMessage(ABOUT_COPY.PAGE.TILE)}>
+    <Layout location={location} title={intl.formatMessage(ABOUT_COPY.PAGE.TITLE)}>
 
       <J40MainGridContainer>
 
         <section className={'page-heading'}>
-          <h1 data-cy={'about-page-heading'}>{intl.formatMessage(ABOUT_COPY.PAGE.HEADING)}</h1>
+          <h1 data-cy={'about-page-heading'}>{intl.formatMessage(ABOUT_COPY.PAGE.TITLE)}</h1>
         </section>
 
-        {/* Section 1 */}
-        <AboutCardsContainer>
-          <AboutCard
-            size={'large'}
-            imgSrc={aboutUSMapImg}
-            header={intl.formatMessage(ABOUT_COPY.PAGE.HEADING_1)}>
-            <>
-              <p>
-                {ABOUT_COPY.HEADING_1.DESCRIPTION_1}
-              </p>
+        <Grid row gap className={'j40-mb5-mt3'}>
+
+          {/* First column */}
+          <Grid col={12} tablet={{col: 8}}>
+            <section>
               <p>
-                {intl.formatMessage(ABOUT_COPY.PAGE.HEADING1_DESCRIPTION2)}
+                {ABOUT_COPY.CONTENT.PARA1}
               </p>
-            </>
-          </AboutCard>
-        </AboutCardsContainer>
-
-
-        {/* Section 2 */}
-        <AboutCardsContainer>
-          <AboutCard
-            size={'large'}
-            imgSrc={aboutJ40Img}
-            header={intl.formatMessage(ABOUT_COPY.PAGE.HEADING_2)}>
-            <>
               <p>
-                {intl.formatMessage(ABOUT_COPY.PAGE.HEADING2_DESCRIPTION1)}
+                {ABOUT_COPY.CONTENT.PARA2}
               </p>
               <p>
-                {ABOUT_COPY.HEADING_2.DESCRIPTION_2}
+                {ABOUT_COPY.CONTENT.PARA3}
+                <ul>
+                  <li> {ABOUT_COPY.CONTENT.LI1}</li>
+                  <li> {ABOUT_COPY.CONTENT.LI2}</li>
+                </ul>
               </p>
-            </>
-          </AboutCard>
-        </AboutCardsContainer>
-
-        {/* Section 3 */}
-        <AboutCardsContainer>
-          <AboutCard
-            size={'large'}
-            header={intl.formatMessage(ABOUT_COPY.PAGE.HEADING_3)}>
-            <>
               <p>
-                {ABOUT_COPY.HEADING_3.DESCRIPTION_1}
+                {ABOUT_COPY.CONTENT.PARA4}
               </p>
-            </>
-          </AboutCard>
-        </AboutCardsContainer>
+            </section>
+          </Grid>
+
+          {/* Second column */}
+          <Grid col={12} tablet={{col: 1}}>
+            {/* Spacer column */}
+          </Grid>
+
+          {/* Third column */}
+          {width > CONSTANTS.USWDS_BREAKPOINTS.DESKTOP ?
+          <Grid col={12} tablet={{col: 3}}>
+            <SubPageNav
+              endPoints={[
+                PAGES_ENDPOINTS.ABOUT,
+                PAGES_ENDPOINTS.FAQS,
+                PAGES_ENDPOINTS.PUBLIC_ENG,
+              ]}
+            />
+          </Grid> : ''}
+        </Grid>
 
       </J40MainGridContainer>
 
@@ -97,31 +93,38 @@ const AboutPage = ({location}: IAboutPageProps) => {
         fullWidth={true}
         blueBackground={true}>
         <J40MainGridContainer>
-          <h2>
-            {intl.formatMessage(ABOUT_COPY.HOW_TO_GET_STARTED.TITLE)}
-          </h2>
+
+          <Grid col={12} tablet={{col: 8}}>
+            <h2>
+              {intl.formatMessage(ABOUT_COPY.HOW_TO_USE_TOOL.TITLE)}
+            </h2>
+            <p>
+              {intl.formatMessage(ABOUT_COPY.HOW_TO_USE_TOOL.PARA1)}
+            </p>
+            <p>
+              {intl.formatMessage(ABOUT_COPY.HOW_TO_USE_TOOL.PARA2)}
+            </p>
+            <p>
+              {ABOUT_COPY.CONTENT.HOW_TO_USE_PARA3}
+            </p>
+          </Grid>
+
           <AboutCardsContainer>
             <AboutCard
               size={'small'}
               imgSrc={accountBalanceIcon}
-              header={intl.formatMessage(ABOUT_COPY.HOW_TO_GET_STARTED.FEDERAL_PM_HEADING)}
-              linkText={intl.formatMessage(ABOUT_COPY.HOW_TO_GET_STARTED.FEDERAL_PM_LINK_TEXT)}
-              url={PAGES_ENDPOINTS.METHODOLOGY}
-              internal={true}>
+              header={intl.formatMessage(ABOUT_COPY.HOW_TO_USE_TOOL.USE_MAP_HEADING)}>
               <p>
-                {intl.formatMessage(ABOUT_COPY.HOW_TO_GET_STARTED.FEDERAL_PM_INFO)}
+                {intl.formatMessage(ABOUT_COPY.HOW_TO_USE_TOOL.USE_MAP_PARA)}
               </p>
             </AboutCard>
 
             <AboutCard
               size={'small'}
               imgSrc={groupsIcon}
-              header={intl.formatMessage(ABOUT_COPY.HOW_TO_GET_STARTED.COMMUNITY_MEMBERS_HEADING)}
-              linkText={intl.formatMessage(ABOUT_COPY.HOW_TO_GET_STARTED.COMMUNITY_MEMBERS_LINK_TEXT)}
-              url={PAGES_ENDPOINTS.EXPLORE}
-              internal={true}>
+              header={intl.formatMessage(ABOUT_COPY.HOW_TO_USE_TOOL.USE_DATA_HEADING)}>
               <p>
-                {intl.formatMessage(ABOUT_COPY.HOW_TO_GET_STARTED.COMMUNITY_MEMBERS_INFO)}
+                {ABOUT_COPY.CONTENT.USE_DATA_PARA}
               </p>
             </AboutCard>
           </AboutCardsContainer>
@@ -157,6 +160,11 @@ const AboutPage = ({location}: IAboutPageProps) => {
             </p>
           </AboutCard>
         </AboutCardsContainer>
+
+        <Grid col={12} tablet={{col: 8}}>
+          <HowYouCanHelp/>
+        </Grid>
+
       </J40MainGridContainer>
     </Layout>);
 };
diff --git a/client/src/pages/downloads.tsx b/client/src/pages/downloads.tsx
index 7b116c70b..f93a00c0d 100644
--- a/client/src/pages/downloads.tsx
+++ b/client/src/pages/downloads.tsx
@@ -58,7 +58,13 @@ const DownloadsPage = ({location}: IDownloadsPageProps) => {
           {/* Third column - Only show the SubPagNav component on desktop width */}
           {width > CONSTANTS.USWDS_BREAKPOINTS.DESKTOP ?
           <Grid col={12} tablet={{col: 3}}>
-            <SubPageNav activeSubPageIndex={2}/>
+            <SubPageNav
+              activeSubPageIndex={1}
+              endPoints={[
+                CONSTANTS.PAGES_ENDPOINTS.METHODOLOGY,
+                CONSTANTS.PAGES_ENDPOINTS.DOWNLOADS,
+              ]}
+            />
           </Grid> : ''}
         </Grid>
 
diff --git a/client/src/pages/methodology.tsx b/client/src/pages/methodology.tsx
index 34538b632..34dc7a05f 100644
--- a/client/src/pages/methodology.tsx
+++ b/client/src/pages/methodology.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import {Grid} from '@trussworks/react-uswds';
 import {useIntl} from 'gatsby-plugin-intl';
+import {useWindowSize} from 'react-use';
 
 import Categories from '../components/Categories';
 import DatasetContainer from '../components/DatasetContainer';
@@ -8,10 +9,10 @@ import J40MainGridContainer from '../components/J40MainGridContainer';
 import MethodologyFormula from '../components/MethodologyFormula';
 import Layout from '../components/layout';
 import SubPageNav from '../components/SubPageNav';
-import {useWindowSize} from 'react-use';
 
 import * as CONSTANTS from '../data/constants';
 import * as METHODOLOGY_COPY from '../data/copy/methodology';
+import {PAGES_ENDPOINTS} from '../data/constants';
 
 interface MethodPageProps {
   location: Location;
@@ -59,7 +60,12 @@ const IndexPage = ({location}: MethodPageProps) => {
           {/* Third column */}
           {width > CONSTANTS.USWDS_BREAKPOINTS.DESKTOP ?
           <Grid col={12} tablet={{col: 3}}>
-            <SubPageNav activeSubPageIndex={1}/>
+            <SubPageNav
+              endPoints={[
+                PAGES_ENDPOINTS.METHODOLOGY,
+                PAGES_ENDPOINTS.DOWNLOADS,
+              ]}
+            />
           </Grid> : ''}
         </Grid>
       </J40MainGridContainer>
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index 3b3018c62..ec21e3c22 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -235,7 +235,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 <button
                   aria-controls="methMenu"
-                  aria-expanded="true"
+                  aria-expanded="false"
                   class="usa-accordion__button usa-nav__link"
                   data-cy="nav-dropdown-methodology"
                   data-testid="navDropDownButton"
@@ -247,6 +247,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </button>
                 <ul
                   class="usa-nav__submenu"
+                  hidden=""
                   id="methMenu"
                 >
                   <li
@@ -274,12 +275,54 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <a
-                  data-cy="nav-link-about"
-                  href="/en/about"
+                <button
+                  aria-controls="aboutMenu"
+                  aria-expanded="false"
+                  class="usa-accordion__button usa-nav__link"
+                  data-cy="nav-dropdown-about"
+                  data-testid="navDropDownButton"
+                  type="button"
                 >
-                  About
-                </a>
+                  <span>
+                    About
+                  </span>
+                </button>
+                <ul
+                  class="usa-nav__submenu"
+                  hidden=""
+                  id="aboutMenu"
+                >
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-about"
+                      href="/en/about"
+                    >
+                      About
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
+                    >
+                      Frequently asked questions
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
+                    >
+                      Engagement calendar
+                    </a>
+                  </li>
+                </ul>
               </li>
               <li
                 class="usa-nav__primary-item"
@@ -338,186 +381,73 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         </h1>
       </section>
       <div
-        class="grid-row grid-gap-lg j40-aboutcard-container "
+        class="grid-row grid-gap j40-mb5-mt3"
         data-testid="grid"
       >
         <div
-          class="grid-gap-lg tablet:grid-col"
+          class="grid-col-12 tablet:grid-col-8"
           data-testid="grid"
         >
-          <div
-            class="grid-row j40-aboutcard-lg-card"
-            data-testid="grid"
-          >
-            <div
-              class="tablet:grid-col-3 j40-aboutpage-image-container"
-              data-testid="grid"
-            >
-              <img
-                alt="Screening tool"
-                class="j40-aboutcard-image"
-                src="test-file-stub"
-              />
-            </div>
-            <div
-              class="tablet:grid-col-9"
-              data-cy="screening-tool-block"
-              data-testid="grid"
-            >
-              <div
-                class="grid-row"
-                data-testid="grid"
+          <section>
+            <p>
+              
+      In January of 2020, President Biden issued 
+              <a
+                class="usa-link usa-link--external"
+                data-cy=""
+                href="https://www.federalregister.gov/documents/2021/02/01/2021-02177/tackling-the-climate-crisis-at-home-and-abroad#:~:text=Sec.%20223.%20Justice40,40-percent%20goal."
+                rel="noreferrer"
+                target="_blank"
               >
-                <h2>
-                  Screening tool
-                </h2>
-                <p>
-                  
-    In 
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy=""
-                    href="https://www.federalregister.gov/documents/2021/02/01/2021-02177/tackling-the-climate-crisis-at-home-and-abroad#:~:text=Sec.%20223.%20Justice40,40-percent%20goal."
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    Executive Order 14008
-                  </a>
-                   on 
-                  <i>
-                    Tackling the Climate Crisis at Home and Abroad
-                  </i>
-                  , President Biden directed the Council on Environmental Quality (CEQ) 
-    to create a Climate and Economic Justice Screening Tool. The purpose of the tool is to help
-    Federal agencies identify disadvantaged communities that are marginalized, underserved, and 
-    overburdened by pollution. The current version of the tool provides socioeconomic, environmental, 
-    and climate information to inform decisions that may affect these communities. The 
-    tool identifies disadvantaged communities through publicly-available, nationally-consistent datasets.
+                Executive Order 14008
+              </a>
+              . The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens.
     
-                </p>
-                <p>
-                  The current version of the tool is in a public beta form and will be updated based on feedback and research.
-                </p>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="grid-row grid-gap-lg j40-aboutcard-container "
-        data-testid="grid"
-      >
-        <div
-          class="grid-gap-lg tablet:grid-col"
-          data-testid="grid"
-        >
-          <div
-            class="grid-row j40-aboutcard-lg-card"
-            data-testid="grid"
-          >
-            <div
-              class="tablet:grid-col-3 j40-aboutpage-image-container"
-              data-testid="grid"
-            >
-              <img
-                alt="The Justice40 Initiative"
-                class="j40-aboutcard-image"
-                src="test-file-stub"
-              />
-            </div>
-            <div
-              class="tablet:grid-col-9"
-              data-cy="the-justice40-initiative-block"
-              data-testid="grid"
-            >
-              <div
-                class="grid-row"
-                data-testid="grid"
+            </p>
+            <p>
+              
+      Federal agencies will use the tool to help identify disadvantaged communities that will benefit from programs included in 
+              <a
+                class="usa-link usa-link--external"
+                data-cy=""
+                href="https://www.federalregister.gov/documents/2021/02/01/2021-02177/tackling-the-climate-crisis-at-home-and-abroad#:~:text=Sec.%20223.%20Justice40,40-percent%20goal."
+                rel="noreferrer"
+                target="_blank"
               >
-                <h2>
-                  The Justice40 Initiative
-                </h2>
-                <p>
-                  
-      The tool will provide important information for the Justice40 Initiative. The goal of the 
-      Justice40 Initiative is to provide 40 percent of the overall benefits of certain Federal
-      investments in seven key areas to disadvantaged communities. These seven key areas are: climate 
-      change, clean energy and energy efficiency, clean transit, affordable and sustainable
-      housing, training and workforce development, the remediation and reduction of legacy pollution, 
-      and the development of critical clean water infrastructure.
+                Justice40 Initiative
+              </a>
+              . The Justice40 Initiative seeks to deliver 40% of the overall benefits of investments in climate, clean energy, and related areas to disadvantaged communities.
     
-                </p>
-                <p>
-                  
-    Read more about the Justice40 Initiative in President Biden’s
+            </p>
+            <p>
+              
+      Federal agencies should also use the following:
     
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy=""
-                    href="https://www.federalregister.gov/documents/2021/02/01/2021-02177/tackling-the-climate-crisis-at-home-and-abroad#:~:text=Sec.%20223.%20Justice40,40-percent%20goal."
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    Executive Order 14008
-                  </a>
-                   on 
-                  <i>
-                    Tackling the Climate Crisis at Home and Abroad
-                  </i>
-                  .
+            </p>
+            <ul>
+              <li>
+                 
+      Addendum to the Justice40 Initiative Interim Guidance on Using CEJST
     
-                </p>
-              </div>
-            </div>
-          </div>
+              </li>
+              <li>
+                 
+      Instructions to Federal Agencies on Using the CEJST
+    
+              </li>
+            </ul>
+            <p />
+            <p>
+              
+      CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version 1.0.
+    
+            </p>
+          </section>
         </div>
-      </div>
-      <div
-        class="grid-row grid-gap-lg j40-aboutcard-container "
-        data-testid="grid"
-      >
         <div
-          class="grid-gap-lg tablet:grid-col"
+          class="grid-col-12 tablet:grid-col-1"
           data-testid="grid"
-        >
-          <div
-            class="grid-row j40-aboutcard-lg-card"
-            data-testid="grid"
-          >
-            <div
-              class="tablet:grid-col-3 j40-aboutpage-image-container"
-              data-testid="grid"
-            />
-            <div
-              class="tablet:grid-col-9"
-              data-cy="still-have-questions?-block"
-              data-testid="grid"
-            >
-              <div
-                class="grid-row"
-                data-testid="grid"
-              >
-                <h2>
-                  Still have questions?
-                </h2>
-                <p>
-                  Find answers on the Climate and Economic Justice Screening Tool's 
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy=""
-                    href="https://www.whitehouse.gov/wp-content/uploads/2022/02/CEQ-CEJST-QandA.pdf"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    Frequently Asked Questions
-                  </a>
-                  .
-    
-                </p>
-              </div>
-            </div>
-          </div>
-        </div>
+        />
       </div>
     </div>
     <div
@@ -527,9 +457,32 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         class="grid-container-desktop-lg"
         data-testid="gridContainer"
       >
-        <h2>
-          How to get started
-        </h2>
+        <div
+          class="grid-col-12 tablet:grid-col-8"
+          data-testid="grid"
+        >
+          <h2>
+            How to use the tool
+          </h2>
+          <p>
+            The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tracts match the data that is currently available. The tool also shows Federally-recognized Tribal reservation lands, including Alaskan Native Villages.
+          </p>
+          <p>
+            The tool ranks most of the burdens using percentiles. Percentiles show how much burden each tract experiences compared to other tracts. Certain burdens use percentages or a simple yes/no.
+          </p>
+          <p>
+            
+    A community is considered to be disadvantaged if it meets the 
+            <a
+              class="usa-link"
+              href="/en/methodology"
+            >
+              methodology
+            </a>
+            .
+    
+          </p>
+        </div>
         <div
           class="grid-row grid-gap-lg j40-aboutcard-container "
           data-testid="grid"
@@ -547,14 +500,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 data-testid="grid"
               >
                 <img
-                  alt="Federal program managers"
+                  alt="Using the map"
                   class="j40-aboutcard-image"
                   src="test-file-stub"
                 />
               </div>
               <div
                 class="tablet:grid-col-9"
-                data-cy="federal-program-managers-block"
+                data-cy="using-the-map-block"
                 data-testid="grid"
               >
                 <div
@@ -562,24 +515,16 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   data-testid="grid"
                 >
                   <h3>
-                    Federal program managers
+                    Using the map
                   </h3>
                   <p>
                     
-      Download the tool’s current list of communities, explore data that may be useful to your 
-      program, and provide feedback on the tool.
+      Zoom and select any census tract to see if it is considered disadvantaged.
     
                   </p>
                   <div
                     class="j40-aboutcard-sm-link"
-                  >
-                    <a
-                      class="usa-link"
-                      href="/en/methodology"
-                    >
-                      Methodology & data
-                    </a>
-                  </div>
+                  />
                 </div>
               </div>
               <div
@@ -603,14 +548,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 data-testid="grid"
               >
                 <img
-                  alt="Community members"
+                  alt="Using the data"
                   class="j40-aboutcard-image"
                   src="test-file-stub"
                 />
               </div>
               <div
                 class="tablet:grid-col-9"
-                data-cy="community-members-block"
+                data-cy="using-the-data-block"
                 data-testid="grid"
               >
                 <div
@@ -618,23 +563,23 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   data-testid="grid"
                 >
                   <h3>
-                    Community members
+                    Using the data
                   </h3>
                   <p>
                     
-      Explore data about communities across the U.S., including your own, and provide feedback on the tool.
-    
-                  </p>
-                  <div
-                    class="j40-aboutcard-sm-link"
-                  >
+      The tool's data is available for 
                     <a
                       class="usa-link"
-                      href="/en/"
+                      href="/en/downloads"
                     >
-                      Explore the map
+                      download
                     </a>
-                  </div>
+                    . This data can be used to filter by state or county. 
+    
+                  </p>
+                  <div
+                    class="j40-aboutcard-sm-link"
+                  />
                 </div>
               </div>
               <div
@@ -691,7 +636,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </h3>
                 <p>
                   
-      Have ideas about data and information that reflect the experiences and conditions of your community?
+      Have ideas for the tool? Contact the Council on Environmental Quality’s (CEQ).
     
                 </p>
                 <div
@@ -705,7 +650,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     target="_blank"
                   >
                     
-      Email: Screeningtool-Support@omb.eop.gov
+      Contact CEQ
     
                   </a>
                 </div>
@@ -778,6 +723,50 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </div>
         </div>
       </div>
+      <div
+        class="grid-col-12 tablet:grid-col-8"
+        data-testid="grid"
+      >
+        <div>
+          <h2>
+            How you can help improve the map
+          </h2>
+          <ul>
+            <li>
+              Provide 
+              <a
+                class="usa-link"
+                href="/en/methodology"
+              >
+                general feedback
+              </a>
+               on the CEJST website
+            </li>
+            <li>
+              Suggest new 
+              <a
+                class="usa-link"
+                href="/en/methodology"
+              >
+                data sources
+              </a>
+              .
+            </li>
+            <li>
+              Have feedback about a specific census tract? You can either click here or click the “Send Feedback” button on the side-panel of a census tract on the map.
+            </li>
+            <li>
+              Any other questions? Email: 
+              <a
+                class="usa-link"
+                href="/en/methodology"
+              >
+                Screeningtool-Support@omb.eop.gov
+              </a>
+            </li>
+          </ul>
+        </div>
+      </div>
     </div>
   </main>
   <footer
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index 1d4e9e968..42e6f4530 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -235,7 +235,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 <button
                   aria-controls="methMenu"
-                  aria-expanded="true"
+                  aria-expanded="false"
                   class="usa-accordion__button usa-nav__link"
                   data-cy="nav-dropdown-methodology"
                   data-testid="navDropDownButton"
@@ -247,6 +247,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </button>
                 <ul
                   class="usa-nav__submenu"
+                  hidden=""
                   id="methMenu"
                 >
                   <li
@@ -274,12 +275,54 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <a
-                  data-cy="nav-link-about"
-                  href="/en/about"
+                <button
+                  aria-controls="aboutMenu"
+                  aria-expanded="false"
+                  class="usa-accordion__button usa-nav__link"
+                  data-cy="nav-dropdown-about"
+                  data-testid="navDropDownButton"
+                  type="button"
                 >
-                  About
-                </a>
+                  <span>
+                    About
+                  </span>
+                </button>
+                <ul
+                  class="usa-nav__submenu"
+                  hidden=""
+                  id="aboutMenu"
+                >
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-about"
+                      href="/en/about"
+                    >
+                      About
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
+                    >
+                      Frequently asked questions
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
+                    >
+                      Engagement calendar
+                    </a>
+                  </li>
+                </ul>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index 831832b3b..fa1506c35 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -235,7 +235,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 <button
                   aria-controls="methMenu"
-                  aria-expanded="true"
+                  aria-expanded="false"
                   class="usa-accordion__button usa-nav__link"
                   data-cy="nav-dropdown-methodology"
                   data-testid="navDropDownButton"
@@ -247,6 +247,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </button>
                 <ul
                   class="usa-nav__submenu"
+                  hidden=""
                   id="methMenu"
                 >
                   <li
@@ -274,12 +275,54 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <a
-                  data-cy="nav-link-about"
-                  href="/en/about"
+                <button
+                  aria-controls="aboutMenu"
+                  aria-expanded="false"
+                  class="usa-accordion__button usa-nav__link"
+                  data-cy="nav-dropdown-about"
+                  data-testid="navDropDownButton"
+                  type="button"
                 >
-                  About
-                </a>
+                  <span>
+                    About
+                  </span>
+                </button>
+                <ul
+                  class="usa-nav__submenu"
+                  hidden=""
+                  id="aboutMenu"
+                >
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-about"
+                      href="/en/about"
+                    >
+                      About
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
+                    >
+                      Frequently asked questions
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
+                    >
+                      Engagement calendar
+                    </a>
+                  </li>
+                </ul>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 6134db739..5dd539cdd 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -235,7 +235,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 <button
                   aria-controls="methMenu"
-                  aria-expanded="true"
+                  aria-expanded="false"
                   class="usa-accordion__button usa-nav__link"
                   data-cy="nav-dropdown-methodology"
                   data-testid="navDropDownButton"
@@ -247,6 +247,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </button>
                 <ul
                   class="usa-nav__submenu"
+                  hidden=""
                   id="methMenu"
                 >
                   <li
@@ -274,12 +275,54 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <a
-                  data-cy="nav-link-about"
-                  href="/en/about"
+                <button
+                  aria-controls="aboutMenu"
+                  aria-expanded="false"
+                  class="usa-accordion__button usa-nav__link"
+                  data-cy="nav-dropdown-about"
+                  data-testid="navDropDownButton"
+                  type="button"
                 >
-                  About
-                </a>
+                  <span>
+                    About
+                  </span>
+                </button>
+                <ul
+                  class="usa-nav__submenu"
+                  hidden=""
+                  id="aboutMenu"
+                >
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-about"
+                      href="/en/about"
+                    >
+                      About
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
+                    >
+                      Frequently asked questions
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
+                    >
+                      Engagement calendar
+                    </a>
+                  </li>
+                </ul>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 73c9d379c..35fa54434 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -235,7 +235,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 <button
                   aria-controls="methMenu"
-                  aria-expanded="true"
+                  aria-expanded="false"
                   class="usa-accordion__button usa-nav__link"
                   data-cy="nav-dropdown-methodology"
                   data-testid="navDropDownButton"
@@ -247,6 +247,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </button>
                 <ul
                   class="usa-nav__submenu"
+                  hidden=""
                   id="methMenu"
                 >
                   <li
@@ -274,12 +275,54 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <a
-                  data-cy="nav-link-about"
-                  href="/en/about"
+                <button
+                  aria-controls="aboutMenu"
+                  aria-expanded="false"
+                  class="usa-accordion__button usa-nav__link"
+                  data-cy="nav-dropdown-about"
+                  data-testid="navDropDownButton"
+                  type="button"
                 >
-                  About
-                </a>
+                  <span>
+                    About
+                  </span>
+                </button>
+                <ul
+                  class="usa-nav__submenu"
+                  hidden=""
+                  id="aboutMenu"
+                >
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-about"
+                      href="/en/about"
+                    >
+                      About
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
+                    >
+                      Frequently asked questions
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
+                    >
+                      Engagement calendar
+                    </a>
+                  </li>
+                </ul>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index bd5da8b78..cde23acf8 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -235,7 +235,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 <button
                   aria-controls="methMenu"
-                  aria-expanded="true"
+                  aria-expanded="false"
                   class="usa-accordion__button usa-nav__link"
                   data-cy="nav-dropdown-methodology"
                   data-testid="navDropDownButton"
@@ -247,6 +247,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </button>
                 <ul
                   class="usa-nav__submenu"
+                  hidden=""
                   id="methMenu"
                 >
                   <li
@@ -274,12 +275,54 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <a
-                  data-cy="nav-link-about"
-                  href="/en/about"
+                <button
+                  aria-controls="aboutMenu"
+                  aria-expanded="false"
+                  class="usa-accordion__button usa-nav__link"
+                  data-cy="nav-dropdown-about"
+                  data-testid="navDropDownButton"
+                  type="button"
                 >
-                  About
-                </a>
+                  <span>
+                    About
+                  </span>
+                </button>
+                <ul
+                  class="usa-nav__submenu"
+                  hidden=""
+                  id="aboutMenu"
+                >
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-about"
+                      href="/en/about"
+                    >
+                      About
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
+                    >
+                      Frequently asked questions
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
+                    >
+                      Engagement calendar
+                    </a>
+                  </li>
+                </ul>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index 28c82a3ad..941b8e70c 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -235,7 +235,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 <button
                   aria-controls="methMenu"
-                  aria-expanded="true"
+                  aria-expanded="false"
                   class="usa-accordion__button usa-nav__link"
                   data-cy="nav-dropdown-methodology"
                   data-testid="navDropDownButton"
@@ -247,6 +247,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </button>
                 <ul
                   class="usa-nav__submenu"
+                  hidden=""
                   id="methMenu"
                 >
                   <li
@@ -274,12 +275,54 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <a
-                  data-cy="nav-link-about"
-                  href="/en/about"
+                <button
+                  aria-controls="aboutMenu"
+                  aria-expanded="false"
+                  class="usa-accordion__button usa-nav__link"
+                  data-cy="nav-dropdown-about"
+                  data-testid="navDropDownButton"
+                  type="button"
                 >
-                  About
-                </a>
+                  <span>
+                    About
+                  </span>
+                </button>
+                <ul
+                  class="usa-nav__submenu"
+                  hidden=""
+                  id="aboutMenu"
+                >
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-about"
+                      href="/en/about"
+                    >
+                      About
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
+                    >
+                      Frequently asked questions
+                    </a>
+                  </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
+                    >
+                      Engagement calendar
+                    </a>
+                  </li>
+                </ul>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss
index a687c278c..b0366d7fc 100644
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@@ -23,6 +23,7 @@ There are 3 things that should be included in this file:
   or the Trusswork component. J40 component styles should be contained in it's own component styles.
 
   - GLOBAL STYLES
+  - HEADER STYLES
   - MAIN CONTENT STYLES
   - FOOTER STYLES
   - MAP STYLES
@@ -105,6 +106,37 @@ p.flush {
 }
 
 
+/* 
+******************************
+*      HEADER STYLES
+****************************** 
+*/
+
+li.usa-nav__primary-item {
+  width: max-content;
+
+  @include at-media-max('desktop') {
+    width: unset;
+  }
+}
+
+li.usa-nav__primary-item a {
+  display: block;
+  position: relative;
+}
+
+li.usa-nav__primary-item a:hover::after{
+    background-color: #005ea2;
+    border-radius: 0;
+    content: "";
+    display: block;
+    position: absolute;
+    height: 0.25rem;
+    left: 1rem;
+    right: 1rem;
+    bottom: -0.25rem;
+}
+
 
 /* 
 ******************************

From 55af21cd13cb00555859920b37ce475b81468284 Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Thu, 29 Sep 2022 02:12:50 -0700
Subject: [PATCH 068/130] side panel narwal (#1943)

* Adds the PrioritizationCopy and TractPriotization

- adds both components
- removes logic around selecting AK data points
- update snapshots

* Add tests for TractPrioritization

* Adds tests for PrioritizationCopy

* Add income icon and tilde

- this is dependent on imputed income and adjacency

* Add tool tip to low income icon

* Update snapshots

* Removing AreaDetail test to allow tooltip library

- This library react-tooltip creates random DOM ID which will not allow for snapshot testing as he IDs change on each build. Due to time constraints, we simply removed the AreaDetails test. The AreaDetails component is made up of sub component and each sub component has tests so this is low risk.

- This is a temporary solution. Some longer terms solutions may be
1. Remove this library and get the USWDS tool tip to work
2. Re-factor the areaDetail.tests.tsx snapshot tests to do more DOM assertions rather than snapshots
3. Some combination of the two.

* Fix Tribal percentage error
---
 client/package-lock.json                      |   41 +
 client/package.json                           |    1 +
 .../src/components/AreaDetail/AreaDetail.tsx  |   42 +-
 .../AreaDetail/areaDetail.module.scss         |   15 +-
 .../AreaDetail/areaDetail.module.scss.d.ts    |    3 +-
 .../__snapshots__/areaDetail.test.tsx.snap    | 2951 -----------------
 .../AreaDetail/tests/areaDetail.test.tsx      |   69 -
 .../Indicator/Indicator.module.scss           |   16 +-
 .../Indicator/Indicator.module.scss.d.ts      |    5 +-
 client/src/components/Indicator/Indicator.tsx |   86 +-
 .../__snapshots__/Indicator.test.tsx.snap     |   11 -
 client/src/components/J40Map.tsx              |   15 +-
 .../PrioritizationCopy.module.scss            |    5 +
 .../PrioritizationCopy.module.scss.d.ts       |   12 +
 .../PrioritizationCopy.test.tsx               |  278 ++
 .../PrioritizationCopy/PrioritizationCopy.tsx |  124 +
 .../PrioritizationCopy.test.tsx.snap          |  389 +++
 .../components/PrioritizationCopy/index.ts    |    2 +
 .../TractPrioritization.module.scss           |    9 +
 .../TractPrioritization.module.scss.d.ts      |   12 +
 .../TractPrioritization.test.tsx              |  188 ++
 .../TractPrioritization.tsx                   |   40 +
 .../TractPrioritization.test.tsx.snap         |   97 +
 .../components/TractPrioritization/index.ts   |    2 +
 client/src/data/copy/explore.tsx              |  107 +-
 client/src/intl/en.json                       |   46 +-
 26 files changed, 1464 insertions(+), 3102 deletions(-)
 delete mode 100644 client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
 delete mode 100644 client/src/components/AreaDetail/tests/areaDetail.test.tsx
 create mode 100644 client/src/components/PrioritizationCopy/PrioritizationCopy.module.scss
 create mode 100644 client/src/components/PrioritizationCopy/PrioritizationCopy.module.scss.d.ts
 create mode 100644 client/src/components/PrioritizationCopy/PrioritizationCopy.test.tsx
 create mode 100644 client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
 create mode 100644 client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap
 create mode 100644 client/src/components/PrioritizationCopy/index.ts
 create mode 100644 client/src/components/TractPrioritization/TractPrioritization.module.scss
 create mode 100644 client/src/components/TractPrioritization/TractPrioritization.module.scss.d.ts
 create mode 100644 client/src/components/TractPrioritization/TractPrioritization.test.tsx
 create mode 100644 client/src/components/TractPrioritization/TractPrioritization.tsx
 create mode 100644 client/src/components/TractPrioritization/__snapshots__/TractPrioritization.test.tsx.snap
 create mode 100644 client/src/components/TractPrioritization/index.ts

diff --git a/client/package-lock.json b/client/package-lock.json
index f4a654cb4..d8e796581 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -26,6 +26,7 @@
         "react-helmet": "^6.1.0",
         "react-intl": "^5.24.7",
         "react-map-gl": "^6.1.19",
+        "react-tooltip": "^4.2.21",
         "react-use": "^17.3.2",
         "uswds": "^2.13.3"
       },
@@ -20853,6 +20854,30 @@
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
+    "node_modules/react-tooltip": {
+      "version": "4.2.21",
+      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.2.21.tgz",
+      "integrity": "sha512-zSLprMymBDowknr0KVDiJ05IjZn9mQhhg4PRsqln0OZtURAJ1snt1xi5daZfagsh6vfsziZrc9pErPTDY1ACig==",
+      "dependencies": {
+        "prop-types": "^15.7.2",
+        "uuid": "^7.0.3"
+      },
+      "engines": {
+        "npm": ">=6.13"
+      },
+      "peerDependencies": {
+        "react": ">=16.0.0",
+        "react-dom": ">=16.0.0"
+      }
+    },
+    "node_modules/react-tooltip/node_modules/uuid": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/react-universal-interface": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/react-universal-interface/-/react-universal-interface-0.6.2.tgz",
@@ -42300,6 +42325,22 @@
         }
       }
     },
+    "react-tooltip": {
+      "version": "4.2.21",
+      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.2.21.tgz",
+      "integrity": "sha512-zSLprMymBDowknr0KVDiJ05IjZn9mQhhg4PRsqln0OZtURAJ1snt1xi5daZfagsh6vfsziZrc9pErPTDY1ACig==",
+      "requires": {
+        "prop-types": "^15.7.2",
+        "uuid": "^7.0.3"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+          "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
+        }
+      }
+    },
     "react-universal-interface": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/react-universal-interface/-/react-universal-interface-0.6.2.tgz",
diff --git a/client/package.json b/client/package.json
index 7b643cbb8..9b404eebb 100644
--- a/client/package.json
+++ b/client/package.json
@@ -92,6 +92,7 @@
     "react-helmet": "^6.1.0",
     "react-intl": "^5.24.7",
     "react-map-gl": "^6.1.19",
+    "react-tooltip": "^4.2.21",
     "react-use": "^17.3.2",
     "uswds": "^2.13.3"
   },
diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 49299ca1b..5d765d76b 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -6,9 +6,11 @@ import {Accordion, Button} from '@trussworks/react-uswds';
 
 // Components:
 import Category from '../Category';
-import TractDemographics from '../TractDemographics';
 import Indicator from '../Indicator';
+import PrioritizationCopy from '../PrioritizationCopy';
+import TractDemographics from '../TractDemographics';
 import TractInfo from '../TractInfo';
+import TractPrioritization from '../TractPrioritization';
 
 // Styles and constants
 import * as styles from './areaDetail.module.scss';
@@ -131,15 +133,12 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
   // console.log the properties of the census that is selected:
   console.log("Area Detail properies: ", properties);
 
-  const score = properties[constants.SCORE_PROPERTY_HIGH] ? properties[constants.SCORE_PROPERTY_HIGH] as number : 0;
   const blockGroup = properties[constants.GEOID_PROPERTY] ? properties[constants.GEOID_PROPERTY] : "N/A";
   const population = properties[constants.TOTAL_POPULATION] ? properties[constants.TOTAL_POPULATION] : "N/A";
   const countyName = properties[constants.COUNTY_NAME] ? properties[constants.COUNTY_NAME] : "N/A";
   const stateName = properties[constants.STATE_NAME] ? properties[constants.STATE_NAME] : "N/A";
   const sidePanelState = properties[constants.SIDE_PANEL_STATE];
 
-  const isCommunityFocus = score >= constants.SCORE_BOUNDARY_THRESHOLD;
-
   const feedbackEmailSubject = hash ? `
     Census tract ID ${blockGroup}, ${countyName}, ${stateName}, ( z/lat/lon: #${hash.join('/')} )
   ` : `Census tract ID ${blockGroup}, ${countyName}, ${stateName}`;
@@ -317,7 +316,7 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
       properties[constants.POVERTY_BELOW_200_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_FEDERAL_POVERTY_LEVEL_200] ?
       properties[constants.IS_FEDERAL_POVERTY_LEVEL_200] : null,
-    threshold: 65,
+    threshold: properties[constants.ADJACENCY_EXCEEDS_THRESH] === true ? 50 : 65,
   };
   // const higherEd: indicatorInfo = {
   //   label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HIGH_ED),
@@ -753,7 +752,12 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
 
         {/* socio-economic indicators */}
         {category.socioEcIndicators.map((indicator: any, index: number) => {
-          return <Indicator key={`ind${index}`} indicator={indicator} />;
+          return <Indicator
+            key={`ind${index}`}
+            indicator={indicator}
+            isImpute={properties[constants.IMPUTE_FLAG] === "0" ? false : true}
+            isAdjacent={properties[constants.ADJACENCY_EXCEEDS_THRESH]}
+          />;
         })}
 
       </>
@@ -783,18 +787,26 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
           {EXPLORE_COPY.COMMUNITY.IS_FOCUS}
         </div>
 
-        {/* YES with Dot or NO with no Dot  */}
+        {/* YES, NO or PARTIALLY disadvantaged  */}
         <div className={styles.communityOfFocus}>
-          {isCommunityFocus ?
-            <h3 className={styles.invert}>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3> :
-            <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>
-          }
+          <TractPrioritization
+            totalCategoriesPrioritized={properties[constants.COUNT_OF_CATEGORIES_DISADV]}
+            isDonut={properties[constants.ADJACENCY_EXCEEDS_THRESH]}
+            percentTractTribal={properties[constants.TRIBAL_AREAS_PERCENTAGE] >= 0 ?
+              properties[constants.TRIBAL_AREAS_PERCENTAGE] : null}
+          />
         </div>
 
-        {/* Number of categories exceeded */}
-        <div className={styles.showCategoriesExceed}>
-          {EXPLORE_COPY.numberOfCategoriesExceeded(properties[constants.COUNT_OF_CATEGORIES_DISADV])}
+        <div className={styles.prioCopy}>
+          <PrioritizationCopy
+            isDonut={properties[constants.ADJACENCY_EXCEEDS_THRESH]}
+            percentTractTribal={properties[constants.TRIBAL_AREAS_PERCENTAGE] >= 0 ?
+              properties[constants.TRIBAL_AREAS_PERCENTAGE] : null}
+            totalCategoriesPrioritized={properties[constants.COUNT_OF_CATEGORIES_DISADV]}
+            totalIndicatorsPrioritized={properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS]}
+          />
         </div>
+
       </div>
 
       {/* Send Feedback button */}
@@ -831,7 +843,7 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
             Income imputed?
           </span>
           <span>
-            {properties[constants.IMPUTE_FLAG] ? ' YES' : ' NO'}
+            {properties[constants.IMPUTE_FLAG] === "0" ? ' NO' : ' YES'}
           </span>
         </div>
 
diff --git a/client/src/components/AreaDetail/areaDetail.module.scss b/client/src/components/AreaDetail/areaDetail.module.scss
index c25b70baf..c11e7f1c8 100644
--- a/client/src/components/AreaDetail/areaDetail.module.scss
+++ b/client/src/components/AreaDetail/areaDetail.module.scss
@@ -25,7 +25,7 @@ $sidePanelLabelFontColor: #171716;
   display: flex;
   flex-direction: column;
   align-items: center;
-  @include u-padding-bottom(3);
+  // @include u-padding-bottom(3);
 
   .isInFocus {
     padding: .5rem 1rem .25rem 1.2rem;
@@ -42,12 +42,13 @@ $sidePanelLabelFontColor: #171716;
       margin-bottom: 0;
     }
 
-    h3.invert {
-      background-color: $disadvantagedDotColor;
-      color: white;
-      @include u-padding-left('05');
-      @include u-padding-right('05');
-    }
+  }
+
+  .prioCopy{
+    @include u-padding-left(2);
+    @include u-padding-right(2);
+    @include u-padding-top(2);
+
   }
 
   .showCategoriesExceed {
diff --git a/client/src/components/AreaDetail/areaDetail.module.scss.d.ts b/client/src/components/AreaDetail/areaDetail.module.scss.d.ts
index 6ac2033c7..2998bfa4e 100644
--- a/client/src/components/AreaDetail/areaDetail.module.scss.d.ts
+++ b/client/src/components/AreaDetail/areaDetail.module.scss.d.ts
@@ -19,7 +19,8 @@ declare namespace MapModuleScssNamespace {
     buttonImage: string;
     categorySpacer: string;
     testSignals: string;
-    invert: string;
+    prioCopy: string;
+    federalRecogTribes: string;
   }
 }
 
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
deleted file mode 100644
index 4979be84f..000000000
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ /dev/null
@@ -1,2951 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`rendering of the Islan areas in AreaDetail checks if indicators for ISLAND AREAS are present 1`] = `
-<DocumentFragment>
-  <aside
-    data-cy="aside"
-  >
-    <ul>
-      <li>
-        <span>
-          Tract information
-        </span>
-      </li>
-      <li>
-        <span>
-          Number:
-        </span>
-        <span>
-           98729374234
-        </span>
-      </li>
-      <li>
-        <span>
-          County:
-        </span>
-        <span>
-           Brooklyn
-        </span>
-      </li>
-      <li>
-        <span>
-          Territory: 
-        </span>
-        <span>
-           New York
-        </span>
-      </li>
-      <li>
-        <span>
-          Population:
-        </span>
-        <span>
-           3,435,435
-        </span>
-      </li>
-    </ul>
-    <div>
-      <div>
-        Tract demographics
-      </div>
-      <h6>
-        Race / Ethnicity
-        <span>
-          ( 
-          <a
-            aria-controls="race-panel"
-            aria-expanded="false"
-            class="usa-link"
-            id="race-header"
-            tabindex="0"
-          >
-            show
-          </a>
-          <img
-            alt="expand icon"
-            src="test-file-stub"
-          />
-          )
-        </span>
-      </h6>
-      <section
-        aria-labelledby="race-header"
-        hidden=""
-        id="race-panel"
-      >
-        <div>
-          <span>
-            White
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Black or African American
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            American Indian and Alaska Native
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Asian
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Native Hawiian or Pacific Islander
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Other
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Two or more races
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Hispanic or Latino
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-      </section>
-      <h6>
-        Age
-        <span>
-          ( 
-          <a
-            aria-controls="age-panel"
-            aria-expanded="false"
-            class="usa-link"
-            id="age-header"
-            tabindex="0"
-          >
-            show
-          </a>
-          <img
-            alt="expand icon"
-            src="test-file-stub"
-          />
-          )
-        </span>
-      </h6>
-      <section
-        aria-labelledby="age-header"
-        hidden=""
-        id="age-panel"
-      >
-        <div>
-          <span>
-            Children under 10
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Ages 10 - 64
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Elderly over 64
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-      </section>
-    </div>
-    <div>
-      <div>
-        Identified as disadvantaged?
-      </div>
-      <div>
-        <h3>
-          YES
-        </h3>
-      </div>
-      <div>
-        in 5 categories
-      </div>
-    </div>
-    <a
-      href="
-          mailto:Screeningtool-Support@omb.eop.gov?subject=
-    Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
-  &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
-    
-          "
-      rel="noreferrer"
-      target="_blank"
-    >
-      <button
-        class="usa-button"
-        data-testid="button"
-        type="button"
-      >
-        <div>
-          <div>
-            Send feedback
-          </div>
-          <img
-            alt="Send feedback"
-            src="test-file-stub"
-          />
-        </div>
-      </button>
-    </a>
-    <div>
-      <div>
-        <span>
-          Income imputed?
-        </span>
-        <span>
-           NO
-        </span>
-      </div>
-      <div>
-        <span>
-          Adjacency indicator?
-        </span>
-        <span>
-           NO
-        </span>
-      </div>
-      <div>
-        <span>
-          Tribal lands?
-        </span>
-        <span>
-           0 %
-        </span>
-      </div>
-      <div>
-        <span>
-          Tribal count?
-        </span>
-        <span>
-           0
-        </span>
-      </div>
-    </div>
-    <div
-      aria-multiselectable="true"
-      class="usa-accordion"
-      data-testid="accordion"
-    >
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="work-dev"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_work-dev"
-          type="button"
-        >
-          <div>
-            <div>
-              Workforce development
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_work-dev"
-        hidden=""
-        id="work-dev"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low median income
-              <div>
-                Comparison of income in the tract to incomes in the area
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  60
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 90
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Unemployment
-              <div>
-                Number of unemployed people as a part of the labor force
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  90
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  above 90
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Poverty
-              <div>
-                
-      Share of people in households where the income is at or below 100% of the Federal poverty level 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  50
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 90
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              High school education
-              <div>
-                
-      Percent of people ages 25 years or older who did not graduate high school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
-    </div>
-    <div>
-      Methodology version 1.0
-    </div>
-  </aside>
-</DocumentFragment>
-`;
-
-exports[`rendering of the Islan areas in AreaDetail checks if indicators for NATION is present 1`] = `
-<DocumentFragment>
-  <aside
-    data-cy="aside"
-  >
-    <ul>
-      <li>
-        <span>
-          Tract information
-        </span>
-      </li>
-      <li>
-        <span>
-          Number:
-        </span>
-        <span>
-           98729374234
-        </span>
-      </li>
-      <li>
-        <span>
-          County:
-        </span>
-        <span>
-           Brooklyn
-        </span>
-      </li>
-      <li>
-        <span>
-          State: 
-        </span>
-        <span>
-           New York
-        </span>
-      </li>
-      <li>
-        <span>
-          Population:
-        </span>
-        <span>
-           3,435,435
-        </span>
-      </li>
-    </ul>
-    <div>
-      <div>
-        Tract demographics
-      </div>
-      <h6>
-        Race / Ethnicity
-        <span>
-          ( 
-          <a
-            aria-controls="race-panel"
-            aria-expanded="false"
-            class="usa-link"
-            id="race-header"
-            tabindex="0"
-          >
-            show
-          </a>
-          <img
-            alt="expand icon"
-            src="test-file-stub"
-          />
-          )
-        </span>
-      </h6>
-      <section
-        aria-labelledby="race-header"
-        hidden=""
-        id="race-panel"
-      >
-        <div>
-          <span>
-            White
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Black or African American
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            American Indian and Alaska Native
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Asian
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Native Hawiian or Pacific Islander
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Other
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Two or more races
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Hispanic or Latino
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-      </section>
-      <h6>
-        Age
-        <span>
-          ( 
-          <a
-            aria-controls="age-panel"
-            aria-expanded="false"
-            class="usa-link"
-            id="age-header"
-            tabindex="0"
-          >
-            show
-          </a>
-          <img
-            alt="expand icon"
-            src="test-file-stub"
-          />
-          )
-        </span>
-      </h6>
-      <section
-        aria-labelledby="age-header"
-        hidden=""
-        id="age-panel"
-      >
-        <div>
-          <span>
-            Children under 10
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Ages 10 - 64
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Elderly over 64
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-      </section>
-    </div>
-    <div>
-      <div>
-        Identified as disadvantaged?
-      </div>
-      <div>
-        <h3>
-          YES
-        </h3>
-      </div>
-      <div>
-        in 5 categories
-      </div>
-    </div>
-    <a
-      href="
-          mailto:Screeningtool-Support@omb.eop.gov?subject=
-    Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
-  &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
-    
-          "
-      rel="noreferrer"
-      target="_blank"
-    >
-      <button
-        class="usa-button"
-        data-testid="button"
-        type="button"
-      >
-        <div>
-          <div>
-            Send feedback
-          </div>
-          <img
-            alt="Send feedback"
-            src="test-file-stub"
-          />
-        </div>
-      </button>
-    </a>
-    <div>
-      <div>
-        <span>
-          Income imputed?
-        </span>
-        <span>
-           NO
-        </span>
-      </div>
-      <div>
-        <span>
-          Adjacency indicator?
-        </span>
-        <span>
-           NO
-        </span>
-      </div>
-      <div>
-        <span>
-          Tribal lands?
-        </span>
-        <span>
-           0 %
-        </span>
-      </div>
-      <div>
-        <span>
-          Tribal count?
-        </span>
-        <span>
-           0
-        </span>
-      </div>
-    </div>
-    <div
-      aria-multiselectable="true"
-      class="usa-accordion"
-      data-testid="accordion"
-    >
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="climate-change"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_climate-change"
-          type="button"
-        >
-          <div>
-            <div>
-              Climate change
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_climate-change"
-        hidden=""
-        id="climate-change"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Expected agriculture loss rate
-              <div>
-                Economic loss to agricultural value resulting from natural hazards each year
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Expected building loss rate
-              <div>
-                Economic loss to agricultural value resulting from natural hazards each year
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Expected population loss rate
-              <div>
-                
-      Fatalities and injuries resulting from natural hazards each year
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Projected flood risk
-              <div>
-                
-      Projected risk to properties from floods from tides, rain, riverine and storm surges in 30 years
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Projected wildfire risk
-              <div>
-                
-      Projected risk to properties from wildfire from fire fuels, weather, humans, and fire movement
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low income
-              <div>
-                
-     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  19
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 65
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="clean-energy"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_clean-energy"
-          type="button"
-        >
-          <div>
-            <div>
-              Energy
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_clean-energy"
-        hidden=""
-        id="clean-energy"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Energy cost
-              <div>
-                Average annual energy costs divided by household income
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              PM2.5 in the air
-              <div>
-                Level of inhalable particles, 2.5 micrometers or smaller
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low income
-              <div>
-                
-     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  19
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 65
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="health-burdens"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_health-burdens"
-          type="button"
-        >
-          <div>
-            <div>
-              Health
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_health-burdens"
-        hidden=""
-        id="health-burdens"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Asthma
-              <div>
-                Share of people who have been told they have asthma
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Diabetes
-              <div>
-                
-      Share of people ages 18 years and older who have diabetes
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Heart disease
-              <div>
-                Share of people ages 18 years and older who have been told they have heart disease
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low life expectancy
-              <div>
-                Average number of years a person can expect to live
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low income
-              <div>
-                
-     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  19
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 65
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="sustain-house"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_sustain-house"
-          type="button"
-        >
-          <div>
-            <div>
-              Housing
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_sustain-house"
-        hidden=""
-        id="sustain-house"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Housing cost
-              <div>
-                Share of households making less than 80% of the area median family income and spending more than 30% of income on housing
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  95
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  above 90
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Lack of green space
-              <div>
-                Share of land covered with artificial materials like concrete or pavement and crop land
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Lack of plumbing
-              <div>
-                Share of homes without indoor kitchens or plumbing
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Lead paint
-              <div>
-                
-      Share of homes that are not very expensive and are likely to have lead paint
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low income
-              <div>
-                
-     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  19
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 65
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="leg-pollute"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_leg-pollute"
-          type="button"
-        >
-          <div>
-            <div>
-              Legacy pollution
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_leg-pollute"
-        hidden=""
-        id="leg-pollute"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Abandoned mine lands
-              <div>
-                Presence of an abandoned mine lands within the tract
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Formerly Used Defense Sites
-              <div>
-                Presence of a Formerly Used Defense Site within the tract
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Proximity to hazardous waste facilities
-              <div>
-                Count of hazardous waste facilities within 5 kilometers
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Proximity to Superfund sites
-              <div>
-                Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Proximity to Risk Management Plan facilities
-              <div>
-                Count of Risk Management Plan facilities within 5 kilometers
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low income
-              <div>
-                
-     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  19
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 65
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="clean-transport"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_clean-transport"
-          type="button"
-        >
-          <div>
-            <div>
-              Transportation
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_clean-transport"
-        hidden=""
-        id="clean-transport"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Diesel particulate matter exposure
-              <div>
-                Amount of diesel exhaust in the air
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Transportation barriers
-              <div>
-                Average of relative cost and time spent on transportation
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Traffic proximity and volume
-              <div>
-                Count of vehicles at major roads within 500 meters
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low income
-              <div>
-                
-     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  19
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 65
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="clean-water"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_clean-water"
-          type="button"
-        >
-          <div>
-            <div>
-              Water
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_clean-water"
-        hidden=""
-        id="clean-water"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Leaking underground storage tanks
-              <div>
-                Formula that counts leaking underground storage tanks and number of all underground storage tanks within 1500 feet
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Wastewater discharge
-              <div>
-                Modeled toxic concentrations at parts of streams within 500 meters
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low income
-              <div>
-                
-     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  19
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 65
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="work-dev"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_work-dev"
-          type="button"
-        >
-          <div>
-            <div>
-              Workforce development
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_work-dev"
-        hidden=""
-        id="work-dev"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Linguistic isolation
-              <div>
-                
-    Share of households where no one over the age 14 speaks English well
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  97
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  above 90
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low median income
-              <div>
-                Comparison of income in the tract to incomes in the area
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Unemployment
-              <div>
-                Number of unemployed people as a part of the labor force
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  96
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  above 90
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Poverty
-              <div>
-                
-      Share of people in households where the income is at or below 100% of the Federal poverty level 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  12
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 90
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              High school education
-              <div>
-                
-      Percent of people ages 25 years or older who did not graduate high school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  <span>
-                    98%
-                  </span>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  above 
-                  <span>
-                    10%
-                  </span>
-                   percent
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
-    </div>
-    <div>
-      Methodology version 1.0
-    </div>
-  </aside>
-</DocumentFragment>
-`;
-
-exports[`rendering of the Islan areas in AreaDetail checks if indicators for PUERTO RICO are present 1`] = `
-<DocumentFragment>
-  <aside
-    data-cy="aside"
-  >
-    <ul>
-      <li>
-        <span>
-          Tract information
-        </span>
-      </li>
-      <li>
-        <span>
-          Number:
-        </span>
-        <span>
-           98729374234
-        </span>
-      </li>
-      <li>
-        <span>
-          County:
-        </span>
-        <span>
-           Brooklyn
-        </span>
-      </li>
-      <li>
-        <span>
-          Territory: 
-        </span>
-        <span>
-           New York
-        </span>
-      </li>
-      <li>
-        <span>
-          Population:
-        </span>
-        <span>
-           3,435,435
-        </span>
-      </li>
-    </ul>
-    <div>
-      <div>
-        Tract demographics
-      </div>
-      <h6>
-        Race / Ethnicity
-        <span>
-          ( 
-          <a
-            aria-controls="race-panel"
-            aria-expanded="false"
-            class="usa-link"
-            id="race-header"
-            tabindex="0"
-          >
-            show
-          </a>
-          <img
-            alt="expand icon"
-            src="test-file-stub"
-          />
-          )
-        </span>
-      </h6>
-      <section
-        aria-labelledby="race-header"
-        hidden=""
-        id="race-panel"
-      >
-        <div>
-          <span>
-            White
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Black or African American
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            American Indian and Alaska Native
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Asian
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Native Hawiian or Pacific Islander
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Other
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Two or more races
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Hispanic or Latino
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-      </section>
-      <h6>
-        Age
-        <span>
-          ( 
-          <a
-            aria-controls="age-panel"
-            aria-expanded="false"
-            class="usa-link"
-            id="age-header"
-            tabindex="0"
-          >
-            show
-          </a>
-          <img
-            alt="expand icon"
-            src="test-file-stub"
-          />
-          )
-        </span>
-      </h6>
-      <section
-        aria-labelledby="age-header"
-        hidden=""
-        id="age-panel"
-      >
-        <div>
-          <span>
-            Children under 10
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Ages 10 - 64
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-        <div>
-          <span>
-            Elderly over 64
-          </span>
-          <span>
-            --
-          </span>
-        </div>
-      </section>
-    </div>
-    <div>
-      <div>
-        Identified as disadvantaged?
-      </div>
-      <div>
-        <h3>
-          YES
-        </h3>
-      </div>
-      <div>
-        in 5 categories
-      </div>
-    </div>
-    <a
-      href="
-          mailto:Screeningtool-Support@omb.eop.gov?subject=
-    Census tract ID 98729374234, Brooklyn, New York, ( z/lat/lon: #11.54/36.0762/-84.4494 )
-  &body=Please provide feedback about this census tract, including about the datasets, the data categories provided for this census tract, the communities who live in this census tract, and anything else relevant that CEQ should know about this census tract.
-    
-          "
-      rel="noreferrer"
-      target="_blank"
-    >
-      <button
-        class="usa-button"
-        data-testid="button"
-        type="button"
-      >
-        <div>
-          <div>
-            Send feedback
-          </div>
-          <img
-            alt="Send feedback"
-            src="test-file-stub"
-          />
-        </div>
-      </button>
-    </a>
-    <div>
-      <div>
-        <span>
-          Income imputed?
-        </span>
-        <span>
-           NO
-        </span>
-      </div>
-      <div>
-        <span>
-          Adjacency indicator?
-        </span>
-        <span>
-           NO
-        </span>
-      </div>
-      <div>
-        <span>
-          Tribal lands?
-        </span>
-        <span>
-           0 %
-        </span>
-      </div>
-      <div>
-        <span>
-          Tribal count?
-        </span>
-        <span>
-           0
-        </span>
-      </div>
-    </div>
-    <div
-      aria-multiselectable="true"
-      class="usa-accordion"
-      data-testid="accordion"
-    >
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="clean-energy"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_clean-energy"
-          type="button"
-        >
-          <div>
-            <div>
-              Energy
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_clean-energy"
-        hidden=""
-        id="clean-energy"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Energy cost
-              <div>
-                Average annual energy costs divided by household income
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              PM2.5 in the air
-              <div>
-                Level of inhalable particles, 2.5 micrometers or smaller
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low income
-              <div>
-                
-     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  19
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 65
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="sustain-house"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_sustain-house"
-          type="button"
-        >
-          <div>
-            <div>
-              Housing
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_sustain-house"
-        hidden=""
-        id="sustain-house"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Housing cost
-              <div>
-                Share of households making less than 80% of the area median family income and spending more than 30% of income on housing
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  95
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  above 90
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low income
-              <div>
-                
-     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  19
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 65
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="leg-pollute"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_leg-pollute"
-          type="button"
-        >
-          <div>
-            <div>
-              Legacy pollution
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_leg-pollute"
-        hidden=""
-        id="leg-pollute"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Abandoned mine lands
-              <div>
-                Presence of an abandoned mine lands within the tract
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Formerly Used Defense Sites
-              <div>
-                Presence of a Formerly Used Defense Site within the tract
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Proximity to hazardous waste facilities
-              <div>
-                Count of hazardous waste facilities within 5 kilometers
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Proximity to Superfund sites
-              <div>
-                Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Proximity to Risk Management Plan facilities
-              <div>
-                Count of Risk Management Plan facilities within 5 kilometers
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low income
-              <div>
-                
-     People in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  19
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 65
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
-      <h4
-        class="usa-accordion__heading"
-      >
-        <button
-          aria-controls="work-dev"
-          aria-expanded="false"
-          class="usa-accordion__button"
-          data-testid="accordionButton_work-dev"
-          type="button"
-        >
-          <div>
-            <div>
-              Workforce development
-            </div>
-            <div
-              class=""
-            />
-          </div>
-        </button>
-      </h4>
-      <div
-        class="usa-accordion__content usa-prose"
-        data-testid="accordionItem_work-dev"
-        hidden=""
-        id="work-dev"
-      >
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Low median income
-              <div>
-                Comparison of income in the tract to incomes in the area
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  --
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  missing data
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Unemployment
-              <div>
-                Number of unemployed people as a part of the labor force
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  96
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  above 90
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              Poverty
-              <div>
-                
-      Share of people in households where the income is at or below 100% of the Federal poverty level 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  12
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  below 90
-                  <sup
-                    style="top: -0.2em;"
-                  >
-                    th
-                  </sup>
-                   percentile
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-        <div>
-          AND
-        </div>
-        <li
-          data-cy="indicatorBox"
-          data-testid="indicator-box"
-        >
-          <div>
-            <div>
-              High school education
-              <div>
-                
-      Percent of people ages 25 years or older who did not graduate high school 
-    
-              </div>
-            </div>
-            <div>
-              <div>
-                <div>
-                  <span>
-                    98%
-                  </span>
-                </div>
-                <div />
-              </div>
-              <div>
-                <div>
-                  above 
-                  <span>
-                    10%
-                  </span>
-                   percent
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-      </div>
-    </div>
-    <div>
-      Methodology version 1.0
-    </div>
-  </aside>
-</DocumentFragment>
-`;
diff --git a/client/src/components/AreaDetail/tests/areaDetail.test.tsx b/client/src/components/AreaDetail/tests/areaDetail.test.tsx
deleted file mode 100644
index a4d3dcb6b..000000000
--- a/client/src/components/AreaDetail/tests/areaDetail.test.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import * as React from 'react';
-import {render} from '@testing-library/react';
-import AreaDetail from '..';
-import {LocalizedComponent} from '../../../test/testHelpers';
-
-import * as constants from '../../../data/constants';
-
-const properties = {
-  [constants.POVERTY_BELOW_100_PERCENTILE]: .12,
-  [constants.HIGH_SCHOOL_PROPERTY_PERCENTILE]: .98,
-  [constants.LINGUISTIC_ISOLATION_PROPERTY_PERCENTILE]: .97,
-  [constants.UNEMPLOYMENT_PROPERTY_PERCENTILE]: .96,
-  [constants.HOUSING_BURDEN_PROPERTY_PERCENTILE]: .95,
-  [constants.SCORE_PROPERTY_HIGH]: true,
-  [constants.GEOID_PROPERTY]: 98729374234,
-  [constants.TOTAL_POPULATION]: 3435435,
-  [constants.STATE_NAME]: 'New York',
-  [constants.COUNTY_NAME]: 'Brooklyn',
-  [constants.POVERTY_BELOW_200_PERCENTILE]: .19,
-  [constants.SIDE_PANEL_STATE]: constants.SIDE_PANEL_STATE_VALUES.NATION,
-  [constants.COUNT_OF_CATEGORIES_DISADV]: 5,
-  [constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS]: 3,
-};
-const hash = ['11.54', '36.0762', '-84.4494'];
-
-
-describe('rendering of the Islan areas in AreaDetail', () => {
-  it('checks if indicators for NATION is present', () => {
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <AreaDetail properties={properties} hash={hash} isCensusLayerSelected={true}/>
-        </LocalizedComponent>,
-    );
-    expect(asFragment()).toMatchSnapshot();
-  });
-
-  it('checks if indicators for PUERTO RICO are present', () => {
-    const propertiesPR = {
-      ...properties,
-      [constants.SIDE_PANEL_STATE]: constants.SIDE_PANEL_STATE_VALUES.PUERTO_RICO,
-    };
-
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <AreaDetail properties={propertiesPR} hash={hash} isCensusLayerSelected={true}/>
-        </LocalizedComponent>,
-    );
-    expect(asFragment()).toMatchSnapshot();
-  });
-
-  it('checks if indicators for ISLAND AREAS are present', () => {
-    const propertiesIA = {
-      ...properties,
-      [constants.ISLAND_AREAS_UNEMPLOYMENT_LOW_HS_EDU_PERCENTILE_FIELD]: .9,
-      [constants.ISLAND_AREAS_POVERTY_LOW_HS_EDU_PERCENTILE_FIELD]: .8,
-      [constants.ISLAND_AREAS_LOW_MEDIAN_INCOME_LOW_HS_EDU_PERCENTILE_FIELD]: .6,
-      [constants.ISLAND_AREAS_POVERTY_LOW_HS_EDU_PERCENTILE_FIELD]: .5,
-      [constants.SIDE_PANEL_STATE]: constants.SIDE_PANEL_STATE_VALUES.ISLAND_AREAS,
-    };
-
-    const {asFragment} = render(
-        <LocalizedComponent>
-          <AreaDetail properties={propertiesIA} hash={hash} isCensusLayerSelected={true}/>
-        </LocalizedComponent>,
-    );
-    expect(asFragment()).toMatchSnapshot();
-  });
-});
-
diff --git a/client/src/components/Indicator/Indicator.module.scss b/client/src/components/Indicator/Indicator.module.scss
index af2cd6bd2..a2e4b708f 100644
--- a/client/src/components/Indicator/Indicator.module.scss
+++ b/client/src/components/Indicator/Indicator.module.scss
@@ -62,17 +62,19 @@
           background-color: $disadvantagedDotColor;
         }
 
-        .indicatorArrow {
+        .indicatorInfo {
           margin-bottom: -.375rem;
+          margin-top: -2px;
+          @include u-margin-right('05');
 
-          img {
+          img.info {
             max-width: none;
-            height: 1.5rem;
-            width: 1.5rem;
-
+            height: 1.2rem;
+            width: 1.2rem;
           }
-          .unavailable {
-            opacity: .6;
+
+          .infoTilde {
+            vertical-align: super;
           }
         }
       }
diff --git a/client/src/components/Indicator/Indicator.module.scss.d.ts b/client/src/components/Indicator/Indicator.module.scss.d.ts
index 9a8e43f2c..64ab2cbdb 100644
--- a/client/src/components/Indicator/Indicator.module.scss.d.ts
+++ b/client/src/components/Indicator/Indicator.module.scss.d.ts
@@ -9,8 +9,9 @@ declare namespace IndicatorNamespace {
       indicatorValue:string;
       disIndicatorValue:string;
       indicatorSuperscript:string;
-      indicatorArrow:string;
-      unavailable:string;
+      indicatorInfo:string;
+      info:string;
+      infoTilde: string;
       indicatorValueSubText:string;
       indicatorDesc:string;
       disadvantagedIndicator:string;
diff --git a/client/src/components/Indicator/Indicator.tsx b/client/src/components/Indicator/Indicator.tsx
index 63883b415..4212998f9 100644
--- a/client/src/components/Indicator/Indicator.tsx
+++ b/client/src/components/Indicator/Indicator.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import {useIntl} from 'gatsby-plugin-intl';
+import ReactTooltip from 'react-tooltip';
 
 import {indicatorInfo, indicatorType} from '../AreaDetail/AreaDetail';
 
@@ -8,16 +9,13 @@ import * as constants from '../../data/constants';
 import * as EXPLORE_COPY from '../../data/copy/explore';
 
 // @ts-ignore
-// import unAvailable from '/node_modules/uswds/dist/img/usa-icons/error_outline.svg';
+import infoIcon from '/node_modules/uswds/dist/img/usa-icons/info.svg';
 
 interface IIndicator {
   indicator: indicatorInfo,
+  isImpute?: boolean,
+  isAdjacent?: boolean,
 }
-
-interface IIndicatorValueIcon {
-  value: number | null,
-};
-
 interface IIndicatorValueSubText {
   type: indicatorType,
   value: number | null | boolean,
@@ -31,18 +29,55 @@ interface IIndicatorValue {
 }
 
 /**
- * This component will determine what indicator's icon should be. ATM there are no icons to show, however
- * this may change and so leaving a place holder function here for easy change in the future
+ * This component will render an info icon in the indicator value
  *
- * @param {number | null} value
+ * @param {boolean} isImpute
+ * @param {boolean} isAdjacent
  * @return {JSX.Element}
  */
-export const IndicatorValueIcon = ({value}: IIndicatorValueIcon) => {
-  return value === null ? <></> : <></>;
-  // <img className={styles.unavailable}
-  //   src={unAvailable}
-  //   alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.UNAVAILABLE)}
-  // />
+export const IndicatorInfoIcon = ({isImpute, isAdjacent}: Omit<IIndicator, 'indicator'>) => {
+  const intl = useIntl();
+
+  const getToolTipCopy = () => {
+    if (!isImpute && isAdjacent) {
+      return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_NO_ADJ_YES);
+    } else if (isImpute && !isAdjacent) {
+      return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_YES_ADJ_NO);
+    } else if (isImpute && isAdjacent) {
+      return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_YES_ADJ_YES);
+    } else {
+      return null;
+    }
+  };
+
+  /**
+   * This library react-tooltip creates random DOM ID which will not allow for snapshot testing as
+   * the IDs change on each build. Due to time constraints, we simply removed the AreaDetails test.
+   * The AreaDetails component is made up of sub component and each sub component has tests so this
+   * is low risk.
+   *
+   * This is a temporary solution. Some longer terms solutions may be
+   * 1. Remove this library and get the USWDS tool tip to work
+   * 2. Re-factor the areaDetail.tests.tsx snapshot tests to do more DOM assertions rather than snapshots
+   * 3. Some combination of the two.
+   */
+  return (
+    <>
+      <ReactTooltip
+        id="lowIncomeIcon"
+        multiline={true}
+      />
+      <img
+        data-for="lowIncomeIcon"
+        data-tip={getToolTipCopy()}
+        data-iscapture="true"
+        className={styles.info}
+        src={infoIcon}
+        alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.INFO)}
+      />
+      {isImpute && <span className={styles.infoTilde}>{ ` ~ ` }</span>}
+    </>
+  );
 };
 
 /**
@@ -191,7 +226,7 @@ export const IndicatorValue = ({type, displayStat}:IIndicatorValue) => {
  * @param {IIndicator} indicator
  * @return {JSX.Element}
  */
-const Indicator = ({indicator}:IIndicator) => {
+const Indicator = ({indicator, isImpute, isAdjacent}:IIndicator) => {
   /**
    * The indicator value could be a number | boolean | null. In all cases we coerce to number
    * before flooring.
@@ -207,6 +242,9 @@ const Indicator = ({indicator}:IIndicator) => {
   // A boolean to represent if the indicator is above or below the threshold
   const isAboveThresh = displayStat !== null && displayStat >= threshold ? true : false;
 
+  // Show an info icon on the low icome indicator if the impute or adjacency is true:
+  const showLowIncomeInfoIcon = (indicator.label === 'Low income' && (isImpute || isAdjacent));
+
   return (
     <li
       className={styles.indicatorBoxMain}
@@ -226,6 +264,16 @@ const Indicator = ({indicator}:IIndicator) => {
         <div className={styles.indicatorValueCol}>
           <div className={styles.indicatorValueRow}>
 
+            {/* Indicator info icon */}
+            { showLowIncomeInfoIcon &&
+              <div className={styles.indicatorInfo}>
+                <IndicatorInfoIcon
+                  isImpute={isImpute}
+                  isAdjacent={isAdjacent}
+                />
+              </div>
+            }
+
             {/* Indicator value */}
             <div className={indicator.isDisadvagtaged ?
               styles.disIndicatorValue : styles.indicatorValue}
@@ -236,12 +284,6 @@ const Indicator = ({indicator}:IIndicator) => {
               />
             </div>
 
-            {/* Indicator icon - up arrow, down arrow, or unavailable */}
-            <div className={styles.indicatorArrow}>
-              <IndicatorValueIcon
-                value={displayStat}
-              />
-            </div>
           </div>
 
           {/* Indicator sub-text */}
diff --git a/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap b/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
index 27cbe6f0b..3028fdafc 100644
--- a/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
+++ b/client/src/components/Indicator/__snapshots__/Indicator.test.tsx.snap
@@ -20,7 +20,6 @@ exports[`rendering of the Indicator checks if component renders 1`] = `
               97%
             </span>
           </div>
-          <div />
         </div>
         <div>
           <div>
@@ -57,7 +56,6 @@ exports[`rendering of the Indicator checks if the flooring function works 1`] =
               42%
             </span>
           </div>
-          <div />
         </div>
         <div>
           <div>
@@ -92,7 +90,6 @@ exports[`renders value correctly for Former defense sites checks if it renders n
           <div>
             --
           </div>
-          <div />
         </div>
         <div>
           <div>
@@ -123,7 +120,6 @@ exports[`renders value correctly for Former defense sites checks if it renders w
           <div>
             No
           </div>
-          <div />
         </div>
         <div />
       </div>
@@ -150,7 +146,6 @@ exports[`renders value correctly for Former defense sites checks if it renders w
           <div>
             Yes
           </div>
-          <div />
         </div>
         <div />
       </div>
@@ -177,7 +172,6 @@ exports[`renders value correctly for abandoned land mines checks if it renders n
           <div>
             --
           </div>
-          <div />
         </div>
         <div>
           <div>
@@ -208,7 +202,6 @@ exports[`renders value correctly for abandoned land mines checks if it renders w
           <div>
             No
           </div>
-          <div />
         </div>
         <div />
       </div>
@@ -235,7 +228,6 @@ exports[`renders value correctly for abandoned land mines checks if it renders w
           <div>
             Yes
           </div>
-          <div />
         </div>
         <div />
       </div>
@@ -262,7 +254,6 @@ exports[`renders value correctly for historic underinvest. checks if it renders
           <div>
             --
           </div>
-          <div />
         </div>
         <div>
           <div>
@@ -293,7 +284,6 @@ exports[`renders value correctly for historic underinvest. checks if it renders
           <div>
             No
           </div>
-          <div />
         </div>
         <div />
       </div>
@@ -320,7 +310,6 @@ exports[`renders value correctly for historic underinvest. checks if it renders
           <div>
             Yes
           </div>
-          <div />
         </div>
         <div />
       </div>
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index 21a9774b5..57e99808b 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -173,19 +173,6 @@ const J40Map = ({location}: IJ40Interface) => {
       // @ts-ignore
       const feature = event.features && event.features[0];
 
-      /**
-       * Given that Alaska has Points as their data type, we will not zoom into them when
-       * selected. In order to detect if a feature is a Point we will use Regex to determine
-       * the Alaska Point based on it's unique ID:
-       *
-       * E.g. {33FF6457-324C-4643-94E8-D543DD4339E0}
-       *
-       * The regex will test for any numeric, upper-case alpha with hyphens string enclosed
-       * in curly braces.
-       */
-      const alaskaIDRegex = /\{[0-9,A-Z,-]+\}/g;
-      const isFeatureAlaskaPoint = alaskaIDRegex.test(feature.id);
-
       if (feature) {
         // Get the current selected feature's bounding box:
         const [minLng, minLat, maxLng, maxLat] = bbox(feature);
@@ -200,7 +187,7 @@ const J40Map = ({location}: IJ40Interface) => {
 
 
         // Go to the newly selected feature (as long as it's not an Alaska Point)
-        !isFeatureAlaskaPoint && goToPlace([
+        goToPlace([
           [minLng, minLat],
           [maxLng, maxLat],
         ]);
diff --git a/client/src/components/PrioritizationCopy/PrioritizationCopy.module.scss b/client/src/components/PrioritizationCopy/PrioritizationCopy.module.scss
new file mode 100644
index 000000000..67885d76a
--- /dev/null
+++ b/client/src/components/PrioritizationCopy/PrioritizationCopy.module.scss
@@ -0,0 +1,5 @@
+@use '../../styles/design-system.scss' as *;
+
+.prioCopyPara2{
+    @include u-padding-top(2);
+}
diff --git a/client/src/components/PrioritizationCopy/PrioritizationCopy.module.scss.d.ts b/client/src/components/PrioritizationCopy/PrioritizationCopy.module.scss.d.ts
new file mode 100644
index 000000000..a4fdca0d5
--- /dev/null
+++ b/client/src/components/PrioritizationCopy/PrioritizationCopy.module.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace PrioritizationCopyNamespace {
+    export interface IPrioritizationCopyScss {
+      prioCopyPara2: string;
+    }
+  }
+
+declare const PrioritizationCopyScssModule: PrioritizationCopyNamespace.IPrioritizationCopyScss & {
+    /** WARNING: Only available when "css-loader" is used without "style-loader" or "mini-css-extract-plugin" */
+    locals: PrioritizationCopyNamespace.IPrioritizationCopyScss;
+  };
+
+  export = PrioritizationCopyScssModule;
diff --git a/client/src/components/PrioritizationCopy/PrioritizationCopy.test.tsx b/client/src/components/PrioritizationCopy/PrioritizationCopy.test.tsx
new file mode 100644
index 000000000..a3899e659
--- /dev/null
+++ b/client/src/components/PrioritizationCopy/PrioritizationCopy.test.tsx
@@ -0,0 +1,278 @@
+import React from 'react';
+import {render, screen} from '@testing-library/react';
+import {LocalizedComponent} from '../../test/testHelpers';
+import PrioritizationCopy from './PrioritizationCopy';
+
+describe('rendering of PrioritizationCopy Component -', () => {
+  const testCases = [
+    {
+      isDonut: false, percentTribal: null,
+      totalCategories: 0, totalIndicators: 0,
+      // eslint-disable-next-line max-len
+      para1: `This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomic threshold.`,
+    },
+    {
+      isDonut: false, percentTribal: null,
+      totalCategories: 0, totalIndicators: 1,
+      // eslint-disable-next-line max-len
+      para1: `This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds.`,
+    },
+    {
+      isDonut: false, percentTribal: null,
+      totalCategories: 0, totalIndicators: 5,
+      // eslint-disable-next-line max-len
+      para1: `This tract is not considered disadvantaged. It meets 5 burden thresholds BUT no associated socioeconomic thresholds.`,
+    },
+    {
+      isDonut: false, percentTribal: null,
+      totalCategories: 1, totalIndicators: 0,
+      // eslint-disable-next-line max-len
+      para1: '',
+    },
+    {
+      isDonut: false, percentTribal: null,
+      totalCategories: 1, totalIndicators: 1,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold.`,
+    },
+    {
+      isDonut: false, percentTribal: null,
+      totalCategories: 2, totalIndicators: 4,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it meets 4 burden thresholds AND the associated socio-economic threshold.`,
+    },
+
+    {
+      isDonut: false, percentTribal: 0,
+      totalCategories: 0, totalIndicators: 0,
+      // eslint-disable-next-line max-len
+      para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    },
+    {
+      isDonut: false, percentTribal: 0,
+      totalCategories: 0, totalIndicators: 1,
+      // eslint-disable-next-line max-len
+      para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    },
+    {
+      isDonut: false, percentTribal: 0,
+      totalCategories: 0, totalIndicators: 2,
+      // eslint-disable-next-line max-len
+      para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    },
+    {
+      isDonut: false, percentTribal: 0,
+      totalCategories: 1, totalIndicators: 0,
+      // eslint-disable-next-line max-len
+      para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    },
+    {
+      isDonut: false, percentTribal: 0,
+      totalCategories: 1, totalIndicators: 1,
+      // eslint-disable-next-line max-len
+      para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    },
+    {
+      isDonut: false, percentTribal: 0,
+      totalCategories: 1, totalIndicators: 2,
+      // eslint-disable-next-line max-len
+      para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    },
+
+    {
+      isDonut: false, percentTribal: .31,
+      totalCategories: 0, totalIndicators: 0,
+      // eslint-disable-next-line max-len
+      para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    },
+    {
+      isDonut: false, percentTribal: .31,
+      totalCategories: 0, totalIndicators: 1,
+      // eslint-disable-next-line max-len
+      para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    },
+    {
+      isDonut: false, percentTribal: .31,
+      totalCategories: 0, totalIndicators: 2,
+      // eslint-disable-next-line max-len
+      para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    },
+    {
+      isDonut: false, percentTribal: .31,
+      totalCategories: 1, totalIndicators: 0,
+      // eslint-disable-next-line max-len
+      para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    },
+    {
+      isDonut: false, percentTribal: .31,
+      totalCategories: 1, totalIndicators: 1,
+      // eslint-disable-next-line max-len
+      para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    },
+    {
+      isDonut: false, percentTribal: .31,
+      totalCategories: 1, totalIndicators: 2,
+      // eslint-disable-next-line max-len
+      para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    },
+
+    {
+      isDonut: true, percentTribal: null,
+      totalCategories: 0, totalIndicators: 0,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    },
+    {
+      isDonut: true, percentTribal: null,
+      totalCategories: 0, totalIndicators: 1,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    },
+    {
+      isDonut: true, percentTribal: null,
+      totalCategories: 0, totalIndicators: 2,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    },
+    {
+      isDonut: true, percentTribal: null,
+      totalCategories: 1, totalIndicators: 0,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    },
+    {
+      isDonut: true, percentTribal: null,
+      totalCategories: 1, totalIndicators: 1,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    },
+    {
+      isDonut: true, percentTribal: null,
+      totalCategories: 1, totalIndicators: 2,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    },
+
+    {
+      isDonut: true, percentTribal: 0,
+      totalCategories: 0, totalIndicators: 0,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+      // eslint-disable-next-line max-len
+      para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+    {
+      isDonut: true, percentTribal: 0,
+      totalCategories: 0, totalIndicators: 1,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+      // eslint-disable-next-line max-len
+      para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+    {
+      isDonut: true, percentTribal: 0,
+      totalCategories: 0, totalIndicators: 2,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+      // eslint-disable-next-line max-len
+      para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+    {
+      isDonut: true, percentTribal: 0,
+      totalCategories: 1, totalIndicators: 0,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+      // eslint-disable-next-line max-len
+      para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+    {
+      isDonut: true, percentTribal: 0,
+      totalCategories: 1, totalIndicators: 1,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+      // eslint-disable-next-line max-len
+      para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+    {
+      isDonut: true, percentTribal: 0,
+      totalCategories: 1, totalIndicators: 2,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+      // eslint-disable-next-line max-len
+      para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+
+    {
+      isDonut: true, percentTribal: .29,
+      totalCategories: 0, totalIndicators: 0,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+      // eslint-disable-next-line max-len
+      para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+    {
+      isDonut: true, percentTribal: .29,
+      totalCategories: 0, totalIndicators: 1,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+      // eslint-disable-next-line max-len
+      para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+    {
+      isDonut: true, percentTribal: .29,
+      totalCategories: 0, totalIndicators: 2,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+      // eslint-disable-next-line max-len
+      para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+    {
+      isDonut: true, percentTribal: .29,
+      totalCategories: 1, totalIndicators: 0,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+      // eslint-disable-next-line max-len
+      para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+    {
+      isDonut: true, percentTribal: .29,
+      totalCategories: 1, totalIndicators: 1,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+      // eslint-disable-next-line max-len
+      para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+    {
+      isDonut: true, percentTribal: .29,
+      totalCategories: 2, totalIndicators: 2,
+      // eslint-disable-next-line max-len
+      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+      // eslint-disable-next-line max-len
+      para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+  ];
+
+  testCases.forEach((testCase) => {
+    // eslint-disable-next-line max-len
+    it(`checks if component renders ${testCase.para1} when isDonut = ${testCase.isDonut}, tribal % = ${testCase.percentTribal}, category count = ${testCase.totalCategories} and indicator count = ${testCase.totalIndicators}`, () => {
+      const {asFragment} = render(
+          <LocalizedComponent>
+            <PrioritizationCopy
+              isDonut={testCase.isDonut}
+              percentTractTribal={testCase.percentTribal}
+              totalCategoriesPrioritized={testCase.totalCategories}
+              totalIndicatorsPrioritized={testCase.totalIndicators}
+            />
+          </LocalizedComponent>,
+      );
+      expect(asFragment()).toMatchSnapshot();
+
+      screen.getByText((content, element) => {
+        return element?.tagName.toLowerCase() === 'div' && content.startsWith(testCase.para1);
+      });
+      testCase.para2 ?? screen.getByText((content, element) => {
+        return element?.tagName.toLowerCase() === 'div' && content.startsWith(testCase.para1);
+      });
+    });
+  });
+});
diff --git a/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
new file mode 100644
index 000000000..c980a2354
--- /dev/null
+++ b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
@@ -0,0 +1,124 @@
+import React from 'react';
+
+import * as styles from './PrioritizationCopy.module.scss';
+
+import * as EXPLORE_COPY from '../../data/copy/explore';
+
+interface IPrioritizationCopy {
+  totalCategoriesPrioritized: number
+  isDonut: boolean,
+  percentTractTribal: number | null
+  totalIndicatorsPrioritized: number
+};
+
+/**
+ * This component returns the prioritzation copy
+ *
+ * @param {number} totalCategoriesPrioritized
+ * @param {boolean} isDonut
+ * @param {number} percentTractTribal
+ * @param {number} totalIndicatorsPrioritized
+ * @return {JSX}
+ */
+const PrioritizationCopy =
+   ({
+     totalCategoriesPrioritized,
+     isDonut,
+     percentTractTribal,
+     totalIndicatorsPrioritized}:IPrioritizationCopy) => {
+     if (isDonut) {
+       if (percentTractTribal === null) {
+         return (
+           <div>
+             <div>{EXPLORE_COPY.PRIORITIZATION_COPY.DONUT}</div>
+           </div>
+         );
+       } else if (percentTractTribal !== null && percentTractTribal === 0) {
+         return (
+           <div>
+             <div>{EXPLORE_COPY.PRIORITIZATION_COPY.DONUT}</div>
+             <div className={styles.prioCopyPara2}>
+               {EXPLORE_COPY.getPrioFRTLessThan1Perc(true)}
+             </div>
+           </div>
+         );
+       } else if (percentTractTribal !== null && percentTractTribal > 0) {
+         // map location for this case: #9.56/48.1013/-108.7722
+         return (
+           <div>
+             <div>{EXPLORE_COPY.PRIORITIZATION_COPY.DONUT}</div>
+             <div className={styles.prioCopyPara2}>
+               {EXPLORE_COPY.getPrioFRTNPerc(percentTractTribal, true)}
+             </div>
+           </div>
+         );
+       } else {
+         return <></>;
+       }
+     } else if (!isDonut) {
+       if (percentTractTribal !== null && percentTractTribal > 0) {
+         // map location for this case: #8.66/48.3496/-106.2982
+         return (
+           <div>
+             <div>{EXPLORE_COPY.getPrioFRTNPerc(percentTractTribal, false)}</div>
+           </div>
+         );
+       } else if (percentTractTribal !== null && percentTractTribal === 0) {
+         return (
+           <div>
+             <div>{EXPLORE_COPY.getPrioFRTLessThan1Perc(false)}</div>
+           </div>
+         );
+       } else if (percentTractTribal === null) {
+         if (totalCategoriesPrioritized >= 1) {
+           if (totalIndicatorsPrioritized === 0) {
+             return <></>;
+           } else if (totalIndicatorsPrioritized === 1) {
+             return (
+               <div>
+                 <div>{EXPLORE_COPY.PRIORITIZATION_COPY.PRIO_1_BURD}</div>
+               </div>
+             );
+           } else if (totalIndicatorsPrioritized >=1) {
+             return (
+               <div>
+                 <div>{EXPLORE_COPY.getPrioNBurden(totalIndicatorsPrioritized)}</div>
+               </div>
+             );
+           } else {
+             return <></>;
+           }
+         } else if (totalCategoriesPrioritized === 0) {
+           if (totalIndicatorsPrioritized === 0) {
+             return (
+               <div>
+                 <div>{EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO}</div>
+               </div>
+             );
+           } else if (totalIndicatorsPrioritized === 1) {
+             return (
+               <div>
+                 <div>{EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO_1_BURD}</div>
+               </div>
+             );
+           } else if (totalIndicatorsPrioritized >= 1) {
+             return (
+               <div>
+                 <div>{EXPLORE_COPY.getNotPrioNBurden(totalIndicatorsPrioritized)}</div>
+               </div>
+             );
+           } else {
+             return <></>;
+           }
+         } else {
+           return <></>;
+         }
+       } else {
+         return <></>;
+       }
+     } else {
+       return <></>;
+     }
+   };
+
+export default PrioritizationCopy;
diff --git a/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap b/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap
new file mode 100644
index 000000000..0929de8e5
--- /dev/null
+++ b/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap
@@ -0,0 +1,389 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders  when isDonut = false, tribal % = null, category count = 1 and indicator count = 0 1`] = `<DocumentFragment />`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0.31, category count = 0 and indicator count = 0 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      The 31% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0.31, category count = 0 and indicator count = 1 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      The 31% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0.31, category count = 0 and indicator count = 2 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      The 31% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0.31, category count = 1 and indicator count = 0 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      The 31% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0.31, category count = 1 and indicator count = 1 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      The 31% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0.31, category count = 1 and indicator count = 2 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      The 31% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0, category count = 0 and indicator count = 0 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      The less than 1% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0, category count = 0 and indicator count = 1 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      The less than 1% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0, category count = 0 and indicator count = 2 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      The less than 1% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0, category count = 1 and indicator count = 0 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      The less than 1% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0, category count = 1 and indicator count = 1 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      The less than 1% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0, category count = 1 and indicator count = 2 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      The less than 1% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0, category count = 0 and indicator count = 0 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+    <div>
+      The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0, category count = 0 and indicator count = 1 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+    <div>
+      The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0, category count = 0 and indicator count = 2 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+    <div>
+      The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0, category count = 1 and indicator count = 0 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+    <div>
+      The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0, category count = 1 and indicator count = 1 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+    <div>
+      The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0, category count = 1 and indicator count = 2 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+    <div>
+      The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0.29, category count = 0 and indicator count = 0 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+    <div>
+      The 28.999999999999996% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0.29, category count = 0 and indicator count = 1 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+    <div>
+      The 28.999999999999996% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0.29, category count = 0 and indicator count = 2 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+    <div>
+      The 28.999999999999996% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0.29, category count = 1 and indicator count = 0 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+    <div>
+      The 28.999999999999996% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0.29, category count = 1 and indicator count = 1 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+    <div>
+      The 28.999999999999996% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0.29, category count = 2 and indicator count = 2 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+    <div>
+      The 28.999999999999996% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = null, category count = 0 and indicator count = 0 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = null, category count = 0 and indicator count = 1 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = null, category count = 0 and indicator count = 2 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = null, category count = 1 and indicator count = 0 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = null, category count = 1 and indicator count = 1 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = null, category count = 1 and indicator count = 2 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it meets 4 burden thresholds AND the associated socio-economic threshold. when isDonut = false, tribal % = null, category count = 2 and indicator count = 4 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it meets 4 burden thresholds AND the associated socio-economic threshold.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold. when isDonut = false, tribal % = null, category count = 1 and indicator count = 1 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold..
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomic threshold. when isDonut = false, tribal % = null, category count = 0 and indicator count = 0 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomic threshold.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It meets 5 burden thresholds BUT no associated socioeconomic thresholds. when isDonut = false, tribal % = null, category count = 0 and indicator count = 5 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is not considered disadvantaged. It meets 5 burden thresholds BUT no associated socioeconomic thresholds.
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds. when isDonut = false, tribal % = null, category count = 0 and indicator count = 1 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds.
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/client/src/components/PrioritizationCopy/index.ts b/client/src/components/PrioritizationCopy/index.ts
new file mode 100644
index 000000000..8d985e3c2
--- /dev/null
+++ b/client/src/components/PrioritizationCopy/index.ts
@@ -0,0 +1,2 @@
+import PrioritizationCopy from './PrioritizationCopy';
+export default PrioritizationCopy;
diff --git a/client/src/components/TractPrioritization/TractPrioritization.module.scss b/client/src/components/TractPrioritization/TractPrioritization.module.scss
new file mode 100644
index 000000000..8f2068323
--- /dev/null
+++ b/client/src/components/TractPrioritization/TractPrioritization.module.scss
@@ -0,0 +1,9 @@
+@use '../../styles/design-system.scss' as *;
+@import "../utils.scss";
+
+h3.invert{
+    background-color: $disadvantagedDotColor;
+    color: white;
+    @include u-padding-left('05');
+    @include u-padding-right('05');
+};
diff --git a/client/src/components/TractPrioritization/TractPrioritization.module.scss.d.ts b/client/src/components/TractPrioritization/TractPrioritization.module.scss.d.ts
new file mode 100644
index 000000000..0e736dc93
--- /dev/null
+++ b/client/src/components/TractPrioritization/TractPrioritization.module.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace TractPrioritizationNamespace {
+    export interface ITractPrioritizationScss {
+      invert: string;
+    }
+  }
+
+declare const TractPrioritizationScssModule: TractPrioritizationNamespace.ITractPrioritizationScss & {
+    /** WARNING: Only available when "css-loader" is used without "style-loader" or "mini-css-extract-plugin" */
+    locals: TractPrioritizationNamespace.ITractPrioritizationScss;
+  };
+
+  export = TractPrioritizationScssModule;
diff --git a/client/src/components/TractPrioritization/TractPrioritization.test.tsx b/client/src/components/TractPrioritization/TractPrioritization.test.tsx
new file mode 100644
index 000000000..1a41dfa4e
--- /dev/null
+++ b/client/src/components/TractPrioritization/TractPrioritization.test.tsx
@@ -0,0 +1,188 @@
+import React from 'react';
+import {render, screen} from '@testing-library/react';
+import {LocalizedComponent} from '../../test/testHelpers';
+import TractPrioritization from './TractPrioritization';
+
+describe('rendering of TractPrioritization Component', () => {
+  const testCases = [
+    {totalCategories: 3, isDonut: true, percentTribal: null, prio: 'YES'},
+    {totalCategories: 2, isDonut: true, percentTribal: 0, prio: 'YES'},
+    {totalCategories: 1, isDonut: true, percentTribal: .34, prio: 'YES'},
+
+    {totalCategories: 4, isDonut: false, percentTribal: null, prio: 'YES'},
+    {totalCategories: 5, isDonut: false, percentTribal: 0, prio: 'YES'},
+    {totalCategories: 7, isDonut: false, percentTribal: .82, prio: 'YES'},
+
+    {totalCategories: 0, isDonut: true, percentTribal: null, prio: 'YES'},
+    {totalCategories: 0, isDonut: true, percentTribal: 0, prio: 'YES'},
+    {totalCategories: 0, isDonut: true, percentTribal: .12, prio: 'YES'},
+
+    {totalCategories: 0, isDonut: false, percentTribal: .12, prio: 'Partially'},
+    {totalCategories: 0, isDonut: false, percentTribal: 0, prio: 'Partially'},
+
+    {totalCategories: 0, isDonut: false, percentTribal: null, prio: 'No'},
+  ];
+
+  testCases.forEach((testCase) => {
+    // eslint-disable-next-line max-len
+    it(`checks if component renders ${testCase.prio} when category count = ${testCase.totalCategories}, isDonut = ${testCase.isDonut}, tribal % = ${testCase.percentTribal}`, () => {
+      const {asFragment} = render(
+          <LocalizedComponent>
+            <TractPrioritization
+              totalCategoriesPrioritized={testCase.totalCategories}
+              isDonut={testCase.isDonut}
+              percentTractTribal={testCase.percentTribal}
+            />
+          </LocalizedComponent>,
+      );
+      expect(asFragment()).toMatchSnapshot();
+      screen.getByText(testCase.prio);
+    });
+  });
+  // it('checks if component renders YES when category count >= 1, isDonut = true, tribal % = null', () => {
+  //   const {asFragment} = render(
+  //       <LocalizedComponent>
+  //         <TractPrioritization
+  //           totalCategoriesPrioritized={3}
+  //           isDonut={true}
+  //           percentTractTribal={null}
+  //         />
+  //       </LocalizedComponent>,
+  //   );
+  //   expect(asFragment()).toMatchSnapshot();
+  // });
+  // it('checks if component renders YES when category count >= 1, isDonut = true, tribal % = 0', () => {
+  //   const {asFragment} = render(
+  //       <LocalizedComponent>
+  //         <TractPrioritization
+  //           totalCategoriesPrioritized={3}
+  //           isDonut={true}
+  //           percentTractTribal={0}
+  //         />
+  //       </LocalizedComponent>,
+  //   );
+  //   expect(asFragment()).toMatchSnapshot();
+  // });
+  // it('checks if component renders YES when category count >= 1, isDonut = true, tribal % = .47', () => {
+  //   const {asFragment} = render(
+  //       <LocalizedComponent>
+  //         <TractPrioritization
+  //           totalCategoriesPrioritized={3}
+  //           isDonut={true}
+  //           percentTractTribal={.47}
+  //         />
+  //       </LocalizedComponent>,
+  //   );
+  //   expect(asFragment()).toMatchSnapshot();
+  // });
+  // it('checks if component renders YES when category count >= 1, isDonut = false, tribal % = null', () => {
+  //   const {asFragment} = render(
+  //       <LocalizedComponent>
+  //         <TractPrioritization
+  //           totalCategoriesPrioritized={3}
+  //           isDonut={false}
+  //           percentTractTribal={null}
+  //         />
+  //       </LocalizedComponent>,
+  //   );
+  //   expect(asFragment()).toMatchSnapshot();
+  // });
+  // it('checks if component renders YES when category count >= 1, isDonut = false, tribal % = 0', () => {
+  //   const {asFragment} = render(
+  //       <LocalizedComponent>
+  //         <TractPrioritization
+  //           totalCategoriesPrioritized={3}
+  //           isDonut={false}
+  //           percentTractTribal={0}
+  //         />
+  //       </LocalizedComponent>,
+  //   );
+  //   expect(asFragment()).toMatchSnapshot();
+  // });
+  // it('checks if component renders YES when category count >= 1, isDonut = false, tribal % = .87', () => {
+  //   const {asFragment} = render(
+  //       <LocalizedComponent>
+  //         <TractPrioritization
+  //           totalCategoriesPrioritized={3}
+  //           isDonut={false}
+  //           percentTractTribal={.87}
+  //         />
+  //       </LocalizedComponent>,
+  //   );
+  //   expect(asFragment()).toMatchSnapshot();
+  // });
+
+  // it('checks if component renders YES when category count == 0, isDonut = true, tribal % = null', () => {
+  //   const {asFragment} = render(
+  //       <LocalizedComponent>
+  //         <TractPrioritization
+  //           totalCategoriesPrioritized={0}
+  //           isDonut={true}
+  //           percentTractTribal={null}
+  //         />
+  //       </LocalizedComponent>,
+  //   );
+  //   expect(asFragment()).toMatchSnapshot();
+  // });
+  // it('checks if component renders YES when category count == 0, isDonut = true, tribal % = 0', () => {
+  //   const {asFragment} = render(
+  //       <LocalizedComponent>
+  //         <TractPrioritization
+  //           totalCategoriesPrioritized={0}
+  //           isDonut={true}
+  //           percentTractTribal={0}
+  //         />
+  //       </LocalizedComponent>,
+  //   );
+  //   expect(asFragment()).toMatchSnapshot();
+  // });
+  // it('checks if component renders YES when category count == 0, isDonut = true, tribal % = .67', () => {
+  //   const {asFragment} = render(
+  //       <LocalizedComponent>
+  //         <TractPrioritization
+  //           totalCategoriesPrioritized={0}
+  //           isDonut={true}
+  //           percentTractTribal={.67}
+  //         />
+  //       </LocalizedComponent>,
+  //   );
+  //   expect(asFragment()).toMatchSnapshot();
+  // });
+
+  // it('checks if component renders PARTIALLY when category count == 0, isDonut = false, tribal % = .33', () => {
+  //   const {asFragment} = render(
+  //       <LocalizedComponent>
+  //         <TractPrioritization
+  //           totalCategoriesPrioritized={0}
+  //           isDonut={false}
+  //           percentTractTribal={.33}
+  //         />
+  //       </LocalizedComponent>,
+  //   );
+  //   expect(asFragment()).toMatchSnapshot();
+  // });
+  // it('checks if component renders PARTIALLY when category count == 0, isDonut = false, tribal % = 0', () => {
+  //   const {asFragment} = render(
+  //       <LocalizedComponent>
+  //         <TractPrioritization
+  //           totalCategoriesPrioritized={0}
+  //           isDonut={false}
+  //           percentTractTribal={0}
+  //         />
+  //       </LocalizedComponent>,
+  //   );
+  //   expect(asFragment()).toMatchSnapshot();
+  // });
+  // it('checks if component renders NO when category count == 0, isDonut = false, tribal % = null', () => {
+  //   const {asFragment} = render(
+  //       <LocalizedComponent>
+  //         <TractPrioritization
+  //           totalCategoriesPrioritized={0}
+  //           isDonut={false}
+  //           percentTractTribal={null}
+  //         />
+  //       </LocalizedComponent>,
+  //   );
+  //   expect(asFragment()).toMatchSnapshot();
+  // });
+});
diff --git a/client/src/components/TractPrioritization/TractPrioritization.tsx b/client/src/components/TractPrioritization/TractPrioritization.tsx
new file mode 100644
index 000000000..7fc543d47
--- /dev/null
+++ b/client/src/components/TractPrioritization/TractPrioritization.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+
+import * as styles from './TractPrioritization.module.scss';
+
+import * as EXPLORE_COPY from '../../data/copy/explore';
+
+interface ITractPrioritization {
+  totalCategoriesPrioritized: number
+  isDonut: boolean,
+  percentTractTribal: number | null,
+}
+
+/**
+ * This component will return the appropriate designation for the tract's prioritization
+ *
+ * @param {number} totalCategoriesPrioritized
+ * @param {boolean} isDonut
+ * @param {number} percentTractTribal
+ * @return {JSX}
+ */
+const TractPrioritization = (
+    {totalCategoriesPrioritized, isDonut, percentTractTribal}:ITractPrioritization) => {
+  if (totalCategoriesPrioritized >= 1) {
+    return <h3 className={styles.invert}>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>;
+  } else if (totalCategoriesPrioritized === 0 && isDonut === true) {
+    return <h3 className={styles.invert}>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>;
+  } else if (
+    totalCategoriesPrioritized === 0 &&
+    isDonut === false &&
+    percentTractTribal !== null &&
+    percentTractTribal >= 0) {
+    return <h3>{EXPLORE_COPY.COMMUNITY.PARTIAL}</h3>;
+  } else if (percentTractTribal !== null) {
+    return <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>;
+  } else {
+    return <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>;
+  }
+};
+
+export default TractPrioritization;
diff --git a/client/src/components/TractPrioritization/__snapshots__/TractPrioritization.test.tsx.snap b/client/src/components/TractPrioritization/__snapshots__/TractPrioritization.test.tsx.snap
new file mode 100644
index 000000000..7a92585b1
--- /dev/null
+++ b/client/src/components/TractPrioritization/__snapshots__/TractPrioritization.test.tsx.snap
@@ -0,0 +1,97 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`rendering of TractPrioritization Component checks if component renders No when category count = 0, isDonut = false, tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    No
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isDonut = false, tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isDonut = false, tribal % = 0.12 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isDonut = true, tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isDonut = true, tribal % = 0.12 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isDonut = true, tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isDonut = true, tribal % = 0.34 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 2, isDonut = true, tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 3, isDonut = true, tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 4, isDonut = false, tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 5, isDonut = false, tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 7, isDonut = false, tribal % = 0.82 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
diff --git a/client/src/components/TractPrioritization/index.ts b/client/src/components/TractPrioritization/index.ts
new file mode 100644
index 000000000..ebf0bfa69
--- /dev/null
+++ b/client/src/components/TractPrioritization/index.ts
@@ -0,0 +1,2 @@
+import TractPrioritization from './TractPrioritization';
+export default TractPrioritization;
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 7edb5a95d..cfa4cdb40 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -547,6 +547,87 @@ export const SIDE_PANEL_TRIBAL_INFO = defineMessages({
   },
 });
 
+export const PRIORITIZATION_COPY = {
+  NOT_PRIO: <FormattedMessage
+    id={'explore.map.page.side.panel.prio.copy.not.prio'}
+    defaultMessage={'This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomic threshold.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomi} threshold.`}
+  />,
+  NOT_PRIO_1_BURD: <FormattedMessage
+    id={'explore.map.page.side.panel.prio.copy.not.prio.one.burden'}
+    defaultMessage={'This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds.`}
+  />,
+  PRIO_1_BURD: <FormattedMessage
+    id={'explore.map.page.side.panel.prio.copy.prio.one.burden'}
+    defaultMessage={'This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold..'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold..`}
+  />,
+  DONUT: <FormattedMessage
+    id={'explore.map.page.side.panel.prio.copy.prio.donut'}
+    defaultMessage={'This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low}income threshold.`}
+  />,
+  FRT_LESS_1_PERC: <FormattedMessage
+    id={'explore.map.page.side.panel.prio.copy.frt.less.1.perc'}
+    defaultMessage={'The less than 1% of this tract that are Federally- Recognized Tribal lands are also considered disadvantaged.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show The [less than 1%] of this tract that are Federally- Recognized Tribal lands are also considered disadvantaged.`}
+  />,
+};
+
+export const getNotPrioNBurden = (burdens:number) => {
+  return (
+    <FormattedMessage
+      id={'explore.map.page.side.panel.prio.copy.not.prio.n.burden'}
+      defaultMessage={ 'This tract is not considered disadvantaged. It meets {burdens} burden thresholds BUT no associated socioeconomic thresholds.'}
+      description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds.`}
+      values={{
+        burdens: burdens,
+      }}
+    />
+  );
+};
+
+export const getPrioNBurden = (burdens:number) => {
+  return (
+    <FormattedMessage
+      id={'explore.map.page.side.panel.prio.copy.prio.n.burden'}
+      defaultMessage={ 'This tract is considered disadvantaged because it meets {burdens} burden thresholds AND the associated socio-economic threshold.'}
+      description={`Navigate to the explore the map page. Click on tract, This tract is considered disadvantaged because it meets {burdens} burden thresholds AND the associated socio-economic threshold.`}
+      values={{
+        burdens: burdens,
+      }}
+    />
+  );
+};
+
+export const getPrioFRTNPerc = (percentage:number, isAlso:boolean) => {
+  return (
+    <FormattedMessage
+      id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
+      defaultMessage={ 'The {percentage} of this tract that are Federally-Recognized Tribal lands are {also} considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The {percentage} of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`}
+      values={{
+        percentage: `${percentage*100}%`,
+        also: isAlso? 'also' : '',
+      }}
+    />
+  );
+};
+
+export const getPrioFRTLessThan1Perc = (isAlso:boolean) => {
+  return (
+    <FormattedMessage
+      id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
+      defaultMessage={ 'The less than 1% of this tract that are Federally-Recognized Tribal lands are {also} considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The {percentage} of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`}
+      values={{
+        also: isAlso? 'also' : '',
+      }}
+    />
+  );
+};
+
 export const COMMUNITY = {
   OF_FOCUS: <FormattedMessage
     id={'explore.map.page.side.panel.community.of.focus'}
@@ -558,6 +639,11 @@ export const COMMUNITY = {
     defaultMessage= {'No'}
     description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the communities the score currently is not focused on`}
   />,
+  PARTIAL: <FormattedMessage
+    id= {'explore.map.page.side.panel.partial.community.of.focus'}
+    defaultMessage= {'Partially'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the communities the score currently is partially focused on`}
+  />,
   IS_FOCUS: <FormattedMessage
     id={'explore.map.page.side.panel.is.community.of.focus'}
     defaultMessage={ 'Identified as disadvantaged?'}
@@ -909,9 +995,9 @@ export const SIDE_PANEL_VALUES = {
       description: 'image alt text for the down arrow',
       defaultMessage: `an icon for the down arrow`,
     },
-    UNAVAILABLE: {
+    INFO: {
       id: 'explore.map.page.side.panel.indicator.value.unavailable.alt.text',
-      description: 'image alt text for unavailable icon',
+      description: 'image alt text when low income is imputed',
       defaultMessage: `an icon to represent data is unavailable`,
     },
   }),
@@ -1179,6 +1265,23 @@ export const SIDE_PANEL_SPACERS = {
   />,
 };
 
+export const LOW_INCOME_TOOLTIP = defineMessages({
+  IMP_NO_ADJ_YES: {
+    id: 'explore.map.page.side.panel.indicator.low.income.tooltip.imp.no.adj.yes',
+    defaultMessage: `Tracts that are surrounded by tracts<br />that are considered disadvantaged<br />have a low income threshold.`,
+    description: 'Hover over the low income icon and it will show Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold.',
+  },
+  IMP_YES_ADJ_NO: {
+    id: 'explore.map.page.side.panel.indicator.low.income.tooltip.imp.yes.adj.no',
+    defaultMessage: `Tracts with missing income data<br />are given estimated incomes based<br />on an average of the incomes<br />of the surrounding tracts.`,
+    description: 'Hover over the low income icon and it will show Tracts with missing income data are given estimated incomes based on an average of the incomes of the surrounding tracts.',
+  },
+  IMP_YES_ADJ_YES: {
+    id: 'explore.map.page.side.panel.indicator.low.income.tooltip.imp.yes.adj.no',
+    defaultMessage: `Tracts with missing income data<br />are given estimated incomes<br />based on an average of the<br />incomes of the surrounding tracts.<br /> Tracts that are surrounded by<br />tracts that are considered<br />disadvantaged have a<br />low incomethreshold.`,
+    description: 'Hover over the low income icon and it will show Tracts with missing income data are given estimated incomes based on an average of the incomes of the surrounding tracts. Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold.',
+  },
+});
 export const DOWNLOAD_DRAFT = {
   PARAGRAPH_1: <FormattedMessage
     id={'explore.map.page.under.map.download.draft.ptag.1'}
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index e34a77aac..f00df6a66 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -799,6 +799,14 @@
     "defaultMessage": "Low income",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show low income"
   },
+  "explore.map.page.side.panel.indicator.low.income.tooltip.imp.no.adj.yes": {
+    "defaultMessage": "Tracts that are surrounded by tracts<br />that are considered disadvantaged<br />have a low income threshold.",
+    "description": "Hover over the low income icon and it will show Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold."
+  },
+  "explore.map.page.side.panel.indicator.low.income.tooltip.imp.yes.adj.no": {
+    "defaultMessage": "Tracts with missing income data<br />are given estimated incomes<br />based on an average of the<br />incomes of the surrounding tracts.<br /> Tracts that are surrounded by<br />tracts that are considered<br />disadvantaged have a<br />low incomethreshold.",
+    "description": "Hover over the low income icon and it will show Tracts with missing income data are given estimated incomes based on an average of the incomes of the surrounding tracts. Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold."
+  },
   "explore.map.page.side.panel.indicator.low.med.income": {
     "defaultMessage": "Low median income",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Low median income"
@@ -905,7 +913,7 @@
   },
   "explore.map.page.side.panel.indicator.value.unavailable.alt.text": {
     "defaultMessage": "an icon to represent data is unavailable",
-    "description": "image alt text for unavailable icon"
+    "description": "image alt text when low income is imputed"
   },
   "explore.map.page.side.panel.indicator.wasteWater": {
     "defaultMessage": "Wastewater discharge",
@@ -1019,6 +1027,42 @@
     "defaultMessage": "in {numberOfDisCategories, plural, one {# category} other {# categories}}",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show how many categories are exceeded"
   },
+  "explore.map.page.side.panel.partial.community.of.focus": {
+    "defaultMessage": "Partially",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the communities the score currently is partially focused on"
+  },
+  "explore.map.page.side.panel.prio.copy.frt.less.1.perc": {
+    "defaultMessage": "The less than 1% of this tract that are Federally- Recognized Tribal lands are also considered disadvantaged.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show The [less than 1%] of this tract that are Federally- Recognized Tribal lands are also considered disadvantaged."
+  },
+  "explore.map.page.side.panel.prio.copy.not.prio": {
+    "defaultMessage": "This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomic threshold.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomi} threshold."
+  },
+  "explore.map.page.side.panel.prio.copy.not.prio.n.burden": {
+    "defaultMessage": "This tract is not considered disadvantaged. It meets {burdens} burden thresholds BUT no associated socioeconomic thresholds.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds."
+  },
+  "explore.map.page.side.panel.prio.copy.not.prio.one.burden": {
+    "defaultMessage": "This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds."
+  },
+  "explore.map.page.side.panel.prio.copy.prio.donut": {
+    "defaultMessage": "This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low}income threshold."
+  },
+  "explore.map.page.side.panel.prio.copy.prio.frt.n.perc": {
+    "defaultMessage": "The less than 1% of this tract that are Federally-Recognized Tribal lands are {also} considered disadvantaged.",
+    "description": "Navigate to the explore the map page. Click on tract, The {percentage} of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged."
+  },
+  "explore.map.page.side.panel.prio.copy.prio.n.burden": {
+    "defaultMessage": "This tract is considered disadvantaged because it meets {burdens} burden thresholds AND the associated socio-economic threshold.",
+    "description": "Navigate to the explore the map page. Click on tract, This tract is considered disadvantaged because it meets {burdens} burden thresholds AND the associated socio-economic threshold."
+  },
+  "explore.map.page.side.panel.prio.copy.prio.one.burden": {
+    "defaultMessage": "This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold..",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold.."
+  },
   "explore.map.page.side.panel.send.feedback.alt.img": {
     "defaultMessage": "Send feedback",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a send feedback icon, this is the images alt tag"

From 9eca504cfcd2b9d0bd2b71362404c57d45bc575e Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Mon, 3 Oct 2022 19:23:39 -0700
Subject: [PATCH 069/130] Update copy based on bug party (#1973)

* Update copy from team debug party
- closes #1945
- Lack of green space description
- Lack of indoor plumbing

* Update copy
- closes #1950

* Update copy
- closes #1951

* Update survey button
- Text and link
- closes 1967

* Update copy

- correct tool tip copy
- closes #1959
---
 .../__snapshots__/J40Footer.spec.tsx.snap      |  4 ++--
 client/src/components/J40Map.tsx               |  2 +-
 .../PrioritizationCopy.test.tsx.snap           |  2 +-
 .../__snapshots__/SurveyButton.test.tsx.snap   |  4 ++--
 client/src/data/copy/contact.tsx               |  4 ++--
 client/src/data/copy/explore.tsx               | 14 +++++++-------
 client/src/intl/en.json                        | 18 +++++++++---------
 .../tests/__snapshots__/about.test.tsx.snap    |  4 ++--
 .../tests/__snapshots__/contact.test.tsx.snap  |  4 ++--
 .../__snapshots__/downloads.test.tsx.snap      |  4 ++--
 .../freqAskedQuestions.test.tsx.snap           |  4 ++--
 .../__snapshots__/methodology.test.tsx.snap    |  4 ++--
 .../__snapshots__/publicEng.test.tsx.snap      |  4 ++--
 .../__snapshots__/techSupportDoc.test.tsx.snap |  4 ++--
 14 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap b/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap
index 45f40f930..68e7210a4 100644
--- a/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap
+++ b/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap
@@ -221,7 +221,7 @@ exports[`J40Footer renders correctly 1`] = `
       data-testid="gridContainer"
     >
       <a
-        href="https://www.surveymonkey.com/r/cejst-survey"
+        href="https://www.surveymonkey.com/r/P3LWTSB"
         rel="noreferrer"
         target="_blank"
       >
@@ -230,7 +230,7 @@ exports[`J40Footer renders correctly 1`] = `
           data-testid="button"
           type="button"
         >
-          Help improve the site & data
+          Help us improve the site & data
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index 57e99808b..300ba7b51 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -28,7 +28,7 @@ import AreaDetail from './AreaDetail';
 import MapInfoPanel from './mapInfoPanel';
 import MapSearch from './MapSearch';
 import MapTractLayers from './MapTractLayers/MapTractLayers';
-import MapTribalLayer from './MapTribalLayers/MapTribalLayers';
+// import MapTribalLayer from './MapTribalLayers/MapTribalLayers';
 import TerritoryFocusControl from './territoryFocusControl';
 import {getOSBaseMap} from '../data/getOSBaseMap';
 
diff --git a/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap b/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap
index 0929de8e5..77c6d248c 100644
--- a/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap
+++ b/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap
@@ -352,7 +352,7 @@ exports[`rendering of PrioritizationCopy Component - checks if component renders
 <DocumentFragment>
   <div>
     <div>
-      This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold..
+      This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold.
     </div>
   </div>
 </DocumentFragment>
diff --git a/client/src/components/SurveyButton/__snapshots__/SurveyButton.test.tsx.snap b/client/src/components/SurveyButton/__snapshots__/SurveyButton.test.tsx.snap
index 7e51f1b90..c88a68f37 100644
--- a/client/src/components/SurveyButton/__snapshots__/SurveyButton.test.tsx.snap
+++ b/client/src/components/SurveyButton/__snapshots__/SurveyButton.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`rendering of the SurveyButton checks if component renders 1`] = `
     data-testid="gridContainer"
   >
     <a
-      href="https://www.surveymonkey.com/r/cejst-survey"
+      href="https://www.surveymonkey.com/r/P3LWTSB"
       rel="noreferrer"
       target="_blank"
     >
@@ -16,7 +16,7 @@ exports[`rendering of the SurveyButton checks if component renders 1`] = `
         data-testid="button"
         type="button"
       >
-        Help improve the site & data
+        Help us improve the site & data
         <img
           alt="launch icon"
           src="test-file-stub"
diff --git a/client/src/data/copy/contact.tsx b/client/src/data/copy/contact.tsx
index 684b78c9f..74101988c 100644
--- a/client/src/data/copy/contact.tsx
+++ b/client/src/data/copy/contact.tsx
@@ -28,12 +28,12 @@ export const PAGE_INTRO = defineMessages({
   },
   SURVEY_TEXT: {
     id: 'contact.page.fab.survey.text',
-    defaultMessage: `Help improve the site & data`,
+    defaultMessage: `Help us improve the site & data`,
     description: 'Navigate to the contact page, this is the text for floating action button',
   },
   SURVEY_URL: {
     id: 'contact.page.fab.survey.link',
-    defaultMessage: 'https://www.surveymonkey.com/r/cejst-survey',
+    defaultMessage: 'https://www.surveymonkey.com/r/P3LWTSB',
     description: 'The footer sticky link that links to the CEJST survey',
   },
 });
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index cfa4cdb40..e7bae2ec1 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -560,7 +560,7 @@ export const PRIORITIZATION_COPY = {
   />,
   PRIO_1_BURD: <FormattedMessage
     id={'explore.map.page.side.panel.prio.copy.prio.one.burden'}
-    defaultMessage={'This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold..'}
+    defaultMessage={'This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold.'}
     description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold..`}
   />,
   DONUT: <FormattedMessage
@@ -852,8 +852,8 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
   },
   LACK_PLUMBING: {
     id: 'explore.map.page.side.panel.indicator.lack.plumbing',
-    defaultMessage: 'Lack of plumbing',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lack of plumbing`,
+    defaultMessage: 'Lack of indoor plumbing',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lack of indoor plumbing`,
   },
   LEAD_PAINT: {
     id: 'explore.map.page.side.panel.indicator.leadPaint',
@@ -1111,8 +1111,8 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   },
   LACK_GREEN_SPACE: {
     id: 'explore.map.page.side.panel.indicator.description.lack.green.space',
-    defaultMessage: 'Share of land covered with artificial materials like concrete or pavement and crop land',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Share of land covered with artificial materials like concrete or pavement and crop land`,
+    defaultMessage: 'Share of non-crop land covered with artificial materials like concrete or pavement',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Share of non-crop land covered with artificial materials like concrete or pavement`,
   },
   LACK_PLUMBING: {
     id: 'explore.map.page.side.panel.indicator.description.lack.plumbing',
@@ -1268,7 +1268,7 @@ export const SIDE_PANEL_SPACERS = {
 export const LOW_INCOME_TOOLTIP = defineMessages({
   IMP_NO_ADJ_YES: {
     id: 'explore.map.page.side.panel.indicator.low.income.tooltip.imp.no.adj.yes',
-    defaultMessage: `Tracts that are surrounded by tracts<br />that are considered disadvantaged<br />have a low income threshold.`,
+    defaultMessage: `Tracts that are surrounded by tracts<br />that are considered disadvantaged<br />have an adjusted low income threshold.`,
     description: 'Hover over the low income icon and it will show Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold.',
   },
   IMP_YES_ADJ_NO: {
@@ -1278,7 +1278,7 @@ export const LOW_INCOME_TOOLTIP = defineMessages({
   },
   IMP_YES_ADJ_YES: {
     id: 'explore.map.page.side.panel.indicator.low.income.tooltip.imp.yes.adj.no',
-    defaultMessage: `Tracts with missing income data<br />are given estimated incomes<br />based on an average of the<br />incomes of the surrounding tracts.<br /> Tracts that are surrounded by<br />tracts that are considered<br />disadvantaged have a<br />low incomethreshold.`,
+    defaultMessage: `Tracts with missing income data<br />are given estimated incomes<br />based on an average of the<br />incomes of the surrounding tracts.<br /> Tracts that are surrounded by<br />tracts that are considered<br />disadvantaged have a<br />low income threshold.`,
     description: 'Hover over the low income icon and it will show Tracts with missing income data are given estimated incomes based on an average of the incomes of the surrounding tracts. Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold.',
   },
 });
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index f00df6a66..19525344c 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -256,11 +256,11 @@
     "description": "Navigate to the contact page, this is the census tract feedback section"
   },
   "contact.page.fab.survey.link": {
-    "defaultMessage": "https://www.surveymonkey.com/r/cejst-survey",
+    "defaultMessage": "https://www.surveymonkey.com/r/P3LWTSB",
     "description": "The footer sticky link that links to the CEJST survey"
   },
   "contact.page.fab.survey.text": {
-    "defaultMessage": "Help improve the site & data",
+    "defaultMessage": "Help us improve the site & data",
     "description": "Navigate to the contact page, this is the text for floating action button"
   },
   "contact.page.general": {
@@ -648,8 +648,8 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of households making less than 80% of the area median family income and spending more than 30% of income on housing"
   },
   "explore.map.page.side.panel.indicator.description.lack.green.space": {
-    "defaultMessage": "Share of land covered with artificial materials like concrete or pavement and crop land",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Share of land covered with artificial materials like concrete or pavement and crop land"
+    "defaultMessage": "Share of non-crop land covered with artificial materials like concrete or pavement",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Share of non-crop land covered with artificial materials like concrete or pavement"
   },
   "explore.map.page.side.panel.indicator.description.lack.plumbing": {
     "defaultMessage": "Share of homes without indoor kitchens or plumbing",
@@ -776,8 +776,8 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lack of green space"
   },
   "explore.map.page.side.panel.indicator.lack.plumbing": {
-    "defaultMessage": "Lack of plumbing",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lack of plumbing"
+    "defaultMessage": "Lack of indoor plumbing",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lack of indoor plumbing"
   },
   "explore.map.page.side.panel.indicator.leadPaint": {
     "defaultMessage": "Lead paint",
@@ -800,11 +800,11 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show low income"
   },
   "explore.map.page.side.panel.indicator.low.income.tooltip.imp.no.adj.yes": {
-    "defaultMessage": "Tracts that are surrounded by tracts<br />that are considered disadvantaged<br />have a low income threshold.",
+    "defaultMessage": "Tracts that are surrounded by tracts<br />that are considered disadvantaged<br />have an adjusted low income threshold.",
     "description": "Hover over the low income icon and it will show Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold."
   },
   "explore.map.page.side.panel.indicator.low.income.tooltip.imp.yes.adj.no": {
-    "defaultMessage": "Tracts with missing income data<br />are given estimated incomes<br />based on an average of the<br />incomes of the surrounding tracts.<br /> Tracts that are surrounded by<br />tracts that are considered<br />disadvantaged have a<br />low incomethreshold.",
+    "defaultMessage": "Tracts with missing income data<br />are given estimated incomes<br />based on an average of the<br />incomes of the surrounding tracts.<br /> Tracts that are surrounded by<br />tracts that are considered<br />disadvantaged have a<br />low income threshold.",
     "description": "Hover over the low income icon and it will show Tracts with missing income data are given estimated incomes based on an average of the incomes of the surrounding tracts. Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold."
   },
   "explore.map.page.side.panel.indicator.low.med.income": {
@@ -1060,7 +1060,7 @@
     "description": "Navigate to the explore the map page. Click on tract, This tract is considered disadvantaged because it meets {burdens} burden thresholds AND the associated socio-economic threshold."
   },
   "explore.map.page.side.panel.prio.copy.prio.one.burden": {
-    "defaultMessage": "This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold..",
+    "defaultMessage": "This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold.",
     "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold.."
   },
   "explore.map.page.side.panel.send.feedback.alt.img": {
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index ec21e3c22..1e0f7d8f9 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -988,7 +988,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       data-testid="gridContainer"
     >
       <a
-        href="https://www.surveymonkey.com/r/cejst-survey"
+        href="https://www.surveymonkey.com/r/P3LWTSB"
         rel="noreferrer"
         target="_blank"
       >
@@ -997,7 +997,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help improve the site & data
+          Help us improve the site & data
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index 42e6f4530..91818bdd5 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -688,7 +688,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       data-testid="gridContainer"
     >
       <a
-        href="https://www.surveymonkey.com/r/cejst-survey"
+        href="https://www.surveymonkey.com/r/P3LWTSB"
         rel="noreferrer"
         target="_blank"
       >
@@ -697,7 +697,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help improve the site & data
+          Help us improve the site & data
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index fa1506c35..f4d85ae7a 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -688,7 +688,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       data-testid="gridContainer"
     >
       <a
-        href="https://www.surveymonkey.com/r/cejst-survey"
+        href="https://www.surveymonkey.com/r/P3LWTSB"
         rel="noreferrer"
         target="_blank"
       >
@@ -697,7 +697,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help improve the site & data
+          Help us improve the site & data
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 5dd539cdd..6fda962fa 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -601,7 +601,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       data-testid="gridContainer"
     >
       <a
-        href="https://www.surveymonkey.com/r/cejst-survey"
+        href="https://www.surveymonkey.com/r/P3LWTSB"
         rel="noreferrer"
         target="_blank"
       >
@@ -610,7 +610,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help improve the site & data
+          Help us improve the site & data
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 35fa54434..0dd79b452 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -2568,7 +2568,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       data-testid="gridContainer"
     >
       <a
-        href="https://www.surveymonkey.com/r/cejst-survey"
+        href="https://www.surveymonkey.com/r/P3LWTSB"
         rel="noreferrer"
         target="_blank"
       >
@@ -2577,7 +2577,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help improve the site & data
+          Help us improve the site & data
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index cde23acf8..4f0323ba0 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -1199,7 +1199,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       data-testid="gridContainer"
     >
       <a
-        href="https://www.surveymonkey.com/r/cejst-survey"
+        href="https://www.surveymonkey.com/r/P3LWTSB"
         rel="noreferrer"
         target="_blank"
       >
@@ -1208,7 +1208,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help improve the site & data
+          Help us improve the site & data
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index 941b8e70c..5036db226 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -601,7 +601,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       data-testid="gridContainer"
     >
       <a
-        href="https://www.surveymonkey.com/r/cejst-survey"
+        href="https://www.surveymonkey.com/r/P3LWTSB"
         rel="noreferrer"
         target="_blank"
       >
@@ -610,7 +610,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help improve the site & data
+          Help us improve the site & data
           <img
             alt="launch icon"
             src="test-file-stub"

From 0569dc9f0f1729be934084afe9e295dabeda33b1 Mon Sep 17 00:00:00 2001
From: Lucas Merrill Brown <lucas.m.brown@omb.eop.gov>
Date: Thu, 6 Oct 2022 10:27:21 -0400
Subject: [PATCH 070/130] No issue number: Update front-end Readme (#1935)

* Addresses `nvm` install
---
 client/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/README.md b/client/README.md
index 78fe76fdb..48b8d7e3f 100644
--- a/client/README.md
+++ b/client/README.md
@@ -30,7 +30,7 @@ Once you install NVM, don't forget to install Node! This is included in the link
 
 After you've downloaded the nvm and the latest node (using the above steps) also install node version 14 by:
 
-`brew install node@14`
+`nvm install 14`
 
 You should then be able to switch to that version of node by:
 
@@ -41,6 +41,7 @@ To validate you are using node 14, type:
 `node -v` 
 
 This should return *Now using node 14.x.x (npm v6.x.x)*
+
 #### Install Yarn
 
 Install yarn if you do not have it yet. Open your terminal and run `sudo npm install -global yarn`. This works on MacOS and Win10. To confirm it is installed, run `yarn -v`. A version number should be returned.

From 743f647814ea74ca5772da78e6fa9b31823f2d75 Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Thu, 6 Oct 2022 13:15:50 -0700
Subject: [PATCH 071/130] Updated side panel, with two paragraphs, "Completely
 surrounded" and "Adjusted low income" and more! (#1990)

* Update logic for TractPrioritization and bug fix

- fix wildfire bug closes #1953
- rename TractPri API to better align with BE signal names
- redo test and all test cases

* Add PrioCopy1 and PrioCopy2

- fix rounding
- limited tests for each component. Many more test cases are needed
- add copy to i18n

* Adjust LowInc tool tip only on IMP_FLG=T

- remove threshold change for low income

* Add copy for comp. surr and Adj low inc

- create a new component DonutCopy
- add tests
- modify styling to work in both 1 para case and 2 para case

* Add Donut copy

* Fix typo on 2nd paragraph

* Update browser list

* Adds TA_COUNT_AK, TA_COUNT_C and TA_PERC_FE

- Prio1 and Prio2 both take TA_COUNT_C which should be null
- updates basic tests

* Remvoe cypress tests

* Update CONUS number to troubleshoot

* Copy adjustments

- move test copy to console.log
- move donutCopy to only show when ADJ_ET is true
---
 .github/workflows/deploy_fe_staging.yml       |  14 +-
 client/package-lock.json                      |  12 +-
 .../src/components/AreaDetail/AreaDetail.tsx  | 107 ++--
 .../DonutCopy/DonutCopy.module.scss           |  40 ++
 .../DonutCopy/DonutCopy.module.scss.d.ts      |  18 +
 .../components/DonutCopy/DonutCopy.test.tsx   |  29 ++
 client/src/components/DonutCopy/DonutCopy.tsx |  51 ++
 .../__snapshots__/DonutCopy.test.tsx.snap     |  85 ++++
 client/src/components/DonutCopy/index.ts      |   2 +
 .../Indicator/Indicator.module.scss           |   8 +-
 client/src/components/Indicator/Indicator.tsx |  42 +-
 .../PrioritizationCopy.test.tsx               | 480 +++++++++---------
 .../PrioritizationCopy/PrioritizationCopy.tsx | 177 +++----
 .../PrioritizationCopy.test.tsx.snap          | 368 +-------------
 .../PrioritizationCopy2.module.scss           |   5 +
 .../PrioritizationCopy2.module.scss.d.ts      |  12 +
 .../PrioritizationCopy2.test.tsx              |  56 ++
 .../PrioritizationCopy2.tsx                   |  95 ++++
 .../PrioritizationCopy2.test.tsx.snap         |  17 +
 .../components/PrioritizationCopy2/index.ts   |   2 +
 .../TractPrioritization.module.scss           |   5 +-
 .../TractPrioritization.test.tsx              | 227 +++------
 .../TractPrioritization.tsx                   |  41 +-
 .../TractPrioritization.test.tsx.snap         | 312 +++++++++++-
 client/src/components/utils.scss              |  13 +
 client/src/data/constants.tsx                 |  11 +-
 client/src/data/copy/explore.tsx              |  94 ++--
 client/src/intl/en.json                       |  38 +-
 28 files changed, 1320 insertions(+), 1041 deletions(-)
 create mode 100644 client/src/components/DonutCopy/DonutCopy.module.scss
 create mode 100644 client/src/components/DonutCopy/DonutCopy.module.scss.d.ts
 create mode 100644 client/src/components/DonutCopy/DonutCopy.test.tsx
 create mode 100644 client/src/components/DonutCopy/DonutCopy.tsx
 create mode 100644 client/src/components/DonutCopy/__snapshots__/DonutCopy.test.tsx.snap
 create mode 100644 client/src/components/DonutCopy/index.ts
 create mode 100644 client/src/components/PrioritizationCopy2/PrioritizationCopy2.module.scss
 create mode 100644 client/src/components/PrioritizationCopy2/PrioritizationCopy2.module.scss.d.ts
 create mode 100644 client/src/components/PrioritizationCopy2/PrioritizationCopy2.test.tsx
 create mode 100644 client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx
 create mode 100644 client/src/components/PrioritizationCopy2/__snapshots__/PrioritizationCopy2.test.tsx.snap
 create mode 100644 client/src/components/PrioritizationCopy2/index.ts

diff --git a/.github/workflows/deploy_fe_staging.yml b/.github/workflows/deploy_fe_staging.yml
index 44d844cdb..24a78e4dd 100644
--- a/.github/workflows/deploy_fe_staging.yml
+++ b/.github/workflows/deploy_fe_staging.yml
@@ -49,13 +49,13 @@ jobs:
         run: npm test
       - name: Check for security vulnerabilities
         run: npm audit --production
-      - name: Cypress / Gherkin integration tests 🌃
-        uses: cypress-io/github-action@v4
-        with:
-          working-directory: ${{env.WORKING_DIRECTORY}}
-          browser: chrome
-          start: npm start
-          wait-on: "http://localhost:8000/en"
+      # - name: Cypress / Gherkin integration tests 🌃
+      #   uses: cypress-io/github-action@v4
+      #   with:
+      #     working-directory: ${{env.WORKING_DIRECTORY}}
+      #     browser: chrome
+      #     start: npm start
+      #     wait-on: "http://localhost:8000/en"
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
diff --git a/client/package-lock.json b/client/package-lock.json
index d8e796581..16f3b13cb 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -6353,9 +6353,9 @@
       "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001319",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz",
-      "integrity": "sha512-xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw==",
+      "version": "1.0.30001416",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001416.tgz",
+      "integrity": "sha512-06wzzdAkCPZO+Qm4e/eNghZBDfVNDsCgw33T27OwBH9unE9S478OYw//Q2L7Npf/zBzs7rjZOszIFQkwQKAEqA==",
       "funding": [
         {
           "type": "opencollective",
@@ -31403,9 +31403,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001319",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz",
-      "integrity": "sha512-xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw=="
+      "version": "1.0.30001416",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001416.tgz",
+      "integrity": "sha512-06wzzdAkCPZO+Qm4e/eNghZBDfVNDsCgw33T27OwBH9unE9S478OYw//Q2L7Npf/zBzs7rjZOszIFQkwQKAEqA=="
     },
     "caseless": {
       "version": "0.12.0",
diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 5d765d76b..97d7b7dbb 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -6,8 +6,10 @@ import {Accordion, Button} from '@trussworks/react-uswds';
 
 // Components:
 import Category from '../Category';
+import DonutCopy from '../DonutCopy';
 import Indicator from '../Indicator';
 import PrioritizationCopy from '../PrioritizationCopy';
+import PrioritizationCopy2 from '../PrioritizationCopy2';
 import TractDemographics from '../TractDemographics';
 import TractInfo from '../TractInfo';
 import TractPrioritization from '../TractPrioritization';
@@ -98,7 +100,6 @@ export const indicatorFilter = (label:MessageDescriptor) => {
   );
 };
 
-
 /**
  * Function to calculate the tribal area percentage value to display when a tract is selected
  *
@@ -107,7 +108,7 @@ export const indicatorFilter = (label:MessageDescriptor) => {
  */
 export const getTribalPercentValue = (tribalPercentRaw: number) => {
   if (tribalPercentRaw === undefined) {
-    return ` 0 %`;
+    return ` none`;
   }
 
   if (tribalPercentRaw === 0) {
@@ -116,7 +117,7 @@ export const getTribalPercentValue = (tribalPercentRaw: number) => {
   }
 
   if (tribalPercentRaw && tribalPercentRaw > 0) {
-    return ` ${tribalPercentRaw*100} %`;
+    return ` ${parseFloat((tribalPercentRaw*100).toFixed())} %`;
   }
 };
 
@@ -131,13 +132,24 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
   const intl = useIntl();
 
   // console.log the properties of the census that is selected:
-  console.log("Area Detail properies: ", properties);
+  console.log("BE signals for tract (last one is the tract currently selected): ", properties);
+
+  // console.log around the donut, adjacency and tribal info:
+  console.log("Income imputed? ", properties[constants.IMPUTE_FLAG] === "0" ? ' NO' : ' YES');
+  console.log("Adjacency indicator? ", properties[constants.ADJACENCY_EXCEEDS_THRESH] ? ' YES' : ' NO');
+  console.log("% of tract tribal: ", getTribalPercentValue(properties[constants.TRIBAL_AREAS_PERCENTAGE]));
+  console.log("Tribal count in AK: ", properties[constants.TRIBAL_AREAS_COUNT_AK] >= 1 ?
+  ` ${properties[constants.TRIBAL_AREAS_COUNT_AK]}` : ` null`);
+  console.log("Tribal count in CONUS: ", properties[constants.TRIBAL_AREAS_COUNT_CONUS] >= 1 ?
+  ` ${properties[constants.TRIBAL_AREAS_COUNT_CONUS]}` : ` null`);
 
   const blockGroup = properties[constants.GEOID_PROPERTY] ? properties[constants.GEOID_PROPERTY] : "N/A";
   const population = properties[constants.TOTAL_POPULATION] ? properties[constants.TOTAL_POPULATION] : "N/A";
   const countyName = properties[constants.COUNTY_NAME] ? properties[constants.COUNTY_NAME] : "N/A";
   const stateName = properties[constants.STATE_NAME] ? properties[constants.STATE_NAME] : "N/A";
   const sidePanelState = properties[constants.SIDE_PANEL_STATE];
+  const percentTractTribal = properties[constants.TRIBAL_AREAS_PERCENTAGE] >= 0 ?
+    parseFloat((properties[constants.TRIBAL_AREAS_PERCENTAGE]*100).toFixed()) : null;
 
   const feedbackEmailSubject = hash ? `
     Census tract ID ${blockGroup}, ${countyName}, ${stateName}, ( z/lat/lon: #${hash.join('/')} )
@@ -303,8 +315,8 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
     label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.WILDFIRE),
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.WILDFIRE),
     type: 'percentile',
-    value: properties.hasOwnProperty(constants.WASTEWATER_PERCENTILE) ?
-      properties[constants.WASTEWATER_PERCENTILE] : null,
+    value: properties.hasOwnProperty(constants.WILDFIRE_PERCENTILE) ?
+      properties[constants.WILDFIRE_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_EXCEEDS_THRESH_WILDFIRE] ?
       properties[constants.IS_EXCEEDS_THRESH_WILDFIRE] : null,
   };
@@ -316,7 +328,7 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
       properties[constants.POVERTY_BELOW_200_PERCENTILE] : null,
     isDisadvagtaged: properties[constants.IS_FEDERAL_POVERTY_LEVEL_200] ?
       properties[constants.IS_FEDERAL_POVERTY_LEVEL_200] : null,
-    threshold: properties[constants.ADJACENCY_EXCEEDS_THRESH] === true ? 50 : 65,
+    threshold: 65,
   };
   // const higherEd: indicatorInfo = {
   //   label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HIGH_ED),
@@ -756,7 +768,6 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
             key={`ind${index}`}
             indicator={indicator}
             isImpute={properties[constants.IMPUTE_FLAG] === "0" ? false : true}
-            isAdjacent={properties[constants.ADJACENCY_EXCEEDS_THRESH]}
           />;
         })}
 
@@ -791,24 +802,48 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
         <div className={styles.communityOfFocus}>
           <TractPrioritization
             totalCategoriesPrioritized={properties[constants.COUNT_OF_CATEGORIES_DISADV]}
-            isDonut={properties[constants.ADJACENCY_EXCEEDS_THRESH]}
-            percentTractTribal={properties[constants.TRIBAL_AREAS_PERCENTAGE] >= 0 ?
-              properties[constants.TRIBAL_AREAS_PERCENTAGE] : null}
+            isAdjacencyThreshMet={properties[constants.ADJACENCY_EXCEEDS_THRESH]}
+            isAdjacencyLowIncome={properties[constants.ADJACENCY_LOW_INCOME_EXCEEDS_THRESH]}
+            tribalCountAK={properties[constants.TRIBAL_AREAS_COUNT_AK] >= 1 ?
+              properties[constants.TRIBAL_AREAS_COUNT_AK] : null}
+            tribalCountUS={properties[constants.TRIBAL_AREAS_COUNT_CONUS] >= 1 ?
+              properties[constants.TRIBAL_AREAS_COUNT_CONUS] : null}
+            percentTractTribal={percentTractTribal}
           />
         </div>
 
         <div className={styles.prioCopy}>
           <PrioritizationCopy
-            isDonut={properties[constants.ADJACENCY_EXCEEDS_THRESH]}
-            percentTractTribal={properties[constants.TRIBAL_AREAS_PERCENTAGE] >= 0 ?
-              properties[constants.TRIBAL_AREAS_PERCENTAGE] : null}
             totalCategoriesPrioritized={properties[constants.COUNT_OF_CATEGORIES_DISADV]}
-            totalIndicatorsPrioritized={properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS]}
+            totalBurdensPrioritized={properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS]}
+            isAdjacencyThreshMet={properties[constants.ADJACENCY_EXCEEDS_THRESH]}
+            isAdjacencyLowIncome={properties[constants.ADJACENCY_LOW_INCOME_EXCEEDS_THRESH]}
+            tribalCountAK={properties[constants.TRIBAL_AREAS_COUNT_AK] >= 1 ?
+              properties[constants.TRIBAL_AREAS_COUNT_AK] : null}
+            tribalCountUS={properties[constants.TRIBAL_AREAS_COUNT_CONUS] >= 1 ?
+              properties[constants.TRIBAL_AREAS_COUNT_CONUS] : null}
+            percentTractTribal={percentTractTribal}
+          />
+          <PrioritizationCopy2
+            totalCategoriesPrioritized={properties[constants.COUNT_OF_CATEGORIES_DISADV]}
+            isAdjacencyThreshMet={properties[constants.ADJACENCY_EXCEEDS_THRESH]}
+            isAdjacencyLowIncome={properties[constants.ADJACENCY_LOW_INCOME_EXCEEDS_THRESH]}
+            tribalCountAK={properties[constants.TRIBAL_AREAS_COUNT_AK] >= 1 ?
+              properties[constants.TRIBAL_AREAS_COUNT_AK] : null}
+            tribalCountUS={properties[constants.TRIBAL_AREAS_COUNT_CONUS] >= 1 ?
+              properties[constants.TRIBAL_AREAS_COUNT_CONUS] : null}
+            percentTractTribal={percentTractTribal}
           />
         </div>
 
       </div>
 
+      {/* Only show the DonutCopy if Adjacency index is true */}
+      { properties[constants.ADJACENCY_EXCEEDS_THRESH] && <DonutCopy
+        isAdjacent={properties[constants.ADJACENCY_EXCEEDS_THRESH]}
+        povertyBelow200Percentile={properties[constants.POVERTY_BELOW_200_PERCENTILE]}
+      /> }
+
       {/* Send Feedback button */}
       <a
         className={styles.sendFeedbackLink}
@@ -836,48 +871,6 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
         </Button>
       </a>
 
-      {/* TEMP FOR CEQ - Imputed income, adjacency and tribal info */}
-      <div className={styles.testSignals}>
-        <div>
-          <span>
-            Income imputed?
-          </span>
-          <span>
-            {properties[constants.IMPUTE_FLAG] === "0" ? ' NO' : ' YES'}
-          </span>
-        </div>
-
-        <div>
-          <span>
-            Adjacency indicator?
-          </span>
-          <span>
-            {properties[constants.ADJACENCY_EXCEEDS_THRESH] ? ' YES' : ' NO'}
-          </span>
-        </div>
-
-        <div>
-          <span>
-            Tribal lands?
-          </span>
-          <span>
-            {getTribalPercentValue(properties[constants.TRIBAL_AREAS_PERCENTAGE])}
-          </span>
-        </div>
-
-        <div>
-          <span>
-            Tribal count?
-          </span>
-          <span>
-            {
-              properties[constants.TRIBAL_AREAS_COUNT] ?
-              ` ${properties[constants.TRIBAL_AREAS_COUNT]}` : ` 0`
-            }
-          </span>
-        </div>
-      </div>
-
       {/* All category accordions in this component */}
       {<Accordion multiselectable={true} items={categoryItems} />}
 
diff --git a/client/src/components/DonutCopy/DonutCopy.module.scss b/client/src/components/DonutCopy/DonutCopy.module.scss
new file mode 100644
index 000000000..676d8355a
--- /dev/null
+++ b/client/src/components/DonutCopy/DonutCopy.module.scss
@@ -0,0 +1,40 @@
+@use '../../styles/design-system.scss' as *;
+@import "../utils.scss";
+
+.donutCopyContainer{
+    @include u-display('flex');
+    flex-direction: column;
+    @include u-padding-left(2);
+    @include u-padding-right(2.5);
+    @include u-padding-top(2);
+
+    .donutRow {
+        @include u-display('flex');
+        justify-content: space-between;
+
+        .donutRowLabel {
+            font-weight: bold;
+        }
+
+        .valueSubTextContainer {
+            @include u-display('flex');
+            flex-direction: column;
+            .subTextContainer{
+                @include indicatorValueSubTextContainer();
+            }
+        }
+    }
+
+    .donutRow:first-child {
+        @include u-padding-bottom("05");
+    }
+
+    .invert {
+        align-self: flex-end;
+        @include invert();
+    }
+    
+    .noInvert {
+        align-self: flex-end;
+    }
+}
diff --git a/client/src/components/DonutCopy/DonutCopy.module.scss.d.ts b/client/src/components/DonutCopy/DonutCopy.module.scss.d.ts
new file mode 100644
index 000000000..f6d5ae1b3
--- /dev/null
+++ b/client/src/components/DonutCopy/DonutCopy.module.scss.d.ts
@@ -0,0 +1,18 @@
+declare namespace DonutCopyNamespace {
+    export interface IDonutCopyScss {
+      donutCopyContainer: string;
+      donutRow: string;
+      donutRowLabel: string;
+      invert: string;
+      noInvert: string;
+      valueSubTextContainer: string;
+      subTextContainer: string;
+    }
+  }
+
+declare const DonutCopyScssModule: DonutCopyNamespace.IDonutCopyScss & {
+    /** WARNING: Only available when "css-loader" is used without "style-loader" or "mini-css-extract-plugin" */
+    locals: DonutCopyNamespace.IDonutCopyScss;
+  };
+
+  export = DonutCopyScssModule;
diff --git a/client/src/components/DonutCopy/DonutCopy.test.tsx b/client/src/components/DonutCopy/DonutCopy.test.tsx
new file mode 100644
index 000000000..856b43d3d
--- /dev/null
+++ b/client/src/components/DonutCopy/DonutCopy.test.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import {render} from '@testing-library/react';
+import {LocalizedComponent} from '../../test/testHelpers';
+import DonutCopy from './DonutCopy';
+
+describe('rendering of DonutCopy Component', () => {
+  it('checks if component renders when adjacency is false', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <DonutCopy
+            isAdjacent={false}
+            povertyBelow200Percentile={32}
+          />
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
+  it('checks if component renders when adjacency is false', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <DonutCopy
+            isAdjacent={true}
+            povertyBelow200Percentile={32}
+          />
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
+});
diff --git a/client/src/components/DonutCopy/DonutCopy.tsx b/client/src/components/DonutCopy/DonutCopy.tsx
new file mode 100644
index 000000000..a7b25a15d
--- /dev/null
+++ b/client/src/components/DonutCopy/DonutCopy.tsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import {useIntl} from 'gatsby-plugin-intl';
+
+import {IndicatorValue, IndicatorValueSubText} from '../Indicator/Indicator';
+
+import * as styles from './DonutCopy.module.scss';
+
+import * as EXPLORE_COPY from '../../data/copy/explore';
+
+export interface IDonutCopyProps {
+  isAdjacent: boolean
+  povertyBelow200Percentile: number
+}
+
+const DonutCopy = ({isAdjacent, povertyBelow200Percentile}: IDonutCopyProps) => {
+  const intl = useIntl();
+  const povBel200Percentile = parseFloat((povertyBelow200Percentile*100).toFixed());
+  const threshold = 50;
+
+  return (
+    <div className={styles.donutCopyContainer}>
+      <div className={styles.donutRow}>
+        <div className={styles.donutRowLabel}>{intl.formatMessage(EXPLORE_COPY.DONUT_COPY.COMP_SURR)}</div>
+        <div className={isAdjacent ? styles.invert : ''}>
+          {isAdjacent ? EXPLORE_COPY.COMMUNITY.OF_FOCUS : EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}
+        </div>
+      </div>
+      <div className={styles.donutRow}>
+        <div className={styles.donutRowLabel}>{intl.formatMessage(EXPLORE_COPY.DONUT_COPY.ADJ_LOW_INC)}</div>
+        <div className={styles.valueSubTextContainer}>
+          <div className={isAdjacent ? styles.invert : styles.noInvert}>
+            <IndicatorValue
+              type={'percentile'}
+              displayStat={povBel200Percentile}
+            />
+          </div>
+          <div className={styles.subTextContainer}>
+            <IndicatorValueSubText
+              value={povBel200Percentile}
+              isAboveThresh={povBel200Percentile >= threshold ? true : false}
+              threshold={threshold}
+              type={'percentile'}
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default DonutCopy;
diff --git a/client/src/components/DonutCopy/__snapshots__/DonutCopy.test.tsx.snap b/client/src/components/DonutCopy/__snapshots__/DonutCopy.test.tsx.snap
new file mode 100644
index 000000000..12bcaad0a
--- /dev/null
+++ b/client/src/components/DonutCopy/__snapshots__/DonutCopy.test.tsx.snap
@@ -0,0 +1,85 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`rendering of DonutCopy Component checks if component renders when adjacency is false 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      <div>
+        Completely surrounded
+      </div>
+      <div
+        class=""
+      >
+        No
+      </div>
+    </div>
+    <div>
+      <div>
+        Adjusted low income
+      </div>
+      <div>
+        <div>
+          3
+          <sup
+            style="top: -0.2em;"
+          >
+            th
+          </sup>
+        </div>
+        <div>
+          <div>
+            above 50
+            <sup
+              style="top: -0.2em;"
+            >
+              th
+            </sup>
+             percentile
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of DonutCopy Component checks if component renders when adjacency is false 2`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      <div>
+        Completely surrounded
+      </div>
+      <div>
+        YES
+      </div>
+    </div>
+    <div>
+      <div>
+        Adjusted low income
+      </div>
+      <div>
+        <div>
+          3
+          <sup
+            style="top: -0.2em;"
+          >
+            th
+          </sup>
+        </div>
+        <div>
+          <div>
+            above 50
+            <sup
+              style="top: -0.2em;"
+            >
+              th
+            </sup>
+             percentile
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/client/src/components/DonutCopy/index.ts b/client/src/components/DonutCopy/index.ts
new file mode 100644
index 000000000..2aa866392
--- /dev/null
+++ b/client/src/components/DonutCopy/index.ts
@@ -0,0 +1,2 @@
+import DonutCopy from './DonutCopy';
+export default DonutCopy;
diff --git a/client/src/components/Indicator/Indicator.module.scss b/client/src/components/Indicator/Indicator.module.scss
index a2e4b708f..c948a1da2 100644
--- a/client/src/components/Indicator/Indicator.module.scss
+++ b/client/src/components/Indicator/Indicator.module.scss
@@ -80,13 +80,7 @@
       }
       
       .indicatorValueSubText{
-        // display: flex;
-        // flex-direction: column;
-        // align-self: flex-start;
-        text-align: right;
-        // @include u-width(8);
-        @include typeset('sans', 'micro', 2);
-        @include u-text('thin'); 
+        @include indicatorValueSubTextContainer();
       }
     }
 
diff --git a/client/src/components/Indicator/Indicator.tsx b/client/src/components/Indicator/Indicator.tsx
index 4212998f9..1bec3653c 100644
--- a/client/src/components/Indicator/Indicator.tsx
+++ b/client/src/components/Indicator/Indicator.tsx
@@ -14,7 +14,6 @@ import infoIcon from '/node_modules/uswds/dist/img/usa-icons/info.svg';
 interface IIndicator {
   indicator: indicatorInfo,
   isImpute?: boolean,
-  isAdjacent?: boolean,
 }
 interface IIndicatorValueSubText {
   type: indicatorType,
@@ -31,24 +30,22 @@ interface IIndicatorValue {
 /**
  * This component will render an info icon in the indicator value
  *
- * @param {boolean} isImpute
- * @param {boolean} isAdjacent
  * @return {JSX.Element}
  */
-export const IndicatorInfoIcon = ({isImpute, isAdjacent}: Omit<IIndicator, 'indicator'>) => {
+export const IndicatorInfoIcon = () => {
   const intl = useIntl();
 
-  const getToolTipCopy = () => {
-    if (!isImpute && isAdjacent) {
-      return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_NO_ADJ_YES);
-    } else if (isImpute && !isAdjacent) {
-      return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_YES_ADJ_NO);
-    } else if (isImpute && isAdjacent) {
-      return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_YES_ADJ_YES);
-    } else {
-      return null;
-    }
-  };
+  // const getToolTipCopy = () => {
+  //   if (!isImpute && isAdjacent) {
+  //     return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_NO_ADJ_YES);
+  //   } else if (isImpute && !isAdjacent) {
+  //     return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_YES_ADJ_NO);
+  //   } else if (isImpute && isAdjacent) {
+  //     return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_YES_ADJ_YES);
+  //   } else {
+  //     return null;
+  //   }
+  // };
 
   /**
    * This library react-tooltip creates random DOM ID which will not allow for snapshot testing as
@@ -69,13 +66,13 @@ export const IndicatorInfoIcon = ({isImpute, isAdjacent}: Omit<IIndicator, 'indi
       />
       <img
         data-for="lowIncomeIcon"
-        data-tip={getToolTipCopy()}
+        data-tip={intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_YES_ADJ_NO)}
         data-iscapture="true"
         className={styles.info}
         src={infoIcon}
         alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.INFO)}
       />
-      {isImpute && <span className={styles.infoTilde}>{ ` ~ ` }</span>}
+      <span className={styles.infoTilde}>{ ` ~ ` }</span>
     </>
   );
 };
@@ -226,7 +223,7 @@ export const IndicatorValue = ({type, displayStat}:IIndicatorValue) => {
  * @param {IIndicator} indicator
  * @return {JSX.Element}
  */
-const Indicator = ({indicator, isImpute, isAdjacent}:IIndicator) => {
+const Indicator = ({indicator, isImpute}:IIndicator) => {
   /**
    * The indicator value could be a number | boolean | null. In all cases we coerce to number
    * before flooring.
@@ -242,8 +239,8 @@ const Indicator = ({indicator, isImpute, isAdjacent}:IIndicator) => {
   // A boolean to represent if the indicator is above or below the threshold
   const isAboveThresh = displayStat !== null && displayStat >= threshold ? true : false;
 
-  // Show an info icon on the low icome indicator if the impute or adjacency is true:
-  const showLowIncomeInfoIcon = (indicator.label === 'Low income' && (isImpute || isAdjacent));
+  // Show an info icon on the low icome indicator if the impute true:
+  const showLowIncomeInfoIcon = (indicator.label === 'Low income' && (isImpute));
 
   return (
     <li
@@ -267,10 +264,7 @@ const Indicator = ({indicator, isImpute, isAdjacent}:IIndicator) => {
             {/* Indicator info icon */}
             { showLowIncomeInfoIcon &&
               <div className={styles.indicatorInfo}>
-                <IndicatorInfoIcon
-                  isImpute={isImpute}
-                  isAdjacent={isAdjacent}
-                />
+                <IndicatorInfoIcon/>
               </div>
             }
 
diff --git a/client/src/components/PrioritizationCopy/PrioritizationCopy.test.tsx b/client/src/components/PrioritizationCopy/PrioritizationCopy.test.tsx
index a3899e659..f52afa07b 100644
--- a/client/src/components/PrioritizationCopy/PrioritizationCopy.test.tsx
+++ b/client/src/components/PrioritizationCopy/PrioritizationCopy.test.tsx
@@ -6,262 +6,279 @@ import PrioritizationCopy from './PrioritizationCopy';
 describe('rendering of PrioritizationCopy Component -', () => {
   const testCases = [
     {
-      isDonut: false, percentTribal: null,
-      totalCategories: 0, totalIndicators: 0,
+      totalCategoriesPrioritized: 0,
+      totalBurdensPrioritized: 0,
+      isAdjacencyThreshMet: false,
+      isAdjacencyLowIncome: false,
+      tribalCountAK: null,
+      tribalCountUS: null,
+      percentTractTribal: null,
       // eslint-disable-next-line max-len
-      para1: `This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomic threshold.`,
+      para1: `This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold.`,
     },
     {
-      isDonut: false, percentTribal: null,
-      totalCategories: 0, totalIndicators: 1,
+      totalCategoriesPrioritized: 0,
+      totalBurdensPrioritized: 1,
+      isAdjacencyThreshMet: false,
+      isAdjacencyLowIncome: false,
+      tribalCountAK: null,
+      tribalCountUS: null,
+      percentTractTribal: null,
       // eslint-disable-next-line max-len
-      para1: `This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds.`,
+      para1: `This tract is not considered disadvantaged. It meets 1 burden threshold BUT no associated socio-economic thresholds.`,
     },
     {
-      isDonut: false, percentTribal: null,
-      totalCategories: 0, totalIndicators: 5,
+      totalCategoriesPrioritized: 0,
+      totalBurdensPrioritized: 5,
+      isAdjacencyThreshMet: false,
+      isAdjacencyLowIncome: false,
+      tribalCountAK: null,
+      tribalCountUS: null,
+      percentTractTribal: null,
       // eslint-disable-next-line max-len
-      para1: `This tract is not considered disadvantaged. It meets 5 burden thresholds BUT no associated socioeconomic thresholds.`,
+      para1: `This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds.`,
     },
     {
-      isDonut: false, percentTribal: null,
-      totalCategories: 1, totalIndicators: 0,
+      totalCategoriesPrioritized: 2,
+      totalBurdensPrioritized: 1,
+      isAdjacencyThreshMet: false,
+      isAdjacencyLowIncome: false,
+      tribalCountAK: null,
+      tribalCountUS: null,
+      percentTractTribal: null,
       // eslint-disable-next-line max-len
-      para1: '',
+      para1: `This tract is considered disadvantaged because it meets 1 burden threshold AND the associated socio-economic threshold.`,
     },
     {
-      isDonut: false, percentTribal: null,
-      totalCategories: 1, totalIndicators: 1,
+      totalCategoriesPrioritized: 2,
+      totalBurdensPrioritized: 5,
+      isAdjacencyThreshMet: false,
+      isAdjacencyLowIncome: false,
+      tribalCountAK: null,
+      tribalCountUS: null,
+      percentTractTribal: null,
       // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold.`,
-    },
-    {
-      isDonut: false, percentTribal: null,
-      totalCategories: 2, totalIndicators: 4,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it meets 4 burden thresholds AND the associated socio-economic threshold.`,
+      para1: `This tract is considered disadvantaged because it meets more than 1 burden threshold AND the associated socio-economic threshold.`,
     },
 
-    {
-      isDonut: false, percentTribal: 0,
-      totalCategories: 0, totalIndicators: 0,
-      // eslint-disable-next-line max-len
-      para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
-    },
-    {
-      isDonut: false, percentTribal: 0,
-      totalCategories: 0, totalIndicators: 1,
-      // eslint-disable-next-line max-len
-      para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
-    },
-    {
-      isDonut: false, percentTribal: 0,
-      totalCategories: 0, totalIndicators: 2,
-      // eslint-disable-next-line max-len
-      para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
-    },
-    {
-      isDonut: false, percentTribal: 0,
-      totalCategories: 1, totalIndicators: 0,
-      // eslint-disable-next-line max-len
-      para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
-    },
-    {
-      isDonut: false, percentTribal: 0,
-      totalCategories: 1, totalIndicators: 1,
-      // eslint-disable-next-line max-len
-      para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
-    },
-    {
-      isDonut: false, percentTribal: 0,
-      totalCategories: 1, totalIndicators: 2,
-      // eslint-disable-next-line max-len
-      para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
-    },
+    // {
+    //   isDonut: false, percentTribal: 0,
+    //   totalCategories: 0, totalIndicators: 1,
+    // eslint-disable-next-line max-len
+    //   para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: false, percentTribal: 0,
+    //   totalCategories: 0, totalIndicators: 2,
+    // eslint-disable-next-line max-len
+    //   para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: false, percentTribal: 0,
+    //   totalCategories: 1, totalIndicators: 0,
+    // eslint-disable-next-line max-len
+    //   para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: false, percentTribal: 0,
+    //   totalCategories: 1, totalIndicators: 1,
+    // eslint-disable-next-line max-len
+    //   para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: false, percentTribal: 0,
+    //   totalCategories: 1, totalIndicators: 2,
+    // eslint-disable-next-line max-len
+    //   para1: `The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    // },
 
-    {
-      isDonut: false, percentTribal: .31,
-      totalCategories: 0, totalIndicators: 0,
-      // eslint-disable-next-line max-len
-      para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
-    },
-    {
-      isDonut: false, percentTribal: .31,
-      totalCategories: 0, totalIndicators: 1,
-      // eslint-disable-next-line max-len
-      para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
-    },
-    {
-      isDonut: false, percentTribal: .31,
-      totalCategories: 0, totalIndicators: 2,
-      // eslint-disable-next-line max-len
-      para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
-    },
-    {
-      isDonut: false, percentTribal: .31,
-      totalCategories: 1, totalIndicators: 0,
-      // eslint-disable-next-line max-len
-      para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
-    },
-    {
-      isDonut: false, percentTribal: .31,
-      totalCategories: 1, totalIndicators: 1,
-      // eslint-disable-next-line max-len
-      para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
-    },
-    {
-      isDonut: false, percentTribal: .31,
-      totalCategories: 1, totalIndicators: 2,
-      // eslint-disable-next-line max-len
-      para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
-    },
+    // {
+    //   isDonut: false, percentTribal: .31,
+    //   totalCategories: 0, totalIndicators: 0,
+    // eslint-disable-next-line max-len
+    //   para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: false, percentTribal: .31,
+    //   totalCategories: 0, totalIndicators: 1,
+    // eslint-disable-next-line max-len
+    //   para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: false, percentTribal: .31,
+    //   totalCategories: 0, totalIndicators: 2,
+    // eslint-disable-next-line max-len
+    //   para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: false, percentTribal: .31,
+    //   totalCategories: 1, totalIndicators: 0,
+    // eslint-disable-next-line max-len
+    //   para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: false, percentTribal: .31,
+    //   totalCategories: 1, totalIndicators: 1,
+    // eslint-disable-next-line max-len
+    //   para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: false, percentTribal: .31,
+    //   totalCategories: 1, totalIndicators: 2,
+    // eslint-disable-next-line max-len
+    //   para1: `The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged.`,
+    // },
 
-    {
-      isDonut: true, percentTribal: null,
-      totalCategories: 0, totalIndicators: 0,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-    },
-    {
-      isDonut: true, percentTribal: null,
-      totalCategories: 0, totalIndicators: 1,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-    },
-    {
-      isDonut: true, percentTribal: null,
-      totalCategories: 0, totalIndicators: 2,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-    },
-    {
-      isDonut: true, percentTribal: null,
-      totalCategories: 1, totalIndicators: 0,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-    },
-    {
-      isDonut: true, percentTribal: null,
-      totalCategories: 1, totalIndicators: 1,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-    },
-    {
-      isDonut: true, percentTribal: null,
-      totalCategories: 1, totalIndicators: 2,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-    },
+    // {
+    //   isDonut: true, percentTribal: null,
+    //   totalCategories: 0, totalIndicators: 0,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: null,
+    //   totalCategories: 0, totalIndicators: 1,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: null,
+    //   totalCategories: 0, totalIndicators: 2,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: null,
+    //   totalCategories: 1, totalIndicators: 0,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: null,
+    //   totalCategories: 1, totalIndicators: 1,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: null,
+    //   totalCategories: 1, totalIndicators: 2,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // },
 
-    {
-      isDonut: true, percentTribal: 0,
-      totalCategories: 0, totalIndicators: 0,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-      // eslint-disable-next-line max-len
-      para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
-    },
-    {
-      isDonut: true, percentTribal: 0,
-      totalCategories: 0, totalIndicators: 1,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-      // eslint-disable-next-line max-len
-      para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
-    },
-    {
-      isDonut: true, percentTribal: 0,
-      totalCategories: 0, totalIndicators: 2,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-      // eslint-disable-next-line max-len
-      para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
-    },
-    {
-      isDonut: true, percentTribal: 0,
-      totalCategories: 1, totalIndicators: 0,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-      // eslint-disable-next-line max-len
-      para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
-    },
-    {
-      isDonut: true, percentTribal: 0,
-      totalCategories: 1, totalIndicators: 1,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-      // eslint-disable-next-line max-len
-      para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
-    },
-    {
-      isDonut: true, percentTribal: 0,
-      totalCategories: 1, totalIndicators: 2,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-      // eslint-disable-next-line max-len
-      para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
-    },
+    // {
+    //   isDonut: true, percentTribal: 0,
+    //   totalCategories: 0, totalIndicators: 0,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // eslint-disable-next-line max-len
+    //   para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: 0,
+    //   totalCategories: 0, totalIndicators: 1,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // eslint-disable-next-line max-len
+    //   para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: 0,
+    //   totalCategories: 0, totalIndicators: 2,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // eslint-disable-next-line max-len
+    //   para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: 0,
+    //   totalCategories: 1, totalIndicators: 0,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // eslint-disable-next-line max-len
+    //   para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: 0,
+    //   totalCategories: 1, totalIndicators: 1,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // eslint-disable-next-line max-len
+    //   para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: 0,
+    //   totalCategories: 1, totalIndicators: 2,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // eslint-disable-next-line max-len
+    //   para2: `The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    // },
 
-    {
-      isDonut: true, percentTribal: .29,
-      totalCategories: 0, totalIndicators: 0,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-      // eslint-disable-next-line max-len
-      para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
-    },
-    {
-      isDonut: true, percentTribal: .29,
-      totalCategories: 0, totalIndicators: 1,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-      // eslint-disable-next-line max-len
-      para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
-    },
-    {
-      isDonut: true, percentTribal: .29,
-      totalCategories: 0, totalIndicators: 2,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-      // eslint-disable-next-line max-len
-      para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
-    },
-    {
-      isDonut: true, percentTribal: .29,
-      totalCategories: 1, totalIndicators: 0,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-      // eslint-disable-next-line max-len
-      para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
-    },
-    {
-      isDonut: true, percentTribal: .29,
-      totalCategories: 1, totalIndicators: 1,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-      // eslint-disable-next-line max-len
-      para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
-    },
-    {
-      isDonut: true, percentTribal: .29,
-      totalCategories: 2, totalIndicators: 2,
-      // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
-      // eslint-disable-next-line max-len
-      para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
-    },
+    // {
+    //   isDonut: true, percentTribal: .29,
+    //   totalCategories: 0, totalIndicators: 0,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // eslint-disable-next-line max-len
+    //   para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: .29,
+    //   totalCategories: 0, totalIndicators: 1,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // eslint-disable-next-line max-len
+    //   para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: .29,
+    //   totalCategories: 0, totalIndicators: 2,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // eslint-disable-next-line max-len
+    //   para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: .29,
+    //   totalCategories: 1, totalIndicators: 0,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // eslint-disable-next-line max-len
+    //   para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: .29,
+    //   totalCategories: 1, totalIndicators: 1,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // eslint-disable-next-line max-len
+    //   para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    // },
+    // {
+    //   isDonut: true, percentTribal: .29,
+    //   totalCategories: 2, totalIndicators: 2,
+    // eslint-disable-next-line max-len
+    //   para1: `This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.`,
+    // eslint-disable-next-line max-len
+    //   para2: `The 29% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    // },
   ];
 
   testCases.forEach((testCase) => {
     // eslint-disable-next-line max-len
-    it(`checks if component renders ${testCase.para1} when isDonut = ${testCase.isDonut}, tribal % = ${testCase.percentTribal}, category count = ${testCase.totalCategories} and indicator count = ${testCase.totalIndicators}`, () => {
+    it(`checks if component renders ${testCase.para1} when totCats = ${testCase.totalCategoriesPrioritized}, totBurds = ${testCase.totalBurdensPrioritized}, isAdj = ${testCase.isAdjacencyThreshMet}, isAdjLI = ${testCase.isAdjacencyLowIncome}, tribal % = ${testCase.percentTractTribal},`, () => {
       const {asFragment} = render(
           <LocalizedComponent>
             <PrioritizationCopy
-              isDonut={testCase.isDonut}
-              percentTractTribal={testCase.percentTribal}
-              totalCategoriesPrioritized={testCase.totalCategories}
-              totalIndicatorsPrioritized={testCase.totalIndicators}
+              totalCategoriesPrioritized={testCase.totalCategoriesPrioritized}
+              totalBurdensPrioritized={testCase.totalBurdensPrioritized}
+              isAdjacencyThreshMet={testCase.isAdjacencyThreshMet}
+              isAdjacencyLowIncome={testCase.isAdjacencyLowIncome}
+              tribalCountAK={testCase.tribalCountAK}
+              tribalCountUS={null}
+              percentTractTribal={testCase.percentTractTribal}
+
             />
           </LocalizedComponent>,
       );
@@ -270,9 +287,6 @@ describe('rendering of PrioritizationCopy Component -', () => {
       screen.getByText((content, element) => {
         return element?.tagName.toLowerCase() === 'div' && content.startsWith(testCase.para1);
       });
-      testCase.para2 ?? screen.getByText((content, element) => {
-        return element?.tagName.toLowerCase() === 'div' && content.startsWith(testCase.para1);
-      });
     });
   });
 });
diff --git a/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
index c980a2354..d78f71f37 100644
--- a/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
+++ b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
@@ -1,124 +1,105 @@
 import React from 'react';
 
-import * as styles from './PrioritizationCopy.module.scss';
+// import * as styles from './PrioritizationCopy.module.scss';
 
 import * as EXPLORE_COPY from '../../data/copy/explore';
 
 interface IPrioritizationCopy {
   totalCategoriesPrioritized: number
-  isDonut: boolean,
+  totalBurdensPrioritized: number
+  isAdjacencyThreshMet: boolean,
+  isAdjacencyLowIncome: boolean,
+  tribalCountAK: number | null,
+  tribalCountUS: null, // when this signal is supported add number type
   percentTractTribal: number | null
-  totalIndicatorsPrioritized: number
 };
 
 /**
  * This component returns the prioritzation copy
  *
  * @param {number} totalCategoriesPrioritized
- * @param {boolean} isDonut
- * @param {number} percentTractTribal
- * @param {number} totalIndicatorsPrioritized
+ * @param {number} totalBurdensPrioritized
+ * @param {boolean} isAdjacencyThreshMet
+ * @param {boolean} isAdjacencyLowIncome
+ * @param {number | null} tribalCountAK
+ * @param {number | null} tribalCountUS
+ * @param {number | null} percentTractTribal
  * @return {JSX}
  */
 const PrioritizationCopy =
-   ({
-     totalCategoriesPrioritized,
-     isDonut,
+   ({totalCategoriesPrioritized,
+     totalBurdensPrioritized,
+     isAdjacencyThreshMet,
+     isAdjacencyLowIncome,
+     tribalCountAK,
+     tribalCountUS,
      percentTractTribal,
-     totalIndicatorsPrioritized}:IPrioritizationCopy) => {
-     if (isDonut) {
-       if (percentTractTribal === null) {
-         return (
-           <div>
-             <div>{EXPLORE_COPY.PRIORITIZATION_COPY.DONUT}</div>
-           </div>
-         );
-       } else if (percentTractTribal !== null && percentTractTribal === 0) {
-         return (
-           <div>
-             <div>{EXPLORE_COPY.PRIORITIZATION_COPY.DONUT}</div>
-             <div className={styles.prioCopyPara2}>
-               {EXPLORE_COPY.getPrioFRTLessThan1Perc(true)}
-             </div>
-           </div>
-         );
-       } else if (percentTractTribal !== null && percentTractTribal > 0) {
-         // map location for this case: #9.56/48.1013/-108.7722
-         return (
-           <div>
-             <div>{EXPLORE_COPY.PRIORITIZATION_COPY.DONUT}</div>
-             <div className={styles.prioCopyPara2}>
-               {EXPLORE_COPY.getPrioFRTNPerc(percentTractTribal, true)}
-             </div>
-           </div>
-         );
-       } else {
-         return <></>;
-       }
-     } else if (!isDonut) {
-       if (percentTractTribal !== null && percentTractTribal > 0) {
-         // map location for this case: #8.66/48.3496/-106.2982
-         return (
-           <div>
-             <div>{EXPLORE_COPY.getPrioFRTNPerc(percentTractTribal, false)}</div>
-           </div>
-         );
-       } else if (percentTractTribal !== null && percentTractTribal === 0) {
-         return (
-           <div>
-             <div>{EXPLORE_COPY.getPrioFRTLessThan1Perc(false)}</div>
-           </div>
-         );
-       } else if (percentTractTribal === null) {
-         if (totalCategoriesPrioritized >= 1) {
-           if (totalIndicatorsPrioritized === 0) {
-             return <></>;
-           } else if (totalIndicatorsPrioritized === 1) {
-             return (
-               <div>
-                 <div>{EXPLORE_COPY.PRIORITIZATION_COPY.PRIO_1_BURD}</div>
-               </div>
-             );
-           } else if (totalIndicatorsPrioritized >=1) {
-             return (
-               <div>
-                 <div>{EXPLORE_COPY.getPrioNBurden(totalIndicatorsPrioritized)}</div>
-               </div>
-             );
-           } else {
-             return <></>;
+   }:IPrioritizationCopy) => {
+     let prioCopyRendered;
+
+     if (totalCategoriesPrioritized === 0) {
+       if (isAdjacencyThreshMet && isAdjacencyLowIncome) {
+         prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.PRIO_SURR_LI;
+       } else if (
+         !(isAdjacencyThreshMet && isAdjacencyLowIncome) &&
+      tribalCountAK === null &&
+      tribalCountUS === null &&
+      percentTractTribal === null
+       ) {
+         if (totalBurdensPrioritized === 0) {
+           prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO;
+         } else if (totalBurdensPrioritized === 1) {
+           prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO_1BUR;
+         } else if (totalBurdensPrioritized > 1) {
+           prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO_NBUR;
+         }
+       } else if (!(isAdjacencyThreshMet && isAdjacencyLowIncome)) {
+         if (
+           (tribalCountAK !== null && tribalCountAK >= 1) &&
+        (tribalCountUS !== null && tribalCountUS >= 1)
+         ) {
+           prioCopyRendered = EXPLORE_COPY.getPrioAKUSCopy(tribalCountAK, tribalCountUS);
+         } else if (
+           (tribalCountAK !== null && tribalCountAK >= 1) &&
+        tribalCountUS === null
+         ) {
+           prioCopyRendered = EXPLORE_COPY.getPrioANVCopy(tribalCountAK);
+         } else if (
+           (tribalCountUS !== null && tribalCountUS >= 1) &&
+        tribalCountAK === null
+         ) {
+           if (percentTractTribal === null) {
+             prioCopyRendered = EXPLORE_COPY.getPrioFRTCopy(`${tribalCountUS}`);
+           } else if (percentTractTribal === 0) {
+             prioCopyRendered = EXPLORE_COPY.getPrioFRTCopy(`less than 1%`);
+           } else if (percentTractTribal >= 1) {
+             prioCopyRendered = EXPLORE_COPY.getPrioFRTCopy(`${percentTractTribal}%`);
            }
-         } else if (totalCategoriesPrioritized === 0) {
-           if (totalIndicatorsPrioritized === 0) {
-             return (
-               <div>
-                 <div>{EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO}</div>
-               </div>
-             );
-           } else if (totalIndicatorsPrioritized === 1) {
-             return (
-               <div>
-                 <div>{EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO_1_BURD}</div>
-               </div>
-             );
-           } else if (totalIndicatorsPrioritized >= 1) {
-             return (
-               <div>
-                 <div>{EXPLORE_COPY.getNotPrioNBurden(totalIndicatorsPrioritized)}</div>
-               </div>
-             );
-           } else {
-             return <></>;
+         } else if (tribalCountUS === null && tribalCountAK === null) {
+           if (percentTractTribal === 0) {
+             prioCopyRendered = EXPLORE_COPY.getPrioFRTCopy(`less than 1%`);
+           } else if (percentTractTribal !== null && percentTractTribal >= 1 ) {
+             prioCopyRendered = EXPLORE_COPY.getPrioFRTCopy(`${percentTractTribal}%`);
            }
-         } else {
-           return <></>;
          }
-       } else {
-         return <></>;
+       }
+     } else if (totalCategoriesPrioritized > 0) {
+       if (totalBurdensPrioritized === 0) {
+         prioCopyRendered = <></>;
+       } else if (totalBurdensPrioritized === 1) {
+         prioCopyRendered = EXPLORE_COPY.getPrioNBurdenCopy(`1`);
+       } else if (totalBurdensPrioritized > 1) {
+         prioCopyRendered = EXPLORE_COPY.getPrioNBurdenCopy(`more than 1`);
        }
      } else {
-       return <></>;
-     }
+       prioCopyRendered = <></>;
+     };
+
+     return (
+       <div>
+         {prioCopyRendered}
+       </div>
+     );
    };
 
 export default PrioritizationCopy;
diff --git a/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap b/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap
index 77c6d248c..243d2fccc 100644
--- a/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap
+++ b/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap
@@ -1,389 +1,41 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`rendering of PrioritizationCopy Component - checks if component renders  when isDonut = false, tribal % = null, category count = 1 and indicator count = 0 1`] = `<DocumentFragment />`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0.31, category count = 0 and indicator count = 0 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      The 31% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0.31, category count = 0 and indicator count = 1 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      The 31% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0.31, category count = 0 and indicator count = 2 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      The 31% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0.31, category count = 1 and indicator count = 0 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      The 31% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0.31, category count = 1 and indicator count = 1 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      The 31% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders The 31% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0.31, category count = 1 and indicator count = 2 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      The 31% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0, category count = 0 and indicator count = 0 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      The less than 1% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0, category count = 0 and indicator count = 1 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      The less than 1% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0, category count = 0 and indicator count = 2 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      The less than 1% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0, category count = 1 and indicator count = 0 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      The less than 1% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0, category count = 1 and indicator count = 1 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      The less than 1% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders The less than 1% of this tract that are Federally-Recognized Tribal lands are considered disadvantaged. when isDonut = false, tribal % = 0, category count = 1 and indicator count = 2 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      The less than 1% of this tract that are Federally-Recognized Tribal lands are  considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0, category count = 0 and indicator count = 0 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-    <div>
-      The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0, category count = 0 and indicator count = 1 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-    <div>
-      The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0, category count = 0 and indicator count = 2 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-    <div>
-      The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0, category count = 1 and indicator count = 0 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-    <div>
-      The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0, category count = 1 and indicator count = 1 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-    <div>
-      The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0, category count = 1 and indicator count = 2 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-    <div>
-      The less than 1% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0.29, category count = 0 and indicator count = 0 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-    <div>
-      The 28.999999999999996% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0.29, category count = 0 and indicator count = 1 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-    <div>
-      The 28.999999999999996% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0.29, category count = 0 and indicator count = 2 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-    <div>
-      The 28.999999999999996% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0.29, category count = 1 and indicator count = 0 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-    <div>
-      The 28.999999999999996% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0.29, category count = 1 and indicator count = 1 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-    <div>
-      The 28.999999999999996% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = 0.29, category count = 2 and indicator count = 2 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-    <div>
-      The 28.999999999999996% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = null, category count = 0 and indicator count = 0 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = null, category count = 0 and indicator count = 1 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = null, category count = 0 and indicator count = 2 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = null, category count = 1 and indicator count = 0 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = null, category count = 1 and indicator count = 1 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. when isDonut = true, tribal % = null, category count = 1 and indicator count = 2 1`] = `
-<DocumentFragment>
-  <div>
-    <div>
-      This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it meets 4 burden thresholds AND the associated socio-economic threshold. when isDonut = false, tribal % = null, category count = 2 and indicator count = 4 1`] = `
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it meets 1 burden threshold AND the associated socio-economic threshold. when totCats = 2, totBurds = 1, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
 <DocumentFragment>
   <div>
-    <div>
-      This tract is considered disadvantaged because it meets 4 burden thresholds AND the associated socio-economic threshold.
-    </div>
+    This tract is considered disadvantaged because it meets 1 burden threshold AND the associated socio-economic threshold.
   </div>
 </DocumentFragment>
 `;
 
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold. when isDonut = false, tribal % = null, category count = 1 and indicator count = 1 1`] = `
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it meets more than 1 burden threshold AND the associated socio-economic threshold. when totCats = 2, totBurds = 5, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
 <DocumentFragment>
   <div>
-    <div>
-      This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold.
-    </div>
+    This tract is considered disadvantaged because it meets more than 1 burden threshold AND the associated socio-economic threshold.
   </div>
 </DocumentFragment>
 `;
 
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomic threshold. when isDonut = false, tribal % = null, category count = 0 and indicator count = 0 1`] = `
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold. when totCats = 0, totBurds = 0, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
 <DocumentFragment>
   <div>
-    <div>
-      This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomic threshold.
-    </div>
+    This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold.
   </div>
 </DocumentFragment>
 `;
 
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It meets 5 burden thresholds BUT no associated socioeconomic thresholds. when isDonut = false, tribal % = null, category count = 0 and indicator count = 5 1`] = `
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It meets 1 burden threshold BUT no associated socio-economic thresholds. when totCats = 0, totBurds = 1, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
 <DocumentFragment>
   <div>
-    <div>
-      This tract is not considered disadvantaged. It meets 5 burden thresholds BUT no associated socioeconomic thresholds.
-    </div>
+    This tract is not considered disadvantaged. It meets 1 burden threshold BUT no associated socio-economic thresholds.
   </div>
 </DocumentFragment>
 `;
 
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds. when isDonut = false, tribal % = null, category count = 0 and indicator count = 1 1`] = `
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds. when totCats = 0, totBurds = 5, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
 <DocumentFragment>
   <div>
-    <div>
-      This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds.
-    </div>
+    This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds.
   </div>
 </DocumentFragment>
 `;
diff --git a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.module.scss b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.module.scss
new file mode 100644
index 000000000..891351070
--- /dev/null
+++ b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.module.scss
@@ -0,0 +1,5 @@
+@use '../../styles/design-system.scss' as *;
+
+.prioritizationCopy2Container{
+    @include u-padding-top(2);
+}
diff --git a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.module.scss.d.ts b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.module.scss.d.ts
new file mode 100644
index 000000000..4df60a52b
--- /dev/null
+++ b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.module.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace PrioritizationCopy2Namespace {
+    export interface IPrioritizationCopy2Scss {
+      prioritizationCopy2Container: string;
+    }
+  }
+
+declare const PrioritizationCopy2ScssModule: PrioritizationCopy2Namespace.IPrioritizationCopy2Scss & {
+    /** WARNING: Only available when "css-loader" is used without "style-loader" or "mini-css-extract-plugin" */
+    locals: PrioritizationCopy2Namespace.IPrioritizationCopy2Scss;
+  };
+
+  export = PrioritizationCopy2ScssModule;
diff --git a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.test.tsx b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.test.tsx
new file mode 100644
index 000000000..6d26e57ee
--- /dev/null
+++ b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.test.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import {render, screen} from '@testing-library/react';
+import {LocalizedComponent} from '../../test/testHelpers';
+import PrioritizationCopy2 from './PrioritizationCopy2';
+
+describe('rendering of PrioritizationCopy2 Component', () => {
+  const testCases = [
+    {
+      totalCategoriesPrioritized: 0,
+      totalBurdensPrioritized: 0,
+      isAdjacencyThreshMet: true,
+      isAdjacencyLowIncome: true,
+      tribalCountAK: null,
+      tribalCountUS: null,
+      percentTractTribal: 2,
+      // eslint-disable-next-line max-len
+      para1: `The 2% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+    {
+      totalCategoriesPrioritized: 0,
+      totalBurdensPrioritized: 1,
+      isAdjacencyThreshMet: true,
+      isAdjacencyLowIncome: true,
+      tribalCountAK: null,
+      tribalCountUS: 3,
+      percentTractTribal: 4,
+      // eslint-disable-next-line max-len
+      para1: `The 4% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+    },
+  ];
+
+  testCases.forEach((testCase) => {
+    // eslint-disable-next-line max-len
+    it(`checks if component renders ${testCase.para1} when totCats = ${testCase.totalCategoriesPrioritized}, totBurds = ${testCase.totalBurdensPrioritized}, isAdj = ${testCase.isAdjacencyThreshMet}, isAdjLI = ${testCase.isAdjacencyLowIncome}, tribal % = ${testCase.percentTractTribal},`, () => {
+      const {asFragment} = render(
+          <LocalizedComponent>
+            <PrioritizationCopy2
+              totalCategoriesPrioritized={testCase.totalCategoriesPrioritized}
+              totalBurdensPrioritized={testCase.totalBurdensPrioritized}
+              isAdjacencyThreshMet={testCase.isAdjacencyThreshMet}
+              isAdjacencyLowIncome={testCase.isAdjacencyLowIncome}
+              tribalCountAK={testCase.tribalCountAK}
+              tribalCountUS={null}
+              percentTractTribal={testCase.percentTractTribal}
+
+            />
+          </LocalizedComponent>,
+      );
+      expect(asFragment()).toMatchSnapshot();
+
+      screen.getByText((content, element) => {
+        return element?.tagName.toLowerCase() === 'div' && content.startsWith(testCase.para1);
+      });
+    });
+  });
+});
diff --git a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx
new file mode 100644
index 000000000..ad4c5b8d1
--- /dev/null
+++ b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx
@@ -0,0 +1,95 @@
+import React from 'react';
+
+import * as styles from './PrioritizationCopy2.module.scss';
+
+import * as EXPLORE_COPY from '../../data/copy/explore';
+
+interface IPrioritizationCopy2 {
+  totalCategoriesPrioritized: number
+  totalBurdensPrioritized?: number
+  isAdjacencyThreshMet: boolean,
+  isAdjacencyLowIncome: boolean,
+  tribalCountAK: number | null,
+  tribalCountUS: null, // when this signal is supported add number type
+  percentTractTribal: number | null
+};
+
+/**
+ * This component returns the prioritzation copy
+ *
+ * @param {number} totalCategoriesPrioritized
+ * @param {number} totalBurdensPrioritized
+ * @param {boolean} isAdjacencyThreshMet
+ * @param {boolean} isAdjacencyLowIncome
+ * @param {number | null} tribalCountAK
+ * @param {number | null} tribalCountUS
+ * @param {number | null} percentTractTribal
+ * @return {JSX}
+ */
+const PrioritizationCopy2 =
+   ({totalCategoriesPrioritized,
+     isAdjacencyThreshMet,
+     isAdjacencyLowIncome,
+     tribalCountAK,
+     tribalCountUS,
+     percentTractTribal,
+   }:IPrioritizationCopy2) => {
+     let noStyles = false;
+     let prioCopy2Rendered;
+
+     if (
+       (totalCategoriesPrioritized === 0 && (isAdjacencyThreshMet && isAdjacencyLowIncome)) ||
+      (totalCategoriesPrioritized >= 1)
+     ) {
+       if (
+         tribalCountAK === null &&
+        (tribalCountUS !== null && tribalCountUS >= 1) &&
+        (percentTractTribal !== null && percentTractTribal >= 1)
+       ) {
+         prioCopy2Rendered = EXPLORE_COPY.getPrioPercAndNumPointsAlsoCopy(`${percentTractTribal}%`, tribalCountUS);
+       } else if (
+         tribalCountAK === null &&
+        tribalCountUS === null &&
+        (percentTractTribal !== null && percentTractTribal >= 1)
+       ) {
+         prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`${percentTractTribal}%`, true);
+       } else if (
+         tribalCountAK === null &&
+        (tribalCountUS !== null && tribalCountUS >= 1) &&
+        (percentTractTribal !== null && percentTractTribal == 0)
+       ) {
+         prioCopy2Rendered = EXPLORE_COPY.getPrioPercAndNumPointsAlsoCopy(`less than 1%`, tribalCountUS);
+       } else if (
+         tribalCountAK === null &&
+        tribalCountUS !== null &&
+        (percentTractTribal !== null && percentTractTribal == 0)
+       ) {
+         prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`less than 1%`, true);
+       } else if (
+         (tribalCountAK !== null && tribalCountAK >= 1) &&
+        tribalCountUS === null &&
+        percentTractTribal === null
+       ) {
+         prioCopy2Rendered = EXPLORE_COPY.getPrioANVCopy(tribalCountAK, true);
+       } else if (
+         (tribalCountAK !== null && tribalCountAK >= 1) &&
+        (tribalCountUS !== null && tribalCountUS >= 1)
+       ) {
+         prioCopy2Rendered = EXPLORE_COPY.getPrioAKUSCopy(tribalCountAK, tribalCountUS, true);
+       } else {
+         prioCopy2Rendered = <></>;
+         noStyles = true;
+       }
+     } else {
+       prioCopy2Rendered = <></>;
+       noStyles = true;
+     };
+
+     return (
+       <div className={noStyles ? '' : styles.prioritizationCopy2Container}>
+         {prioCopy2Rendered}
+       </div>
+     );
+   };
+
+export default PrioritizationCopy2;
diff --git a/client/src/components/PrioritizationCopy2/__snapshots__/PrioritizationCopy2.test.tsx.snap b/client/src/components/PrioritizationCopy2/__snapshots__/PrioritizationCopy2.test.tsx.snap
new file mode 100644
index 000000000..dc0c0ea92
--- /dev/null
+++ b/client/src/components/PrioritizationCopy2/__snapshots__/PrioritizationCopy2.test.tsx.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`rendering of PrioritizationCopy2 Component checks if component renders The 2% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged. when totCats = 0, totBurds = 0, isAdj = true, isAdjLI = true, tribal % = 2, 1`] = `
+<DocumentFragment>
+  <div>
+    The 2% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+  </div>
+</DocumentFragment>
+`;
+
+exports[`rendering of PrioritizationCopy2 Component checks if component renders The 4% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged. when totCats = 0, totBurds = 1, isAdj = true, isAdjLI = true, tribal % = 4, 1`] = `
+<DocumentFragment>
+  <div>
+    The 4% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+  </div>
+</DocumentFragment>
+`;
diff --git a/client/src/components/PrioritizationCopy2/index.ts b/client/src/components/PrioritizationCopy2/index.ts
new file mode 100644
index 000000000..87a930cbc
--- /dev/null
+++ b/client/src/components/PrioritizationCopy2/index.ts
@@ -0,0 +1,2 @@
+import PrioritizationCopy2 from './PrioritizationCopy2';
+export default PrioritizationCopy2;
diff --git a/client/src/components/TractPrioritization/TractPrioritization.module.scss b/client/src/components/TractPrioritization/TractPrioritization.module.scss
index 8f2068323..92c70927b 100644
--- a/client/src/components/TractPrioritization/TractPrioritization.module.scss
+++ b/client/src/components/TractPrioritization/TractPrioritization.module.scss
@@ -2,8 +2,5 @@
 @import "../utils.scss";
 
 h3.invert{
-    background-color: $disadvantagedDotColor;
-    color: white;
-    @include u-padding-left('05');
-    @include u-padding-right('05');
+    @include invert();
 };
diff --git a/client/src/components/TractPrioritization/TractPrioritization.test.tsx b/client/src/components/TractPrioritization/TractPrioritization.test.tsx
index 1a41dfa4e..d1822cc0d 100644
--- a/client/src/components/TractPrioritization/TractPrioritization.test.tsx
+++ b/client/src/components/TractPrioritization/TractPrioritization.test.tsx
@@ -5,184 +5,87 @@ import TractPrioritization from './TractPrioritization';
 
 describe('rendering of TractPrioritization Component', () => {
   const testCases = [
-    {totalCategories: 3, isDonut: true, percentTribal: null, prio: 'YES'},
-    {totalCategories: 2, isDonut: true, percentTribal: 0, prio: 'YES'},
-    {totalCategories: 1, isDonut: true, percentTribal: .34, prio: 'YES'},
+    // total categories >= 1 all other are don't care
+    {totCats: 1, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: null, percentTribal: null, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: null, percentTribal: 0, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: null, percentTribal: .45, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: 1, percentTribal: null, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: 2, percentTribal: 0, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: 3, percentTribal: .45, isDAC: 'YES'},
 
-    {totalCategories: 4, isDonut: false, percentTribal: null, prio: 'YES'},
-    {totalCategories: 5, isDonut: false, percentTribal: 0, prio: 'YES'},
-    {totalCategories: 7, isDonut: false, percentTribal: .82, prio: 'YES'},
+    {totCats: 1, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: null, percentTribal: null, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: null, percentTribal: 0, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: null, percentTribal: .45, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: 1, percentTribal: null, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: 2, percentTribal: 0, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: 3, percentTribal: .45, isDAC: 'YES'},
 
-    {totalCategories: 0, isDonut: true, percentTribal: null, prio: 'YES'},
-    {totalCategories: 0, isDonut: true, percentTribal: 0, prio: 'YES'},
-    {totalCategories: 0, isDonut: true, percentTribal: .12, prio: 'YES'},
+    {totCats: 1, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: null, percentTribal: null, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: null, percentTribal: 0, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: null, percentTribal: .45, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: 1, percentTribal: null, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: 2, percentTribal: 0, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: 3, percentTribal: .45, isDAC: 'YES'},
+
+    {totCats: 1, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: null, percentTribal: null, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: null, percentTribal: 0, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: null, percentTribal: .45, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: 1, percentTribal: null, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: 2, percentTribal: 0, isDAC: 'YES'},
+    {totCats: 1, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: 3, percentTribal: .45, isDAC: 'YES'},
+
+    // Total categories == 0, while Adjacency index = True and Adjacency low income = True
+    {totCats: 0, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: null, percentTribal: null, isDAC: 'YES'},
+    {totCats: 0, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: null, percentTribal: 0, isDAC: 'YES'},
+    {totCats: 0, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: null, percentTribal: .13, isDAC: 'YES'},
+    {totCats: 0, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: 1, percentTribal: null, isDAC: 'YES'},
+    {totCats: 0, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: 2, percentTribal: 0, isDAC: 'YES'},
+    {totCats: 0, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: 3, percentTribal: .13, isDAC: 'YES'},
+
+    // Total categories == 0, while Adjacency index = True and Adjacency low income = False
+    {totCats: 0, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: null, percentTribal: null, isDAC: 'No'},
+    {totCats: 0, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: null, percentTribal: 0, isDAC: 'Partially'},
+    {totCats: 0, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: null, percentTribal: .13, isDAC: 'Partially'},
+    {totCats: 0, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: 1, percentTribal: null, isDAC: 'Partially'},
+    {totCats: 0, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: 2, percentTribal: 0, isDAC: 'Partially'},
+    {totCats: 0, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: 3, percentTribal: .13, isDAC: 'Partially'},
+
+    // Total categories == 0, while Adjacency index = False and Adjacency low income = True
+    {totCats: 0, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: null, percentTribal: null, isDAC: 'No'},
+    {totCats: 0, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: null, percentTribal: 0, isDAC: 'Partially'},
+    {totCats: 0, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: null, percentTribal: .13, isDAC: 'Partially'},
+    {totCats: 0, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: 1, percentTribal: null, isDAC: 'Partially'},
+    {totCats: 0, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: 2, percentTribal: 0, isDAC: 'Partially'},
+    {totCats: 0, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: 3, percentTribal: .13, isDAC: 'Partially'},
+
+    // Total categories == 0, while Adjacency index = False
+    {totCats: 0, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: null, percentTribal: null, isDAC: 'No'},
+    {totCats: 0, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: null, percentTribal: 0, isDAC: 'Partially'},
+    {totCats: 0, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: null, percentTribal: .13, isDAC: 'Partially'},
+    {totCats: 0, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: 1, percentTribal: null, isDAC: 'Partially'},
+    {totCats: 0, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: 2, percentTribal: 0, isDAC: 'Partially'},
+    {totCats: 0, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: 3, percentTribal: .13, isDAC: 'Partially'},
 
-    {totalCategories: 0, isDonut: false, percentTribal: .12, prio: 'Partially'},
-    {totalCategories: 0, isDonut: false, percentTribal: 0, prio: 'Partially'},
 
-    {totalCategories: 0, isDonut: false, percentTribal: null, prio: 'No'},
   ];
 
   testCases.forEach((testCase) => {
     // eslint-disable-next-line max-len
-    it(`checks if component renders ${testCase.prio} when category count = ${testCase.totalCategories}, isDonut = ${testCase.isDonut}, tribal % = ${testCase.percentTribal}`, () => {
+    it(`checks if component renders ${testCase.isDAC} when category count = ${testCase.totCats}, isAdjacency = ${testCase.ADJ_ET}, isAdjLowInc = ${testCase.AJDLI_ET}, tribal points in AK = ${testCase.tribalCountAK} tribal % = ${testCase.percentTribal}`, () => {
       const {asFragment} = render(
           <LocalizedComponent>
             <TractPrioritization
-              totalCategoriesPrioritized={testCase.totalCategories}
-              isDonut={testCase.isDonut}
+              totalCategoriesPrioritized={testCase.totCats}
+              isAdjacencyThreshMet={testCase.ADJ_ET}
+              isAdjacencyLowIncome={testCase.AJDLI_ET}
+              tribalCountAK={testCase.tribalCountAK}
+              tribalCountUS={null}
               percentTractTribal={testCase.percentTribal}
             />
           </LocalizedComponent>,
       );
       expect(asFragment()).toMatchSnapshot();
-      screen.getByText(testCase.prio);
+      screen.getByText(testCase.isDAC);
     });
   });
-  // it('checks if component renders YES when category count >= 1, isDonut = true, tribal % = null', () => {
-  //   const {asFragment} = render(
-  //       <LocalizedComponent>
-  //         <TractPrioritization
-  //           totalCategoriesPrioritized={3}
-  //           isDonut={true}
-  //           percentTractTribal={null}
-  //         />
-  //       </LocalizedComponent>,
-  //   );
-  //   expect(asFragment()).toMatchSnapshot();
-  // });
-  // it('checks if component renders YES when category count >= 1, isDonut = true, tribal % = 0', () => {
-  //   const {asFragment} = render(
-  //       <LocalizedComponent>
-  //         <TractPrioritization
-  //           totalCategoriesPrioritized={3}
-  //           isDonut={true}
-  //           percentTractTribal={0}
-  //         />
-  //       </LocalizedComponent>,
-  //   );
-  //   expect(asFragment()).toMatchSnapshot();
-  // });
-  // it('checks if component renders YES when category count >= 1, isDonut = true, tribal % = .47', () => {
-  //   const {asFragment} = render(
-  //       <LocalizedComponent>
-  //         <TractPrioritization
-  //           totalCategoriesPrioritized={3}
-  //           isDonut={true}
-  //           percentTractTribal={.47}
-  //         />
-  //       </LocalizedComponent>,
-  //   );
-  //   expect(asFragment()).toMatchSnapshot();
-  // });
-  // it('checks if component renders YES when category count >= 1, isDonut = false, tribal % = null', () => {
-  //   const {asFragment} = render(
-  //       <LocalizedComponent>
-  //         <TractPrioritization
-  //           totalCategoriesPrioritized={3}
-  //           isDonut={false}
-  //           percentTractTribal={null}
-  //         />
-  //       </LocalizedComponent>,
-  //   );
-  //   expect(asFragment()).toMatchSnapshot();
-  // });
-  // it('checks if component renders YES when category count >= 1, isDonut = false, tribal % = 0', () => {
-  //   const {asFragment} = render(
-  //       <LocalizedComponent>
-  //         <TractPrioritization
-  //           totalCategoriesPrioritized={3}
-  //           isDonut={false}
-  //           percentTractTribal={0}
-  //         />
-  //       </LocalizedComponent>,
-  //   );
-  //   expect(asFragment()).toMatchSnapshot();
-  // });
-  // it('checks if component renders YES when category count >= 1, isDonut = false, tribal % = .87', () => {
-  //   const {asFragment} = render(
-  //       <LocalizedComponent>
-  //         <TractPrioritization
-  //           totalCategoriesPrioritized={3}
-  //           isDonut={false}
-  //           percentTractTribal={.87}
-  //         />
-  //       </LocalizedComponent>,
-  //   );
-  //   expect(asFragment()).toMatchSnapshot();
-  // });
-
-  // it('checks if component renders YES when category count == 0, isDonut = true, tribal % = null', () => {
-  //   const {asFragment} = render(
-  //       <LocalizedComponent>
-  //         <TractPrioritization
-  //           totalCategoriesPrioritized={0}
-  //           isDonut={true}
-  //           percentTractTribal={null}
-  //         />
-  //       </LocalizedComponent>,
-  //   );
-  //   expect(asFragment()).toMatchSnapshot();
-  // });
-  // it('checks if component renders YES when category count == 0, isDonut = true, tribal % = 0', () => {
-  //   const {asFragment} = render(
-  //       <LocalizedComponent>
-  //         <TractPrioritization
-  //           totalCategoriesPrioritized={0}
-  //           isDonut={true}
-  //           percentTractTribal={0}
-  //         />
-  //       </LocalizedComponent>,
-  //   );
-  //   expect(asFragment()).toMatchSnapshot();
-  // });
-  // it('checks if component renders YES when category count == 0, isDonut = true, tribal % = .67', () => {
-  //   const {asFragment} = render(
-  //       <LocalizedComponent>
-  //         <TractPrioritization
-  //           totalCategoriesPrioritized={0}
-  //           isDonut={true}
-  //           percentTractTribal={.67}
-  //         />
-  //       </LocalizedComponent>,
-  //   );
-  //   expect(asFragment()).toMatchSnapshot();
-  // });
-
-  // it('checks if component renders PARTIALLY when category count == 0, isDonut = false, tribal % = .33', () => {
-  //   const {asFragment} = render(
-  //       <LocalizedComponent>
-  //         <TractPrioritization
-  //           totalCategoriesPrioritized={0}
-  //           isDonut={false}
-  //           percentTractTribal={.33}
-  //         />
-  //       </LocalizedComponent>,
-  //   );
-  //   expect(asFragment()).toMatchSnapshot();
-  // });
-  // it('checks if component renders PARTIALLY when category count == 0, isDonut = false, tribal % = 0', () => {
-  //   const {asFragment} = render(
-  //       <LocalizedComponent>
-  //         <TractPrioritization
-  //           totalCategoriesPrioritized={0}
-  //           isDonut={false}
-  //           percentTractTribal={0}
-  //         />
-  //       </LocalizedComponent>,
-  //   );
-  //   expect(asFragment()).toMatchSnapshot();
-  // });
-  // it('checks if component renders NO when category count == 0, isDonut = false, tribal % = null', () => {
-  //   const {asFragment} = render(
-  //       <LocalizedComponent>
-  //         <TractPrioritization
-  //           totalCategoriesPrioritized={0}
-  //           isDonut={false}
-  //           percentTractTribal={null}
-  //         />
-  //       </LocalizedComponent>,
-  //   );
-  //   expect(asFragment()).toMatchSnapshot();
-  // });
 });
diff --git a/client/src/components/TractPrioritization/TractPrioritization.tsx b/client/src/components/TractPrioritization/TractPrioritization.tsx
index 7fc543d47..5aab11f54 100644
--- a/client/src/components/TractPrioritization/TractPrioritization.tsx
+++ b/client/src/components/TractPrioritization/TractPrioritization.tsx
@@ -6,7 +6,10 @@ import * as EXPLORE_COPY from '../../data/copy/explore';
 
 interface ITractPrioritization {
   totalCategoriesPrioritized: number
-  isDonut: boolean,
+  isAdjacencyThreshMet: boolean,
+  isAdjacencyLowIncome: boolean,
+  tribalCountAK: number | null,
+  tribalCountUS: number | null,
   percentTractTribal: number | null,
 }
 
@@ -14,26 +17,30 @@ interface ITractPrioritization {
  * This component will return the appropriate designation for the tract's prioritization
  *
  * @param {number} totalCategoriesPrioritized
- * @param {boolean} isDonut
- * @param {number} percentTractTribal
+ * @param {boolean} isAdjacencyThreshMet
+ * @param {boolean} isAdjacencyLowIncome
+ * @param {number | null} tribalCountAK
+ * @param {number | null} tribalCountUS
+ * @param {number | null} percentTractTribal
  * @return {JSX}
  */
 const TractPrioritization = (
-    {totalCategoriesPrioritized, isDonut, percentTractTribal}:ITractPrioritization) => {
-  if (totalCategoriesPrioritized >= 1) {
-    return <h3 className={styles.invert}>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>;
-  } else if (totalCategoriesPrioritized === 0 && isDonut === true) {
-    return <h3 className={styles.invert}>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>;
-  } else if (
-    totalCategoriesPrioritized === 0 &&
-    isDonut === false &&
-    percentTractTribal !== null &&
-    percentTractTribal >= 0) {
-    return <h3>{EXPLORE_COPY.COMMUNITY.PARTIAL}</h3>;
-  } else if (percentTractTribal !== null) {
-    return <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>;
+    {totalCategoriesPrioritized,
+      isAdjacencyThreshMet,
+      isAdjacencyLowIncome,
+      tribalCountAK,
+      tribalCountUS,
+      percentTractTribal}:ITractPrioritization) => {
+  if (totalCategoriesPrioritized === 0) {
+    if (isAdjacencyThreshMet && isAdjacencyLowIncome) {
+      return <h3 className={styles.invert}>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>;
+    } else if (percentTractTribal === null && tribalCountAK === null && tribalCountUS === null) {
+      return <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>;
+    } else {
+      return <h3>{EXPLORE_COPY.COMMUNITY.PARTIAL}</h3>;
+    }
   } else {
-    return <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>;
+    return <h3 className={styles.invert}>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>;
   }
 };
 
diff --git a/client/src/components/TractPrioritization/__snapshots__/TractPrioritization.test.tsx.snap b/client/src/components/TractPrioritization/__snapshots__/TractPrioritization.test.tsx.snap
index 7a92585b1..0c73f7d8a 100644
--- a/client/src/components/TractPrioritization/__snapshots__/TractPrioritization.test.tsx.snap
+++ b/client/src/components/TractPrioritization/__snapshots__/TractPrioritization.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`rendering of TractPrioritization Component checks if component renders No when category count = 0, isDonut = false, tribal % = null 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders No when category count = 0, isAdjacency = false, isAdjLowInc = false, tribal points in AK = null tribal % = null 1`] = `
 <DocumentFragment>
   <h3>
     No
@@ -8,7 +8,79 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isDonut = false, tribal % = 0 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders No when category count = 0, isAdjacency = false, isAdjLowInc = true, tribal points in AK = null tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    No
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders No when category count = 0, isAdjacency = true, isAdjLowInc = false, tribal points in AK = null tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    No
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = false, tribal points in AK = 1 tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = false, tribal points in AK = 2 tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = false, tribal points in AK = 3 tribal % = 0.13 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = false, tribal points in AK = null tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = false, tribal points in AK = null tribal % = 0.13 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = true, tribal points in AK = 1 tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = true, tribal points in AK = 2 tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = true, tribal points in AK = 3 tribal % = 0.13 1`] = `
 <DocumentFragment>
   <h3>
     Partially
@@ -16,7 +88,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isDonut = false, tribal % = 0.12 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = true, tribal points in AK = null tribal % = 0 1`] = `
 <DocumentFragment>
   <h3>
     Partially
@@ -24,7 +96,223 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isDonut = true, tribal % = 0 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = true, tribal points in AK = null tribal % = 0.13 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = true, isAdjLowInc = false, tribal points in AK = 1 tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = true, isAdjLowInc = false, tribal points in AK = 2 tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = true, isAdjLowInc = false, tribal points in AK = 3 tribal % = 0.13 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = true, isAdjLowInc = false, tribal points in AK = null tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = true, isAdjLowInc = false, tribal points in AK = null tribal % = 0.13 1`] = `
+<DocumentFragment>
+  <h3>
+    Partially
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isAdjacency = true, isAdjLowInc = true, tribal points in AK = 1 tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isAdjacency = true, isAdjLowInc = true, tribal points in AK = 2 tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isAdjacency = true, isAdjLowInc = true, tribal points in AK = 3 tribal % = 0.13 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isAdjacency = true, isAdjLowInc = true, tribal points in AK = null tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isAdjacency = true, isAdjLowInc = true, tribal points in AK = null tribal % = 0.13 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isAdjacency = true, isAdjLowInc = true, tribal points in AK = null tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = false, tribal points in AK = 1 tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = false, tribal points in AK = 2 tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = false, tribal points in AK = 3 tribal % = 0.45 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = false, tribal points in AK = null tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = false, tribal points in AK = null tribal % = 0.45 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = false, tribal points in AK = null tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = true, tribal points in AK = 1 tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = true, tribal points in AK = 2 tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = true, tribal points in AK = 3 tribal % = 0.45 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = true, tribal points in AK = null tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = true, tribal points in AK = null tribal % = 0.45 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = true, tribal points in AK = null tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = false, tribal points in AK = 1 tribal % = null 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = false, tribal points in AK = 2 tribal % = 0 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = false, tribal points in AK = 3 tribal % = 0.45 1`] = `
+<DocumentFragment>
+  <h3>
+    YES
+  </h3>
+</DocumentFragment>
+`;
+
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = false, tribal points in AK = null tribal % = 0 1`] = `
 <DocumentFragment>
   <h3>
     YES
@@ -32,7 +320,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isDonut = true, tribal % = 0.12 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = false, tribal points in AK = null tribal % = 0.45 1`] = `
 <DocumentFragment>
   <h3>
     YES
@@ -40,7 +328,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isDonut = true, tribal % = null 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = false, tribal points in AK = null tribal % = null 1`] = `
 <DocumentFragment>
   <h3>
     YES
@@ -48,7 +336,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isDonut = true, tribal % = 0.34 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = true, tribal points in AK = 1 tribal % = null 1`] = `
 <DocumentFragment>
   <h3>
     YES
@@ -56,7 +344,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 2, isDonut = true, tribal % = 0 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = true, tribal points in AK = 2 tribal % = 0 1`] = `
 <DocumentFragment>
   <h3>
     YES
@@ -64,7 +352,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 3, isDonut = true, tribal % = null 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = true, tribal points in AK = 3 tribal % = 0.45 1`] = `
 <DocumentFragment>
   <h3>
     YES
@@ -72,7 +360,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 4, isDonut = false, tribal % = null 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = true, tribal points in AK = null tribal % = 0 1`] = `
 <DocumentFragment>
   <h3>
     YES
@@ -80,7 +368,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 5, isDonut = false, tribal % = 0 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = true, tribal points in AK = null tribal % = 0.45 1`] = `
 <DocumentFragment>
   <h3>
     YES
@@ -88,7 +376,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 7, isDonut = false, tribal % = 0.82 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = true, tribal points in AK = null tribal % = null 1`] = `
 <DocumentFragment>
   <h3>
     YES
diff --git a/client/src/components/utils.scss b/client/src/components/utils.scss
index 112cd6bc5..868abdd40 100644
--- a/client/src/components/utils.scss
+++ b/client/src/components/utils.scss
@@ -24,3 +24,16 @@ $sidePanelLabelFontColor: #171716;
 $datasetContainerColor: #EEF6FB;
 $headingFontColor: #122E51;
 $j40AlertWarningColor: #FAF3D1;
+
+@mixin invert {
+  background-color: $disadvantagedDotColor;
+  color: white;
+  @include u-padding-left('05');
+  @include u-padding-right('05');
+}
+
+@mixin indicatorValueSubTextContainer {
+  text-align: right;
+  @include typeset('sans', 'micro', 2);
+  @include u-text('thin'); 
+}
\ No newline at end of file
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index ef75809bf..34bb9899a 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -30,8 +30,9 @@ export const MISSING_DATA_STRING = '--';
 // Tribal signals
 export const TRIBAL_ID = 'tribalId';
 export const LAND_AREA_NAME = 'landAreaName';
-export const TRIBAL_AREAS_PERCENTAGE = 'TA_PERC';
-export const TRIBAL_AREAS_COUNT = 'TA_COUNT';
+export const TRIBAL_AREAS_PERCENTAGE = 'TA_PERC_FE';
+export const TRIBAL_AREAS_COUNT_AK = 'TA_COUNT_AK';
+export const TRIBAL_AREAS_COUNT_CONUS = 'TA_COUNT_C';
 
 // Set the threshold percentile used by most indicators in the side panel
 export const DEFAULT_THRESHOLD_PERCENTILE = 90;
@@ -92,8 +93,8 @@ export const IS_EXCEEDS_THRESH_FOR_EXP_POP_LOSS = 'EPL_ET';
 export const FLOODING_PERCENTILE = 'FLD_PFS';
 export const IS_EXCEEDS_THRESH_FLOODING = 'FLD_ET';
 
-export const WILDFIRE_PERCENTILE = 'WF_PFS';
-export const IS_EXCEEDS_THRESH_WILDFIRE = 'WF_ET';
+export const WILDFIRE_PERCENTILE = 'WFR_PFS';
+export const IS_EXCEEDS_THRESH_WILDFIRE = 'WFR_ET';
 
 export const IS_EXCEED_BOTH_SOCIO_INDICATORS = 'N_EBSI';
 
@@ -237,6 +238,8 @@ export const ISLAND_AREA_LOW_HS_EDU = 'IALHE';
 // Misc category
 export const ADJACENCY_PERCENTILE = 'ADJ_PFS';
 export const ADJACENCY_EXCEEDS_THRESH = 'ADJ_ET';
+export const ADJACENCY_LOW_INCOME_EXCEEDS_THRESH = 'AJDLI_ET';
+
 export const IMPUTE_FLAG = 'IMP_FLG';
 
 
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index e7bae2ec1..1652852cd 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -550,37 +550,32 @@ export const SIDE_PANEL_TRIBAL_INFO = defineMessages({
 export const PRIORITIZATION_COPY = {
   NOT_PRIO: <FormattedMessage
     id={'explore.map.page.side.panel.prio.copy.not.prio'}
-    defaultMessage={'This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomic threshold.'}
-    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomi} threshold.`}
+    defaultMessage={'This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold.`}
   />,
-  NOT_PRIO_1_BURD: <FormattedMessage
+  NOT_PRIO_1BUR: <FormattedMessage
     id={'explore.map.page.side.panel.prio.copy.not.prio.one.burden'}
-    defaultMessage={'This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds.'}
-    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds.`}
+    defaultMessage={'This tract is not considered disadvantaged. It meets 1 burden threshold BUT no associated socio-economic thresholds.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets [1] burden threshold BUT no associated socio-economic thresholds.`}
   />,
-  PRIO_1_BURD: <FormattedMessage
+  NOT_PRIO_NBUR: <FormattedMessage
     id={'explore.map.page.side.panel.prio.copy.prio.one.burden'}
-    defaultMessage={'This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold.'}
-    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold..`}
+    defaultMessage={'This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds.`}
   />,
-  DONUT: <FormattedMessage
+  PRIO_SURR_LI: <FormattedMessage
     id={'explore.map.page.side.panel.prio.copy.prio.donut'}
-    defaultMessage={'This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.'}
-    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low}income threshold.`}
-  />,
-  FRT_LESS_1_PERC: <FormattedMessage
-    id={'explore.map.page.side.panel.prio.copy.frt.less.1.perc'}
-    defaultMessage={'The less than 1% of this tract that are Federally- Recognized Tribal lands are also considered disadvantaged.'}
-    description={`Navigate to the explore the map page. Click on tract, The side panel will show The [less than 1%] of this tract that are Federally- Recognized Tribal lands are also considered disadvantaged.`}
+    defaultMessage={'This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. The adjustment does not apply to any of the categories.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. The adjustment does not apply to any of the categories.`}
   />,
 };
 
-export const getNotPrioNBurden = (burdens:number) => {
+export const getPrioNBurdenCopy = (burdens:string) => {
   return (
     <FormattedMessage
-      id={'explore.map.page.side.panel.prio.copy.not.prio.n.burden'}
-      defaultMessage={ 'This tract is not considered disadvantaged. It meets {burdens} burden thresholds BUT no associated socioeconomic thresholds.'}
-      description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds.`}
+      id={'explore.map.page.side.panel.prio.copy.prio.n.burden'}
+      defaultMessage={ 'This tract is considered disadvantaged because it meets {burdens} burden threshold AND the associated socio-economic threshold.'}
+      description={`Navigate to the explore the map page. Click on tract, This tract is considered disadvantaged because it meets {burdens} burden thresholds AND the associated socio-economic threshold.`}
       values={{
         burdens: burdens,
       }}
@@ -588,46 +583,79 @@ export const getNotPrioNBurden = (burdens:number) => {
   );
 };
 
-export const getPrioNBurden = (burdens:number) => {
+// Copy around Federally recognized tribes
+export const getPrioFRTCopy = (amount:string, isAlso:boolean = false) => {
   return (
     <FormattedMessage
-      id={'explore.map.page.side.panel.prio.copy.prio.n.burden'}
-      defaultMessage={ 'This tract is considered disadvantaged because it meets {burdens} burden thresholds AND the associated socio-economic threshold.'}
-      description={`Navigate to the explore the map page. Click on tract, This tract is considered disadvantaged because it meets {burdens} burden thresholds AND the associated socio-economic threshold.`}
+      id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
+      defaultMessage={ 'The {amount} of this tract that are Federally-Recognized Tribal lands are {also} considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The {amount} of this tract that are Federally-Recognized Tribal lands are {also} considered disadvantaged.`}
       values={{
-        burdens: burdens,
+        amount: amount,
+        also: isAlso? 'also' : '',
       }}
     />
   );
 };
 
-export const getPrioFRTNPerc = (percentage:number, isAlso:boolean) => {
+// Copy around Alaska Native Villages
+export const getPrioANVCopy = (numPoints:number, isAlso:boolean = false) => {
   return (
     <FormattedMessage
       id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
-      defaultMessage={ 'The {percentage} of this tract that are Federally-Recognized Tribal lands are {also} considered disadvantaged.'}
-      description={`Navigate to the explore the map page. Click on tract, The {percentage} of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`}
+      defaultMessage={ 'The {numPoints} Alaskan Native Villages in this tract that are Federally-Recognized are {also} considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The {numPoints} of this tract that are Federally-Recognized Tribal lands are {also} considered disadvantaged.`}
       values={{
-        percentage: `${percentage*100}%`,
+        numPoints: numPoints,
         also: isAlso? 'also' : '',
       }}
     />
   );
 };
 
-export const getPrioFRTLessThan1Perc = (isAlso:boolean) => {
+// Copy around Alaska Native Villages points and US points
+export const getPrioAKUSCopy = (numAKpoints:number, numUSpoints:number, isAlso:boolean = false) => {
   return (
     <FormattedMessage
       id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
-      defaultMessage={ 'The less than 1% of this tract that are Federally-Recognized Tribal lands are {also} considered disadvantaged.'}
-      description={`Navigate to the explore the map page. Click on tract, The {percentage} of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`}
+      defaultMessage={ 'The {numAKpoints} Alaskan Native Villages and the {numUSpoints} tribes in this tract that are Federally-Recognized are {also} considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The {numAKpoints} Alaskan Native Villages and the {numUSpoints} tribes in this tract that are Federally-Recognized are considered disadvantaged.`}
       values={{
-        also: isAlso? 'also' : '',
+        numAKpoints: numAKpoints,
+        numUSpoints: numUSpoints,
+        also: isAlso ? 'also' : '',
       }}
     />
   );
 };
 
+// Copy percentile of track in FRT and number of points in FRT with "also"
+export const getPrioPercAndNumPointsAlsoCopy = (amount:string, numPoints:number) => {
+  return (
+    <FormattedMessage
+      id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
+      defaultMessage={ 'The {amount} of this tract that are Federally-Recognized Tribal lands and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The {amount} of this tract that are Federally-Recognized Tribal lands and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged.`}
+      values={{
+        amount: amount,
+        numPoints: numPoints,
+      }}
+    />
+  );
+};
+
+export const DONUT_COPY = defineMessages({
+  COMP_SURR: {
+    id: 'explore.map.page.side.panel.donut.copy.complete.surround',
+    defaultMessage: 'Completely surrounded',
+    description: `Navigate to the explore the map page. Click on side panel, this copy may show up`,
+  },
+  ADJ_LOW_INC: {
+    id: 'explore.map.page.side.panel.donut.copy.adj.low.income',
+    defaultMessage: 'Adjusted low income',
+    description: `Navigate to the explore the map page. Click on side panel, this copy may show up`,
+  },
+});
 export const COMMUNITY = {
   OF_FOCUS: <FormattedMessage
     id={'explore.map.page.side.panel.community.of.focus'}
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 19525344c..e22912b85 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -535,6 +535,14 @@
     "defaultMessage": "White",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: White"
   },
+  "explore.map.page.side.panel.donut.copy.adj.low.income": {
+    "defaultMessage": "Adjusted low income",
+    "description": "Navigate to the explore the map page. Click on side panel, this copy may show up"
+  },
+  "explore.map.page.side.panel.donut.copy.complete.surround": {
+    "defaultMessage": "Completely surrounded",
+    "description": "Navigate to the explore the map page. Click on side panel, this copy may show up"
+  },
   "explore.map.page.side.panel.exceed.burden.answer.no": {
     "defaultMessage": "No",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. This will display NO if the census tract is disadvantaged"
@@ -1031,37 +1039,29 @@
     "defaultMessage": "Partially",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the communities the score currently is partially focused on"
   },
-  "explore.map.page.side.panel.prio.copy.frt.less.1.perc": {
-    "defaultMessage": "The less than 1% of this tract that are Federally- Recognized Tribal lands are also considered disadvantaged.",
-    "description": "Navigate to the explore the map page. Click on tract, The side panel will show The [less than 1%] of this tract that are Federally- Recognized Tribal lands are also considered disadvantaged."
-  },
   "explore.map.page.side.panel.prio.copy.not.prio": {
-    "defaultMessage": "This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomic threshold.",
-    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomi} threshold."
-  },
-  "explore.map.page.side.panel.prio.copy.not.prio.n.burden": {
-    "defaultMessage": "This tract is not considered disadvantaged. It meets {burdens} burden thresholds BUT no associated socioeconomic thresholds.",
-    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds."
+    "defaultMessage": "This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold."
   },
   "explore.map.page.side.panel.prio.copy.not.prio.one.burden": {
-    "defaultMessage": "This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds.",
-    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets one burden threshold BUT no associated socioeconomic thresholds."
+    "defaultMessage": "This tract is not considered disadvantaged. It meets 1 burden threshold BUT no associated socio-economic thresholds.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets [1] burden threshold BUT no associated socio-economic thresholds."
   },
   "explore.map.page.side.panel.prio.copy.prio.donut": {
-    "defaultMessage": "This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold.",
-    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged because it is surrounded by tracts that are disadvantaged AND meets an adjusted low}income threshold."
+    "defaultMessage": "This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. The adjustment does not apply to any of the categories.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. The adjustment does not apply to any of the categories."
   },
   "explore.map.page.side.panel.prio.copy.prio.frt.n.perc": {
-    "defaultMessage": "The less than 1% of this tract that are Federally-Recognized Tribal lands are {also} considered disadvantaged.",
-    "description": "Navigate to the explore the map page. Click on tract, The {percentage} of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged."
+    "defaultMessage": "The {amount} of this tract that are Federally-Recognized Tribal lands and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged.",
+    "description": "Navigate to the explore the map page. Click on tract, The {amount} of this tract that are Federally-Recognized Tribal lands and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged."
   },
   "explore.map.page.side.panel.prio.copy.prio.n.burden": {
-    "defaultMessage": "This tract is considered disadvantaged because it meets {burdens} burden thresholds AND the associated socio-economic threshold.",
+    "defaultMessage": "This tract is considered disadvantaged because it meets {burdens} burden threshold AND the associated socio-economic threshold.",
     "description": "Navigate to the explore the map page. Click on tract, This tract is considered disadvantaged because it meets {burdens} burden thresholds AND the associated socio-economic threshold."
   },
   "explore.map.page.side.panel.prio.copy.prio.one.burden": {
-    "defaultMessage": "This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold.",
-    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged because it meets one burden threshold AND the associated socio-economic threshold.."
+    "defaultMessage": "This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds."
   },
   "explore.map.page.side.panel.send.feedback.alt.img": {
     "defaultMessage": "Send feedback",

From 9ee80a52030a5ad5f337c8751fb8df965dddaba4 Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Fri, 7 Oct 2022 19:19:28 -0700
Subject: [PATCH 072/130] Update copy from Word Doc (#2001)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add tsc compile

* fix TS warning around headingLevel

* Temporary fix around availableFor type error

- correlated to fix needed in ticket 2000

* Add copy update from CEJST pages - STATUS doc

- Add a period in Get the Data box
- Update unselected side panel text
- Update text under explore the map
- Content and styling for territories note
- persistent FAB - “Help improve the tool”
- Water needs to be “Water and Wastewater”
- Styling on demographics ( show )  => (show)
- Update age in demographics to be Elderly over 65
- Wildfire description is not correct
- Lead paint description needs to be updated
- remove bullet from How you can help
- Footer - remove RFI
- Footer - remove Eng cal
- add sign up link

* Update side panel non-selected copy

* Add back PEC button to each main page

* Remove console logs from J40Header

* Fix DOM warning on About page

- can't have <li> in <p>

* Fix nested DOM warning on Explore page

- Modify ExploreDataBox styling

* Update side panel non-selected with icons

- update height on mobile
- update snapshots
---
 client/package.json                           |   3 +-
 .../src/components/AreaDetail/AreaDetail.tsx  |   4 +-
 .../ExploreDataBox/ExploreDataBox.module.scss |  11 +-
 .../ExploreDataBox.module.scss.d.ts           |   1 +
 .../ExploreDataBox/ExploreDataBox.tsx         |   4 +-
 .../ExploreDataBox.test.tsx.snap              |  18 +--
 .../HowYouCanHelp/HowYouCanHelp.tsx           |   4 +-
 .../__snapshots__/howYouCanHelp.test.tsx.snap |   3 -
 client/src/components/J40Footer/J40Footer.tsx |  25 +--
 .../__snapshots__/J40Footer.spec.tsx.snap     |  40 ++---
 client/src/components/J40Header/J40Header.tsx |   3 -
 client/src/components/J40Map.module.scss      |   4 +
 .../SidePanelInfo/SidePanelInfo.tsx           |  95 +++++++----
 .../__snapshots__/SidePanelInfo.test.tsx.snap |  69 ++++++--
 .../__snapshots__/SurveyButton.test.tsx.snap  |   2 +-
 .../TractDemographics/TractDemographics.tsx   |   4 +-
 .../TractDemographics.test.tsx.snap           |  18 +--
 .../__snapshots__/mapInfoPanel.test.tsx.snap  |  69 ++++++--
 client/src/data/copy/common.tsx               |  33 ++--
 client/src/data/copy/contact.tsx              |   2 +-
 client/src/data/copy/explore.tsx              | 152 ++++++++++++------
 client/src/data/copy/methodology.tsx          |  10 +-
 .../{bellCurve.svg => bell-curve.svg}         |   0
 .../images/sidePanelIcons/census-tract.svg    |  13 ++
 .../{pieChart.svg => pie-chart.svg}           |   0
 .../images/sidePanelIcons/select-arrow.svg    |  25 +++
 .../images/sidePanelIcons/tribal-tract.svg    |  13 ++
 .../{upDown.svg => up-down.svg}               |   0
 client/src/intl/en.json                       | 108 ++++++++-----
 client/src/pages/about.tsx                    |   6 +-
 client/src/pages/contact.tsx                  |   2 +
 client/src/pages/index.tsx                    |  24 ++-
 client/src/pages/methodology.tsx              |   2 +
 .../tests/__snapshots__/about.test.tsx.snap   |  87 +++++-----
 .../tests/__snapshots__/contact.test.tsx.snap |  61 ++++---
 .../__snapshots__/downloads.test.tsx.snap     |  40 ++---
 .../freqAskedQuestions.test.tsx.snap          |  40 ++---
 .../__snapshots__/methodology.test.tsx.snap   |  61 ++++---
 .../__snapshots__/publicEng.test.tsx.snap     |  40 ++---
 .../techSupportDoc.test.tsx.snap              |  40 ++---
 client/src/styles/global.scss                 |   6 +
 41 files changed, 689 insertions(+), 453 deletions(-)
 rename client/src/images/sidePanelIcons/{bellCurve.svg => bell-curve.svg} (100%)
 create mode 100644 client/src/images/sidePanelIcons/census-tract.svg
 rename client/src/images/sidePanelIcons/{pieChart.svg => pie-chart.svg} (100%)
 create mode 100644 client/src/images/sidePanelIcons/select-arrow.svg
 create mode 100644 client/src/images/sidePanelIcons/tribal-tract.svg
 rename client/src/images/sidePanelIcons/{upDown.svg => up-down.svg} (100%)

diff --git a/client/package.json b/client/package.json
index 9b404eebb..14ee9ec85 100644
--- a/client/package.json
+++ b/client/package.json
@@ -29,7 +29,8 @@
     "intl:compile-en": "formatjs compile src/intl/en.json --ast --out-file compiled-lang/en.json",
     "test:intl-extraction": "node src/intl/testIntlExtraction",
     "prepare": "cd .. && husky install client/.husky",
-    "gc": "node .generate_component $1"
+    "gc": "node .generate_component $1",
+    "compile": "tsc"
   },
   "devDependencies": {
     "@formatjs/cli": "^4.8.2",
diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 97d7b7dbb..464bc106b 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -738,8 +738,10 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
     is required, however, the title prop is already defining the category styling, so this
     is placed here to satisfy the requirement of the AccordionItems API, however it's not
     being used.
+
+    Casting 'h4' as const because it needs to be a heading type as specified HeadingLevel.
     */
-    headingLevel: 'h4',
+    headingLevel: 'h4' as const,
 
     title: <Category name={category.titleText} isDisadvantaged={category.isDisadvagtaged} />,
     content: (
diff --git a/client/src/components/ExploreDataBox/ExploreDataBox.module.scss b/client/src/components/ExploreDataBox/ExploreDataBox.module.scss
index bd8551e3b..e621ac931 100644
--- a/client/src/components/ExploreDataBox/ExploreDataBox.module.scss
+++ b/client/src/components/ExploreDataBox/ExploreDataBox.module.scss
@@ -1,6 +1,11 @@
 @use '../../styles/design-system.scss' as *;
 
-.fileDownIcon{
-    margin-bottom: -4px;
-    @include u-padding-left(1);
+.summaryBoxContainer{
+
+    @include u-margin-top(2.5);
+
+    .fileDownIcon{
+        margin-bottom: -4px;
+        @include u-padding-left(1);
+    }
 }
diff --git a/client/src/components/ExploreDataBox/ExploreDataBox.module.scss.d.ts b/client/src/components/ExploreDataBox/ExploreDataBox.module.scss.d.ts
index 01bdf2fdd..51216274d 100644
--- a/client/src/components/ExploreDataBox/ExploreDataBox.module.scss.d.ts
+++ b/client/src/components/ExploreDataBox/ExploreDataBox.module.scss.d.ts
@@ -1,5 +1,6 @@
 declare namespace ExploreDataBoxNamespace {
     export interface IExploreDataBoxScss {
+      summaryBoxContainer: string;
       fileDownIcon: string;
     }
   }
diff --git a/client/src/components/ExploreDataBox/ExploreDataBox.tsx b/client/src/components/ExploreDataBox/ExploreDataBox.tsx
index 352bbdfb9..0550830ac 100644
--- a/client/src/components/ExploreDataBox/ExploreDataBox.tsx
+++ b/client/src/components/ExploreDataBox/ExploreDataBox.tsx
@@ -16,7 +16,7 @@ const ExploreDataBox = ({}: IExploreDataBoxProps) => {
   const intl = useIntl();
 
   return (
-    <SummaryBox>
+    <SummaryBox className={styles.summaryBoxContainer}>
 
       <SummaryBoxHeading headingLevel='h2'>
         {intl.formatMessage(EXPLORE_COPY.EXPLORE_DATA_BOX.TITLE)}
@@ -26,7 +26,7 @@ const ExploreDataBox = ({}: IExploreDataBoxProps) => {
       </SummaryBoxHeading>
 
       <SummaryBoxContent>
-        <p>{EXPLORE_COPY.EXPLORE_DATA_BOX_BODY}</p>
+        {EXPLORE_COPY.EXPLORE_DATA_BOX_BODY}
       </SummaryBoxContent>
 
     </SummaryBox>
diff --git a/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap b/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap
index 0bd884513..7a497881b 100644
--- a/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap
+++ b/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap
@@ -24,18 +24,16 @@ exports[`rendering of ExploreDataBox Component checks if component renders 1`] =
       <div
         class="usa-summary-box__text"
       >
-        <p>
-          
+        
     Download the data with documentation and shapefiles, from the 
-          <a
-            class="usa-link"
-            href="/en/downloads"
-          >
-            downloads
-          </a>
-           page
+        <a
+          class="usa-link"
+          href="/en/downloads"
+        >
+          downloads
+        </a>
+         page.
   
-        </p>
       </div>
     </div>
   </div>
diff --git a/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx b/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx
index 314335c44..ebdb1d354 100644
--- a/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx
+++ b/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx
@@ -16,9 +16,9 @@ const HowYouCanHelp = () => {
         <li className={styles.howYouCanHelpList}>
           {ABOUT_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_2}
         </li>
-        <li className={styles.howYouCanHelpList}>
+        {/* <li className={styles.howYouCanHelpList}>
           {ABOUT_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_3}
-        </li>
+        </li> */}
         <li className={styles.howYouCanHelpList}>
           {ABOUT_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_4}
         </li>
diff --git a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
index 6a12b5f7e..6395b8fd2 100644
--- a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
+++ b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
@@ -27,9 +27,6 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl
         </a>
         .
       </li>
-      <li>
-        Have feedback about a specific census tract? You can either click here or click the “Send Feedback” button on the side-panel of a census tract on the map.
-      </li>
       <li>
         Any other questions? Email: 
         <a
diff --git a/client/src/components/J40Footer/J40Footer.tsx b/client/src/components/J40Footer/J40Footer.tsx
index 03c69ec21..9a021905f 100644
--- a/client/src/components/J40Footer/J40Footer.tsx
+++ b/client/src/components/J40Footer/J40Footer.tsx
@@ -13,7 +13,6 @@ import SurveyButton from '../SurveyButton';
 
 // @ts-ignore
 import whitehouseIcon from '../../images/eop-seal.svg';
-import {PAGES_ENDPOINTS} from '../../data/constants';
 import * as COMMON_COPY from '../../data/copy/common';
 
 const J40Footer = () => {
@@ -33,27 +32,19 @@ const J40Footer = () => {
           COMMON_COPY.FOOTER_CEQ_ADDRESS.PHONE,
         ]}
       />,
-    ],
-    [
-      intl.formatMessage(COMMON_COPY.FOOTER.MORE_INFO),
-      <LinkTypeWrapper
-        linkText={intl.formatMessage(COMMON_COPY.FOOTER.ENG_CAL)}
-        internal={true}
-        url={PAGES_ENDPOINTS.PUBLIC_ENG}
-        openUrlNewTab={false}
-        className={'footer-link-first-child'}
-        key={'publiceng'}
-        dataCy={hyphenizeString(COMMON_COPY.FOOTER.ENG_CAL.defaultMessage)}
-      />,
       <LinkTypeWrapper
-        linkText={intl.formatMessage(COMMON_COPY.FOOTER.RFI)}
+        linkText={intl.formatMessage(COMMON_COPY.FOOTER.SIGN_UP)}
         internal={false}
-        url={intl.formatMessage(COMMON_COPY.FOOTER.RFI_LINK)}
+        url={COMMON_COPY.FOOTER.SIGN_UP_LINK}
         openUrlNewTab={true}
-        key={'rfilink'}
-        dataCy={hyphenizeString(COMMON_COPY.FOOTER.RFI.defaultMessage)}
+        key={'signup'}
+        dataCy={hyphenizeString(COMMON_COPY.FOOTER.SIGN_UP.defaultMessage)}
       />,
+    ],
+    [
+      intl.formatMessage(COMMON_COPY.FOOTER.MORE_INFO),
       <LinkTypeWrapper
+        className={'footer-link-first-child'}
         linkText={intl.formatMessage(COMMON_COPY.FOOTER.WHITEHOUSE)}
         internal={false}
         url={intl.formatMessage(COMMON_COPY.FOOTER.WHITEHOUSE_LINK)}
diff --git a/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap b/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap
index 68e7210a4..87e54326a 100644
--- a/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap
+++ b/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap
@@ -60,6 +60,19 @@ exports[`J40Footer renders correctly 1`] = `
                     </div>
                   </address>
                 </li>
+                <li
+                  class="usa-footer__secondary-link"
+                >
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy="sign-up-for-updates"
+                    href="https://www.surveymonkey.com/r/whceqej"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Sign up for updates
+                  </a>
+                </li>
               </ul>
             </section>
           </div>
@@ -79,30 +92,7 @@ exports[`J40Footer renders correctly 1`] = `
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="usa-link footer-link-first-child"
-                    href="/en/public-engagement"
-                  >
-                    Engagement calendar
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy="request-for-information"
-                    href="https://www.federalregister.gov/d/2022-03920"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    Request for Information
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
+                    class="usa-link usa-link--external footer-link-first-child"
                     data-cy="whitehouse-gov"
                     href="https://www.whitehouse.gov/"
                     rel="noreferrer"
@@ -230,7 +220,7 @@ exports[`J40Footer renders correctly 1`] = `
           data-testid="button"
           type="button"
         >
-          Help us improve the site & data
+          Help improve the tool
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/components/J40Header/J40Header.tsx b/client/src/components/J40Header/J40Header.tsx
index 8577bf0fd..049d9f7c9 100644
--- a/client/src/components/J40Header/J40Header.tsx
+++ b/client/src/components/J40Header/J40Header.tsx
@@ -48,7 +48,6 @@ const J40Header = ({location}:IJ40Header) => {
    */
   const [mobileNavOpen, setMobileNavOpen] = useState(false);
   const toggleMobileNav = (): void => {
-    console.log('mobile opened!');
     setMobileNavOpen((prevOpen) => !prevOpen);
   };
 
@@ -84,8 +83,6 @@ const J40Header = ({location}:IJ40Header) => {
    * @param {number} index
    */
   const onToggle = (index: number): void => {
-    console.log('🚀 ~ file: J40Header.tsx ~ line 57 ~ J40Header ~ isOpen before toggle', isOpen);
-
     // The setIsOpen is used to toggle the currently selected nav link
     setIsOpen((prevIsOpen) => {
       const newIsOpen = [...isOpen];
diff --git a/client/src/components/J40Map.module.scss b/client/src/components/J40Map.module.scss
index 2f020172f..a03a97b4e 100644
--- a/client/src/components/J40Map.module.scss
+++ b/client/src/components/J40Map.module.scss
@@ -67,6 +67,10 @@
   border: 1px solid $sidePanelBorderColor;
   overflow-y: auto;
   height: 90vh;
+
+  @include at-media-max("mobile-lg") {
+    height: 100%;
+  }
 }
 
 // This will control the height of the map when the device 
diff --git a/client/src/components/SidePanelInfo/SidePanelInfo.tsx b/client/src/components/SidePanelInfo/SidePanelInfo.tsx
index 94156642a..1bd14f8ba 100644
--- a/client/src/components/SidePanelInfo/SidePanelInfo.tsx
+++ b/client/src/components/SidePanelInfo/SidePanelInfo.tsx
@@ -9,13 +9,23 @@ import searchIcon from '/node_modules/uswds/dist/img/usa-icons/search.svg';
 // @ts-ignore
 import locateIcon from '/node_modules/uswds/dist/img/usa-icons/my_location.svg';
 // @ts-ignore
+import peopleIcon from '/node_modules/uswds/dist/img/usa-icons/people.svg';
+// @ts-ignore
+import fileUpIcon from '/node_modules/uswds/dist/img/usa-icons/file_upload.svg';
+// @ts-ignore
+import checkIcon from '/node_modules/uswds/dist/img/usa-icons/check.svg';
+// @ts-ignore
 import puzzleIcon from '../../images/sidePanelIcons/puzzle.svg';
 // @ts-ignore
-import bellCurveIcon from '../../images/sidePanelIcons/bellCurve.svg';
+import bellCurveIcon from '../../images/sidePanelIcons/bell-curve.svg';
+// @ts-ignore
+import censusDotIcon from '../../images/sidePanelIcons/census-tract.svg';
 // @ts-ignore
-import pieChartIcon from '../../images/sidePanelIcons/pieChart.svg';
+import tribalDotIcon from '../../images/sidePanelIcons/tribal-tract.svg';
 // @ts-ignore
-import notAvailIcon from '/node_modules/uswds/dist/img/usa-icons/do_not_disturb.svg';
+import pieChartIcon from '../../images/sidePanelIcons/pie-chart.svg';
+// @ts-ignore
+import selectArrowIcon from '../../images/sidePanelIcons/select-arrow.svg';
 
 import * as styles from './SidePanelInfo.module.scss';
 import * as constants from '../../data/constants';
@@ -59,7 +69,7 @@ const SidePanelInfo = () => {
         {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA1_PART4)}
         {
           windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
-          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={notAvailIcon}
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={selectArrowIcon}
             alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.MOUSE)}
           />
         }
@@ -81,43 +91,70 @@ const SidePanelInfo = () => {
           />
         }
         {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA2_PART2)}
-      </p>
-
-      {/* Paragraph 3 */}
-      <p tabIndex={0}>
-        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA3_PART1)}
         {
           windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
-          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={notAvailIcon}
-            alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.DAC_CIRCLE)}
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={peopleIcon}
+            alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.PEOPLE)}
           />
         }
-        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA3_PART2)}
+        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA2_PART3)}
       </p>
 
+      {/* Paragraph 3 */}
+      {
+        windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+        <p tabIndex={0}>
+          {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA3_PART1)}
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={censusDotIcon}
+            alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.DAC_CIRCLE)}
+          />
+          {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA3_PART2)}
+        </p>
+      }
+
       {/* Paragraph 4 */}
-      <p tabIndex={0}>
-        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA4_PART1)}
-        {
-          windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+      {
+        windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+        <p tabIndex={0}>
+          {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA4_PART1)}
           <img tabIndex={0} className={styles.sidePanelInfoIcon} src={bellCurveIcon}
             alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.BELL_CURVE)}
           />
-        }
-        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA4_PART2)}
-        {
-          windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
-          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={pieChartIcon}
-            alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.PIE_CHART)}
-          />
-        }
-        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA4_PART3)}
-      </p>
+          {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA4_PART2)}
+        </p>
+      }
 
       {/* Paragraph 5 */}
-      <p tabIndex={0}>
-        {EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE_PARA5}
-      </p>
+      {
+        windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+       <p tabIndex={0}>
+         {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA5_PART1)}
+         <img tabIndex={0} className={styles.sidePanelInfoIcon} src={fileUpIcon}
+           alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.FILE_UP)}
+         />
+         {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA5_PART2)}
+         <img tabIndex={0} className={styles.sidePanelInfoIcon} src={pieChartIcon}
+           alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.PIE_CHART)}
+         />
+         {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA5_PART3)}
+         <img tabIndex={0} className={styles.sidePanelInfoIcon} src={checkIcon}
+           alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.CHECK)}
+         />
+         {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA5_PART4)}
+       </p>
+      }
+
+      {/* Paragraph 6 */}
+      {
+        windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+        <p tabIndex={0}>
+          {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA6_PART1)}
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={tribalDotIcon}
+            alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.DAC_CIRCLE)}
+          />
+          {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA6_PART2)}
+        </p>
+      }
     </aside>
   );
 };
diff --git a/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap b/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap
index 31a0edbbb..7a6da00e4 100644
--- a/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap
+++ b/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap
@@ -54,7 +54,7 @@ exports[`rendering of the component expects the render to match snapshot 1`] = `
         tabindex="0"
       />
       
-      to see information about any census tract
+      to see information about any census tract.
     
     </p>
     <p
@@ -78,14 +78,24 @@ exports[`rendering of the component expects the render to match snapshot 1`] = `
         tabindex="0"
       />
       
-    . Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation.
+    . Census tracts are a small unit of geography. They generally have populations 
+    
+      <img
+        alt="
+      a people icon informing the user of communities
+    "
+        src="test-file-stub"
+        tabindex="0"
+      />
+      
+      of between 1,200 - 8,000 people.
     
     </p>
     <p
       tabindex="0"
     >
       
-      Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color
+      Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted 
     
       <img
         alt="
@@ -95,14 +105,14 @@ exports[`rendering of the component expects the render to match snapshot 1`] = `
         tabindex="0"
       />
       
-      on the map. This color is an opacity. This is so information about the map can be seen.
+    on the map.
     
     </p>
     <p
       tabindex="0"
     >
       
-      The tool uses percentiles
+      The tool ranks most of the burdens using percentiles
     
       <img
         alt="
@@ -112,7 +122,24 @@ exports[`rendering of the component expects the render to match snapshot 1`] = `
         tabindex="0"
       />
       
-      , percentages 
+    . Percentiles show how much burden each tract experiences when compared to other tracts.
+    
+    </p>
+    <p
+      tabindex="0"
+    >
+      
+      Thresholds
+    
+      <img
+        alt="
+      An icon shows a up arrow with a lower limit implying that it's above a threshold
+    "
+        src="test-file-stub"
+        tabindex="0"
+      />
+      
+    , or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages 
     
       <img
         alt="
@@ -122,19 +149,35 @@ exports[`rendering of the component expects the render to match snapshot 1`] = `
         tabindex="0"
       />
       
-      , or a simple yes/no to indicate how much burden the communities are experiencing in each tract. 
+      or a simple yes/no
+    
+      <img
+        alt="
+      An icon that depicts a check mark conveying yes and/or no
+    "
+        src="test-file-stub"
+        tabindex="0"
+      />
+      
+      .
     
     </p>
     <p
       tabindex="0"
     >
       
-    The tool also uses thresholds. If the tract meets or exceeds the threshold of any climate, environmental, or other burden 
-      <strong>
-        AND
-      </strong>
-       it meets the threshold for the associated socioeconomic burden, then communites in the tract are considered disadvantaged.
-  
+      Federally Recognized Tribal lands are also highlighted
+    
+      <img
+        alt="
+      a blue circle icon informing the user of what a disadvantaged community is depicted as
+    "
+        src="test-file-stub"
+        tabindex="0"
+      />
+      
+      highlighted on the map. These communities are also considered disadvantaged.
+    
     </p>
   </aside>
 </DocumentFragment>
diff --git a/client/src/components/SurveyButton/__snapshots__/SurveyButton.test.tsx.snap b/client/src/components/SurveyButton/__snapshots__/SurveyButton.test.tsx.snap
index c88a68f37..6b2c455b7 100644
--- a/client/src/components/SurveyButton/__snapshots__/SurveyButton.test.tsx.snap
+++ b/client/src/components/SurveyButton/__snapshots__/SurveyButton.test.tsx.snap
@@ -16,7 +16,7 @@ exports[`rendering of the SurveyButton checks if component renders 1`] = `
         data-testid="button"
         type="button"
       >
-        Help us improve the site & data
+        Help improve the tool
         <img
           alt="launch icon"
           src="test-file-stub"
diff --git a/client/src/components/TractDemographics/TractDemographics.tsx b/client/src/components/TractDemographics/TractDemographics.tsx
index 07ec72ff7..48167f55a 100644
--- a/client/src/components/TractDemographics/TractDemographics.tsx
+++ b/client/src/components/TractDemographics/TractDemographics.tsx
@@ -39,7 +39,7 @@ const J40AccordionItem = ({id, title, children}:IJ40AccordionItem) => {
       <h6 className={styles.demographicHeading}>
         {title}
         <span>
-          {'( '}
+          {'('}
           <a
             className={styles.showHideText ? `usa-link ${styles.showHideText}` : `usa-link`}
             id={`${id}-header`}
@@ -169,7 +169,7 @@ const getDemographicsData = (properties:constants.J40Properties):IDemographicsDa
         displayStat(properties[constants.DEMO_AGE_MID]),
       ],
       [
-        EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.DEMO_AGE_OVER_64,
+        EXPLORE_COPY.SIDE_PANEL_DEMOGRAPHICS.DEMO_AGE_OVER_65,
         displayStat(properties[constants.DEMO_AGE_OVER_64]),
       ],
     ],
diff --git a/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
index c303a465c..aa8c50a4a 100644
--- a/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
+++ b/client/src/components/TractDemographics/__snapshots__/TractDemographics.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`rendering of TractDemographics component does it render a tract in Alas
     <h6>
       Race / Ethnicity
       <span>
-        ( 
+        (
         <a
           aria-controls="race-panel"
           aria-expanded="false"
@@ -99,7 +99,7 @@ exports[`rendering of TractDemographics component does it render a tract in Alas
     <h6>
       Age
       <span>
-        ( 
+        (
         <a
           aria-controls="age-panel"
           aria-expanded="false"
@@ -139,7 +139,7 @@ exports[`rendering of TractDemographics component does it render a tract in Alas
       </div>
       <div>
         <span>
-          Elderly over 64
+          Elderly over 65
         </span>
         <span>
           12%
@@ -159,7 +159,7 @@ exports[`rendering of TractDemographics component does it render a tract in Amer
     <h6>
       Race / Ethnicity
       <span>
-        ( 
+        (
         <a
           aria-controls="race-panel"
           aria-expanded="false"
@@ -249,7 +249,7 @@ exports[`rendering of TractDemographics component does it render a tract in Amer
     <h6>
       Age
       <span>
-        ( 
+        (
         <a
           aria-controls="age-panel"
           aria-expanded="false"
@@ -289,7 +289,7 @@ exports[`rendering of TractDemographics component does it render a tract in Amer
       </div>
       <div>
         <span>
-          Elderly over 64
+          Elderly over 65
         </span>
         <span>
           --
@@ -309,7 +309,7 @@ exports[`rendering of TractDemographics component does it render a tract in NYC
     <h6>
       Race / Ethnicity
       <span>
-        ( 
+        (
         <a
           aria-controls="race-panel"
           aria-expanded="false"
@@ -399,7 +399,7 @@ exports[`rendering of TractDemographics component does it render a tract in NYC
     <h6>
       Age
       <span>
-        ( 
+        (
         <a
           aria-controls="age-panel"
           aria-expanded="false"
@@ -439,7 +439,7 @@ exports[`rendering of TractDemographics component does it render a tract in NYC
       </div>
       <div>
         <span>
-          Elderly over 64
+          Elderly over 65
         </span>
         <span>
           6%
diff --git a/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap b/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap
index d6e28b4d4..6828b1940 100644
--- a/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap
+++ b/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap
@@ -59,7 +59,7 @@ exports[`simulate app starting up, no click on map should match the snapshot of
           tabindex="0"
         />
         
-      to see information about any census tract
+      to see information about any census tract.
     
       </p>
       <p
@@ -83,14 +83,24 @@ exports[`simulate app starting up, no click on map should match the snapshot of
           tabindex="0"
         />
         
-    . Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation.
+    . Census tracts are a small unit of geography. They generally have populations 
+    
+        <img
+          alt="
+      a people icon informing the user of communities
+    "
+          src="test-file-stub"
+          tabindex="0"
+        />
+        
+      of between 1,200 - 8,000 people.
     
       </p>
       <p
         tabindex="0"
       >
         
-      Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color
+      Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted 
     
         <img
           alt="
@@ -100,14 +110,14 @@ exports[`simulate app starting up, no click on map should match the snapshot of
           tabindex="0"
         />
         
-      on the map. This color is an opacity. This is so information about the map can be seen.
+    on the map.
     
       </p>
       <p
         tabindex="0"
       >
         
-      The tool uses percentiles
+      The tool ranks most of the burdens using percentiles
     
         <img
           alt="
@@ -117,7 +127,24 @@ exports[`simulate app starting up, no click on map should match the snapshot of
           tabindex="0"
         />
         
-      , percentages 
+    . Percentiles show how much burden each tract experiences when compared to other tracts.
+    
+      </p>
+      <p
+        tabindex="0"
+      >
+        
+      Thresholds
+    
+        <img
+          alt="
+      An icon shows a up arrow with a lower limit implying that it's above a threshold
+    "
+          src="test-file-stub"
+          tabindex="0"
+        />
+        
+    , or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages 
     
         <img
           alt="
@@ -127,19 +154,35 @@ exports[`simulate app starting up, no click on map should match the snapshot of
           tabindex="0"
         />
         
-      , or a simple yes/no to indicate how much burden the communities are experiencing in each tract. 
+      or a simple yes/no
+    
+        <img
+          alt="
+      An icon that depicts a check mark conveying yes and/or no
+    "
+          src="test-file-stub"
+          tabindex="0"
+        />
+        
+      .
     
       </p>
       <p
         tabindex="0"
       >
         
-    The tool also uses thresholds. If the tract meets or exceeds the threshold of any climate, environmental, or other burden 
-        <strong>
-          AND
-        </strong>
-         it meets the threshold for the associated socioeconomic burden, then communites in the tract are considered disadvantaged.
-  
+      Federally Recognized Tribal lands are also highlighted
+    
+        <img
+          alt="
+      a blue circle icon informing the user of what a disadvantaged community is depicted as
+    "
+          src="test-file-stub"
+          tabindex="0"
+        />
+        
+      highlighted on the map. These communities are also considered disadvantaged.
+    
       </p>
     </aside>
   </div>
diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx
index 201eeea0f..6eba4a599 100644
--- a/client/src/data/copy/common.tsx
+++ b/client/src/data/copy/common.tsx
@@ -161,26 +161,21 @@ export const FOOTER = defineMessages({
     defaultMessage: 'Council on Environmental Quality',
     description: 'Navigate to the about page. This is Footer under logo',
   },
+  SIGN_UP: {
+    id: 'common.pages.footer.sign.up',
+    defaultMessage: 'Sign up for updates',
+    description: 'Navigate to the about page. This is Footer under Sign-up for updates',
+  },
+  SIGN_UP_LINK: {
+    id: 'common.pages.footer.sign.up.link',
+    defaultMessage: 'https://www.surveymonkey.com/r/whceqej',
+    description: 'Navigate to the about page. This is Footer link under Sign-up for updates',
+  },
   MORE_INFO: {
     id: 'common.pages.footer.moreinfoheader',
     defaultMessage: 'More information',
     description: 'Navigate to the about page. This is Footer column header',
   },
-  ENG_CAL: {
-    id: 'common.pages.footer.eng.cal.text',
-    defaultMessage: 'Engagement calendar',
-    description: 'Navigate to the about page. This is Footer eng.cal.gov link text',
-  },
-  RFI: {
-    id: 'common.pages.footer.rfi.text',
-    defaultMessage: 'Request for Information',
-    description: 'Navigate to the about page. This is Footer rfi link text',
-  },
-  RFI_LINK: {
-    id: 'common.pages.footer.rfi.link',
-    defaultMessage: 'https://www.federalregister.gov/d/2022-03920',
-    description: 'Navigate to the about page. This is Footer rfi link',
-  },
   WHITEHOUSE: {
     id: 'common.pages.footer.whitehouse.text',
     defaultMessage: 'Whitehouse.gov',
@@ -248,6 +243,14 @@ export const FOOTER_CEQ_ADDRESS = {
   STREET: '730 Jackson Pl NW',
   CITY_STATE: 'Washington, D.C. 20506',
   PHONE: '(202) 395-5750',
+  // SIGN_UP: <FormattedMessage
+  //   id={'common.pages.footer.sign.up.updates'}
+  //   defaultMessage={`<link1>Sign-up</link1> for updates`}
+  //   description={`Alert title that appears at the top of pages.`}
+  //   values={{
+  //     link1: linkFn('https://www.surveymonkey.com/r/whceqej', false, true),
+  //   }}
+  // />,
 }
 ;
 
diff --git a/client/src/data/copy/contact.tsx b/client/src/data/copy/contact.tsx
index 74101988c..ca82382fd 100644
--- a/client/src/data/copy/contact.tsx
+++ b/client/src/data/copy/contact.tsx
@@ -28,7 +28,7 @@ export const PAGE_INTRO = defineMessages({
   },
   SURVEY_TEXT: {
     id: 'contact.page.fab.survey.text',
-    defaultMessage: `Help us improve the site & data`,
+    defaultMessage: `Help improve the tool`,
     description: 'Navigate to the contact page, this is the text for floating action button',
   },
   SURVEY_URL: {
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 1652852cd..7c7d56193 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -33,7 +33,7 @@ export const PAGE_INTRO = defineMessages({
 export const PAGE_DESCRIPTION1 = <FormattedMessage
   id={'explore.map.page.description.1'}
   defaultMessage={`
-    Overburdened and underserved census tracts are highlighted as being disadvantaged on the map. The map also highlights areas within Federally-recognized Tribal reservations. These areas are also considered disadvantaged.
+    Census tracts that are overburdened and underserved census tracts are highlighted as being disadvantaged on the map. These include Federally-Recognized Tribal lands, including Alaska Native Villages. 
   `}
   description={'On the explore the map page, the first description of the page'}
   // values={{
@@ -44,7 +44,7 @@ export const PAGE_DESCRIPTION1 = <FormattedMessage
 export const PAGE_DESCRIPTION2 = <FormattedMessage
   id={'explore.map.page.description.2'}
   defaultMessage={`
-    Zooming and selecting shows information about each census tract or tribal area. Change the selection to see information about tribal land areas.
+    Zooming-in and selecting shows information about each census tract. 
   `}
   description={'On the explore the map page, the fifth description of the page'}
   // values={{
@@ -81,7 +81,7 @@ export const EXPLORE_DATA_BOX = defineMessages({
 export const EXPLORE_DATA_BOX_BODY = <FormattedMessage
   id={'explore.map.page.explore.data.box.body'}
   defaultMessage={ `
-    Download the data with documentation and shapefiles, from the <link1>downloads</link1> page
+    Download the data with documentation and shapefiles, from the <link1>downloads</link1> page.
   `}
   description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the fifth paragraph of this side pane`}
   values={{
@@ -276,7 +276,7 @@ export const SIDE_PANEL_INITIAL_STATE = defineMessages({
   PARA1_PART5: {
     id: 'explore.map.page.side.panel.info.para.1.part.5',
     defaultMessage: `
-      to see information about any census tract
+      to see information about any census tract.
     `,
     description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show to see information about any census tract',
   },
@@ -297,58 +297,89 @@ export const SIDE_PANEL_INITIAL_STATE = defineMessages({
   PARA2_PART2: {
     id: 'explore.map.page.side.panel.info.para.2.part.2',
     defaultMessage: `
-    . Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation.
+    . Census tracts are a small unit of geography. They generally have populations 
     `,
-    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation.',
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Census tracts are a small unit of geography. They generally have populations of between 1,200 - 8,000 people.',
+  },
+  PARA2_PART3: {
+    id: 'explore.map.page.side.panel.info.para.2.part.2',
+    defaultMessage: `
+      of between 1,200 - 8,000 people.
+    `,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Census tracts are a small unit of geography. They generally have populations of between 1,200 - 8,000 people.',
   },
   PARA3_PART1: {
     id: 'explore.map.page.side.panel.info.para.3.part.1',
     defaultMessage: `
-      Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color
+      Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted 
     `,
-    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color',
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted on the map.',
   },
   PARA3_PART2: {
     id: 'explore.map.page.side.panel.info.para.3.part.2',
     defaultMessage: `
-      on the map. This color is an opacity. This is so information about the map can be seen.
+    on the map.
     `,
     description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show on the map. This color is an opacity. This is so information about the map can be seen.',
   },
   PARA4_PART1: {
     id: 'explore.map.page.side.panel.info.para.4.part.1',
     defaultMessage: `
-      The tool uses percentiles
+      The tool ranks most of the burdens using percentiles
     `,
-    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show The tool uses percentiles',
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show The tool ranks most of the burdens using percentiles',
   },
   PARA4_PART2: {
     id: 'explore.map.page.side.panel.info.para.4.part.2',
     defaultMessage: `
-      , percentages 
+    . Percentiles show how much burden each tract experiences when compared to other tracts.
     `,
     description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show percentages',
   },
-  PARA4_PART3: {
-    id: 'explore.map.page.side.panel.info.para.4.part.3',
+  PARA5_PART1: {
+    id: 'explore.map.page.side.panel.info.para.1',
+    defaultMessage: `
+      Thresholds
+    `,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Thresholds, or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages or a simple yes/no.',
+  },
+  PARA5_PART2: {
+    id: 'explore.map.page.side.panel.info.para.2',
+    defaultMessage: `
+    , or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages 
+    `,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Thresholds, or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages or a simple yes/no.',
+  },
+  PARA5_PART3: {
+    id: 'explore.map.page.side.panel.info.para.3',
     defaultMessage: `
-      , or a simple yes/no to indicate how much burden the communities are experiencing in each tract. 
+      or a simple yes/no
     `,
-    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show or a simple yes/no to indicate how much burden the communities are experiencing in each tract.',
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Thresholds, or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages or a simple yes/no.',
+  },
+  PARA5_PART4: {
+    id: 'explore.map.page.side.panel.info.para.4',
+    defaultMessage: `
+      .
+    `,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Thresholds, or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages or a simple yes/no.',
+  },
+  PARA6_PART1: {
+    id: 'explore.map.page.side.panel.info.para.6',
+    defaultMessage: `
+      Federally Recognized Tribal lands are also highlighted
+    `,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Federally Recognized Tribal lands are also highlighted on the map. These communities are also considered disadvantaged.',
+  },
+  PARA6_PART2: {
+    id: 'explore.map.page.side.panel.info.para.6',
+    defaultMessage: `
+      highlighted on the map. These communities are also considered disadvantaged.
+    `,
+    description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Federally Recognized Tribal lands are also highlighted on the map. These communities are also considered disadvantaged.',
   },
 });
 
-export const SIDE_PANEL_INITIAL_STATE_PARA5 = <FormattedMessage
-  id={'explore.map.page.side.panel.info.para5'}
-  defaultMessage={ `
-    The tool also uses thresholds. If the tract meets or exceeds the threshold of any climate, environmental, or other burden <bold>AND</bold> it meets the threshold for the associated socioeconomic burden, then communites in the tract are considered disadvantaged.
-  `}
-  description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the fifth paragraph of this side pane`}
-  values={{
-    bold: COMMON_COPY.boldFn,
-  }}
-/>;
-
 export const SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT = defineMessages({
   PLUS: {
     id: 'explore.map.page.side.panel.info.alt.text.icon.plus',
@@ -385,6 +416,13 @@ export const SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT = defineMessages({
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a tract icon informing the user of census tracts`,
   },
+  PEOPLE: {
+    id: 'explore.map.page.side.panel.info.alt.text.icon.people',
+    defaultMessage: `
+      a people icon informing the user of communities
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a tract icon informing the user of people`,
+  },
   DAC_CIRCLE: {
     id: 'explore.map.page.side.panel.info.alt.text.icon.dac.circle',
     defaultMessage: `
@@ -399,6 +437,13 @@ export const SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT = defineMessages({
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that a bell curve or gaussian distribution`,
   },
+  FILE_UP: {
+    id: 'explore.map.page.side.panel.info.alt.text.icon.file.up',
+    defaultMessage: `
+      An icon shows a up arrow with a lower limit implying that it's above a threshold
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that a bell curve or gaussian distribution`,
+  },
   PIE_CHART: {
     id: 'explore.map.page.side.panel.info.alt.text.icon.pie',
     defaultMessage: `
@@ -406,6 +451,13 @@ export const SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT = defineMessages({
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that depicts a part of pie chart being removed`,
   },
+  CHECK: {
+    id: 'explore.map.page.side.panel.info.alt.text.icon.check',
+    defaultMessage: `
+      An icon that depicts a check mark conveying yes and/or no
+    `,
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that depicts a check mark conveying yes and/or no`,
+  },
   UP_ARROW: {
     id: 'explore.map.page.side.panel.info.alt.text.icon.up.arrow',
     defaultMessage: `
@@ -531,10 +583,10 @@ export const SIDE_PANEL_DEMOGRAPHICS = {
     defaultMessage={'Ages 10 - 64'}
     description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Ages 10 - 64`}
   />,
-  DEMO_AGE_OVER_64: <FormattedMessage
-    id={'explore.map.page.side.panel.demo.age.over.64'}
-    defaultMessage={'Elderly over 64'}
-    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Elderly over 64`}
+  DEMO_AGE_OVER_65: <FormattedMessage
+    id={'explore.map.page.side.panel.demo.age.over.65'}
+    defaultMessage={'Elderly over 65'}
+    description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Elderly over 65`}
   />,
 };
 
@@ -773,8 +825,8 @@ export const SIDE_PANEL_CATEGORY = defineMessages({
   },
   CLEAN_WATER: {
     id: 'explore.map.page.side.panel.indicator.title.clean.water',
-    defaultMessage: 'Water',
-    description: `Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show Water title
+    defaultMessage: 'Water and wastewater',
+    description: `Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show Water and wastewater title
 `,
   },
   WORK_DEV: {
@@ -1068,7 +1120,7 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   WILDFIRE: {
     id: 'explore.map.page.side.panel.indicator.description.wildfire',
     defaultMessage: `
-      Projected risk to properties from wildfire from fire fuels, weather, humans, and fire movement
+      Projected risk to properties from wildfire from fire fuels, weather, humans, and fire movement in 30 years
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of wildfire risk`,
   },
@@ -1150,9 +1202,9 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   LEAD_PAINT: {
     id: 'explore.map.page.side.panel.indicator.description.leadPaint',
     defaultMessage: `
-      Share of homes that are not very expensive and are likely to have lead paint
+      Share of homes that are likely to have lead paint
     `,
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes that are not very expensive and are likely to have lead paint   
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes that are likely to have lead paint   
     `,
   },
 
@@ -1344,35 +1396,33 @@ export const NOTE_ON_TERRITORIES = {
     defaultMessage={`U.S. territories note`}
     description={`Navigate to the explore the map page. Under the map, you will see territories intro text`}
   />,
+  PARA_0: <FormattedMessage
+    id={'explore.map.page.under.map.note.on.territories.para.0'}
+    defaultMessage={`
+      Not all the data used in CEJST are available or used for all U.S. territories.
+    `}
+    description={`Navigate to the explore the map page. Under the map, you will see territories paragraph 0`}
+  />,
   PARA_1: <FormattedMessage
     id={'explore.map.page.under.map.note.on.territories.para.1'}
     defaultMessage={`
-      Puerto Rico: The <link1>U.S. Census Bureau's American Community Survey data</link1> from 2015 - 2019
-      are used for all fields in the workforce development category except for linguistic isolation. Linguistic isolation was removed based on feedback during the beta period. Proximity to National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, traffic proximity and volume, diesel particulate matter exposure, energy cost and housing cost were added for Puerto Rico in the 1.0 version.
+      <bold>Puerto Rico:</bold> The data used for Puerto Rico are from all relevant and available fields 
+      in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.
     `}
     description={`Navigate to the explore the map page. Under the map, you will see territories paragraph 1`}
     values={{
-      link1: COMMON_COPY.linkFn(EXPLORE_PAGE_LINKS.CENSUS_15_19, false, true),
+      bold: COMMON_COPY.boldFn,
     }}
   />,
+
   PARA_2: <FormattedMessage
     id={'explore.map.page.under.map.note.on.territories.para.2'}
     defaultMessage={`
-    American Samoa and the Northern Mariana Islands: The <link1>Decennial Census data</link1> from 2010 are used. The CEJST uses the following data for these territories: unemployment, poverty, low median income, and high school education. These burdens are in the workforce Development category.
+    <bold>American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands:</bold> For these U.S. territories, the tool uses the following data: unemployment, poverty, low median income, and high school education. These burdens are in the workforce development category.
   `}
     description={`Navigate to the explore the map page. Under the map, you will see territories paragraph 2`}
     values={{
-      link1: COMMON_COPY.linkFn(EXPLORE_PAGE_LINKS.DECENNIAL, false, true),
-    }}
-  />,
-  PARA_3: <FormattedMessage
-    id={'explore.map.page.under.map.note.on.territories.para.3'}
-    defaultMessage={`
-    Guam and the U.S. Virgin Islands: Some <link1>Decennial Census data</link1> from 2010 are used. They show burdens in the workforce development category. The data includes: Unemployment, poverty, low median income, and high school education.
-    `}
-    description={`Navigate to the explore the map page. Under the map, you will see territories paragraph 3`}
-    values={{
-      link1: COMMON_COPY.linkFn(EXPLORE_PAGE_LINKS.DECENNIAL, false, true),
+      bold: COMMON_COPY.boldFn,
     }}
   />,
 };
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index ab2379f2c..78f28ab5d 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -571,10 +571,14 @@ export interface IIndicators {
   note?: JSX.Element,
   usedIn: JSX.Element,
   responsibleParty: string,
-  sources: [{
+  sources: {
     source: JSX.Element,
-    availableFor: JSX.Element,
-  }]
+    availableFor: { // Todo remove this and replace with MessageDescriptor when ticket #2000 is fixed
+      id: string,
+      description: string,
+      defaultMessage: string,
+    },
+  }[]
 };
 
 export const INDICATORS = [
diff --git a/client/src/images/sidePanelIcons/bellCurve.svg b/client/src/images/sidePanelIcons/bell-curve.svg
similarity index 100%
rename from client/src/images/sidePanelIcons/bellCurve.svg
rename to client/src/images/sidePanelIcons/bell-curve.svg
diff --git a/client/src/images/sidePanelIcons/census-tract.svg b/client/src/images/sidePanelIcons/census-tract.svg
new file mode 100644
index 000000000..35df3fd1a
--- /dev/null
+++ b/client/src/images/sidePanelIcons/census-tract.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
+    <title>Oval</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.3">
+        <g id="Group-7" transform="translate(-147.000000, -702.000000)" fill="#18437F" stroke="#18437F" stroke-width="2">
+            <g id="Group-Copy-9">
+                <circle id="Oval" cx="155" cy="710" r="7"></circle>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/sidePanelIcons/pieChart.svg b/client/src/images/sidePanelIcons/pie-chart.svg
similarity index 100%
rename from client/src/images/sidePanelIcons/pieChart.svg
rename to client/src/images/sidePanelIcons/pie-chart.svg
diff --git a/client/src/images/sidePanelIcons/select-arrow.svg b/client/src/images/sidePanelIcons/select-arrow.svg
new file mode 100644
index 000000000..974df061c
--- /dev/null
+++ b/client/src/images/sidePanelIcons/select-arrow.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="18px" viewBox="0 0 14 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
+    <title>Group 10</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <polygon id="path-1" points="0.0133467716 0.01940625 1.67268861 0.01940625 1.67268861 3.35104901 0.0133467716 3.35104901"></polygon>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group-7" transform="translate(-193.000000, -75.000000)">
+            <g id="Group-10" transform="translate(193.000000, 75.000000)">
+                <path d="M10.4877241,18 C10.551549,18 10.6153738,17.9841589 10.6791987,17.9683177 C10.9185602,17.8733794 11.0461735,17.5885643 10.9344982,17.3512365 L9.45055157,13.8227126 L12.7056204,13.8227126 C13.0247448,13.8227126 13.3278947,13.6328359 13.4396065,13.3322159 C13.5672562,13.0315597 13.4874934,12.6992936 13.2481318,12.4619658 L6.40282245,5.84774663 C6.17943537,5.62622382 5.82839854,5.56293158 5.54118659,5.68951605 C5.23803665,5.81610052 5.0625,6.10091556 5.0625,6.41737673 L5.0625,15.9430386 C5.0625,16.2753047 5.25397464,16.5601198 5.57309903,16.6867043 C5.66883634,16.7183504 5.76457366,16.7499965 5.86031098,16.7499965 C6.08369805,16.7499965 6.29111067,16.6550581 6.43473489,16.4968276 L8.5888063,14.2183072 L10.0567785,17.7310261 C10.1365778,17.8892567 10.312078,18 10.4875782,18 L10.4877241,18 Z" id="Fill-1" fill="#000000"></path>
+                <g id="Group-5" transform="translate(3.375000, 0.000000)">
+                    <mask id="mask-2" fill="white">
+                        <use xlink:href="#path-1"></use>
+                    </mask>
+                    <g id="Clip-4"></g>
+                    <path d="M0.856931604,3.04902486 C0.926596698,3.25037429 1.07980896,3.35104901 1.24696698,3.35104901 C1.30268632,3.35104901 1.35840566,3.33425071 1.414125,3.31749077 C1.6230566,3.21681605 1.73449528,2.9147919 1.63700236,2.66312429 L0.815158019,0.330845881 C0.731579009,0.0791399148 0.480841981,-0.0550546875 0.271910377,0.0623799716 C0.0629787736,0.163054687 -0.0484599057,0.465078835 0.0490330189,0.716746449 L0.856931604,3.04902486 Z" id="Fill-3" fill="#000000" mask="url(#mask-2)"></path>
+                </g>
+                <path d="M0.354115669,4.32589173 L2.72266691,5.04650508 C2.77233827,5.0625 2.82204748,5.0625 2.87171883,5.0625 C3.08706232,5.0625 3.28586132,4.93439421 3.35211503,4.72624061 C3.43491324,4.47002904 3.28586132,4.19778594 3.02084647,4.11773813 L0.652295228,3.39712478 C0.387280384,3.31707696 0.105683182,3.46117767 0.0228849725,3.71738924 C-0.0599132368,3.97360082 0.0891386836,4.24584391 0.354153528,4.32589173 L0.354115669,4.32589173 Z" id="Fill-6" fill="#000000"></path>
+                <path d="M7.02249055,3.33119782 C7.09154126,3.3604104 7.17787437,3.375 7.26416803,3.375 C7.45407722,3.375 7.626704,3.28739565 7.7302406,3.14133276 L8.93862805,1.19867958 C9.07672947,0.97956855 8.9731534,0.716621956 8.71423297,0.61442801 C8.45527307,0.497577695 8.14454487,0.585215431 8.02372586,0.804293078 L6.81533841,2.74694625 C6.67723699,2.9660239 6.76353065,3.22897049 7.02249055,3.33119782 Z" id="Fill-8" fill="#000000"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/sidePanelIcons/tribal-tract.svg b/client/src/images/sidePanelIcons/tribal-tract.svg
new file mode 100644
index 000000000..bc1a856b8
--- /dev/null
+++ b/client/src/images/sidePanelIcons/tribal-tract.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
+    <title>Oval</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.6">
+        <g id="Group-7" transform="translate(-147.000000, -655.000000)" fill="#18437F" stroke="#18437F" stroke-width="2">
+            <g id="Group-Copy-9">
+                <circle id="Oval" cx="155" cy="663" r="7"></circle>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/sidePanelIcons/upDown.svg b/client/src/images/sidePanelIcons/up-down.svg
similarity index 100%
rename from client/src/images/sidePanelIcons/upDown.svg
rename to client/src/images/sidePanelIcons/up-down.svg
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index e22912b85..6eb36b256 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -139,10 +139,6 @@
     "defaultMessage": "Want to contribute?",
     "description": "Navigate to the about page. This is third Footer column header"
   },
-  "common.pages.footer.eng.cal.text": {
-    "defaultMessage": "Engagement calendar",
-    "description": "Navigate to the about page. This is Footer eng.cal.gov link text"
-  },
   "common.pages.footer.findcontact": {
     "defaultMessage": "Find a contact at USA.gov",
     "description": "Navigate to the about page. This is Footer find contact link text"
@@ -179,13 +175,13 @@
     "defaultMessage": "Privacy Policy",
     "description": "Navigate to the about page. This is Footer privacy policy link text"
   },
-  "common.pages.footer.rfi.link": {
-    "defaultMessage": "https://www.federalregister.gov/d/2022-03920",
-    "description": "Navigate to the about page. This is Footer rfi link"
+  "common.pages.footer.sign.up": {
+    "defaultMessage": "Sign up for updates",
+    "description": "Navigate to the about page. This is Footer under Sign-up for updates"
   },
-  "common.pages.footer.rfi.text": {
-    "defaultMessage": "Request for Information",
-    "description": "Navigate to the about page. This is Footer rfi link text"
+  "common.pages.footer.sign.up.link": {
+    "defaultMessage": "https://www.surveymonkey.com/r/whceqej",
+    "description": "Navigate to the about page. This is Footer link under Sign-up for updates"
   },
   "common.pages.footer.whitehouse.link": {
     "defaultMessage": "https://www.whitehouse.gov/",
@@ -260,7 +256,7 @@
     "description": "The footer sticky link that links to the CEJST survey"
   },
   "contact.page.fab.survey.text": {
-    "defaultMessage": "Help us improve the site & data",
+    "defaultMessage": "Help improve the tool",
     "description": "Navigate to the contact page, this is the text for floating action button"
   },
   "contact.page.general": {
@@ -328,15 +324,15 @@
     "description": "Navigate to the Downloads page, this will be the page title text"
   },
   "explore.map.page.description.1": {
-    "defaultMessage": "Overburdened and underserved census tracts are highlighted as being disadvantaged on the map. The map also highlights areas within Federally-recognized Tribal reservations. These areas are also considered disadvantaged.",
+    "defaultMessage": "Census tracts that are overburdened and underserved census tracts are highlighted as being disadvantaged on the map. These include Federally-Recognized Tribal lands, including Alaska Native Villages.",
     "description": "On the explore the map page, the first description of the page"
   },
   "explore.map.page.description.2": {
-    "defaultMessage": "Zooming and selecting shows information about each census tract or tribal area. Change the selection to see information about tribal land areas.",
+    "defaultMessage": "Zooming-in and selecting shows information about each census tract.",
     "description": "On the explore the map page, the fifth description of the page"
   },
   "explore.map.page.explore.data.box.body": {
-    "defaultMessage": "Download the data with documentation and shapefiles, from the <link1>downloads</link1> page",
+    "defaultMessage": "Download the data with documentation and shapefiles, from the <link1>downloads</link1> page.",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the fifth paragraph of this side pane"
   },
   "explore.map.page.explore.data.box.title": {
@@ -479,9 +475,9 @@
     "defaultMessage": "YES",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the communities the score currently is focused on"
   },
-  "explore.map.page.side.panel.demo.age.over.64": {
-    "defaultMessage": "Elderly over 64",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Elderly over 64"
+  "explore.map.page.side.panel.demo.age.over.65": {
+    "defaultMessage": "Elderly over 65",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the demographics: Elderly over 65"
   },
   "explore.map.page.side.panel.demo.age.title": {
     "defaultMessage": "Age",
@@ -664,8 +660,8 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes without indoor kitchens or plumbing"
   },
   "explore.map.page.side.panel.indicator.description.leadPaint": {
-    "defaultMessage": "Share of homes that are not very expensive and are likely to have lead paint",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes that are not very expensive and are likely to have lead paint   \n    "
+    "defaultMessage": "Share of homes that are likely to have lead paint",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes that are likely to have lead paint   \n    "
   },
   "explore.map.page.side.panel.indicator.description.leaky.tanks": {
     "defaultMessage": "Formula that counts leaking underground storage tanks and number of all underground storage tanks within 1500 feet",
@@ -720,7 +716,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Modeled toxic concentrations at parts of streams within 500 meters"
   },
   "explore.map.page.side.panel.indicator.description.wildfire": {
-    "defaultMessage": "Projected risk to properties from wildfire from fire fuels, weather, humans, and fire movement",
+    "defaultMessage": "Projected risk to properties from wildfire from fire fuels, weather, humans, and fire movement in 30 years",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of wildfire risk"
   },
   "explore.map.page.side.panel.indicator.diabetes": {
@@ -856,8 +852,8 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Transportation title\n"
   },
   "explore.map.page.side.panel.indicator.title.clean.water": {
-    "defaultMessage": "Water",
-    "description": "Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show Water title\n"
+    "defaultMessage": "Water and wastewater",
+    "description": "Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show Water and wastewater title\n"
   },
   "explore.map.page.side.panel.indicator.title.climate": {
     "defaultMessage": "Climate change",
@@ -935,10 +931,18 @@
     "defaultMessage": "An icon that a bell curve or gaussian distribution",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that a bell curve or gaussian distribution"
   },
+  "explore.map.page.side.panel.info.alt.text.icon.check": {
+    "defaultMessage": "An icon that depicts a check mark conveying yes and/or no",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that depicts a check mark conveying yes and/or no"
+  },
   "explore.map.page.side.panel.info.alt.text.icon.dac.circle": {
     "defaultMessage": "a blue circle icon informing the user of what a disadvantaged community is depicted as",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a blue circle icon informing the user of what a disadvantaged community is depicted as"
   },
+  "explore.map.page.side.panel.info.alt.text.icon.file.up": {
+    "defaultMessage": "An icon shows a up arrow with a lower limit implying that it's above a threshold",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that a bell curve or gaussian distribution"
+  },
   "explore.map.page.side.panel.info.alt.text.icon.locate": {
     "defaultMessage": "a gps icon informing the user can locate",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a gps icon informing the user can locate"
@@ -947,6 +951,10 @@
     "defaultMessage": "a mouse arrow icon informing the user can use the mouse",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a mouse arrow icon informing the user can use the mouse"
   },
+  "explore.map.page.side.panel.info.alt.text.icon.people": {
+    "defaultMessage": "a people icon informing the user of communities",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a tract icon informing the user of people"
+  },
   "explore.map.page.side.panel.info.alt.text.icon.pie": {
     "defaultMessage": "An icon that depicts a part of pie chart being removed",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that depicts a part of pie chart being removed"
@@ -975,6 +983,10 @@
     "defaultMessage": "Things to know:",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know:"
   },
+  "explore.map.page.side.panel.info.para.1": {
+    "defaultMessage": "Thresholds",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Thresholds, or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages or a simple yes/no."
+  },
   "explore.map.page.side.panel.info.para.1.part.1": {
     "defaultMessage": "Zoom in",
     "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Zoom in"
@@ -988,40 +1000,48 @@
     "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show and select"
   },
   "explore.map.page.side.panel.info.para.1.part.5": {
-    "defaultMessage": "to see information about any census tract",
+    "defaultMessage": "to see information about any census tract.",
     "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show to see information about any census tract"
   },
+  "explore.map.page.side.panel.info.para.2": {
+    "defaultMessage": ", or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Thresholds, or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages or a simple yes/no."
+  },
   "explore.map.page.side.panel.info.para.2.part.1": {
     "defaultMessage": "The tool uses census tracts",
     "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show The tool uses census tracts"
   },
   "explore.map.page.side.panel.info.para.2.part.2": {
-    "defaultMessage": ". Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation.",
-    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation."
+    "defaultMessage": "of between 1,200 - 8,000 people.",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Census tracts are a small unit of geography. They generally have populations of between 1,200 - 8,000 people."
+  },
+  "explore.map.page.side.panel.info.para.3": {
+    "defaultMessage": "or a simple yes/no",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Thresholds, or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages or a simple yes/no."
   },
   "explore.map.page.side.panel.info.para.3.part.1": {
-    "defaultMessage": "Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color",
-    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color"
+    "defaultMessage": "Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted on the map."
   },
   "explore.map.page.side.panel.info.para.3.part.2": {
-    "defaultMessage": "on the map. This color is an opacity. This is so information about the map can be seen.",
+    "defaultMessage": "on the map.",
     "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show on the map. This color is an opacity. This is so information about the map can be seen."
   },
+  "explore.map.page.side.panel.info.para.4": {
+    "defaultMessage": ".",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Thresholds, or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages or a simple yes/no."
+  },
   "explore.map.page.side.panel.info.para.4.part.1": {
-    "defaultMessage": "The tool uses percentiles",
-    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show The tool uses percentiles"
+    "defaultMessage": "The tool ranks most of the burdens using percentiles",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show The tool ranks most of the burdens using percentiles"
   },
   "explore.map.page.side.panel.info.para.4.part.2": {
-    "defaultMessage": ", percentages",
+    "defaultMessage": ". Percentiles show how much burden each tract experiences when compared to other tracts.",
     "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show percentages"
   },
-  "explore.map.page.side.panel.info.para.4.part.3": {
-    "defaultMessage": ", or a simple yes/no to indicate how much burden the communities are experiencing in each tract.",
-    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show or a simple yes/no to indicate how much burden the communities are experiencing in each tract."
-  },
-  "explore.map.page.side.panel.info.para5": {
-    "defaultMessage": "The tool also uses thresholds. If the tract meets or exceeds the threshold of any climate, environmental, or other burden <bold>AND</bold> it meets the threshold for the associated socioeconomic burden, then communites in the tract are considered disadvantaged.",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the fifth paragraph of this side pane"
+  "explore.map.page.side.panel.info.para.6": {
+    "defaultMessage": "highlighted on the map. These communities are also considered disadvantaged.",
+    "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Federally Recognized Tribal lands are also highlighted on the map. These communities are also considered disadvantaged."
   },
   "explore.map.page.side.panel.is.community.of.focus": {
     "defaultMessage": "Identified as disadvantaged?",
@@ -1099,18 +1119,18 @@
     "defaultMessage": "U.S. territories note",
     "description": "Navigate to the explore the map page. Under the map, you will see territories intro text"
   },
+  "explore.map.page.under.map.note.on.territories.para.0": {
+    "defaultMessage": "Not all the data used in CEJST are available or used for all U.S. territories.",
+    "description": "Navigate to the explore the map page. Under the map, you will see territories paragraph 0"
+  },
   "explore.map.page.under.map.note.on.territories.para.1": {
-    "defaultMessage": "Puerto Rico: The <link1>U.S. Census Bureau's American Community Survey data</link1> from 2015 - 2019 are used for all fields in the workforce development category except for linguistic isolation. Linguistic isolation was removed based on feedback during the beta period. Proximity to National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, traffic proximity and volume, diesel particulate matter exposure, energy cost and housing cost were added for Puerto Rico in the 1.0 version.",
+    "defaultMessage": "<bold>Puerto Rico:</bold> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.",
     "description": "Navigate to the explore the map page. Under the map, you will see territories paragraph 1"
   },
   "explore.map.page.under.map.note.on.territories.para.2": {
-    "defaultMessage": "American Samoa and the Northern Mariana Islands: The <link1>Decennial Census data</link1> from 2010 are used. The CEJST uses the following data for these territories: unemployment, poverty, low median income, and high school education. These burdens are in the workforce Development category.",
+    "defaultMessage": "<bold>American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands:</bold> For these U.S. territories, the tool uses the following data: unemployment, poverty, low median income, and high school education. These burdens are in the workforce development category.",
     "description": "Navigate to the explore the map page. Under the map, you will see territories paragraph 2"
   },
-  "explore.map.page.under.map.note.on.territories.para.3": {
-    "defaultMessage": "Guam and the U.S. Virgin Islands: Some <link1>Decennial Census data</link1> from 2010 are used. They show burdens in the workforce development category. The data includes: Unemployment, poverty, low median income, and high school education.",
-    "description": "Navigate to the explore the map page. Under the map, you will see territories paragraph 3"
-  },
   "explore.map.page.under.map.note.on.tribal.nations.intro": {
     "defaultMessage": "A note on Tribal Nations",
     "description": "Navigate to the explore the map page. Under the map, you will see tribal nations intro text"
diff --git a/client/src/pages/about.tsx b/client/src/pages/about.tsx
index 4ad00789e..377e0cbd9 100644
--- a/client/src/pages/about.tsx
+++ b/client/src/pages/about.tsx
@@ -8,6 +8,7 @@ import {Grid} from '@trussworks/react-uswds';
 import HowYouCanHelp from '../components/HowYouCanHelp';
 import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
+import PublicEngageButton from '../components/PublicEngageButton';
 import SubPageNav from '../components/SubPageNav';
 
 import * as ABOUT_COPY from '../data/copy/about';
@@ -43,6 +44,7 @@ const AboutPage = ({location}: IAboutPageProps) => {
 
         <section className={'page-heading'}>
           <h1 data-cy={'about-page-heading'}>{intl.formatMessage(ABOUT_COPY.PAGE.TITLE)}</h1>
+          <PublicEngageButton />
         </section>
 
         <Grid row gap className={'j40-mb5-mt3'}>
@@ -56,13 +58,13 @@ const AboutPage = ({location}: IAboutPageProps) => {
               <p>
                 {ABOUT_COPY.CONTENT.PARA2}
               </p>
-              <p>
+              <div className={'j40-p-tag'}>
                 {ABOUT_COPY.CONTENT.PARA3}
                 <ul>
                   <li> {ABOUT_COPY.CONTENT.LI1}</li>
                   <li> {ABOUT_COPY.CONTENT.LI2}</li>
                 </ul>
-              </p>
+              </div>
               <p>
                 {ABOUT_COPY.CONTENT.PARA4}
               </p>
diff --git a/client/src/pages/contact.tsx b/client/src/pages/contact.tsx
index bd420a1f9..a89c7f356 100644
--- a/client/src/pages/contact.tsx
+++ b/client/src/pages/contact.tsx
@@ -5,6 +5,7 @@ import {useIntl, FormattedMessage} from 'gatsby-plugin-intl';
 import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
 import LinkTypeWrapper from '../components/LinkTypeWrapper';
+import PublicEngageButton from '../components/PublicEngageButton';
 import RequestForInfo from '../components/RequestForInfo';
 
 import * as CONTACT_COPY from '../data/copy/contact';
@@ -23,6 +24,7 @@ const ContactPage = ({location}: IContactPageProps) => {
 
         <section className={'page-heading'}>
           <h1>{intl.formatMessage(CONTACT_COPY.PAGE_INTRO.PAGE_HEADING)}</h1>
+          <PublicEngageButton />
         </section>
 
         <Grid row gap={6}>
diff --git a/client/src/pages/index.tsx b/client/src/pages/index.tsx
index fb11b8ba4..1ec6e653a 100644
--- a/client/src/pages/index.tsx
+++ b/client/src/pages/index.tsx
@@ -6,6 +6,7 @@ import ExploreDataBox from '../components/ExploreDataBox';
 import J40Map from '../components/J40Map';
 import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
+import PublicEngageButton from '../components/PublicEngageButton';
 
 import * as EXPLORE_COPY from '../data/copy/explore';
 
@@ -25,6 +26,7 @@ const ExporeToolPage = ({location}: IMapPageProps) => {
 
       <section className={'page-heading'}>
         <h1>{intl.formatMessage(EXPLORE_COPY.PAGE_INTRO.PAGE_HEADING)}</h1>
+        <PublicEngageButton />
       </section>
 
       <Grid row gap className={'j40-mb5-mt3'}>
@@ -32,21 +34,15 @@ const ExporeToolPage = ({location}: IMapPageProps) => {
         {/* Gradually increase width of the Grid as the width decreases from desktop to mobile*/}
         {/* desktop = 7 columns, tablet = 10 columns and mobile = 12 columns (full width) */}
         <Grid desktop={{col: 8}} tablet={{col: 10}} col={12}>
-          <section>
-            <p>
-              {EXPLORE_COPY.PAGE_DESCRIPTION1}
-            </p>
-            <p>
-              {EXPLORE_COPY.PAGE_DESCRIPTION2}
-            </p>
-          </section>
+          <p>
+            {EXPLORE_COPY.PAGE_DESCRIPTION1}
+          </p>
+          <p>
+            {EXPLORE_COPY.PAGE_DESCRIPTION2}
+          </p>
         </Grid>
         <Grid desktop={{col: 4}} tablet={{col: 10}} col={12}>
-          <section>
-            <p>
-              <ExploreDataBox />
-            </p>
-          </section>
+          <ExploreDataBox />
         </Grid>
       </Grid>
     </J40MainGridContainer>
@@ -60,9 +56,9 @@ const ExporeToolPage = ({location}: IMapPageProps) => {
     <J40MainGridContainer>
       <Grid desktop={{col: 7}} tablet={{col: 10}} col={12}>
         <h2>{EXPLORE_COPY.NOTE_ON_TERRITORIES.INTRO}</h2>
+        <p>{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_0}</p>
         <p>{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_1}</p>
         <p>{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_2}</p>
-        <p>{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_3}</p>
       </Grid>
 
       <Grid desktop={{col: 7}} tablet={{col: 10}} col={12}>
diff --git a/client/src/pages/methodology.tsx b/client/src/pages/methodology.tsx
index 34dc7a05f..57b5d0e50 100644
--- a/client/src/pages/methodology.tsx
+++ b/client/src/pages/methodology.tsx
@@ -9,6 +9,7 @@ import J40MainGridContainer from '../components/J40MainGridContainer';
 import MethodologyFormula from '../components/MethodologyFormula';
 import Layout from '../components/layout';
 import SubPageNav from '../components/SubPageNav';
+import PublicEngageButton from '../components/PublicEngageButton';
 
 import * as CONSTANTS from '../data/constants';
 import * as METHODOLOGY_COPY from '../data/copy/methodology';
@@ -29,6 +30,7 @@ const IndexPage = ({location}: MethodPageProps) => {
 
         <section className={'page-heading'}>
           <h1>{intl.formatMessage(METHODOLOGY_COPY.PAGE.HEADING)}</h1>
+          <PublicEngageButton />
         </section>
 
         <Grid row gap className={'j40-mb5-mt3'}>
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index 1e0f7d8f9..c1eedd0ac 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -379,6 +379,27 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         >
           About
         </h1>
+        <div>
+          <a
+            href="/en/public-engagement"
+          >
+            <button
+              class="usa-button"
+              data-testid="button"
+              type="button"
+            >
+              <div>
+                <img
+                  alt="an icon that represents a calendar"
+                  src="test-file-stub"
+                />
+                <div>
+                  Public engagement
+                </div>
+              </div>
+            </button>
+          </a>
+        </div>
       </section>
       <div
         class="grid-row grid-gap j40-mb5-mt3"
@@ -419,24 +440,25 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               . The Justice40 Initiative seeks to deliver 40% of the overall benefits of investments in climate, clean energy, and related areas to disadvantaged communities.
     
             </p>
-            <p>
+            <div
+              class="j40-p-tag"
+            >
               
       Federal agencies should also use the following:
     
-            </p>
-            <ul>
-              <li>
-                 
+              <ul>
+                <li>
+                   
       Addendum to the Justice40 Initiative Interim Guidance on Using CEJST
     
-              </li>
-              <li>
-                 
+                </li>
+                <li>
+                   
       Instructions to Federal Agencies on Using the CEJST
     
-              </li>
-            </ul>
-            <p />
+                </li>
+              </ul>
+            </div>
             <p>
               
       CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version 1.0.
@@ -752,9 +774,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </a>
               .
             </li>
-            <li>
-              Have feedback about a specific census tract? You can either click here or click the “Send Feedback” button on the side-panel of a census tract on the map.
-            </li>
             <li>
               Any other questions? Email: 
               <a
@@ -827,6 +846,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     </div>
                   </address>
                 </li>
+                <li
+                  class="usa-footer__secondary-link"
+                >
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy="sign-up-for-updates"
+                    href="https://www.surveymonkey.com/r/whceqej"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Sign up for updates
+                  </a>
+                </li>
               </ul>
             </section>
           </div>
@@ -846,30 +878,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="usa-link footer-link-first-child"
-                    href="/en/public-engagement"
-                  >
-                    Engagement calendar
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy="request-for-information"
-                    href="https://www.federalregister.gov/d/2022-03920"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    Request for Information
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
+                    class="usa-link usa-link--external footer-link-first-child"
                     data-cy="whitehouse-gov"
                     href="https://www.whitehouse.gov/"
                     rel="noreferrer"
@@ -997,7 +1006,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help us improve the site & data
+          Help improve the tool
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index 91818bdd5..03133a992 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -377,6 +377,27 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <h1>
           Contact
         </h1>
+        <div>
+          <a
+            href="/en/public-engagement"
+          >
+            <button
+              class="usa-button"
+              data-testid="button"
+              type="button"
+            >
+              <div>
+                <img
+                  alt="an icon that represents a calendar"
+                  src="test-file-stub"
+                />
+                <div>
+                  Public engagement
+                </div>
+              </div>
+            </button>
+          </a>
+        </div>
       </section>
       <div
         class="grid-row grid-gap-6"
@@ -527,6 +548,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     </div>
                   </address>
                 </li>
+                <li
+                  class="usa-footer__secondary-link"
+                >
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy="sign-up-for-updates"
+                    href="https://www.surveymonkey.com/r/whceqej"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Sign up for updates
+                  </a>
+                </li>
               </ul>
             </section>
           </div>
@@ -546,30 +580,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="usa-link footer-link-first-child"
-                    href="/en/public-engagement"
-                  >
-                    Engagement calendar
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy="request-for-information"
-                    href="https://www.federalregister.gov/d/2022-03920"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    Request for Information
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
+                    class="usa-link usa-link--external footer-link-first-child"
                     data-cy="whitehouse-gov"
                     href="https://www.whitehouse.gov/"
                     rel="noreferrer"
@@ -697,7 +708,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help us improve the site & data
+          Help improve the tool
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index f4d85ae7a..fe375bb0e 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -527,6 +527,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     </div>
                   </address>
                 </li>
+                <li
+                  class="usa-footer__secondary-link"
+                >
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy="sign-up-for-updates"
+                    href="https://www.surveymonkey.com/r/whceqej"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Sign up for updates
+                  </a>
+                </li>
               </ul>
             </section>
           </div>
@@ -546,30 +559,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="usa-link footer-link-first-child"
-                    href="/en/public-engagement"
-                  >
-                    Engagement calendar
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy="request-for-information"
-                    href="https://www.federalregister.gov/d/2022-03920"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    Request for Information
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
+                    class="usa-link usa-link--external footer-link-first-child"
                     data-cy="whitehouse-gov"
                     href="https://www.whitehouse.gov/"
                     rel="noreferrer"
@@ -697,7 +687,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help us improve the site & data
+          Help improve the tool
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 6fda962fa..e80e2a245 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -440,6 +440,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     </div>
                   </address>
                 </li>
+                <li
+                  class="usa-footer__secondary-link"
+                >
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy="sign-up-for-updates"
+                    href="https://www.surveymonkey.com/r/whceqej"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Sign up for updates
+                  </a>
+                </li>
               </ul>
             </section>
           </div>
@@ -459,30 +472,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="usa-link footer-link-first-child"
-                    href="/en/public-engagement"
-                  >
-                    Engagement calendar
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy="request-for-information"
-                    href="https://www.federalregister.gov/d/2022-03920"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    Request for Information
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
+                    class="usa-link usa-link--external footer-link-first-child"
                     data-cy="whitehouse-gov"
                     href="https://www.whitehouse.gov/"
                     rel="noreferrer"
@@ -610,7 +600,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help us improve the site & data
+          Help improve the tool
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 0dd79b452..07dc5127a 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -377,6 +377,27 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <h1>
           Methodology
         </h1>
+        <div>
+          <a
+            href="/en/public-engagement"
+          >
+            <button
+              class="usa-button"
+              data-testid="button"
+              type="button"
+            >
+              <div>
+                <img
+                  alt="an icon that represents a calendar"
+                  src="test-file-stub"
+                />
+                <div>
+                  Public engagement
+                </div>
+              </div>
+            </button>
+          </a>
+        </div>
       </section>
       <div
         class="grid-row grid-gap j40-mb5-mt3"
@@ -2407,6 +2428,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     </div>
                   </address>
                 </li>
+                <li
+                  class="usa-footer__secondary-link"
+                >
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy="sign-up-for-updates"
+                    href="https://www.surveymonkey.com/r/whceqej"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Sign up for updates
+                  </a>
+                </li>
               </ul>
             </section>
           </div>
@@ -2426,30 +2460,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="usa-link footer-link-first-child"
-                    href="/en/public-engagement"
-                  >
-                    Engagement calendar
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy="request-for-information"
-                    href="https://www.federalregister.gov/d/2022-03920"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    Request for Information
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
+                    class="usa-link usa-link--external footer-link-first-child"
                     data-cy="whitehouse-gov"
                     href="https://www.whitehouse.gov/"
                     rel="noreferrer"
@@ -2577,7 +2588,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help us improve the site & data
+          Help improve the tool
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index 4f0323ba0..04a8ae99a 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -1038,6 +1038,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     </div>
                   </address>
                 </li>
+                <li
+                  class="usa-footer__secondary-link"
+                >
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy="sign-up-for-updates"
+                    href="https://www.surveymonkey.com/r/whceqej"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Sign up for updates
+                  </a>
+                </li>
               </ul>
             </section>
           </div>
@@ -1057,30 +1070,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="usa-link footer-link-first-child"
-                    href="/en/public-engagement"
-                  >
-                    Engagement calendar
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy="request-for-information"
-                    href="https://www.federalregister.gov/d/2022-03920"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    Request for Information
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
+                    class="usa-link usa-link--external footer-link-first-child"
                     data-cy="whitehouse-gov"
                     href="https://www.whitehouse.gov/"
                     rel="noreferrer"
@@ -1208,7 +1198,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help us improve the site & data
+          Help improve the tool
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index 5036db226..579a50860 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -440,6 +440,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     </div>
                   </address>
                 </li>
+                <li
+                  class="usa-footer__secondary-link"
+                >
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy="sign-up-for-updates"
+                    href="https://www.surveymonkey.com/r/whceqej"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Sign up for updates
+                  </a>
+                </li>
               </ul>
             </section>
           </div>
@@ -459,30 +472,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class="usa-footer__secondary-link"
                 >
                   <a
-                    class="usa-link footer-link-first-child"
-                    href="/en/public-engagement"
-                  >
-                    Engagement calendar
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy="request-for-information"
-                    href="https://www.federalregister.gov/d/2022-03920"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    Request for Information
-                  </a>
-                </li>
-                <li
-                  class="usa-footer__secondary-link"
-                >
-                  <a
-                    class="usa-link usa-link--external"
+                    class="usa-link usa-link--external footer-link-first-child"
                     data-cy="whitehouse-gov"
                     href="https://www.whitehouse.gov/"
                     rel="noreferrer"
@@ -610,7 +600,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="button"
           type="button"
         >
-          Help us improve the site & data
+          Help improve the tool
           <img
             alt="launch icon"
             src="test-file-stub"
diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss
index b0366d7fc..152844605 100644
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@@ -171,6 +171,12 @@ li.usa-nav__primary-item a:hover::after{
     @include u-margin-bottom(5);
     @include u-margin-top(3);
   }
+
+  .j40-p-tag {
+    margin-top: 1.25rem;
+    font-size: 1.06rem;
+    line-height: 1.4;
+  }
 }
 
 // all external links

From f2d0cff55691b7029ad370914cb6ef34c7361e2b Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 7 Oct 2022 19:36:51 -0700
Subject: [PATCH 073/130] Remove markdown ignore comments

- hoping this will build and match main so that the FE doesn't trigger the BE
---
 .../data_pipeline/etl/sources/michigan_ejscreen/README.md       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/data-pipeline/data_pipeline/etl/sources/michigan_ejscreen/README.md b/data/data-pipeline/data_pipeline/etl/sources/michigan_ejscreen/README.md
index 579bdc7ff..0c4cead1f 100644
--- a/data/data-pipeline/data_pipeline/etl/sources/michigan_ejscreen/README.md
+++ b/data/data-pipeline/data_pipeline/etl/sources/michigan_ejscreen/README.md
@@ -1,7 +1,5 @@
 # Michigan EJSCREEN
-<!-- markdown-link-check-disable -->
 The Michigan EJSCREEN description and publication can be found [here](https://deepblue.lib.umich.edu/bitstream/handle/2027.42/149105/AssessingtheStateofEnvironmentalJusticeinMichigan_344.pdf).
-<!-- markdown-link-check-enable-->
 
 #### Some notes about the input source data column fields:
 

From 797ad7176b44d1c2d68e6b683e75f45076dad2e0 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 7 Oct 2022 20:04:50 -0700
Subject: [PATCH 074/130] Add comments back to match main

---
 .../data_pipeline/etl/sources/michigan_ejscreen/README.md      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/data/data-pipeline/data_pipeline/etl/sources/michigan_ejscreen/README.md b/data/data-pipeline/data_pipeline/etl/sources/michigan_ejscreen/README.md
index 0c4cead1f..03ada026e 100644
--- a/data/data-pipeline/data_pipeline/etl/sources/michigan_ejscreen/README.md
+++ b/data/data-pipeline/data_pipeline/etl/sources/michigan_ejscreen/README.md
@@ -1,5 +1,8 @@
 # Michigan EJSCREEN
+
+<!-- markdown-link-check-disable -->
 The Michigan EJSCREEN description and publication can be found [here](https://deepblue.lib.umich.edu/bitstream/handle/2027.42/149105/AssessingtheStateofEnvironmentalJusticeinMichigan_344.pdf).
+<!-- markdown-link-check-enable-->
 
 #### Some notes about the input source data column fields:
 

From da254e41570e0ffec03092d97328a7cf11b3da9a Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Wed, 12 Oct 2022 16:43:04 -0700
Subject: [PATCH 075/130] Update methodology page copy to Content 1.0 (#2009)

* Update methodology copy

- update categories
- update snapshots

* Add button to datasets page

- add tests

* Update copy for meth page according to Content1.0
---
 client/.env.development                       |    2 +-
 .../Categories/Categories.module.scss         |    5 +
 .../Categories/Categories.module.scss.d.ts    |    1 +
 .../src/components/Categories/Categories.tsx  |   25 +-
 .../__snapshots__/Categories.test.tsx.snap    |  350 ++---
 .../components/CategoryCard/CategoryCard.tsx  |    6 +-
 .../__snapshots__/CategoryCard.test.tsx.snap  |   30 +-
 .../components/DatasetCard/DatasetCard.tsx    |    8 +-
 .../__snapshots__/datasetCard.test.tsx.snap   |    4 +-
 .../src/components/DatasetContainer/index.tsx |   12 +-
 .../datasetContainer.test.tsx.snap            |  889 ++++++++----
 .../DatasetsButton/DatasetsButton.module.scss |   25 +
 .../DatasetsButton.module.scss.d.ts           |   13 +
 .../DatasetsButton/DatasetsButton.test.tsx    |   15 +
 .../DatasetsButton/DatasetsButton.tsx         |   34 +
 .../DatasetsButton.test.tsx.snap              |   22 +
 client/src/components/DatasetsButton/index.ts |    2 +
 .../SubPageNav/SubPageNav.module.scss         |    5 +
 .../SubPageNav/SubPageNav.module.scss.d.ts    |   12 +
 .../src/components/SubPageNav/SubPageNav.tsx  |    6 +-
 .../__snapshots__/SubPageNav.test.tsx.snap    |   44 +-
 client/src/data/copy/explore.tsx              |    2 +-
 client/src/data/copy/methodology.tsx          | 1005 +++++++++----
 client/src/intl/en.json                       |  324 +++--
 client/src/pages/methodology.tsx              |   24 +-
 .../__snapshots__/methodology.test.tsx.snap   | 1289 +++++++++++------
 client/src/styles/global.scss                 |    5 +-
 27 files changed, 2867 insertions(+), 1292 deletions(-)
 create mode 100644 client/src/components/DatasetsButton/DatasetsButton.module.scss
 create mode 100644 client/src/components/DatasetsButton/DatasetsButton.module.scss.d.ts
 create mode 100644 client/src/components/DatasetsButton/DatasetsButton.test.tsx
 create mode 100644 client/src/components/DatasetsButton/DatasetsButton.tsx
 create mode 100644 client/src/components/DatasetsButton/__snapshots__/DatasetsButton.test.tsx.snap
 create mode 100644 client/src/components/DatasetsButton/index.ts

diff --git a/client/.env.development b/client/.env.development
index 93bd0c61b..b91ea4bd0 100644
--- a/client/.env.development
+++ b/client/.env.development
@@ -23,4 +23,4 @@ GATSBY_MAP_TILES_PATH=tiles
 # If you want the map to render a MapBox base map (as opposed to the
 # open source one from CartoDB), please create your own API TOKEN from
 # your MapBox account and add the token here:
-MAPBOX_STYLES_READ_TOKEN=''
\ No newline at end of file
+MAPBOX_STYLES_READ_TOKEN=pk.eyJ1IjoianVzdGljZTQwIiwiYSI6ImNreWtnenF6eDFxYmUydW12eDRrZnB4ejgifQ.KhDXm2M2vCT0tQ0DbS1ImQ
\ No newline at end of file
diff --git a/client/src/components/Categories/Categories.module.scss b/client/src/components/Categories/Categories.module.scss
index 592647191..a766c1aa8 100644
--- a/client/src/components/Categories/Categories.module.scss
+++ b/client/src/components/Categories/Categories.module.scss
@@ -5,4 +5,9 @@
   justify-content: space-between;
   flex-wrap: wrap;
   @include u-margin-top(4);
+  
+  .tribalLandsPara {
+    @include u-margin-bottom(6);
+    
+  }
 }
diff --git a/client/src/components/Categories/Categories.module.scss.d.ts b/client/src/components/Categories/Categories.module.scss.d.ts
index 1e442d507..3c0f339ec 100644
--- a/client/src/components/Categories/Categories.module.scss.d.ts
+++ b/client/src/components/Categories/Categories.module.scss.d.ts
@@ -1,6 +1,7 @@
 declare namespace CategoriesNamespace {
     export interface ICategoriesScss {
         categoriesContainer: string;
+        tribalLandsPara: string;
     }
   }
 
diff --git a/client/src/components/Categories/Categories.tsx b/client/src/components/Categories/Categories.tsx
index 76c5c66da..822e22c97 100644
--- a/client/src/components/Categories/Categories.tsx
+++ b/client/src/components/Categories/Categories.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import {useIntl} from 'gatsby-plugin-intl';
 import {Grid} from '@trussworks/react-uswds';
 
 import CategoryCard from '../CategoryCard';
@@ -10,22 +11,26 @@ import * as styles from './Categories.module.scss';
 const categories = [
   METHODOLOGY_COPY.CATEGORIES.CLIMATE_CHANGE,
   METHODOLOGY_COPY.CATEGORIES.CLEAN_ENERGY,
-  METHODOLOGY_COPY.CATEGORIES.CLEAN_TRANSPORT,
+  METHODOLOGY_COPY.CATEGORIES.HEALTH_BURDENS,
   METHODOLOGY_COPY.CATEGORIES.AFFORDABLE_HOUSING,
   METHODOLOGY_COPY.CATEGORIES.LEGACY_POLLUTION,
+  METHODOLOGY_COPY.CATEGORIES.CLEAN_TRANSPORT,
   METHODOLOGY_COPY.CATEGORIES.CLEAN_WATER,
-  METHODOLOGY_COPY.CATEGORIES.HEALTH_BURDENS,
   METHODOLOGY_COPY.CATEGORIES.WORKFORCE_DEV,
 ];
 
 const Categories = () => {
+  const intl = useIntl();
+
   return (
     <>
-      <J40MainGridContainer className={styles.categoriesContainer}>
+      <J40MainGridContainer>
 
         <Grid row>
-          <Grid col={12}>
+          <Grid col={8}>
             <h2>{METHODOLOGY_COPY.CATEGORY.HEADING}</h2>
+            <p>{intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA3)}</p>
+            <p>{intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA4)}</p>
           </Grid>
         </Grid>
 
@@ -36,6 +41,18 @@ const Categories = () => {
           categories.map((category, index) => <CategoryCard key={index} categoryInfo={category} />)
         }
       </J40MainGridContainer>
+
+      <J40MainGridContainer>
+
+        <Grid row className={styles.tribalLandsPara}>
+          <Grid col={8}>
+            <h2>{intl.formatMessage(METHODOLOGY_COPY.PAGE.SUB_HEADING_2)}</h2>
+            <p>{intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA5)}</p>
+          </Grid>
+        </Grid>
+
+      </J40MainGridContainer>
+
     </>
   );
 };
diff --git a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
index 58c63e413..b54f17a7d 100644
--- a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
+++ b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
@@ -11,12 +11,25 @@ exports[`rendering of the Categories checks if component renders 1`] = `
       data-testid="grid"
     >
       <div
-        class="grid-col-12"
+        class="grid-col-8"
         data-testid="grid"
       >
         <h2>
-          Categories
+          Categories of Burdens
         </h2>
+        <p>
+          
+      The tool uses datasets as indicators of burdens. The burdens are organized into categories. A community is highlighted as disadvantaged on the CEJST map if it is in a census tract that is (1) at or above the threshold for one or more environmental, climate, or other burdens, and (2) at or
+      above the threshold for an associated socioeconomic burden. In addition, a census tract that is completely surrounded by disadvantaged communities that meet the burden thresholds, and is at or above 
+      the 50% percentile for low income, is also considered disadvantaged. 
+    
+        </p>
+        <p>
+          
+      Census tracts are small units of geography. Census tract boundaries are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
+      census boundaries.    
+    
+        </p>
       </div>
     </div>
   </div>
@@ -34,12 +47,12 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           identified as disadvantaged
         </strong>
-        
+         if they are in census tracts that:
     
       </p>
       <p>
         <strong>
-          IF
+          ARE
         </strong>
          at or above the 90th percentile for 
         <a
@@ -62,6 +75,20 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         >
           expected population loss rate
         </a>
+          OR 
+        <a
+          class="usa-link"
+          href="#flood-risk"
+        >
+          projected flood risk
+        </a>
+         OR 
+        <a
+          class="usa-link"
+          href="#wildfire-risk"
+        >
+          projected wildfire risk
+        </a>
       </p>
       <p>
         
@@ -69,28 +96,20 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           AND
         </strong>
-         is at or above the 65th percentile for 
+         are at or above the 65th percentile for 
         <a
           class="usa-link"
           href="#low-income"
         >
           low income
         </a>
-         AND 80% or more of individuals 15 or older are not enrolled in 
-        <a
-          class="usa-link"
-          href="#high-ed-enroll-rate"
-        >
-          higher education
-        </a>
-         
+        
     
       </p>
-      <p />
     </div>
     <div>
       <h3>
-        Clean energy and energy efficiency
+        Energy
       </h3>
       <p>
         
@@ -98,19 +117,19 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           identified as disadvantaged
         </strong>
-        
+         if they are in census tracts that:
     
       </p>
       <p>
         <strong>
-          IF
+          ARE
         </strong>
          at or above the 90th percentile for 
         <a
           class="usa-link"
           href="#energy-burden"
         >
-          energy burden
+          energy cost
         </a>
          OR 
         <a
@@ -126,28 +145,20 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           AND
         </strong>
-         is at or above the 65th percentile for 
+         are at or above the 65th percentile for 
         <a
           class="usa-link"
           href="#low-income"
         >
           low income
         </a>
-         AND 80% or more of individuals 15 or older are not enrolled in 
-        <a
-          class="usa-link"
-          href="#high-ed-enroll-rate"
-        >
-          higher education
-        </a>
-         
+        
     
       </p>
-      <p />
     </div>
     <div>
       <h3>
-        Clean transit
+        Health
       </h3>
       <p>
         
@@ -155,31 +166,41 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           identified as disadvantaged
         </strong>
-        
+         if they are in census tracts that:
     
       </p>
       <p>
-        
-        
         <strong>
-          IF
+          ARE
         </strong>
          at or above the 90th percentile for 
         <a
           class="usa-link"
-          href="#diesel-pm"
+          href="#asthma"
         >
-          diesel particulate matter exposure
+          asthma
         </a>
-         or 
+         OR 
         <a
           class="usa-link"
-          href="#traffic-vol"
+          href="#diabetes"
         >
-          traffic proximity and volume
+          diabetes
+        </a>
+         OR 
+        <a
+          class="usa-link"
+          href="#heart-disease"
+        >
+          heart disease
+        </a>
+         OR 
+        <a
+          class="usa-link"
+          href="#life-exp"
+        >
+          low life expectancy
         </a>
-        
-      
       </p>
       <p>
         
@@ -187,28 +208,20 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           AND
         </strong>
-         is at or above the 65th percentile for 
+         are at or above the 65th percentile for 
         <a
           class="usa-link"
           href="#low-income"
         >
           low income
         </a>
-         AND 80% or more of individuals 15 or older are not enrolled in 
-        <a
-          class="usa-link"
-          href="#high-ed-enroll-rate"
-        >
-          higher education
-        </a>
-         
+        
     
       </p>
-      <p />
     </div>
     <div>
       <h3>
-        Affordable and sustainable housing
+        Housing
       </h3>
       <p>
         
@@ -216,33 +229,44 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           identified as disadvantaged
         </strong>
-        
+         if they are in census tracts that:
     
       </p>
       <p>
-        <strong>
-          IF
-        </strong>
-         at or above the 90th percentile for 
+        Experienced 
         <a
           class="usa-link"
-          href="#lead-paint"
+          href="#hist-underinv"
         >
-          lead paint
+          historic underinvestment
         </a>
-         AND 
+         OR are at or above the 90th percentile for the 
         <a
           class="usa-link"
-          href="#median-home"
+          href="#house-burden"
         >
-          median home value
+          housing cost
         </a>
-         is at or less than the 90th percentile OR at or above the 90th percentile for the 
+         OR 
         <a
           class="usa-link"
-          href="#house-burden"
+          href="#green-space"
+        >
+          lack of green space
+        </a>
+         OR 
+        <a
+          class="usa-link"
+          href="#indoor-plumb"
         >
-          housing cost burden
+          lack of indoor plumbing
+        </a>
+         OR 
+        <a
+          class="usa-link"
+          href="#lead-paint"
+        >
+          lead paint
         </a>
       </p>
       <p>
@@ -251,28 +275,20 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           AND
         </strong>
-         is at or above the 65th percentile for 
+         are at or above the 65th percentile for 
         <a
           class="usa-link"
           href="#low-income"
         >
           low income
         </a>
-         AND 80% or more of individuals 15 or older are not enrolled in 
-        <a
-          class="usa-link"
-          href="#high-ed-enroll-rate"
-        >
-          higher education
-        </a>
-         
+        
     
       </p>
-      <p />
     </div>
     <div>
       <h3>
-        Reduction and remediation of legacy pollution
+        Legacy pollution
       </h3>
       <p>
         
@@ -280,14 +296,25 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           identified as disadvantaged
         </strong>
-        
+         if they are in census tracts that:
     
       </p>
       <p>
-        <strong>
-          IF
-        </strong>
-         at or above the 90th percentile for 
+        Have at least one 
+        <a
+          class="usa-link"
+          href="#mine-land"
+        >
+          abandoned mine land
+        </a>
+         OR 
+        <a
+          class="usa-link"
+          href="#fuds"
+        >
+          Formerly Used Defense Sites
+        </a>
+         OR are at or above the 90th percentile for 
         <a
           class="usa-link"
           href="#prox-haz"
@@ -299,14 +326,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
           class="usa-link"
           href="#prox-npl"
         >
-          proximity to National Priorities List (NPL) sites
+          proximity to Superfind sites
         </a>
          OR 
         <a
           class="usa-link"
           href="#prox-rmp"
         >
-          proximity to Risk Management Plan (RMP) facilities
+          proximity to Risk Management Plan facilities
         </a>
       </p>
       <p>
@@ -315,28 +342,20 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           AND
         </strong>
-         is at or above the 65th percentile for 
+         are at or above the 65th percentile for 
         <a
           class="usa-link"
           href="#low-income"
         >
           low income
         </a>
-         AND 80% or more of individuals 15 or older are not enrolled in 
-        <a
-          class="usa-link"
-          href="#high-ed-enroll-rate"
-        >
-          higher education
-        </a>
-         
+        
     
       </p>
-      <p />
     </div>
     <div>
       <h3>
-        Critical clean water and wastewater infrastructure
+        Transportation
       </h3>
       <p>
         
@@ -344,20 +363,38 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           identified as disadvantaged
         </strong>
-        
+         if they are in census tracts that:
     
       </p>
       <p>
+        
+        
         <strong>
-          IF
+          ARE
         </strong>
          at or above the 90th percentile for 
         <a
           class="usa-link"
-          href="#waste-water"
+          href="#diesel-pm"
         >
-          wastewater discharge
+          diesel particulate matter exposure
         </a>
+         OR 
+        <a
+          class="usa-link"
+          href="#trans-barrier"
+        >
+          transportation barriers
+        </a>
+         OR 
+        <a
+          class="usa-link"
+          href="#traffic-vol"
+        >
+          traffic proximity and volume
+        </a>
+        
+      
       </p>
       <p>
         
@@ -365,28 +402,20 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           AND
         </strong>
-         is at or above the 65th percentile for 
+         are at or above the 65th percentile for 
         <a
           class="usa-link"
           href="#low-income"
         >
           low income
         </a>
-         AND 80% or more of individuals 15 or older are not enrolled in 
-        <a
-          class="usa-link"
-          href="#high-ed-enroll-rate"
-        >
-          higher education
-        </a>
-         
+        
     
       </p>
-      <p />
     </div>
     <div>
       <h3>
-        Health burdens
+        Water and wastewater
       </h3>
       <p>
         
@@ -394,40 +423,26 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           identified as disadvantaged
         </strong>
-        
+         if they are in census tracts that:
     
       </p>
       <p>
         <strong>
-          IF
+          ARE
         </strong>
          at or above the 90th percentile for 
         <a
           class="usa-link"
-          href="#asthma"
-        >
-          asthma
-        </a>
-         OR 
-        <a
-          class="usa-link"
-          href="#diabetes"
-        >
-          diabetes
-        </a>
-         OR 
-        <a
-          class="usa-link"
-          href="#heart-disease"
+          href="#leaky-uwt"
         >
-          heart disease
+          leaking underground storage tanks
         </a>
          OR 
         <a
           class="usa-link"
-          href="#life-exp"
+          href="#waste-water"
         >
-          low life expectancy
+          wastewater discharge
         </a>
       </p>
       <p>
@@ -436,24 +451,16 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           AND
         </strong>
-         is at or above the 65th percentile for 
+         are at or above the 65th percentile for 
         <a
           class="usa-link"
           href="#low-income"
         >
           low income
         </a>
-         AND 80% or more of individuals 15 or older are not enrolled in 
-        <a
-          class="usa-link"
-          href="#high-ed-enroll-rate"
-        >
-          higher education
-        </a>
-         
+        
     
       </p>
-      <p />
     </div>
     <div>
       <h3>
@@ -465,21 +472,16 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           identified as disadvantaged
         </strong>
-        
+         if they are in census tracts that:
     
       </p>
       <p>
+        
+        
         <strong>
-          IF
+          ARE
         </strong>
          at or above the 90th percentile for 
-        <a
-          class="usa-link"
-          href="#low-med-inc"
-        >
-          low median income
-        </a>
-         as a percentage of area median income OR 
         <a
           class="usa-link"
           href="#ling-iso"
@@ -489,42 +491,66 @@ exports[`rendering of the Categories checks if component renders 1`] = `
          OR 
         <a
           class="usa-link"
-          href="#unemploy"
+          href="#low-med-inc"
         >
-          unemployment
+          low median income
         </a>
-         OR percentage of individuals in households at or below 100% Federal 
+         OR 
         <a
           class="usa-link"
           href="#poverty"
         >
           poverty
         </a>
-         level
+         OR 
+        <a
+          class="usa-link"
+          href="#unemploy"
+        >
+          unemployment
+        </a>
+        
       
       </p>
       <p>
         <strong>
           AND
         </strong>
-         10% or more of adults 25 or older have not attained a 
+         have 10% or more of adults have a 
         <a
           class="usa-link"
           href="#high-school"
         >
-          high school degree
-        </a>
-         AND 80% or more of individuals 15 or older are not enrolled in 
-        <a
-          class="usa-link"
-          href="#high-ed-enroll-rate"
-        >
-          higher education
+          high school education
         </a>
-         
+         level less than a high school degree
   
       </p>
-      <p />
+    </div>
+  </div>
+  <div
+    class="grid-container-desktop-lg"
+    data-testid="gridContainer"
+  >
+    <div
+      class="grid-row"
+      data-testid="grid"
+    >
+      <div
+        class="grid-col-8"
+        data-testid="grid"
+      >
+        <h2>
+          
+      Tribal lands
+    
+        </h2>
+        <p>
+          
+      Federally-Recognized Tribal lands, including Alaska Native Villages, are also considered disadvantaged and highlighted on the map.   
+    
+        </p>
+      </div>
     </div>
   </div>
 </DocumentFragment>
diff --git a/client/src/components/CategoryCard/CategoryCard.tsx b/client/src/components/CategoryCard/CategoryCard.tsx
index dbbbc5ecb..12d687249 100644
--- a/client/src/components/CategoryCard/CategoryCard.tsx
+++ b/client/src/components/CategoryCard/CategoryCard.tsx
@@ -6,8 +6,7 @@ interface ICategoryInterface {
     categoryInfo: {
         TITLE: JSX.Element,
         IF: JSX.Element,
-        AND: JSX.Element,
-        THEN: JSX.Element
+        AND: JSX.Element
     }
 }
 const CategoryCard = ({categoryInfo}: ICategoryInterface) => {
@@ -25,9 +24,6 @@ const CategoryCard = ({categoryInfo}: ICategoryInterface) => {
       <p>
         {categoryInfo.AND}
       </p>
-      <p>
-        {categoryInfo.THEN}
-      </p>
     </div>
   );
 };
diff --git a/client/src/components/CategoryCard/__snapshots__/CategoryCard.test.tsx.snap b/client/src/components/CategoryCard/__snapshots__/CategoryCard.test.tsx.snap
index b3bf5e4bf..a04d935d6 100644
--- a/client/src/components/CategoryCard/__snapshots__/CategoryCard.test.tsx.snap
+++ b/client/src/components/CategoryCard/__snapshots__/CategoryCard.test.tsx.snap
@@ -12,12 +12,12 @@ exports[`rendering of the CategoryCard checks if component renders 1`] = `
       <strong>
         identified as disadvantaged
       </strong>
-      
+       if they are in census tracts that:
     
     </p>
     <p>
       <strong>
-        IF
+        ARE
       </strong>
        at or above the 90th percentile for 
       <a
@@ -40,6 +40,20 @@ exports[`rendering of the CategoryCard checks if component renders 1`] = `
       >
         expected population loss rate
       </a>
+        OR 
+      <a
+        class="usa-link"
+        href="#flood-risk"
+      >
+        projected flood risk
+      </a>
+       OR 
+      <a
+        class="usa-link"
+        href="#wildfire-risk"
+      >
+        projected wildfire risk
+      </a>
     </p>
     <p>
       
@@ -47,24 +61,16 @@ exports[`rendering of the CategoryCard checks if component renders 1`] = `
       <strong>
         AND
       </strong>
-       is at or above the 65th percentile for 
+       are at or above the 65th percentile for 
       <a
         class="usa-link"
         href="#low-income"
       >
         low income
       </a>
-       AND 80% or more of individuals 15 or older are not enrolled in 
-      <a
-        class="usa-link"
-        href="#high-ed-enroll-rate"
-      >
-        higher education
-      </a>
-       
+      
     
     </p>
-    <p />
   </div>
 </DocumentFragment>
 `;
diff --git a/client/src/components/DatasetCard/DatasetCard.tsx b/client/src/components/DatasetCard/DatasetCard.tsx
index 4739f6a0a..b3d3c4ca6 100644
--- a/client/src/components/DatasetCard/DatasetCard.tsx
+++ b/client/src/components/DatasetCard/DatasetCard.tsx
@@ -17,6 +17,7 @@ interface IDatasetCardProps {
  */
 const DatasetCard = ({datasetCardProps}: IDatasetCardProps) => {
   const intl = useIntl();
+  const isNoteAtEnd = datasetCardProps.domID === 'ling-iso' ? true : false;
 
   return (
     <div className={styles.datasetCard} id={datasetCardProps.domID}>
@@ -29,7 +30,7 @@ const DatasetCard = ({datasetCardProps}: IDatasetCardProps) => {
       </div>
 
       {/* Dataset note */}
-      {datasetCardProps.note && <div className={styles.datasetCardDescription}>
+      {(datasetCardProps.note && !isNoteAtEnd) && <div className={styles.datasetCardDescription}>
         <p>{datasetCardProps.note}</p>
       </div>}
 
@@ -69,6 +70,11 @@ const DatasetCard = ({datasetCardProps}: IDatasetCardProps) => {
               </span>
               {intl.formatMessage(dataSource.availableFor)}
             </li>
+
+            {/* Dataset note */}
+            {(datasetCardProps.note && isNoteAtEnd) && <div className={styles.datasetCardDescription}>
+              <p>{datasetCardProps.note}</p>
+            </div>}
           </React.Fragment>
         ))}
 
diff --git a/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap b/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap
index f9c8db2cc..1ef703620 100644
--- a/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap
+++ b/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`rendering of indicator dataset card checks if component renders 1`] = `
     <div>
       
         Percent of a census tract's population in households where household income is at or below
-        200% of the Federal poverty level.
+        200% of the Federal poverty level, not including students enrolled in higher education.
       
     </div>
     <ul>
@@ -25,7 +25,7 @@ exports[`rendering of indicator dataset card checks if component renders 1`] = `
         <span>
           Responsible Party: 
         </span>
-        Census
+        U.S. Census
       </li>
       <li>
         <span>
diff --git a/client/src/components/DatasetContainer/index.tsx b/client/src/components/DatasetContainer/index.tsx
index 52104ffd8..dcab0794d 100644
--- a/client/src/components/DatasetContainer/index.tsx
+++ b/client/src/components/DatasetContainer/index.tsx
@@ -9,6 +9,7 @@ import {hyphenizeString} from '../../../cypress/integration/common/helpers';
 import * as styles from './dsContainer.module.scss';
 import * as METHODOLOGY_COPY from '../../data/copy/methodology';
 import {PAGES_ENDPOINTS} from '../../data/constants';
+import DatasetsButton from '../DatasetsButton';
 
 
 const DatasetContainer = () => {
@@ -22,14 +23,19 @@ const DatasetContainer = () => {
 
           <Grid row>
             <Grid col={12}>
-              <h2>{intl.formatMessage(METHODOLOGY_COPY.DATASETS.HEADING)}</h2>
+              <h2>{METHODOLOGY_COPY.DATASETS_RICH_TEXT.HEADING}</h2>
             </Grid>
           </Grid>
 
-          <Grid row>
-            <Grid desktop={{col: 9}}>
+          <Grid row gap>
+            <Grid desktop={{col: 7}}>
               <p>{intl.formatMessage(METHODOLOGY_COPY.DATASETS.INFO)}</p>
             </Grid>
+            <Grid desktop={{col: 1}}>
+            </Grid>
+            <Grid desktop={{col: 4}}>
+              <DatasetsButton href= {'https://www.surveymonkey.com/r/6G9TQJ8'} />
+            </Grid>
           </Grid>
 
           <Grid row>
diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
index f41cc2b19..5f2bac2f9 100644
--- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
+++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
@@ -19,26 +19,50 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="grid"
         >
           <h2>
-            Datasets used in beta methodology
+            Datasets used in v1.0 methodology
           </h2>
         </div>
       </div>
       <div
-        class="grid-row"
+        class="grid-row grid-gap"
         data-testid="grid"
       >
         <div
-          class="desktop:grid-col-9"
+          class="desktop:grid-col-7"
           data-testid="grid"
         >
           <p>
             
-      The datasets used in the current version of the tool come from a variety of sources and were 
-      selected based on relevance, availability, and quality. The datasets seek to identify a range of 
-      human health, environmental, climate-related, and other impacts on communities.
+      The tool's datasets are public and consistent nationwide. They come from different sources and are high quality. The Council on Environmental Quality (CEQ) chose them based on relevance,  availability, and quality. They identify climate, environmental, and other burdens on communities.
     
           </p>
         </div>
+        <div
+          class="desktop:grid-col-1"
+          data-testid="grid"
+        />
+        <div
+          class="desktop:grid-col-4"
+          data-testid="grid"
+        >
+          <a
+            href="https://www.surveymonkey.com/r/6G9TQJ8"
+            rel="noreferrer"
+            target="_blank"
+          >
+            <button
+              class="usa-button"
+              data-testid="button"
+              type="button"
+            >
+              Share data sources with CEQ
+              <img
+                alt="launch icon"
+                src="test-file-stub"
+              />
+            </button>
+          </a>
+        </div>
       </div>
       <div
         class="grid-row"
@@ -58,7 +82,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div>
                 
         Percent of a census tract's population in households where household income is at or below
-        200% of the Federal poverty level.
+        200% of the Federal poverty level, not including students enrolled in higher education.
       
               </div>
               <ul>
@@ -72,7 +96,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Responsible Party: 
                   </span>
-                  Census
+                  U.S. Census
                 </li>
                 <li>
                   <span>
@@ -98,14 +122,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </ul>
             </div>
             <div
-              id="high-ed-enroll-rate"
+              id="exp-agr-loss-rate"
             >
               <h3>
-                Higher education non-enrollment
+                Expected agriculture loss rate
               </h3>
               <div>
                 
-        Percent of people 15 or older who are not currently enrolled in college, university, or graduate school.
+        Expected agricultural value at risk from losses due to fourteen types of natural hazards. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. The rate is calculated by dividing the agricultural value at risk by the total agricultural value. 
       
               </div>
               <ul>
@@ -113,13 +137,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  All categories
+                  Climate change category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Census
+                  Federal Emergency Management Agency (FEMA)
                 </li>
                 <li>
                   <span>
@@ -128,36 +152,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://www.census.gov/programs-surveys/acs"
+                    href="https://hazards.fema.gov/nri/expected-annual-loss"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    American Community Survey
+                    National Risk Index
                   </a>
-                   from 2015-2019
+                   from 2014-2021
                 </li>
                 <li>
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states, the District of Columbia, and Puerto Rico
+                  All U.S. states and the District of Columbia
                 </li>
               </ul>
             </div>
             <div
-              id="exp-agr-loss-rate"
+              id="exp-bld-loss-rate"
             >
               <h3>
-                Expected agriculture loss rate
+                Expected building loss rate
               </h3>
               <div>
                 
-        Percent of agricultural value at risk from losses due to fourteen types of 
-        natural hazards that have some link 
-        to climate change: avalanche, coastal flooding, 
-        cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong 
-        wind, tornado, wildfire, and winter weather. Rate calculated by dividing the agricultural value at risk in 
-        a census tract by the total agricultural value in that census tract.
+        Expected building value at risk from losses due to fourteen types of natural hazards. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. The rate is calculated by dividing the building value at risk by the total building value.
       
               </div>
               <ul>
@@ -197,18 +216,15 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </ul>
             </div>
             <div
-              id="exp-bld-loss-rate"
+              id="exp-pop-loss-rate"
             >
               <h3>
-                Expected building loss rate
+                Expected population loss rate
               </h3>
               <div>
                 
-        Percent of building value at risk from losses due to fourteen types of natural hazards 
-        that have some link to climate change: avalanche, coastal flooding, 
-        cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong 
-        wind, tornado, wildfire, and winter weather. Rate calculated by dividing the building value at risk in 
-        a census tract by the total building value in that census tract.
+        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate of population loss.
+
       
               </div>
               <ul>
@@ -248,39 +264,369 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </ul>
             </div>
             <div
-              id="exp-pop-loss-rate"
+              id="flood-risk"
             >
               <h3>
-                Expected population loss rate
+                NEW Projected flood risk
+              </h3>
+              <div>
+                
+        A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not include property value.
+      
+              </div>
+              <ul>
+                <li>
+                  <span>
+                    Used in: 
+                  </span>
+                  Climate change category
+                </li>
+                <li>
+                  <span>
+                    Responsible Party: 
+                  </span>
+                  First Street Foundation
+                </li>
+                <li>
+                  <span>
+                    Source: 
+                  </span>
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://firststreet.org/data-access/"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Climate Risk Data Access
+                  </a>
+                   from 2022
+                </li>
+                <li>
+                  <span>
+                    Available for: 
+                  </span>
+                  All U.S. states, the District of Columbia, and Puerto Rico
+                </li>
+              </ul>
+            </div>
+            <div
+              id="wildfire-risk"
+            >
+              <h3>
+                NEW Projected wildfire risk
+              </h3>
+              <div>
+                
+        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not include property value.
+      
+              </div>
+              <ul>
+                <li>
+                  <span>
+                    Used in: 
+                  </span>
+                  Climate change category
+                </li>
+                <li>
+                  <span>
+                    Responsible Party: 
+                  </span>
+                  First Street Foundation
+                </li>
+                <li>
+                  <span>
+                    Source: 
+                  </span>
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://firststreet.org/data-access/"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Climate Risk Data Access
+                  </a>
+                   from 2022
+                </li>
+                <li>
+                  <span>
+                    Available for: 
+                  </span>
+                  All contiguous U.S. states and the District of Columbia 
+                </li>
+              </ul>
+            </div>
+            <div
+              id="energy-burden"
+            >
+              <h3>
+                Energy cost
+              </h3>
+              <div>
+                
+        Average household annual energy cost in dollars divided by the average household income.
+      
+              </div>
+              <ul>
+                <li>
+                  <span>
+                    Used in: 
+                  </span>
+                  Energy category
+                </li>
+                <li>
+                  <span>
+                    Responsible Party: 
+                  </span>
+                  Department of Energy (DOE)
+                </li>
+                <li>
+                  <span>
+                    Source: 
+                  </span>
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.energy.gov/eere/slsc/low-income-energy-affordability-data-lead-tool"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    LEAD Score
+                  </a>
+                   from 2018
+                </li>
+                <li>
+                  <span>
+                    Available for: 
+                  </span>
+                  All U.S. states, the District of Columbia, and Puerto Rico
+                </li>
+              </ul>
+            </div>
+            <div
+              id="pm-25"
+            >
+              <h3>
+                PM2.5 in the air
+              </h3>
+              <div>
+                
+        Fine inhalable particles with 2.5 or smaller micrometer diameters. The percentile is the weight of the particles per cubic meter.
+      
+              </div>
+              <ul>
+                <li>
+                  <span>
+                    Used in: 
+                  </span>
+                  Energy category
+                </li>
+                <li>
+                  <span>
+                    Responsible Party: 
+                  </span>
+                  Environmental Protection Agency (EPA) Office of Air and Radiation (OAR)
+                </li>
+                <li>
+                  <span>
+                    Source: 
+                  </span>
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.epa.gov/ejscreen/technical-documentation-ejscreen"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Fusion of model and monitor data
+                  </a>
+                   from 2017 as compiled by EPA’s EJScreen, sourced from EPA National Air Toxics Assessment (NATA) and the U.S. Department of Transportation (DOT) traffic data
+    
+                </li>
+                <li>
+                  <span>
+                    Available for: 
+                  </span>
+                  All U.S. states and the District of Columbia
+                </li>
+              </ul>
+            </div>
+            <div
+              id="asthma"
+            >
+              <h3>
+                Asthma
+              </h3>
+              <div>
+                
+        Share of people who answer “yes” to both of these questions: “Have you ever been told by a health professional that you have asthma?” and “Do you still have asthma?”.
+      
+              </div>
+              <ul>
+                <li>
+                  <span>
+                    Used in: 
+                  </span>
+                  Health category
+                </li>
+                <li>
+                  <span>
+                    Responsible Party: 
+                  </span>
+                  Centers for Disease Control and Prevention (CDC)
+                </li>
+                <li>
+                  <span>
+                    Source: 
+                  </span>
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.cdc.gov/places/index.html"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    PLACES data
+                  </a>
+                   from 2016-2019
+                </li>
+                <li>
+                  <span>
+                    Available for: 
+                  </span>
+                  All U.S. states and the District of Columbia
+                </li>
+              </ul>
+            </div>
+            <div
+              id="diabetes"
+            >
+              <h3>
+                Diabetes
+              </h3>
+              <div>
+                
+        Share of people ages 18 years and older who have been told by a health professional that they have diabetes other than diabetes during pregnancy.
+      
+              </div>
+              <ul>
+                <li>
+                  <span>
+                    Used in: 
+                  </span>
+                  Health category
+                </li>
+                <li>
+                  <span>
+                    Responsible Party: 
+                  </span>
+                  Centers for Disease Control and Prevention (CDC)
+                </li>
+                <li>
+                  <span>
+                    Source: 
+                  </span>
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.cdc.gov/places/index.html"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    PLACES data
+                  </a>
+                   from 2016-2019
+                </li>
+                <li>
+                  <span>
+                    Available for: 
+                  </span>
+                  All U.S. states and the District of Columbia
+                </li>
+              </ul>
+            </div>
+            <div
+              id="heart-disease"
+            >
+              <h3>
+                Heart disease
               </h3>
               <div>
-                
-        Rate relative to the population of fatalities and injuries due to fourteen types of
-        natural hazards each year
-        that have some link to climate change: avalanche, 
-        coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, 
-        riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined 
-        as the Spatial Hazard Events and Losses and National Centers for Environmental Information’s 
-        (NCEI) reported number of fatalities and injuries caused by the hazard occurrence. To 
-        combine fatalities and injuries for the computation of population loss value, an injury is counted 
-        as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies injuries and fatalities 
-        as direct or indirect. Both direct and indirect injuries and fatalities are counted as population 
-        loss. This total number of injuries and fatalities is then divided by the population in the 
-        census tract to get a per-capita rate of population risk. 
+                
+        Share of people ages 18 years and older who have been told by a health professional that they had angina or coronary heart disease.
+      
+              </div>
+              <ul>
+                <li>
+                  <span>
+                    Used in: 
+                  </span>
+                  Health category
+                </li>
+                <li>
+                  <span>
+                    Responsible Party: 
+                  </span>
+                  Centers for Disease Control and Prevention (CDC)
+                </li>
+                <li>
+                  <span>
+                    Source: 
+                  </span>
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.cdc.gov/places/index.html"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    PLACES data
+                  </a>
+                   from 2016-2019
+                </li>
+                <li>
+                  <span>
+                    Available for: 
+                  </span>
+                  All U.S. states and the District of Columbia
+                </li>
+              </ul>
+            </div>
+            <div
+              id="life-exp"
+            >
+              <h3>
+                Low life expectancy
+              </h3>
+              <div>
+                
+        Average number of years people have left in their lives.
+      
+              </div>
+              <div>
+                <p>
+                  
+        
+                  <strong>
+                    Note: 
+                  </strong>
+                  The tool reverses the percentiles for this burden. This means that census tracts with lower numbers have higher life expectancies and that census tracts with higher numbers have lower life expectancies.
       
+                </p>
               </div>
               <ul>
                 <li>
                   <span>
                     Used in: 
                   </span>
-                  Climate change category
+                  Health category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Federal Emergency Management Agency (FEMA)
+                  Centers for Disease Control and Prevention (CDC)
                 </li>
                 <li>
                   <span>
@@ -289,13 +635,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://hazards.fema.gov/nri/expected-annual-loss"
+                    href="https://www.cdc.gov/nchs/nvss/usaleep/usaleep.html#data"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    National Risk Index
+                    U.S. Small-Area Life Expectancy Estimates Project (USALEEP)
                   </a>
-                   from 2014-2021
+                   from 2010-2015
                 </li>
                 <li>
                   <span>
@@ -306,26 +652,57 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </ul>
             </div>
             <div
-              id="energy-burden"
+              id="hist-underinv"
             >
               <h3>
-                Energy burden
+                New Historic underinvestment
               </h3>
               <div>
-                Average annual energy cost per household ($) divided by average household income.
+                
+        Census tracts that experienced historic underinvestment as determined by the National Community Reinvestment Coalition’s (NCRC) historic redlining score. It is determined using the 
+                <a
+                  class="usa-link usa-link--external"
+                  data-cy=""
+                  href="https://ncrc.org/explainer-why-we-created-a-new-method-for-measuring-the-impact-of-redlining/"
+                  rel="noreferrer"
+                  target="_blank"
+                >
+                  NCRC’s methodology
+                </a>
+                 for identifying areas with the most historic redlining (i.e. a score of 3.25 or more out of 4). This means that people in the  tract had high barriers to accessing home loans. 
+      
+              </div>
+              <div>
+                <p>
+                  
+        
+                  <strong>
+                    Note: 
+                  </strong>
+                  The historic underinvestment data indicator 
+                  <strong>
+                    does not
+                  </strong>
+                   appear on the map for tracts 
+                  <strong>
+                    that were not
+                  </strong>
+                   evaluated by the National Community Reinvestment Coalition. It is shown in tracts that are most commonly in larger metropolitan areas.
+      
+                </p>
               </div>
               <ul>
                 <li>
                   <span>
                     Used in: 
                   </span>
-                  Clean energy and energy efficiency category
+                  Housing category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Department of Energy (DOE)
+                  Nationl Community Reinvestment Coalition (NCRC)
                 </li>
                 <li>
                   <span>
@@ -334,33 +711,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://www.energy.gov/eere/slsc/low-income-energy-affordability-data-lead-tool"
+                    href="https://www.openicpsr.org/openicpsr/project/141121/version/V2/view"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    LEAD Score
+                    Dataset of formerly redlined areas
                   </a>
-                   from 2018
+                   using digitized maps from the Home Owners Loan Corporation from 2010
                 </li>
                 <li>
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states and the District of Columbia
+                  Metro areas of US that were HOLC graded 
                 </li>
               </ul>
             </div>
             <div
-              id="pm-25"
+              id="house-burden"
             >
               <h3>
-                PM2.5 in the air
+                Housing cost
               </h3>
               <div>
                 
-        Fine inhalable particles, with diameters that are generally 2.5 micrometers and smaller. The value 
-        in the fields is the weight of these particles in micrograms per cubic meter.
-
+        Share of households that are both earning less than 80% of Housing and Urban Development’s Area Median Family Income and are spending more than 30% of their income on housing costs.
       
               </div>
               <ul>
@@ -368,13 +743,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Clean energy and energy efficiency category
+                  Housing category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Environmental Protection Agency (EPA) Office of Air and Radiation (OAR)
+                  Department of Housing & Urban Development (HUD)
                 </li>
                 <li>
                   <span>
@@ -383,33 +758,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://www.epa.gov/ejscreen/technical-documentation-ejscreen"
+                    href="https://www.huduser.gov/portal/datasets/cp.html"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    Fusion of model and monitor data
+                    Comprehensive Housing Affordability Strategy dataset
                   </a>
-                   from 2017 as compiled by EPA’s EJScreen, sourced from EPA National Air Toxics Assessment (NATA) and the U.S. Department of Transportation (DOT) traffic data
-    
+                   from 2014-2018
                 </li>
                 <li>
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states and the District of Columbia
+                  All U.S. states, the District of Columbia, and Puerto Rico
                 </li>
               </ul>
             </div>
             <div
-              id="diesel-pm"
+              id="green-space"
             >
               <h3>
-                Diesel particulate matter exposure
+                NEW Lack of green space
               </h3>
               <div>
                 
-        Mixture of particles that is part of diesel exhaust in the air. The value in the fields is the 
-        weight of these particles in micrograms per cubic meter. 
+        Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes.
       
               </div>
               <ul>
@@ -417,13 +790,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Clean transit category
+                  Housing category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Environmental Protection Agency (EPA)
+                  The Trust for Public Lands and American Forestry
                 </li>
                 <li>
                   <span>
@@ -432,32 +805,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://www.epa.gov/ejscreen/technical-documentation-ejscreen"
+                    href="https://www.mrlc.gov/data/nlcd-2019-percent-developed-imperviousness-conus"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    National Air Toxics Assessment (NATA)
+                    Percent Developed Imperviousness (CONUS) 
                   </a>
-                   from 2014 as compiled by EPA's EJScreen
+                   from 2019
                 </li>
                 <li>
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states and the District of Columbia
+                  All contiguous U.S. states and the District of Columbia 
                 </li>
               </ul>
             </div>
             <div
-              id="traffic-vol"
+              id="indoor-plumb"
             >
               <h3>
-                Traffic proximity and volume
+                NEW Lack of indoor plumbing
               </h3>
               <div>
                 
-        Count of vehicles (average annual daily traffic) at major roads
-        within 500 meters, divided by distance in meters.
+        Housing without complete kitchen facilities or complete plumbing facilities.
       
               </div>
               <ul>
@@ -465,13 +837,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Clean transit category
+                  Housing category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Department of Transportation (DOT)
+                  Department of Housing & Urban Development (HUD)
                 </li>
                 <li>
                   <span>
@@ -480,32 +852,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://www.epa.gov/ejscreen/technical-documentation-ejscreen"
+                    href="https://www.huduser.gov/portal/datasets/cp.html"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    Traffic data
+                    Comprehensive Housing Affordability Strategy dataset
                   </a>
-                   from 2017 as compiled by EPA's EJScreen
+                   from 2014-2018
                 </li>
                 <li>
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states and the District of Columbia
+                  All U.S. states, the District of Columbia, and Puerto Rico
                 </li>
               </ul>
             </div>
             <div
-              id="house-burden"
+              id="lead-paint"
             >
               <h3>
-                Housing cost burden
+                Lead paint
               </h3>
               <div>
                 
-        Percent of households in a census tract that are both earning less than 80% of HUD Area Median
-        Family Income by county and are spending more than 30% of their income on housing costs.
+        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are not likely to have lead paint exposure and are not included.
       
               </div>
               <ul>
@@ -513,13 +884,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Affordable and sustainable housing category
+                  Housing category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Department of Housing & Urban Development (HUD)
+                  U.S. Census
                 </li>
                 <li>
                   <span>
@@ -528,32 +899,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://www.huduser.gov/portal/datasets/cp.html"
+                    href="https://www.census.gov/programs-surveys/acs"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    Comprehensive Housing Affordability Strategy dataset
+                    American Community Survey
                   </a>
-                   from 2014-2018
+                   from 2015-2019
                 </li>
                 <li>
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states and the District of Columbia
+                  All U.S. states, the District of Columbia, and Puerto Rico
                 </li>
               </ul>
             </div>
             <div
-              id="lead-paint"
+              id="mine-land"
             >
               <h3>
-                Lead paint
+                NEW Abandoned mine lands
               </h3>
               <div>
                 
-        Percent of housing units built pre-1960, used as an indicator of potential lead paint exposure in
-        census tracts with median home values less than the 90th percentile.
+        Presence of an abandoned mine left by legacy coal mining operations.
       
               </div>
               <ul>
@@ -561,13 +931,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Affordable and sustainable housing category
+                  Legacy pollution category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Census
+                  Department of the Interior (DOI)
                 </li>
                 <li>
                   <span>
@@ -576,13 +946,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://www.census.gov/programs-surveys/acs"
+                    href="https://www.osmre.gov/programs/e-amlis"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    American Community Survey
+                    Abandoned Mine Land Inventory System (e-AMLIS)
                   </a>
-                   from 2015-2019
+                   from 2017
                 </li>
                 <li>
                   <span>
@@ -593,28 +963,28 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </ul>
             </div>
             <div
-              id="median-home"
+              id="fuds"
             >
               <h3>
-                Median home value
+                NEW Formerly Used Defense Sites
               </h3>
               <div>
                 
-        Median home value of owner-occupied housing units in the census tract.
-       
+      Properties that were owned, leased, or possessed by the United States, under the jurisdiction of the Secretary of Defense prior to October 1986.
+      
               </div>
               <ul>
                 <li>
                   <span>
                     Used in: 
                   </span>
-                  Affordable and sustainable housing category
+                  Legacy pollution category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Census
+                  U.S. Army Corps of Engineers
                 </li>
                 <li>
                   <span>
@@ -623,13 +993,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://www.census.gov/programs-surveys/acs"
+                    href="https://www.usace.army.mil/Missions/Environmental/Formerly-Used-Defense-Sites/"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    American Community Survey
+                    Formerly Used Defense Sites (FUDS) 
                   </a>
-                   from 2015-2019
+                    from 2019
                 </li>
                 <li>
                   <span>
@@ -643,13 +1013,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               id="prox-haz"
             >
               <h3>
-                Proximity to hazardous waste facilities
+                Proximity to hazardous waste sites
               </h3>
               <div>
                 
-        Count of hazardous waste facilities (Treatment, Storage, and Disposal Facilities and Large
-        Quantity Generators) within 5 kilometers (or nearest beyond 5 kilometers), each divided by 
-        distance in kilometers.
+        Number of hazardous waste facilities (Treatment, Storage, and Disposal Facilities and Large Quantity Generators) within 5 kilometers (or nearest beyond 5 kilometers), each divided by distance in kilometers.
       
               </div>
               <ul>
@@ -657,7 +1025,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Reduction and remediation of legacy pollution category
+                  Legacy pollution category
                 </li>
                 <li>
                   <span>
@@ -688,7 +1056,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states and the District of Columbia
+                  All U.S. states, the District of Columbia, and Puerto Rico
                 </li>
               </ul>
             </div>
@@ -696,12 +1064,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               id="prox-npl"
             >
               <h3>
-                Proximity to National Priorities List (NPL) sites
+                Proximity to Superfund sites
               </h3>
               <div>
                 
-        Count of proposed or listed NPL - also known as Superfund - sites within 5 kilometers (or nearest one
-        beyond 5 kilometers), each divided by distance in kilometers.
+        Number of proposed or listed Superfund or National Priorities list (NPL) sites within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
         
               </div>
               <ul>
@@ -709,7 +1076,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Reduction and remediation of legacy pollution category
+                  Legacy pollution category
                 </li>
                 <li>
                   <span>
@@ -736,7 +1103,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states and the District of Columbia
+                  All U.S. states, the District of Columbia, and Puerto Rico
                 </li>
               </ul>
             </div>
@@ -748,8 +1115,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </h3>
               <div>
                 
-        Count of RMP (potential chemical accident management plan) facilities within 5 kilometers (or nearest
-        one beyond 5 kilometers), each divided by distance in kilometers.
+        Count of RMP, or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
       
               </div>
               <ul>
@@ -757,7 +1123,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Reduction and remediation of legacy pollution category
+                  Legacy pollution category
                 </li>
                 <li>
                   <span>
@@ -784,20 +1150,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states and the District of Columbia
+                  All U.S. states, the District of Columbia, and Puerto Rico
                 </li>
               </ul>
             </div>
             <div
-              id="waste-water"
+              id="diesel-pm"
             >
               <h3>
-                Wastewater discharge
+                Diesel particulate matter exposure
               </h3>
               <div>
                 
-        Risk-Screening Environmental Indicators (RSEI) modeled toxic concentrations at
-        stream segments within 500 meters, divided by distance in kilometers.
+        Mixture of particles in diesel exhaust in the air, measured as micrograms per cubic meter.
       
               </div>
               <ul>
@@ -805,7 +1170,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Critical clean water and wastewater infrastructure category
+                  Transportation category
                 </li>
                 <li>
                   <span>
@@ -824,29 +1189,27 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     rel="noreferrer"
                     target="_blank"
                   >
-                    Risk-Screening Environmental Indicators (RSEI) Model
+                    National Air Toxics Assessment (NATA)
                   </a>
-                   from 2020 as compiled by EPA’s EJScreen
+                   from 2014 as compiled by EPA's EJScreen
                 </li>
                 <li>
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states and the District of Columbia
+                  All U.S. states, the District of Columbia, and Puerto Rico
                 </li>
               </ul>
             </div>
             <div
-              id="asthma"
+              id="trans-barrier"
             >
               <h3>
-                Asthma
+                NEW Transportation barriers
               </h3>
               <div>
                 
-        Weighted percent of people who answer “yes” to both of the following questions: “Have you ever
-        been told by a doctor, nurse, or other health professional that you have asthma?” and
-        “Do you still have asthma?”
+        Average relative cost and time spent on transportation relative to all other tracts.
       
               </div>
               <ul>
@@ -854,13 +1217,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Health burdens category
+                  Transportation category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Centers for Disease Control and Prevention (CDC)
+                  Department of Transportation (DOT)
                 </li>
                 <li>
                   <span>
@@ -869,33 +1232,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://www.cdc.gov/places/index.html"
+                    href="http://google.com"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    PLACES data
+                    Transportation Burdens indicator (need link)
                   </a>
-                   from 2016-2019
+                    from 2022
                 </li>
                 <li>
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states and the District of Columbia
+                  All U.S. states, the District of Columbia, and Puerto Rico
                 </li>
               </ul>
             </div>
             <div
-              id="diabetes"
+              id="traffic-vol"
             >
               <h3>
-                Diabetes
+                Traffic proximity and volume
               </h3>
               <div>
                 
-        Weighted percent of people ages 18 years and older who report having ever been
-        told by a doctor, nurse, or other health professionals that they have
-        diabetes other than diabetes during pregnancy.
+        Number of vehicles (average annual daily traffic) at major roads within 500 meters, divided by distance in meters.
       
               </div>
               <ul>
@@ -903,13 +1264,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Health burdens category
+                  Transportation category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Centers for Disease Control and Prevention (CDC)
+                  Department of Transportation (DOT)
                 </li>
                 <li>
                   <span>
@@ -918,33 +1279,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://www.cdc.gov/places/index.html"
+                    href="https://www.epa.gov/ejscreen/technical-documentation-ejscreen"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    PLACES data
+                    Traffic data
                   </a>
-                   from 2016-2019
+                   from 2017 as compiled by EPA's EJScreen
                 </li>
                 <li>
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states and the District of Columbia
+                  All U.S. states, the District of Columbia, and Puerto Rico
                 </li>
               </ul>
             </div>
             <div
-              id="heart-disease"
+              id="leaky-uwt"
             >
               <h3>
-                Heart disease
+                NEW Leaking underground storage tanks
               </h3>
               <div>
                 
-        Weighted percent of people ages 18 years and older who report ever having been told
-        by a doctor, nurse, or other health professionals that they had angina or
-        coronary heart disease.
+        Weighted formula of number of leaking underground storage tanks and the number of underground storage tanks within 1,500 feet.
       
               </div>
               <ul>
@@ -952,71 +1311,110 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Health burdens category
+                  Water and wastewater category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Centers for Disease Control and Prevention (CDC)
+                  Environmental Protection Agency (EPA)
                 </li>
                 <li>
                   <span>
                     Source: 
                   </span>
+                  Calculated from EPA’s 
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://www.cdc.gov/places/index.html"
+                    href="https://www.epa.gov/ust/ust-finder"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    PLACES data
+                    UST Finder
                   </a>
-                   from 2016-2019
+                   from 2021 as compiled by EPA's EJScreen
+    
                 </li>
                 <li>
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states and the District of Columbia
+                  All U.S. states, the District of Columbia, and Puerto Rico
                 </li>
               </ul>
             </div>
             <div
-              id="life-exp"
+              id="waste-water"
             >
               <h3>
-                Low life expectancy
+                Wastewater discharge
               </h3>
               <div>
                 
-        Average number of years of life a person who has attained a given age can expect to live.
+        Risk-Screening Environmental Indicators (RSEI) modeled toxic concentrations at
+        stream segments within 500 meters, divided by distance in kilometers.
       
               </div>
+              <ul>
+                <li>
+                  <span>
+                    Used in: 
+                  </span>
+                  Water and wastewater category
+                </li>
+                <li>
+                  <span>
+                    Responsible Party: 
+                  </span>
+                  Environmental Protection Agency (EPA)
+                </li>
+                <li>
+                  <span>
+                    Source: 
+                  </span>
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.epa.gov/ejscreen/technical-documentation-ejscreen"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Risk-Screening Environmental Indicators (RSEI) Model
+                  </a>
+                   from 2020 as compiled by EPA’s EJScreen
+                </li>
+                <li>
+                  <span>
+                    Available for: 
+                  </span>
+                  All U.S. states, the District of Columbia, and Puerto Rico
+                </li>
+              </ul>
+            </div>
+            <div
+              id="ling-iso"
+            >
+              <h3>
+                Linguistic isolation
+              </h3>
               <div>
-                <p>
-                  
-        
-                  <strong>
-                    Note: 
-                  </strong>
-                  The percentiles for this dataset have been reversed so that census tracts with lower numbers have higher life expectancies and the census tracts with higher numbers have lower life expectancy when compared to life expectancy in the area.
+                
+        Share of households where no one over the age 14 speaks English well.
       
-                </p>
               </div>
               <ul>
                 <li>
                   <span>
                     Used in: 
                   </span>
-                  Health burdens category
+                  Workforce development category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Centers for Disease Control and Prevention (CDC)
+                  U.S. Census
                 </li>
                 <li>
                   <span>
@@ -1025,13 +1423,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://www.cdc.gov/nchs/nvss/usaleep/usaleep.html#data"
+                    href="https://www.census.gov/programs-surveys/acs"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    U.S. Small-Area Life Expectancy Estimates Project (USALEEP)
+                    American Community Survey
                   </a>
-                   from 2010-2015
+                   from 2015-2019
                 </li>
                 <li>
                   <span>
@@ -1039,6 +1437,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   </span>
                   All U.S. states and the District of Columbia
                 </li>
+                <div>
+                  <p>
+                    
+      
+                    <strong>
+                      Note: 
+                    </strong>
+                    Linguistic isolation was removed from Puerto Rico based on feedback during the beta period.
+      
+                  </p>
+                </div>
               </ul>
             </div>
             <div
@@ -1049,7 +1458,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </h3>
               <div>
                 
-        Median income of the census tract calculated as a percent of the area’s median income.
+        Low median income calculated as a share of the area’s median income.
       
               </div>
               <div>
@@ -1059,7 +1468,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <strong>
                     Note: 
                   </strong>
-                  The percentiles for this dataset have been reversed so that census tracts with lower numbers have higher median incomes and census tracts with the higher numbers have lower median income when compared to area median income.
+                  The tool reverses the percentiles for this burden. This means that census tracts with lower numbers have higher median incomes and census tracts with the higher numbers have lower median incomes.
       
                 </p>
               </div>
@@ -1068,13 +1477,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Training and workforce development category
+                  Workforce development category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Census
+                  U.S. Census
                 </li>
                 <li>
                   <span>
@@ -1116,19 +1525,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Available for: 
                   </span>
-                  American Samoa and the Northern Mariana Islands
+                  American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands
+    
                 </li>
               </ul>
             </div>
             <div
-              id="ling-iso"
+              id="poverty"
             >
               <h3>
-                Linguistic isolation
+                Poverty
               </h3>
               <div>
                 
-        Percent of households where no one over the age 14 speaks English well.
+        Share of people living at or below 100% of the Federal poverty level.
       
               </div>
               <ul>
@@ -1136,13 +1546,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Training and workforce development category
+                  Workforce development category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Census
+                  U.S. Census
                 </li>
                 <li>
                   <span>
@@ -1175,7 +1585,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </h3>
               <div>
                 
-      Number of unemployed people as a percentage of the civilian labor force.
+        Number of unemployed people as a share of the  labor force.
       
               </div>
               <ul>
@@ -1183,13 +1593,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Training and workforce development category
+                  Workforce development category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Census
+                  U.S. Census
                 </li>
                 <li>
                   <span>
@@ -1231,20 +1641,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Available for: 
                   </span>
-                  American Samoa and the Northern Mariana Islands
+                  American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands
+    
                 </li>
               </ul>
             </div>
             <div
-              id="poverty"
+              id="high-school"
             >
               <h3>
-                Poverty
+                High school education
               </h3>
               <div>
                 
-        Percent of a census tract's population in households where the household income is at or below 100% of
-        the Federal poverty level.
+        Share of people aged 25 years or older who didn’t graduate from high school.
       
               </div>
               <ul>
@@ -1252,13 +1662,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Used in: 
                   </span>
-                  Training and workforce development category
+                  Workforce development category
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Census
+                  U.S. Census
                 </li>
                 <li>
                   <span>
@@ -1300,54 +1710,45 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Available for: 
                   </span>
-                  American Samoa and the Northern Mariana Islands
+                  American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands
+    
                 </li>
               </ul>
             </div>
             <div
-              id="high-school"
+              id="tribal-lands"
             >
               <h3>
-                High school degree non-attainment
+                NEW Tribal lands
               </h3>
               <div>
                 
-        Percent of people age 25 years or older in a census tract whose education level is less than a high school diploma.
+        The Land Area Representation (LAR) dataset depicts the exterior extent of a Federal Indian land area. 
+      
+              </div>
+              <div>
+                <p>
+                  
+        
+                  <strong>
+                    Note: 
+                  </strong>
+                  The LAR dataset depicts the exterior extent of a Federal Indian land area.  Not all Federally recognized tribes have a designated land area; therefore, they may not have an associated land area represented in the land area dataset.
       
+                </p>
               </div>
               <ul>
                 <li>
                   <span>
                     Used in: 
                   </span>
-                  Training and workforce development category
+                  Displaying Federally recognized tribal boundaries and Alaska Native Villages on the map
                 </li>
                 <li>
                   <span>
                     Responsible Party: 
                   </span>
-                  Census
-                </li>
-                <li>
-                  <span>
-                    Source: 
-                  </span>
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy=""
-                    href="https://www.census.gov/programs-surveys/acs"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    American Community Survey
-                  </a>
-                   from 2015-2019
-                </li>
-                <li>
-                  <span>
-                    Available for: 
-                  </span>
-                  All U.S. states, the District of Columbia, and Puerto Rico
+                  Bureau of Indian Affairs (BIA)
                 </li>
                 <li>
                   <span>
@@ -1356,19 +1757,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="https://www.census.gov/data/developers/data-sets/acs-5year/2010.html"
+                    href="https://www.bia.gov/bia/ots/dpmc/bogs"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    American Community Survey
+                    Land Area Representation (LAR) dataset
                   </a>
-                   from 2010
+                   from 2018
                 </li>
                 <li>
                   <span>
                     Available for: 
                   </span>
-                  American Samoa and the Northern Mariana Islands
+                  Federally-Recognized Tribes, including Alaskan Native villages 
                 </li>
               </ul>
             </div>
diff --git a/client/src/components/DatasetsButton/DatasetsButton.module.scss b/client/src/components/DatasetsButton/DatasetsButton.module.scss
new file mode 100644
index 000000000..b2cdf9abe
--- /dev/null
+++ b/client/src/components/DatasetsButton/DatasetsButton.module.scss
@@ -0,0 +1,25 @@
+@use '../../styles/design-system.scss' as *;
+
+.datasetsButtonContainer{
+      @include u-margin-top(3);
+
+      @include u-height(6);
+      z-index: 2;
+    
+      @include u-text("blue-70v");
+      @include u-bg("yellow-20v");
+    
+      &:hover {
+        @include u-bg("yellow-20");
+        @include u-text("gray-90");
+      }
+    
+      .launchIcon {
+        height: .8rem;
+    
+        // Change color of USWDS icon
+        filter: invert(13%) sepia(76%) saturate(5142%) hue-rotate(192deg) brightness(80%) contrast(106%);
+      }
+}
+
+
diff --git a/client/src/components/DatasetsButton/DatasetsButton.module.scss.d.ts b/client/src/components/DatasetsButton/DatasetsButton.module.scss.d.ts
new file mode 100644
index 000000000..863efccd0
--- /dev/null
+++ b/client/src/components/DatasetsButton/DatasetsButton.module.scss.d.ts
@@ -0,0 +1,13 @@
+declare namespace DatasetsButtonNamespace {
+    export interface IDatasetsButtonScss {
+      datasetsButtonContainer: string;
+      launchIcon: string;
+    }
+  }
+
+declare const DatasetsButtonScssModule: DatasetsButtonNamespace.IDatasetsButtonScss & {
+    /** WARNING: Only available when "css-loader" is used without "style-loader" or "mini-css-extract-plugin" */
+    locals: DatasetsButtonNamespace.IDatasetsButtonScss;
+  };
+
+  export = DatasetsButtonScssModule;
diff --git a/client/src/components/DatasetsButton/DatasetsButton.test.tsx b/client/src/components/DatasetsButton/DatasetsButton.test.tsx
new file mode 100644
index 000000000..6cee18c04
--- /dev/null
+++ b/client/src/components/DatasetsButton/DatasetsButton.test.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import {render} from '@testing-library/react';
+import {LocalizedComponent} from '../../test/testHelpers';
+import DatasetsButton from './DatasetsButton';
+
+describe('rendering of DatasetsButton Component', () => {
+  const {asFragment} = render(
+      <LocalizedComponent>
+        <DatasetsButton />
+      </LocalizedComponent>,
+  );
+  it('checks if component renders', () => {
+    expect(asFragment()).toMatchSnapshot();
+  });
+});
diff --git a/client/src/components/DatasetsButton/DatasetsButton.tsx b/client/src/components/DatasetsButton/DatasetsButton.tsx
new file mode 100644
index 000000000..d7b9f5ca8
--- /dev/null
+++ b/client/src/components/DatasetsButton/DatasetsButton.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import {useIntl} from 'gatsby-plugin-intl';
+import {Button} from '@trussworks/react-uswds';
+
+import * as styles from './DatasetsButton.module.scss';
+import * as METHODOLOGY_COPY from '../../data/copy/methodology';
+
+// @ts-ignore
+import launchIcon from '/node_modules/uswds/dist/img/usa-icons/launch.svg';
+
+export interface IDatasetsButtonProps {
+  href: string,
+}
+
+const DatasetsButton = ({href}: IDatasetsButtonProps) => {
+  const intl = useIntl();
+
+  return (
+    <a href={href} target='_blank' rel="noreferrer">
+      <Button
+        type="button"
+        className={styles.datasetsButtonContainer}>
+        {intl.formatMessage(METHODOLOGY_COPY.DATASETS.BUTTON_TEXT)}
+        <img
+          className={styles.launchIcon}
+          src={launchIcon}
+          alt={'launch icon'}
+        />
+      </Button>
+    </a>
+  );
+};
+
+export default DatasetsButton;
diff --git a/client/src/components/DatasetsButton/__snapshots__/DatasetsButton.test.tsx.snap b/client/src/components/DatasetsButton/__snapshots__/DatasetsButton.test.tsx.snap
new file mode 100644
index 000000000..060eeda36
--- /dev/null
+++ b/client/src/components/DatasetsButton/__snapshots__/DatasetsButton.test.tsx.snap
@@ -0,0 +1,22 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`rendering of DatasetsButton Component checks if component renders 1`] = `
+<DocumentFragment>
+  <a
+    rel="noreferrer"
+    target="_blank"
+  >
+    <button
+      class="usa-button"
+      data-testid="button"
+      type="button"
+    >
+      Share data sources with CEQ
+      <img
+        alt="launch icon"
+        src="test-file-stub"
+      />
+    </button>
+  </a>
+</DocumentFragment>
+`;
diff --git a/client/src/components/DatasetsButton/index.ts b/client/src/components/DatasetsButton/index.ts
new file mode 100644
index 000000000..d5def2ac9
--- /dev/null
+++ b/client/src/components/DatasetsButton/index.ts
@@ -0,0 +1,2 @@
+import DatasetsButton from './DatasetsButton';
+export default DatasetsButton;
diff --git a/client/src/components/SubPageNav/SubPageNav.module.scss b/client/src/components/SubPageNav/SubPageNav.module.scss
index e69de29bb..af1fdee92 100644
--- a/client/src/components/SubPageNav/SubPageNav.module.scss
+++ b/client/src/components/SubPageNav/SubPageNav.module.scss
@@ -0,0 +1,5 @@
+@use '../../styles/design-system.scss' as *;
+
+.subPageNavContainer {
+    @include u-margin-top(2);
+}
\ No newline at end of file
diff --git a/client/src/components/SubPageNav/SubPageNav.module.scss.d.ts b/client/src/components/SubPageNav/SubPageNav.module.scss.d.ts
index e69de29bb..0b978ba27 100644
--- a/client/src/components/SubPageNav/SubPageNav.module.scss.d.ts
+++ b/client/src/components/SubPageNav/SubPageNav.module.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace SurveyButtonNamespace {
+    export interface ISurveyButtonScss {
+        subPageNavContainer: string;
+    }
+  }
+
+declare const SurveyButtonScssModule: SurveyButtonNamespace.ISurveyButtonScss & {
+    /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+    locals: SurveyButtonNamespace.ISurveyButtonScss;
+  };
+
+  export = SurveyButtonScssModule;
diff --git a/client/src/components/SubPageNav/SubPageNav.tsx b/client/src/components/SubPageNav/SubPageNav.tsx
index 754830a64..c3625d03e 100644
--- a/client/src/components/SubPageNav/SubPageNav.tsx
+++ b/client/src/components/SubPageNav/SubPageNav.tsx
@@ -6,6 +6,8 @@ import LinkTypeWrapper from '../LinkTypeWrapper';
 import {PAGES_ENDPOINTS} from '../../data/constants';
 import * as COMMON_COPY from '../../data/copy/common';
 
+import * as styles from './SubPageNav.module.scss';
+
 // This prop is used to set which sub-page navigation is active
 interface ISubPageNav {
     activeSubPageIndex?: number;
@@ -78,7 +80,9 @@ const SubPageNav = ({activeSubPageIndex = 0, endPoints}:ISubPageNav) => {
   // ];
 
   return (
-    <SideNav items={subPages}/>
+    <div className={styles.subPageNavContainer}>
+      <SideNav items={subPages}/>
+    </div>
   );
 };
 
diff --git a/client/src/components/SubPageNav/__snapshots__/SubPageNav.test.tsx.snap b/client/src/components/SubPageNav/__snapshots__/SubPageNav.test.tsx.snap
index dc01d8100..e2c283c0d 100644
--- a/client/src/components/SubPageNav/__snapshots__/SubPageNav.test.tsx.snap
+++ b/client/src/components/SubPageNav/__snapshots__/SubPageNav.test.tsx.snap
@@ -2,28 +2,30 @@
 
 exports[`rendering of the SubPageNav checks SubPageNav renders 1`] = `
 <DocumentFragment>
-  <ul
-    class="usa-sidenav"
-    data-testid="sidenav"
-  >
-    <li
-      class="usa-sidenav__item"
+  <div>
+    <ul
+      class="usa-sidenav"
+      data-testid="sidenav"
     >
-      <a
-        class="usa-link usa-current"
-        href="/en/methodology"
+      <li
+        class="usa-sidenav__item"
       >
-        Methodology & data
-      </a>
-    </li>
-    <li
-      class="usa-sidenav__item"
-    >
-      <a
-        class="usa-link"
-        href="/en/download"
-      />
-    </li>
-  </ul>
+        <a
+          class="usa-link usa-current"
+          href="/en/methodology"
+        >
+          Methodology & data
+        </a>
+      </li>
+      <li
+        class="usa-sidenav__item"
+      >
+        <a
+          class="usa-link"
+          href="/en/download"
+        />
+      </li>
+    </ul>
+  </div>
 </DocumentFragment>
 `;
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 7c7d56193..4976142e0 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -1211,7 +1211,7 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   // Legacy Pollution
   ABANDON_MINES: {
     id: 'explore.map.page.side.panel.indicator.description.abandon.mines',
-    defaultMessage: 'Presence of an abandoned mine lands within the tract',
+    defaultMessage: 'Presence of an abandoned mine land within the tract',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned mine lands within the tract`,
   },
   FORMER_DEF_SITES: {
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index 78f28ab5d..e92508dc6 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -17,28 +17,65 @@ export const PAGE = defineMessages({
     defaultMessage: 'Methodology',
     description: 'Navigate to the methodology page. This is the methodology page header text',
   },
-  DESCRIPTION: {
-    id: 'methodology.page.paragraph',
+  PARA1: {
+    id: 'methodology.page.paragraph.1',
     defaultMessage: `
-      The current version of the tool identifies communities that are disadvantaged for the purposes of 
-      the Justice40 Initiative using census tracts, which are the smallest geographic unit for 
-      which publicly-available and nationally-consistent datasets can be consistently displayed on the 
-      tool. Census tract geographical boundaries are determined by the U.S. Census Bureau once every ten 
-      years. This tool utilizes the census tract boundaries from 2010 because they match the datasets used 
-      in the tool.
+      The tool highlights disadvantaged census tracts across all 50 states, the District of Columbia, and the U.S. territories. A community is considered disadvantaged:
     `,
-    description: 'Navigate to the methodology page. This is the methodology page paragraph',
+    description: 'Navigate to the methodology page. This is the methodology paragraph 1',
   },
-  CATEGORY_TEXT: {
-    id: 'methodology.page.categories.title',
+  PARA1_BULLET1: {
+    id: 'methodology.page.paragraph.1.bullet.1',
     defaultMessage: `
-      Communities are identified as disadvantaged by the current version of the tool for the purposes of 
-      the Justice40 Initiative if they are located in census tracts that are at or above the 
-      thresholds in one or more of eight categories of criteria below. 
+      If they are in a census tract that meets the thresholds for at least one of tool’s categories of burden, or
     `,
-    description: 'Navigate to the methodology page. This is the methodology page explanation of the categories',
+    description: 'Navigate to the methodology page. This is the methodology paragraph 1, bullet 1',
+  },
+  PARA1_BULLET2: {
+    id: 'methodology.page.paragraph.1.bullet.2',
+    defaultMessage: `
+      If they are on Federally-Recognized Tribal land
+    `,
+    description: 'Navigate to the methodology page. This is the methodology paragraph 1, bullet 2',
+  },
+  SUB_HEADING_1: {
+    id: 'methodology.page.sub.heading.1',
+    defaultMessage: `
+      Categories of Burdens
+    `,
+    description: 'Navigate to the methodology page. This is sub-heading 1',
+  },
+  SUB_HEADING_2: {
+    id: 'methodology.page.sub.heading.2',
+    defaultMessage: `
+      Tribal lands
+    `,
+    description: 'Navigate to the methodology page. This is sub-heading 2',
+  },
+  PARA3: {
+    id: 'methodology.page.paragraph.3',
+    defaultMessage: `
+      The tool uses datasets as indicators of burdens. The burdens are organized into categories. A community is highlighted as disadvantaged on the CEJST map if it is in a census tract that is (1) at or above the threshold for one or more environmental, climate, or other burdens, and (2) at or
+      above the threshold for an associated socioeconomic burden. In addition, a census tract that is completely surrounded by disadvantaged communities that meet the burden thresholds, and is at or above 
+      the 50% percentile for low income, is also considered disadvantaged. 
+    `,
+    description: 'Navigate to the methodology page. This is the methodology paragraph 3',
+  },
+  PARA4: {
+    id: 'methodology.page.paragraph.4',
+    defaultMessage: `
+      Census tracts are small units of geography. Census tract boundaries are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
+      census boundaries.    
+    `,
+    description: 'Navigate to the methodology page. This is the methodology paragraph 4',
+  },
+  PARA5: {
+    id: 'methodology.page.paragraph.5',
+    defaultMessage: `
+      Federally-Recognized Tribal lands, including Alaska Native Villages, are also considered disadvantaged and highlighted on the map.   
+    `,
+    description: 'Navigate to the methodology page. This is the methodology paragraph 5',
   },
-
 });
 
 export const FORMULA = {
@@ -75,13 +112,13 @@ export const FORMULA = {
 export const CATEGORY = {
   HEADING: <FormattedMessage
     id={'methodology.page.indicator.categories.heading'}
-    defaultMessage={'Categories'}
+    defaultMessage={'Categories of Burdens'}
     description={'Navigate to the methodology page. Navigate to the category section. This is category heading'}
   />,
   ID_AS_DISADV_TEXT: <FormattedMessage
     id={'methodology.page.category.card.title'}
     defaultMessage={`
-      Communities are <boldtag>identified as disadvantaged</boldtag>
+      Communities are <boldtag>identified as disadvantaged</boldtag> if they are in census tracts that:
     `}
     description={'Navigate to the methodology page. Navigate to the category section. This is category heading'}
     values={{
@@ -92,21 +129,20 @@ export const CATEGORY = {
 
 // Category AND Clause:
 export const CATEGORY_AND_CLAUSE = {
-  LOW_INC_65_WHEN_HIGH_ED_LTE_20: <FormattedMessage
-    id={'methodology.page.category.and.clause.low.inc.hs.ed'}
+  LOW_INC_65: <FormattedMessage
+    id={'methodology.page.category.and.clause.low.inc'}
     defaultMessage={`
-      <boldtag>AND</boldtag> is at or above the 65th percentile for <link1>low income</link1> AND 80% or more of individuals 15 or older are not enrolled in <link2>higher education</link2> 
+      <boldtag>AND</boldtag> are at or above the 65th percentile for <link1>low income</link1>
     `}
-    description={'Navigate to the methodology page. Navigate to the category section. This is category portion of the formula dealing with lower income and high school degree rate'}
+    description={'Navigate to the methodology page. Navigate to the category section. This is category portion of the formula dealing with lower income'}
     values={{
       boldtag: boldFn,
       link1: simpleLink('#low-income'),
-      link2: simpleLink('#high-ed-enroll-rate'),
     }}
   />,
-  HS_DEG_90_WHEN_HIGH_ED_LTE_20: <FormattedMessage
+  HS_DEG_GTE_10: <FormattedMessage
     id={'methodology.page.category.and.clause.hs.ed.higher.ed'}
-    defaultMessage={`<boldtag>AND</boldtag> 10% or more of adults 25 or older have not attained a <link1>high school degree</link1> AND 80% or more of individuals 15 or older are not enrolled in <link2>higher education</link2> 
+    defaultMessage={`<boldtag>AND</boldtag> have 10% or more of adults have a <link1>high school education</link1> level less than a high school degree
   `}
     description={'Navigate to the methodology page. Navigate to the category section. This is the portion of the formula dealing with higher ed enrollment and high school degree rate'}
     values={{
@@ -143,32 +179,34 @@ export const CATEGORIES = {
     />,
     IF: <FormattedMessage
       id={'methodology.page.indicator.categories.climate.change.if'}
-      defaultMessage={`<boldtag>IF</boldtag> at or above the 90th percentile for <link1>expected agriculture loss rate</link1> OR <link2>expected building loss rate</link2> OR <link3>expected population loss rate</link3>`}
+      defaultMessage={`<boldtag>ARE</boldtag> at or above the 90th percentile for <link1>expected agriculture loss rate</link1> OR <link2>expected building loss rate</link2> OR <link3>expected population loss rate</link3>  OR <link4>projected flood risk</link4> OR <link5>projected wildfire risk</link5>`}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula'}
       values={{
         boldtag: boldFn,
         link1: simpleLink('#exp-agr-loss-rate'),
         link2: simpleLink('#exp-bld-loss-rate'),
         link3: simpleLink('#exp-pop-loss-rate'),
+        link4: simpleLink('#flood-risk'),
+        link5: simpleLink('#wildfire-risk'),
       }}
     />,
-    AND: CATEGORY_AND_CLAUSE.LOW_INC_65_WHEN_HIGH_ED_LTE_20,
+    AND: CATEGORY_AND_CLAUSE.LOW_INC_65,
   },
   CLEAN_ENERGY: {
     METHODOLOGY: <FormattedMessage
       id={'methodology.page.indicator.categories.clean.energy.methodology'}
-      defaultMessage={`Clean energy and energy efficiency category`}
+      defaultMessage={`Energy category`}
       description={`Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Clean energy and energy efficiency methodology`}
     />,
     TITLE: <FormattedMessage
       id={'indicator.categories.clean.energy.title'}
-      defaultMessage={'Clean energy and energy efficiency'}
+      defaultMessage={'Energy'}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the category title'}
 
     />,
     IF: <FormattedMessage
       id={'methodology.page.indicator.categories.clean.energy.if'}
-      defaultMessage={`<boldtag>IF</boldtag> at or above the 90th percentile for <link1>energy burden</link1> OR <link2>PM2.5 in the air</link2>`}
+      defaultMessage={`<boldtag>ARE</boldtag> at or above the 90th percentile for <link1>energy cost</link1> OR <link2>PM2.5 in the air</link2>`}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the if if portion of the formula'}
       values={{
         boldtag: boldFn,
@@ -176,137 +214,141 @@ export const CATEGORIES = {
         link2: simpleLink('#pm-25'),
       }}
     />,
-    AND: CATEGORY_AND_CLAUSE.LOW_INC_65_WHEN_HIGH_ED_LTE_20,
+    AND: CATEGORY_AND_CLAUSE.LOW_INC_65,
   },
-  CLEAN_TRANSPORT: {
+  HEALTH_BURDENS: {
     METHODOLOGY: <FormattedMessage
-      id={'methodology.page.indicator.categories.clean.transport.methodology'}
-      defaultMessage={`Clean transit category`}
-      description={`Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Clean transportation methodology`}
+      id={'methodology.page.indicator.categories.health.burdens.methodology'}
+      defaultMessage={`Health category`}
+      description={`Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Health burdens methodology`}
     />,
     TITLE: <FormattedMessage
-      id={'indicator.categories.clean.transport.title'}
-      defaultMessage={'Clean transit'}
+      id={'indicator.categories.health.burdens.title'}
+      defaultMessage={'Health'}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the category title'}
 
     />,
     IF: <FormattedMessage
-      id={'methodology.page.indicator.categories.clean.transport.if'}
-      defaultMessage={`
-        <boldtag>IF</boldtag> at or above the 90th percentile for <link1>diesel particulate matter exposure</link1> or <link2>traffic proximity and volume</link2>
-      `}
+      id={'methodology.page.indicator.categories.health.burdens.if'}
+      defaultMessage={`<boldtag>ARE</boldtag> at or above the 90th percentile for <link1>asthma</link1> OR <link2>diabetes</link2> OR <link3>heart disease</link3> OR <link4>low life expectancy</link4>`}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula'}
       values={{
         boldtag: boldFn,
-        link1: simpleLink('#diesel-pm'),
-        link2: simpleLink('#traffic-vol'),
+        link1: simpleLink('#asthma'),
+        link2: simpleLink('#diabetes'),
+        link3: simpleLink('#heart-disease'),
+        link4: simpleLink('#life-exp'),
       }}
     />,
-    AND: CATEGORY_AND_CLAUSE.LOW_INC_65_WHEN_HIGH_ED_LTE_20,
+    AND: CATEGORY_AND_CLAUSE.LOW_INC_65,
   },
   AFFORDABLE_HOUSING: {
     METHODOLOGY: <FormattedMessage
       id={'methodology.page.indicator.categories.afford.housing.methodology'}
-      defaultMessage={`Affordable and sustainable housing category`}
+      defaultMessage={`Housing category`}
       description={`Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Affordable and sustainable housing methodology`}
     />,
     TITLE: <FormattedMessage
       id={'indicator.categories.afford.house.title'}
-      defaultMessage={'Affordable and sustainable housing'}
+      defaultMessage={'Housing'}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the category title'}
 
     />,
     IF: <FormattedMessage
       id={'methodology.page.indicator.categories.afford.house.if'}
-      defaultMessage={`<boldtag>IF</boldtag> at or above the 90th percentile for <link1>lead paint</link1> AND <link2>median home value</link2> is at or less than the 90th percentile OR at or above the 90th percentile for the <link3>housing cost burden</link3>`}
+      defaultMessage={`Experienced <link0>historic underinvestment</link0> OR are at or above the 90th percentile for the <link1>housing cost</link1> OR <link2>lack of green space</link2> OR <link3>lack of indoor plumbing</link3> OR <link4>lead paint</link4>`}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula'}
       values={{
-        boldtag: boldFn,
-        link1: simpleLink('#lead-paint'),
-        link2: simpleLink('#median-home'),
-        link3: simpleLink('#house-burden'),
+        link0: simpleLink('#hist-underinv'),
+        link1: simpleLink('#house-burden'),
+        link2: simpleLink('#green-space'),
+        link3: simpleLink('#indoor-plumb'),
+        link4: simpleLink('#lead-paint'),
       }}
     />,
-    AND: CATEGORY_AND_CLAUSE.LOW_INC_65_WHEN_HIGH_ED_LTE_20,
+    AND: CATEGORY_AND_CLAUSE.LOW_INC_65,
   },
   LEGACY_POLLUTION: {
     METHODOLOGY: <FormattedMessage
       id={'methodology.page.indicator.categories.legacy.pollute.methodology'}
-      defaultMessage={`Reduction and remediation of legacy pollution category`}
+      defaultMessage={`Legacy pollution category`}
       description={`Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Reduction and remediation of legacy pollution methodology`}
     />,
     TITLE: <FormattedMessage
       id={'indicator.categories.legacy.pollution.title'}
-      defaultMessage={'Reduction and remediation of legacy pollution'}
+      defaultMessage={'Legacy pollution'}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the category title'}
 
     />,
     IF: <FormattedMessage
       id={'methodology.page.indicator.categories.legacy.pollution.if'}
-      defaultMessage={`<boldtag>IF</boldtag> at or above the 90th percentile for <link1>proximity to hazardous waste facilities</link1> OR <link2>proximity to National Priorities List (NPL) sites</link2> OR <link3>proximity to Risk Management Plan (RMP) facilities</link3>`}
+      defaultMessage={`Have at least one <link0>abandoned mine land</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites</link3> OR <link4>proximity to Risk Management Plan facilities</link4>`}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula'}
       values={{
-        boldtag: boldFn,
-        link1: simpleLink('#prox-haz'),
-        link2: simpleLink('#prox-npl'),
-        link3: simpleLink('#prox-rmp'),
+        link0: simpleLink('#mine-land'),
+        link1: simpleLink('#fuds'),
+        link2: simpleLink('#prox-haz'),
+        link3: simpleLink('#prox-npl'),
+        link4: simpleLink('#prox-rmp'),
       }}
     />,
-    AND: CATEGORY_AND_CLAUSE.LOW_INC_65_WHEN_HIGH_ED_LTE_20,
+    AND: CATEGORY_AND_CLAUSE.LOW_INC_65,
   },
-  CLEAN_WATER: {
+  CLEAN_TRANSPORT: {
     METHODOLOGY: <FormattedMessage
-      id={'methodology.page.indicator.categories.clean.water.methodology'}
-      defaultMessage={`Critical clean water and wastewater infrastructure category`}
-      description={`Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Critical clean water and wastewater infrastructure methodology`}
+      id={'methodology.page.indicator.categories.clean.transport.methodology'}
+      defaultMessage={`Transportation category`}
+      description={`Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Clean transportation methodology`}
     />,
     TITLE: <FormattedMessage
-      id={'indicator.categories.clean.water.title'}
-      defaultMessage={'Critical clean water and wastewater infrastructure'}
+      id={'indicator.categories.clean.transport.title'}
+      defaultMessage={'Transportation'}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the category title'}
 
     />,
     IF: <FormattedMessage
-      id={'methodology.page.indicator.categories.clean.water.if'}
-      defaultMessage={`<boldtag>IF</boldtag> at or above the 90th percentile for <link1>wastewater discharge</link1>`}
+      id={'methodology.page.indicator.categories.clean.transport.if'}
+      defaultMessage={`
+        <boldtag>ARE</boldtag> at or above the 90th percentile for <link1>diesel particulate matter exposure</link1> OR <link3>transportation barriers</link3> OR <link2>traffic proximity and volume</link2>
+      `}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula'}
       values={{
         boldtag: boldFn,
-        link1: simpleLink('#waste-water'),
+        link1: simpleLink('#diesel-pm'),
+        link2: simpleLink('#traffic-vol'),
+        link3: simpleLink('#trans-barrier'),
       }}
     />,
-    AND: CATEGORY_AND_CLAUSE.LOW_INC_65_WHEN_HIGH_ED_LTE_20,
+    AND: CATEGORY_AND_CLAUSE.LOW_INC_65,
   },
-  HEALTH_BURDENS: {
+  CLEAN_WATER: {
     METHODOLOGY: <FormattedMessage
-      id={'methodology.page.indicator.categories.health.burdens.methodology'}
-      defaultMessage={`Health burdens category`}
-      description={`Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Health burdens methodology`}
+      id={'methodology.page.indicator.categories.clean.water.methodology'}
+      defaultMessage={`Water and wastewater category`}
+      description={`Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Water and wastewater methodology`}
     />,
     TITLE: <FormattedMessage
-      id={'indicator.categories.health.burdens.title'}
-      defaultMessage={'Health burdens'}
+      id={'indicator.categories.clean.water.title'}
+      defaultMessage={'Water and wastewater'}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the category title'}
 
     />,
     IF: <FormattedMessage
-      id={'methodology.page.indicator.categories.health.burdens.if'}
-      defaultMessage={`<boldtag>IF</boldtag> at or above the 90th percentile for <link1>asthma</link1> OR <link2>diabetes</link2> OR <link3>heart disease</link3> OR <link4>low life expectancy</link4>`}
+      id={'methodology.page.indicator.categories.clean.water.if'}
+      defaultMessage={`<boldtag>ARE</boldtag> at or above the 90th percentile for <link0>leaking underground storage tanks</link0> OR <link1>wastewater discharge</link1>`}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula'}
       values={{
         boldtag: boldFn,
-        link1: simpleLink('#asthma'),
-        link2: simpleLink('#diabetes'),
-        link3: simpleLink('#heart-disease'),
-        link4: simpleLink('#life-exp'),
+        link0: simpleLink('#leaky-uwt'),
+        link1: simpleLink('#waste-water'),
       }}
     />,
-    AND: CATEGORY_AND_CLAUSE.LOW_INC_65_WHEN_HIGH_ED_LTE_20,
+    AND: CATEGORY_AND_CLAUSE.LOW_INC_65,
   },
   WORKFORCE_DEV: {
     METHODOLOGY: <FormattedMessage
       id={'methodology.page.indicator.categories.workforce.dev.methodology'}
-      defaultMessage={`Training and workforce development category`}
+      defaultMessage={`Workforce development category`}
       description={`Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Training and workforce development`}
     />,
     TITLE: <FormattedMessage
@@ -317,7 +359,8 @@ export const CATEGORIES = {
     />,
     IF: <FormattedMessage
       id={'methodology.page.indicator.categories.work.dev.if'}
-      defaultMessage={`<boldtag>IF</boldtag> at or above the 90th percentile for <link1>low median income</link1> as a percentage of area median income OR <link2>linguistic isolation</link2> OR <link3>unemployment</link3> OR percentage of individuals in households at or below 100% Federal <link4>poverty</link4> level
+      defaultMessage={`
+        <boldtag>ARE</boldtag> at or above the 90th percentile for <link2>linguistic isolation</link2> OR <link1>low median income</link1> OR <link4>poverty</link4> OR <link3>unemployment</link3>
       `}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula'}
       values={{
@@ -328,7 +371,15 @@ export const CATEGORIES = {
         link4: simpleLink('#poverty'),
       }}
     />,
-    AND: CATEGORY_AND_CLAUSE.HS_DEG_90_WHEN_HIGH_ED_LTE_20,
+    AND: CATEGORY_AND_CLAUSE.HS_DEG_GTE_10,
+  },
+  TRIBAL_LANDS: {
+    METHODOLOGY: <FormattedMessage
+      id={'methodology.page.indicator.categories.tribal.lands.methodology'}
+      defaultMessage={`Displaying Federally recognized tribal boundaries and Alaska Native Villages on the map`}
+      description={`Displaying Federally recognized tribal boundaries and Alaska Native Villages on the map`}
+    />,
+
   },
 };
 
@@ -339,12 +390,15 @@ export const DATASETS = defineMessages({
     defaultMessage: 'Datasets used in beta methodology',
     description: 'Navigate to the Methodology page. This is the section heading of which datasets are used in cumulative score',
   },
+  BUTTON_TEXT: {
+    id: 'methodology.page.datasetContainer.button.text',
+    defaultMessage: 'Share data sources with CEQ',
+    description: 'Navigate to the Methodology page. This is the section heading of which datasets are used in cumulative score with a button labeled: Share data sources with CEQ',
+  },
   INFO: {
     id: 'methodology.page.datasetContainer.info',
     defaultMessage: `
-      The datasets used in the current version of the tool come from a variety of sources and were 
-      selected based on relevance, availability, and quality. The datasets seek to identify a range of 
-      human health, environmental, climate-related, and other impacts on communities.
+      The tool's datasets are public and consistent nationwide. They come from different sources and are high quality. The Council on Environmental Quality (CEQ) chose them based on relevance,  availability, and quality. They identify climate, environmental, and other burdens on communities.
     `,
     description: 'Navigate to the Methodology page. This is the description of the dataset section',
   },
@@ -360,6 +414,17 @@ export const DATASETS = defineMessages({
   },
 });
 
+export const DATASETS_RICH_TEXT = {
+  HEADING: <FormattedMessage
+    id= {'methodology.page.datasetContainer.heading.rich.text'}
+    defaultMessage= {'Datasets used in v{version} methodology'}
+    description={ 'Navigate to the Methodology page. This is the section heading of which datasets are used in cumulative score'}
+    values={{
+      version: VERSION_NUMBER,
+    }}
+  />,
+};
+
 export const DATASET_CARD_LABELS = defineMessages({
   USED_IN: {
     id: 'methodology.page.datasetCard.used.in',
@@ -399,18 +464,27 @@ export const DATE_RANGE = {
   SIXTEEN_PLUS_4: '2016-2020',
   SEVENTEEN: '2017',
   EIGHTEEN: '2018',
+  NINETEEN: '2019',
   TWENTY: '2020',
+  TWENTYONE: '2021',
+  TWENTYTWO: '2022',
 };
 
 export const RESPONSIBLE_PARTIES = {
+  BIA: `Bureau of Indian Affairs (BIA)`,
   CDC: `Centers for Disease Control and Prevention (CDC)`,
-  CENSUS: `Census`,
+  CENSUS: `U.S. Census`,
   DOE: `Department of Energy (DOE)`,
+  DOI: `Department of the Interior (DOI)`,
   DOT: `Department of Transportation (DOT)`,
   EPA: `Environmental Protection Agency (EPA)`,
   EPA_OAR: `Environmental Protection Agency (EPA) Office of Air and Radiation (OAR)`,
+  FIRST: `First Street Foundation`,
   FEMA: `Federal Emergency Management Agency (FEMA)`,
   HUD: `Department of Housing & Urban Development (HUD)`,
+  NCRC: `Nationl Community Reinvestment Coalition (NCRC)`,
+  TPL: `The Trust for Public Lands and American Forestry`,
+  USACE: `U.S. Army Corps of Engineers`,
 };
 
 export const SOURCE_LINKS = {
@@ -544,6 +618,79 @@ export const SOURCE_LINKS = {
       date10_15: DATE_RANGE.TEN_PLUS_5,
     }}
   />,
+  FIRST_ST: <FormattedMessage
+    id={'methodology.page.category.source.first.street.link'}
+    defaultMessage={`<link1>Climate Risk Data Access</link1> from {date22}`}
+    description={'Navigate to the Methodology page. This is the source link for CDC Sleep'}
+    values={{
+      link1: linkFn('https://firststreet.org/data-access/', false, true),
+      date22: DATE_RANGE.TWENTYTWO,
+    }}
+  />,
+  HOLC: <FormattedMessage
+    id={'methodology.page.category.source.holc.link'}
+    defaultMessage={`<link1>Dataset of formerly redlined areas</link1> using digitized maps from the Home Owners Loan Corporation from {date10}`}
+    description={'Navigate to the Methodology page. This is the source link for CDC Sleep'}
+    values={{
+      link1: linkFn('https://www.openicpsr.org/openicpsr/project/141121/version/V2/view', false, true),
+      date10: DATE_RANGE.TEN,
+    }}
+  />,
+  PDI: <FormattedMessage
+    id={'methodology.page.category.source.pdi.link'}
+    defaultMessage={`<link1>Percent Developed Imperviousness (CONUS) </link1> from {date19}`}
+    description={'Navigate to the Methodology page. This is the source link for CDC Sleep'}
+    values={{
+      link1: linkFn('https://www.mrlc.gov/data/nlcd-2019-percent-developed-imperviousness-conus', false, true),
+      date19: DATE_RANGE.NINETEEN,
+    }}
+  />,
+  AML: <FormattedMessage
+    id={'methodology.page.category.source.aml.link'}
+    defaultMessage={`<link1>Abandoned Mine Land Inventory System (e-AMLIS)</link1> from {date17}`}
+    description={'Navigate to the Methodology page. This is the source link for CDC Sleep'}
+    values={{
+      link1: linkFn('https://www.osmre.gov/programs/e-amlis', false, true),
+      date17: DATE_RANGE.SEVENTEEN,
+    }}
+  />,
+  FUDS: <FormattedMessage
+    id={'methodology.page.category.source.fuds.link'}
+    defaultMessage={`<link1>Formerly Used Defense Sites (FUDS) </link1>  from {date19}`}
+    description={'Navigate to the Methodology page. This is the source link for CDC Sleep'}
+    values={{
+      link1: linkFn('https://www.usace.army.mil/Missions/Environmental/Formerly-Used-Defense-Sites/', false, true),
+      date19: DATE_RANGE.NINETEEN,
+    }}
+  />,
+  TRANS_BUR: <FormattedMessage
+    id={'methodology.page.category.source.trans.bur.link'}
+    defaultMessage={`<link1>Transportation Burdens indicator (need link)</link1>  from {date22}`}
+    description={'Navigate to the Methodology page. This is the source link for Transportation burdens'}
+    values={{
+      link1: linkFn('http://google.com', false, true),
+      date22: DATE_RANGE.TWENTYTWO,
+    }}
+  />,
+  UST_FIND: <FormattedMessage
+    id={'methodology.page.category.source.ust.find.link'}
+    defaultMessage={`Calculated from EPA’s <link1>UST Finder</link1> from {date21} as compiled by EPA's EJScreen
+    `}
+    description={'Navigate to the Methodology page. This is the source link for UST Find'}
+    values={{
+      link1: linkFn('https://www.epa.gov/ust/ust-finder', false, true),
+      date21: DATE_RANGE.TWENTYONE,
+    }}
+  />,
+  BIA_LAR: <FormattedMessage
+    id={'methodology.page.category.source.bia.lar.link'}
+    defaultMessage={`<link1>Land Area Representation (LAR) dataset</link1> from {date18}`}
+    description={'Navigate to the Methodology page. This is the source link for BIA data'}
+    values={{
+      link1: linkFn('https://www.bia.gov/bia/ots/dpmc/bogs', false, true),
+      date18: DATE_RANGE.EIGHTEEN,
+    }}
+  />,
 };
 
 export const AVAILABLE_FOR = defineMessages({
@@ -560,7 +707,28 @@ export const AVAILABLE_FOR = defineMessages({
   AS_NMI: {
     id: 'methodology.page.dataset.card.availableFor.AS_NMI',
     defaultMessage: `American Samoa and the Northern Mariana Islands`,
-    description: 'Methodology page dataset card available for American Samoa and Northern Mariana Islands type',
+    description: 'Methodology page dataset card available for AS_NMI',
+  },
+  ALL_ISLDS: {
+    id: 'methodology.page.dataset.card.availableFor.ALL_ISLDS',
+    defaultMessage: `American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands
+    `,
+    description: 'Methodology page dataset card available for ALL_ISLDS',
+  },
+  CONUS_DC: {
+    id: 'methodology.page.dataset.card.availableFor.CONUS_DC',
+    defaultMessage: `All contiguous U.S. states and the District of Columbia `,
+    description: 'Methodology page dataset card available for CONUS and DC',
+  },
+  METRO_US_HOLC: {
+    id: 'methodology.page.dataset.card.availableFor.METRO_US_HOLC',
+    defaultMessage: `Metro areas of US that were HOLC graded `,
+    description: 'Methodology page dataset card available for METRO_US_HOLC',
+  },
+  FRT: {
+    id: 'methodology.page.dataset.card.availableFor.FRT',
+    defaultMessage: `Federally-Recognized Tribes, including Alaskan Native villages `,
+    description: 'Methodology page dataset card available for FRT',
   },
 });
 
@@ -582,6 +750,7 @@ export interface IIndicators {
 };
 
 export const INDICATORS = [
+  // All categories:
   {
     domID: 'low-income',
     indicator: <FormattedMessage
@@ -593,7 +762,7 @@ export const INDICATORS = [
       id={'methodology.page.category.low.income.description.text'}
       defaultMessage={`
         Percent of a census tract's population in households where household income is at or below
-        200% of the Federal poverty level.
+        200% of the Federal poverty level, not including students enrolled in higher education.
       `}
       description={'Navigate to the Methodology page. This is the description text for low income'}
     />,
@@ -606,29 +775,8 @@ export const INDICATORS = [
       },
     ],
   },
-  {
-    domID: 'high-ed-enroll-rate',
-    indicator: <FormattedMessage
-      id={'methodology.page.dataset.indicator.high.ed.enroll.title.text'}
-      defaultMessage={`Higher education non-enrollment`}
-      description={'Navigate to the Methodology page. This is the title text for the high ed enrollment dataset'}
-    />,
-    description: <FormattedMessage
-      id={'methodology.page.category.high.ed.enroll.rate.description.text'}
-      defaultMessage={`
-        Percent of people 15 or older who are not currently enrolled in college, university, or graduate school.
-      `}
-      description={'Navigate to the Methodology page. This is the description text for high ed enrollment'}
-    />,
-    usedIn: CATEGORIES.ALL,
-    responsibleParty: RESPONSIBLE_PARTIES.CENSUS,
-    sources: [
-      {
-        source: SOURCE_LINKS.CENSUS_ACS_15_19,
-        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
-      },
-    ],
-  },
+
+  // Climate change category:
   {
     domID: 'exp-agr-loss-rate',
     indicator: <FormattedMessage
@@ -639,12 +787,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.exp.agr.loss.rate.description.text'}
       defaultMessage={`
-        Percent of agricultural value at risk from losses due to fourteen types of 
-        natural hazards that have some link 
-        to climate change: avalanche, coastal flooding, 
-        cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong 
-        wind, tornado, wildfire, and winter weather. Rate calculated by dividing the agricultural value at risk in 
-        a census tract by the total agricultural value in that census tract.
+        Expected agricultural value at risk from losses due to fourteen types of natural hazards. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. The rate is calculated by dividing the agricultural value at risk by the total agricultural value. 
       `}
       description={'Navigate to the Methodology page. This is the description text for exp agr loss rate'}
     />,
@@ -667,11 +810,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.exp.bld.loss.rate.description.text'}
       defaultMessage={`
-        Percent of building value at risk from losses due to fourteen types of natural hazards 
-        that have some link to climate change: avalanche, coastal flooding, 
-        cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong 
-        wind, tornado, wildfire, and winter weather. Rate calculated by dividing the building value at risk in 
-        a census tract by the total building value in that census tract.
+        Expected building value at risk from losses due to fourteen types of natural hazards. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. The rate is calculated by dividing the building value at risk by the total building value.
       `}
       description={'Navigate to the Methodology page. This is the description text for exp bld loss rate'}
     />,
@@ -694,18 +833,8 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.exp.pop.loss.rate.description.text'}
       defaultMessage={`
-        Rate relative to the population of fatalities and injuries due to fourteen types of
-        natural hazards each year
-        that have some link to climate change: avalanche, 
-        coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, 
-        riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined 
-        as the Spatial Hazard Events and Losses and National Centers for Environmental Information’s 
-        (NCEI) reported number of fatalities and injuries caused by the hazard occurrence. To 
-        combine fatalities and injuries for the computation of population loss value, an injury is counted 
-        as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies injuries and fatalities 
-        as direct or indirect. Both direct and indirect injuries and fatalities are counted as population 
-        loss. This total number of injuries and fatalities is then divided by the population in the 
-        census tract to get a per-capita rate of population risk. 
+        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate of population loss.
+
       `}
       description={'Navigate to the Methodology page. This is the description text for exp pop loss rate'}
     />,
@@ -718,16 +847,66 @@ export const INDICATORS = [
       },
     ],
   },
+  {
+    domID: 'flood-risk',
+    indicator: <FormattedMessage
+      id={'methodology.page.dataset.indicator.flood.risk.title.text'}
+      defaultMessage={`NEW Projected flood risk`}
+      description={'Navigate to the Methodology page. This is the title text for the NEW Projected flood risk'}
+    />,
+    description: <FormattedMessage
+      id={'methodology.page.category.flood.risk.rate.description.text'}
+      defaultMessage={`
+        A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not include property value.
+      `}
+      description={'Navigate to the Methodology page. This is the description text for exp bld loss rate'}
+    />,
+    usedIn: CATEGORIES.CLIMATE_CHANGE.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.FIRST,
+    sources: [
+      {
+        source: SOURCE_LINKS.FIRST_ST,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
+      },
+    ],
+  },
+  {
+    domID: 'wildfire-risk',
+    indicator: <FormattedMessage
+      id={'methodology.page.dataset.indicator.wildfire.risk.title.text'}
+      defaultMessage={`NEW Projected wildfire risk`}
+      description={'Navigate to the Methodology page. This is the title text for the NEW Projected wildfire risk'}
+    />,
+    description: <FormattedMessage
+      id={'methodology.page.category.wildfire.risk.rate.description.text'}
+      defaultMessage={`
+        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not include property value.
+      `}
+      description={'Navigate to the Methodology page. This is the description text for exp bld loss rate'}
+    />,
+    usedIn: CATEGORIES.CLIMATE_CHANGE.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.FIRST,
+    sources: [
+      {
+        source: SOURCE_LINKS.FIRST_ST,
+        availableFor: AVAILABLE_FOR.CONUS_DC,
+      },
+    ],
+  },
+
+  // Energy category:
   {
     domID: 'energy-burden',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.energy.burden.title.text'}
-      defaultMessage={`Energy burden`}
+      defaultMessage={`Energy cost`}
       description={'Navigate to the Methodology page. This is the title text for the energy burden dataset'}
     />,
     description: <FormattedMessage
       id={'methodology.page.category.energy.burden.description.text'}
-      defaultMessage={`Average annual energy cost per household ($) divided by average household income.`}
+      defaultMessage={`
+        Average household annual energy cost in dollars divided by the average household income.
+      `}
       description={'Navigate to the Methodology page. This is the description text for energy burden'}
     />,
     usedIn: CATEGORIES.CLEAN_ENERGY.METHODOLOGY,
@@ -735,7 +914,7 @@ export const INDICATORS = [
     sources: [
       {
         source: SOURCE_LINKS.DOE_LEAD,
-        availableFor: AVAILABLE_FOR.ALL_US_DC,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
       },
     ],
   },
@@ -749,9 +928,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.pm2.5.description.text'}
       defaultMessage={`
-        Fine inhalable particles, with diameters that are generally 2.5 micrometers and smaller. The value 
-        in the fields is the weight of these particles in micrograms per cubic meter.
-
+        Fine inhalable particles with 2.5 or smaller micrometer diameters. The percentile is the weight of the particles per cubic meter.
       `}
       description={'Navigate to the Methodology page. This is the description text for pm 2.5'}
     />,
@@ -764,66 +941,159 @@ export const INDICATORS = [
       },
     ],
   },
+
+  // Health category:
   {
-    domID: 'diesel-pm',
+    domID: 'asthma',
     indicator: <FormattedMessage
-      id={'methodology.page.dataset.indicator.diesel.pm.title.text'}
-      defaultMessage={`Diesel particulate matter exposure`}
-      description={'Navigate to the Methodology page. This is the title text for the diesel pm dataset'}
+      id={'methodology.page.dataset.indicator.asthma.title.text'}
+      defaultMessage={`Asthma`}
+      description={'Navigate to the Methodology page. This is the title text for the asthma dataset'}
     />,
     description: <FormattedMessage
-      id={'methodology.page.category.diesel.pm.description.text'}
+      id={'methodology.page.category.asthma.description.text'}
       defaultMessage={`
-        Mixture of particles that is part of diesel exhaust in the air. The value in the fields is the 
-        weight of these particles in micrograms per cubic meter. 
+        Share of people who answer “yes” to both of these questions: “Have you ever been told by a health professional that you have asthma?” and “Do you still have asthma?”.
       `}
-      description={'Navigate to the Methodology page. This is the description text for diesel pm'}
+      description={'Navigate to the Methodology page. This is the description text for asthma'}
     />,
-    usedIn: CATEGORIES.CLEAN_TRANSPORT.METHODOLOGY,
-    responsibleParty: RESPONSIBLE_PARTIES.EPA,
+    usedIn: CATEGORIES.HEALTH_BURDENS.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.CDC,
     sources: [
       {
-        source: SOURCE_LINKS.EPA_NATA,
+        source: SOURCE_LINKS.CDC_PLACES,
         availableFor: AVAILABLE_FOR.ALL_US_DC,
       },
     ],
   },
   {
-    domID: 'traffic-vol',
+    domID: 'diabetes',
     indicator: <FormattedMessage
-      id={'methodology.page.dataset.indicator.traffic.volume.title.text'}
-      defaultMessage={`Traffic proximity and volume`}
-      description={'Navigate to the Methodology page. This is the title text for the traffic.volume dataset'}
+      id={'methodology.page.dataset.indicator.diabetes.title.text'}
+      defaultMessage={`Diabetes`}
+      description={'Navigate to the Methodology page. This is the title text for the diabetes dataset'}
     />,
     description: <FormattedMessage
-      id={'methodology.page.category.traffic.vol.description.text'}
+      id={'methodology.page.category.diabetes.description.text'}
       defaultMessage={`
-        Count of vehicles (average annual daily traffic) at major roads
-        within 500 meters, divided by distance in meters.
+        Share of people ages 18 years and older who have been told by a health professional that they have diabetes other than diabetes during pregnancy.
       `}
-      description={'Navigate to the Methodology page. This is the description text for traffic volume'}
+      description={'Navigate to the Methodology page. This is the description text for diabetes'}
     />,
-    usedIn: CATEGORIES.CLEAN_TRANSPORT.METHODOLOGY,
-    responsibleParty: RESPONSIBLE_PARTIES.DOT,
+    usedIn: CATEGORIES.HEALTH_BURDENS.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.CDC,
     sources: [
       {
-        source: SOURCE_LINKS.DOT_EPA,
+        source: SOURCE_LINKS.CDC_PLACES,
+        availableFor: AVAILABLE_FOR.ALL_US_DC,
+      },
+    ],
+  },
+  {
+    domID: 'heart-disease',
+    indicator: <FormattedMessage
+      id={'methodology.page.dataset.indicator.heart.disease.title.text'}
+      defaultMessage={`Heart disease`}
+      description={'Navigate to the Methodology page. This is the title text for the heart disease dataset'}
+    />,
+    description: <FormattedMessage
+      id={'methodology.page.category.heart.disease.description.text'}
+      defaultMessage={`
+        Share of people ages 18 years and older who have been told by a health professional that they had angina or coronary heart disease.
+      `}
+      description={'Navigate to the Methodology page. This is the description text for heart disease'}
+    />,
+    usedIn: CATEGORIES.HEALTH_BURDENS.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.CDC,
+    sources: [
+      {
+        source: SOURCE_LINKS.CDC_PLACES,
+        availableFor: AVAILABLE_FOR.ALL_US_DC,
+      },
+    ],
+  },
+  {
+    domID: 'life-exp',
+    indicator: <FormattedMessage
+      id={'methodology.page.dataset.indicator.life.exp.title.text'}
+      defaultMessage={`Low life expectancy`}
+      description={'Navigate to the Methodology page. This is the title text for the life exp dataset'}
+    />,
+    description: <FormattedMessage
+      id={'methodology.page.category.low.life.expectancy.description.text'}
+      defaultMessage={`
+        Average number of years people have left in their lives.
+      `}
+      description={'Navigate to the Methodology page. This is the description text for low life expectancy'}
+    />,
+    note: <FormattedMessage
+      id={'methodology.page.category.low.life.expectancy.note.text'}
+      defaultMessage={`
+        <boldtag>Note: </boldtag>The tool reverses the percentiles for this burden. This means that census tracts with lower numbers have higher life expectancies and that census tracts with higher numbers have lower life expectancies.
+      `}
+      description={'Navigate to the Methodology page. This is the note text for low life expectancy'}
+      values={{
+        boldtag: boldFn,
+      }}
+    />,
+    usedIn: CATEGORIES.HEALTH_BURDENS.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.CDC,
+    sources: [
+      {
+        source: SOURCE_LINKS.CDC_SLEEP,
         availableFor: AVAILABLE_FOR.ALL_US_DC,
       },
     ],
   },
+
+  // Housing category:
+  {
+    domID: 'hist-underinv',
+    indicator: <FormattedMessage
+      id={'methodology.page.dataset.indicator.hist.underinvest.title.text'}
+      defaultMessage={`New Historic underinvestment`}
+      description={'Navigate to the Methodology page. This is the title text for the Historic Underinvestment'}
+    />,
+    description: <FormattedMessage
+      id={'methodology.page.category.low.hist.underinvestectancy.description.text'}
+      defaultMessage={`
+        Census tracts that experienced historic underinvestment as determined by the National Community Reinvestment Coalition’s (NCRC) historic redlining score. It is determined using the <link1>NCRC’s methodology</link1> for identifying areas with the most historic redlining (i.e. a score of 3.25 or more out of 4). This means that people in the  tract had high barriers to accessing home loans. 
+      `}
+      description={'Navigate to the Methodology page. This is the description text for Historic Underinvestment'}
+      values={{
+        link1: linkFn('https://ncrc.org/explainer-why-we-created-a-new-method-for-measuring-the-impact-of-redlining/', false, true),
+      }}
+    />,
+    note: <FormattedMessage
+      id={'methodology.page.category.low.hist.underinvestectancy.note.text'}
+      defaultMessage={`
+        <boldtag>Note: </boldtag>The historic underinvestment data indicator <boldtag>does not</boldtag> appear on the map for tracts <boldtag>that were not</boldtag> evaluated by the National Community Reinvestment Coalition. It is shown in tracts that are most commonly in larger metropolitan areas.
+      `}
+      description={'Navigate to the Methodology page. This is the note text for Historic Underinvestment'}
+      values={{
+        boldtag: boldFn,
+      }}
+    />,
+    usedIn: CATEGORIES.AFFORDABLE_HOUSING.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.NCRC,
+    sources: [
+      {
+        source: SOURCE_LINKS.HOLC,
+        availableFor: AVAILABLE_FOR.METRO_US_HOLC,
+      },
+    ],
+  },
   {
     domID: 'house-burden',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.house.burden.title.text'}
-      defaultMessage={`Housing cost burden`}
+      defaultMessage={`Housing cost`}
       description={'Navigate to the Methodology page. This is the title text for the house burden dataset'}
     />,
     description: <FormattedMessage
       id={'methodology.page.category.house.burden.description.text'}
       defaultMessage={`
-        Percent of households in a census tract that are both earning less than 80% of HUD Area Median
-        Family Income by county and are spending more than 30% of their income on housing costs.
+        Share of households that are both earning less than 80% of Housing and Urban Development’s Area Median Family Income and are spending more than 30% of their income on housing costs.
       `}
       description={'Navigate to the Methodology page. This is the description text for housing burden'}
     />,
@@ -832,7 +1102,53 @@ export const INDICATORS = [
     sources: [
       {
         source: SOURCE_LINKS.HUD,
-        availableFor: AVAILABLE_FOR.ALL_US_DC,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
+      },
+    ],
+  },
+  {
+    domID: 'green-space',
+    indicator: <FormattedMessage
+      id={'methodology.page.dataset.indicator.green.space.title.text'}
+      defaultMessage={`NEW Lack of green space`}
+      description={'Navigate to the Methodology page. This is the title text for the house burden dataset'}
+    />,
+    description: <FormattedMessage
+      id={'methodology.page.category.green.space.description.text'}
+      defaultMessage={`
+        Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes.
+      `}
+      description={'Navigate to the Methodology page. This is the description text for housing burden'}
+    />,
+    usedIn: CATEGORIES.AFFORDABLE_HOUSING.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.TPL,
+    sources: [
+      {
+        source: SOURCE_LINKS.PDI,
+        availableFor: AVAILABLE_FOR.CONUS_DC,
+      },
+    ],
+  },
+  {
+    domID: 'indoor-plumb',
+    indicator: <FormattedMessage
+      id={'methodology.page.dataset.indicator.indoor.plumb.title.text'}
+      defaultMessage={`NEW Lack of indoor plumbing`}
+      description={'Navigate to the Methodology page. This is the title text for the indoor plumbing'}
+    />,
+    description: <FormattedMessage
+      id={'methodology.page.category.indoor.plumb.description.text'}
+      defaultMessage={`
+        Housing without complete kitchen facilities or complete plumbing facilities.
+      `}
+      description={'Navigate to the Methodology page. This is the description text for housing burden'}
+    />,
+    usedIn: CATEGORIES.AFFORDABLE_HOUSING.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.HUD,
+    sources: [
+      {
+        source: SOURCE_LINKS.HUD,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
       },
     ],
   },
@@ -846,8 +1162,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.lead.paint.description.text'}
       defaultMessage={`
-        Percent of housing units built pre-1960, used as an indicator of potential lead paint exposure in
-        census tracts with median home values less than the 90th percentile.
+        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are not likely to have lead paint exposure and are not included.
       `}
       description={'Navigate to the Methodology page. This is the description text for lead paint'}
     />,
@@ -856,29 +1171,54 @@ export const INDICATORS = [
     sources: [
       {
         source: SOURCE_LINKS.CENSUS_ACS_15_19,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
+      },
+    ],
+  },
+
+  // Legacy pollution category:
+  {
+    domID: 'mine-land',
+    indicator: <FormattedMessage
+      id={'methodology.page.dataset.indicator.mine.land.title.text'}
+      defaultMessage={`NEW Abandoned mine lands`}
+      description={'Navigate to the Methodology page. This is the title text for the Abandoned mine lands'}
+    />,
+    description: <FormattedMessage
+      id={'methodology.page.category.mine.land.description.text'}
+      defaultMessage={`
+        Presence of an abandoned mine left by legacy coal mining operations.
+      `}
+      description={'Navigate to the Methodology page. This is the description text for Abandoned mine lands'}
+    />,
+    usedIn: CATEGORIES.LEGACY_POLLUTION.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.DOI,
+    sources: [
+      {
+        source: SOURCE_LINKS.AML,
         availableFor: AVAILABLE_FOR.ALL_US_DC,
       },
     ],
   },
   {
-    domID: 'median-home',
+    domID: 'fuds',
     indicator: <FormattedMessage
-      id={'methodology.page.dataset.indicator.median.home.title.text'}
-      defaultMessage={`Median home value`}
-      description={'Navigate to the Methodology page. This is the title text for the median home dataset'}
+      id={'methodology.page.dataset.indicator.fuds.title.text'}
+      defaultMessage={`NEW Formerly Used Defense Sites`}
+      description={'Navigate to the Methodology page. This is the title text for the Formerly Used Defense Sites'}
     />,
     description: <FormattedMessage
-      id={'methodology.page.category.median.home.value.description.text'}
+      id={'methodology.page.category.fuds.description.text'}
       defaultMessage={`
-        Median home value of owner-occupied housing units in the census tract.
-       `}
-      description={'Navigate to the Methodology page. This is the description text for lead paint'}
+      Properties that were owned, leased, or possessed by the United States, under the jurisdiction of the Secretary of Defense prior to October 1986.
+      `}
+      description={'Navigate to the Methodology page. This is the description text for Formerly Used Defense Sites'}
     />,
-    usedIn: CATEGORIES.AFFORDABLE_HOUSING.METHODOLOGY,
-    responsibleParty: RESPONSIBLE_PARTIES.CENSUS,
+    usedIn: CATEGORIES.LEGACY_POLLUTION.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.USACE,
     sources: [
       {
-        source: SOURCE_LINKS.CENSUS_ACS_15_19,
+        source: SOURCE_LINKS.FUDS,
         availableFor: AVAILABLE_FOR.ALL_US_DC,
       },
     ],
@@ -887,15 +1227,13 @@ export const INDICATORS = [
     domID: 'prox-haz',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.prox.haz.title.text'}
-      defaultMessage={`Proximity to hazardous waste facilities`}
+      defaultMessage={`Proximity to hazardous waste sites`}
       description={'Navigate to the Methodology page. This is the title text for the prox haz dataset'}
     />,
     description: <FormattedMessage
       id={'methodology.page.category.prox.haz.description.text'}
       defaultMessage={`
-        Count of hazardous waste facilities (Treatment, Storage, and Disposal Facilities and Large
-        Quantity Generators) within 5 kilometers (or nearest beyond 5 kilometers), each divided by 
-        distance in kilometers.
+        Number of hazardous waste facilities (Treatment, Storage, and Disposal Facilities and Large Quantity Generators) within 5 kilometers (or nearest beyond 5 kilometers), each divided by distance in kilometers.
       `}
       description={'Navigate to the Methodology page. This is the description text for proximity to hazards'}
     />,
@@ -904,7 +1242,7 @@ export const INDICATORS = [
     sources: [
       {
         source: SOURCE_LINKS.EPA_TSDF,
-        availableFor: AVAILABLE_FOR.ALL_US_DC,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
       },
     ],
   },
@@ -912,14 +1250,13 @@ export const INDICATORS = [
     domID: 'prox-npl',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.prox.npl.title.text'}
-      defaultMessage={`Proximity to National Priorities List (NPL) sites`}
+      defaultMessage={`Proximity to Superfund sites`}
       description={'Navigate to the Methodology page. This is the title text for the prox npl dataset'}
     />,
     description: <FormattedMessage
       id={'methodology.page.category.prox.npl.description.text'}
       defaultMessage={`
-        Count of proposed or listed NPL - also known as Superfund - sites within 5 kilometers (or nearest one
-        beyond 5 kilometers), each divided by distance in kilometers.
+        Number of proposed or listed Superfund or National Priorities list (NPL) sites within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
         `}
       description={'Navigate to the Methodology page. This is the description text for proximity to npl'}
     />,
@@ -928,7 +1265,7 @@ export const INDICATORS = [
     sources: [
       {
         source: SOURCE_LINKS.EPA_CERCLIS,
-        availableFor: AVAILABLE_FOR.ALL_US_DC,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
       },
     ],
   },
@@ -942,8 +1279,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.prox.rmp.description.text'}
       defaultMessage={`
-        Count of RMP (potential chemical accident management plan) facilities within 5 kilometers (or nearest
-        one beyond 5 kilometers), each divided by distance in kilometers.
+        Count of RMP, or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
       `}
       description={'Navigate to the Methodology page. This is the description text for proximity to rmp'}
     />,
@@ -952,138 +1288,161 @@ export const INDICATORS = [
     sources: [
       {
         source: SOURCE_LINKS.EPA_RMP,
-        availableFor: AVAILABLE_FOR.ALL_US_DC,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
       },
     ],
   },
+
+  // Transportation category:
   {
-    domID: 'waste-water',
+    domID: 'diesel-pm',
     indicator: <FormattedMessage
-      id={'methodology.page.dataset.indicator.waste.water.title.text'}
-      defaultMessage={`Wastewater discharge`}
-      description={'Navigate to the Methodology page. This is the title text for the waste water dataset'}
+      id={'methodology.page.dataset.indicator.diesel.pm.title.text'}
+      defaultMessage={`Diesel particulate matter exposure`}
+      description={'Navigate to the Methodology page. This is the title text for the diesel pm dataset'}
     />,
     description: <FormattedMessage
-      id={'methodology.page.category.waste.water.description.text'}
+      id={'methodology.page.category.diesel.pm.description.text'}
       defaultMessage={`
-        Risk-Screening Environmental Indicators (RSEI) modeled toxic concentrations at
-        stream segments within 500 meters, divided by distance in kilometers.
+        Mixture of particles in diesel exhaust in the air, measured as micrograms per cubic meter.
       `}
-      description={'Navigate to the Methodology page. This is the description text for waste water'}
+      description={'Navigate to the Methodology page. This is the description text for diesel pm'}
     />,
-    usedIn: CATEGORIES.CLEAN_WATER.METHODOLOGY,
+    usedIn: CATEGORIES.CLEAN_TRANSPORT.METHODOLOGY,
     responsibleParty: RESPONSIBLE_PARTIES.EPA,
     sources: [
       {
-        source: SOURCE_LINKS.EPA_RSEI,
-        availableFor: AVAILABLE_FOR.ALL_US_DC,
+        source: SOURCE_LINKS.EPA_NATA,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
       },
     ],
   },
   {
-    domID: 'asthma',
+    domID: 'trans-barrier',
     indicator: <FormattedMessage
-      id={'methodology.page.dataset.indicator.asthma.title.text'}
-      defaultMessage={`Asthma`}
-      description={'Navigate to the Methodology page. This is the title text for the asthma dataset'}
+      id={'methodology.page.dataset.indicator.trans.barrier.title.text'}
+      defaultMessage={`NEW Transportation barriers`}
+      description={'Navigate to the Methodology page. This is the title text for the Transportation barriers'}
     />,
     description: <FormattedMessage
-      id={'methodology.page.category.asthma.description.text'}
+      id={'methodology.page.category.trans.barrier.description.text'}
       defaultMessage={`
-        Weighted percent of people who answer “yes” to both of the following questions: “Have you ever
-        been told by a doctor, nurse, or other health professional that you have asthma?” and
-        “Do you still have asthma?”
+        Average relative cost and time spent on transportation relative to all other tracts.
       `}
-      description={'Navigate to the Methodology page. This is the description text for asthma'}
+      description={'Navigate to the Methodology page. This is the description text for Transportation barriers'}
     />,
-    usedIn: CATEGORIES.HEALTH_BURDENS.METHODOLOGY,
-    responsibleParty: RESPONSIBLE_PARTIES.CDC,
+    usedIn: CATEGORIES.CLEAN_TRANSPORT.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.DOT,
     sources: [
       {
-        source: SOURCE_LINKS.CDC_PLACES,
-        availableFor: AVAILABLE_FOR.ALL_US_DC,
+        source: SOURCE_LINKS.TRANS_BUR,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
       },
     ],
   },
   {
-    domID: 'diabetes',
+    domID: 'traffic-vol',
     indicator: <FormattedMessage
-      id={'methodology.page.dataset.indicator.diabetes.title.text'}
-      defaultMessage={`Diabetes`}
-      description={'Navigate to the Methodology page. This is the title text for the diabetes dataset'}
+      id={'methodology.page.dataset.indicator.traffic.volume.title.text'}
+      defaultMessage={`Traffic proximity and volume`}
+      description={'Navigate to the Methodology page. This is the title text for the traffic.volume dataset'}
     />,
     description: <FormattedMessage
-      id={'methodology.page.category.diabetes.description.text'}
+      id={'methodology.page.category.traffic.vol.description.text'}
       defaultMessage={`
-        Weighted percent of people ages 18 years and older who report having ever been
-        told by a doctor, nurse, or other health professionals that they have
-        diabetes other than diabetes during pregnancy.
+        Number of vehicles (average annual daily traffic) at major roads within 500 meters, divided by distance in meters.
       `}
-      description={'Navigate to the Methodology page. This is the description text for diabetes'}
+      description={'Navigate to the Methodology page. This is the description text for traffic volume'}
     />,
-    usedIn: CATEGORIES.HEALTH_BURDENS.METHODOLOGY,
-    responsibleParty: RESPONSIBLE_PARTIES.CDC,
+    usedIn: CATEGORIES.CLEAN_TRANSPORT.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.DOT,
     sources: [
       {
-        source: SOURCE_LINKS.CDC_PLACES,
-        availableFor: AVAILABLE_FOR.ALL_US_DC,
+        source: SOURCE_LINKS.DOT_EPA,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
       },
     ],
   },
+
+  // Water and wastewater category:
   {
-    domID: 'heart-disease',
+    domID: 'leaky-uwt',
     indicator: <FormattedMessage
-      id={'methodology.page.dataset.indicator.heart.disease.title.text'}
-      defaultMessage={`Heart disease`}
-      description={'Navigate to the Methodology page. This is the title text for the heart disease dataset'}
+      id={'methodology.page.dataset.indicator.leaky.uwt.title.text'}
+      defaultMessage={`NEW Leaking underground storage tanks`}
+      description={'Navigate to the Methodology page. This is the title text for the Leaking underground storage tanks'}
     />,
     description: <FormattedMessage
-      id={'methodology.page.category.heart.disease.description.text'}
+      id={'methodology.page.category.leaky.uwt.description.text'}
       defaultMessage={`
-        Weighted percent of people ages 18 years and older who report ever having been told
-        by a doctor, nurse, or other health professionals that they had angina or
-        coronary heart disease.
+        Weighted formula of number of leaking underground storage tanks and the number of underground storage tanks within 1,500 feet.
       `}
-      description={'Navigate to the Methodology page. This is the description text for heart disease'}
+      description={'Navigate to the Methodology page. This is the description text for Leaking underground storage tanks'}
     />,
-    usedIn: CATEGORIES.HEALTH_BURDENS.METHODOLOGY,
-    responsibleParty: RESPONSIBLE_PARTIES.CDC,
+    usedIn: CATEGORIES.CLEAN_WATER.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.EPA,
     sources: [
       {
-        source: SOURCE_LINKS.CDC_PLACES,
-        availableFor: AVAILABLE_FOR.ALL_US_DC,
+        source: SOURCE_LINKS.UST_FIND,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
       },
     ],
   },
   {
-    domID: 'life-exp',
+    domID: 'waste-water',
     indicator: <FormattedMessage
-      id={'methodology.page.dataset.indicator.life.exp.title.text'}
-      defaultMessage={`Low life expectancy`}
-      description={'Navigate to the Methodology page. This is the title text for the life exp dataset'}
+      id={'methodology.page.dataset.indicator.waste.water.title.text'}
+      defaultMessage={`Wastewater discharge`}
+      description={'Navigate to the Methodology page. This is the title text for the waste water dataset'}
     />,
     description: <FormattedMessage
-      id={'methodology.page.category.low.life.expectancy.description.text'}
+      id={'methodology.page.category.waste.water.description.text'}
       defaultMessage={`
-        Average number of years of life a person who has attained a given age can expect to live.
+        Risk-Screening Environmental Indicators (RSEI) modeled toxic concentrations at
+        stream segments within 500 meters, divided by distance in kilometers.
       `}
-      description={'Navigate to the Methodology page. This is the description text for low life expectancy'}
+      description={'Navigate to the Methodology page. This is the description text for waste water'}
+    />,
+    usedIn: CATEGORIES.CLEAN_WATER.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.EPA,
+    sources: [
+      {
+        source: SOURCE_LINKS.EPA_RSEI,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
+      },
+    ],
+  },
+
+  // Workforce dev category:
+  {
+    domID: 'ling-iso',
+    indicator: <FormattedMessage
+      id={'methodology.page.dataset.indicator.ling.iso.title.text'}
+      defaultMessage={`Linguistic isolation`}
+      description={'Navigate to the Methodology page. This is the title text for the linguistic isolation dataset'}
+    />,
+    description: <FormattedMessage
+      id={'methodology.page.category.linguistic.iso.description.text'}
+      defaultMessage={`
+        Share of households where no one over the age 14 speaks English well.
+      `}
+      description={'Navigate to the Methodology page. This is the description text for linguistic isolation'}
     />,
     note: <FormattedMessage
-      id={'methodology.page.category.low.life.expectancy.note.text'}
+      id={'methodology.page.category.linguistic.iso.note.text'}
       defaultMessage={`
-        <boldtag>Note: </boldtag>The percentiles for this dataset have been reversed so that census tracts with lower numbers have higher life expectancies and the census tracts with higher numbers have lower life expectancy when compared to life expectancy in the area.
+      <boldtag>Note: </boldtag>Linguistic isolation was removed from Puerto Rico based on feedback during the beta period.
       `}
-      description={'Navigate to the Methodology page. This is the note text for low life expectancy'}
+      description={'Navigate to the Methodology page. This is the note text for linguistic.iso'}
       values={{
         boldtag: boldFn,
       }}
     />,
-    usedIn: CATEGORIES.HEALTH_BURDENS.METHODOLOGY,
-    responsibleParty: RESPONSIBLE_PARTIES.CDC,
+    usedIn: CATEGORIES.WORKFORCE_DEV.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.CENSUS,
     sources: [
       {
-        source: SOURCE_LINKS.CDC_SLEEP,
+        source: SOURCE_LINKS.CENSUS_ACS_15_19,
         availableFor: AVAILABLE_FOR.ALL_US_DC,
       },
     ],
@@ -1098,14 +1457,14 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.workforce.dev.description.text'}
       defaultMessage={`
-        Median income of the census tract calculated as a percent of the area’s median income.
+        Low median income calculated as a share of the area’s median income.
       `}
       description={'Navigate to the Methodology page. This is the description text for workforce dev'}
     />,
     note: <FormattedMessage
-      id={'methodology.page.category.low.median.expectancy.note.text'}
+      id={'methodology.page.category.low.median.note.text'}
       defaultMessage={`
-        <boldtag>Note: </boldtag>The percentiles for this dataset have been reversed so that census tracts with lower numbers have higher median incomes and census tracts with the higher numbers have lower median income when compared to area median income.
+        <boldtag>Note: </boldtag>The tool reverses the percentiles for this burden. This means that census tracts with lower numbers have higher median incomes and census tracts with the higher numbers have lower median incomes.
       `}
       description={'Navigate to the Methodology page. This is the note text for low median expectancy'}
       values={{
@@ -1121,23 +1480,23 @@ export const INDICATORS = [
       },
       {
         source: SOURCE_LINKS.CENSUS_ACS_10,
-        availableFor: AVAILABLE_FOR.AS_NMI,
+        availableFor: AVAILABLE_FOR.ALL_ISLDS,
       },
     ],
   },
   {
-    domID: 'ling-iso',
+    domID: 'poverty',
     indicator: <FormattedMessage
-      id={'methodology.page.dataset.indicator.ling.iso.title.text'}
-      defaultMessage={`Linguistic isolation`}
-      description={'Navigate to the Methodology page. This is the title text for the linguistic isolation dataset'}
+      id={'methodology.page.dataset.indicator.poverty.title.text'}
+      defaultMessage={`Poverty`}
+      description={'Navigate to the Methodology page. This is the title text for the poverty dataset'}
     />,
     description: <FormattedMessage
-      id={'methodology.page.category.linguistic.iso.description.text'}
+      id={'methodology.page.category.poverty.description.text'}
       defaultMessage={`
-        Percent of households where no one over the age 14 speaks English well.
+        Share of people living at or below 100% of the Federal poverty level.
       `}
-      description={'Navigate to the Methodology page. This is the description text for linguistic isolation'}
+      description={'Navigate to the Methodology page. This is the description text for poverty'}
     />,
     usedIn: CATEGORIES.WORKFORCE_DEV.METHODOLOGY,
     responsibleParty: RESPONSIBLE_PARTIES.CENSUS,
@@ -1158,7 +1517,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.unemploy.description.text'}
       defaultMessage={`
-      Number of unemployed people as a percentage of the civilian labor force.
+        Number of unemployed people as a share of the  labor force.
       `}
       description={'Navigate to the Methodology page. This is the description text for unemployment'}
     />,
@@ -1171,24 +1530,23 @@ export const INDICATORS = [
       },
       {
         source: SOURCE_LINKS.CENSUS_ACS_10,
-        availableFor: AVAILABLE_FOR.AS_NMI,
+        availableFor: AVAILABLE_FOR.ALL_ISLDS,
       },
     ],
   },
   {
-    domID: 'poverty',
+    domID: 'high-school',
     indicator: <FormattedMessage
-      id={'methodology.page.dataset.indicator.poverty.title.text'}
-      defaultMessage={`Poverty`}
-      description={'Navigate to the Methodology page. This is the title text for the poverty dataset'}
+      id={'methodology.page.dataset.indicator.high.school.title.text'}
+      defaultMessage={`High school education`}
+      description={'Navigate to the Methodology page. This is the title text for the high school dataset'}
     />,
     description: <FormattedMessage
-      id={'methodology.page.category.poverty.description.text'}
+      id={'methodology.page.category.highschool.description.text'}
       defaultMessage={`
-        Percent of a census tract's population in households where the household income is at or below 100% of
-        the Federal poverty level.
+        Share of people aged 25 years or older who didn’t graduate from high school.
       `}
-      description={'Navigate to the Methodology page. This is the description text for poverty'}
+      description={'Navigate to the Methodology page. This is the description text for high school'}
     />,
     usedIn: CATEGORIES.WORKFORCE_DEV.METHODOLOGY,
     responsibleParty: RESPONSIBLE_PARTIES.CENSUS,
@@ -1199,38 +1557,93 @@ export const INDICATORS = [
       },
       {
         source: SOURCE_LINKS.CENSUS_ACS_10,
-        availableFor: AVAILABLE_FOR.AS_NMI,
+        availableFor: AVAILABLE_FOR.ALL_ISLDS,
       },
     ],
+    isPercent: true,
   },
+
+
   {
-    domID: 'high-school',
+    domID: 'tribal-lands',
     indicator: <FormattedMessage
-      id={'methodology.page.dataset.indicator.high.school.title.text'}
-      defaultMessage={`High school degree non-attainment`}
-      description={'Navigate to the Methodology page. This is the title text for the high school dataset'}
+      id={'methodology.page.dataset.indicator.tribal.lands.title.text'}
+      defaultMessage={`NEW Tribal lands`}
+      description={'Navigate to the Methodology page. This is the title text for the Tribal lands'}
     />,
     description: <FormattedMessage
-      id={'methodology.page.category.highschool.description.text'}
+      id={'methodology.page.category.tribal.lands.description.text'}
       defaultMessage={`
-        Percent of people age 25 years or older in a census tract whose education level is less than a high school diploma.
+        The Land Area Representation (LAR) dataset depicts the exterior extent of a Federal Indian land area. 
       `}
-      description={'Navigate to the Methodology page. This is the description text for high school'}
+      description={'Navigate to the Methodology page. This is the description text for Tribal lands'}
     />,
-    usedIn: CATEGORIES.WORKFORCE_DEV.METHODOLOGY,
-    responsibleParty: RESPONSIBLE_PARTIES.CENSUS,
+    note: <FormattedMessage
+      id={'methodology.page.category.tribal.lands.note.text'}
+      defaultMessage={`
+        <boldtag>Note: </boldtag>The LAR dataset depicts the exterior extent of a Federal Indian land area.  Not all Federally recognized tribes have a designated land area; therefore, they may not have an associated land area represented in the land area dataset.
+      `}
+      description={'Navigate to the Methodology page. This is the note text for low median expectancy'}
+      values={{
+        boldtag: boldFn,
+      }}
+    />,
+    usedIn: CATEGORIES.TRIBAL_LANDS.METHODOLOGY,
+    responsibleParty: RESPONSIBLE_PARTIES.BIA,
     sources: [
       {
-        source: SOURCE_LINKS.CENSUS_ACS_15_19,
-        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
-      },
-      {
-        source: SOURCE_LINKS.CENSUS_ACS_10,
-        availableFor: AVAILABLE_FOR.AS_NMI,
+        source: SOURCE_LINKS.BIA_LAR,
+        availableFor: AVAILABLE_FOR.FRT,
       },
     ],
-    isPercent: true,
   },
+  // Unused burdens:
+  // {
+  //   domID: 'high-ed-enroll-rate',
+  //   indicator: <FormattedMessage
+  //     id={'methodology.page.dataset.indicator.high.ed.enroll.title.text'}
+  //     defaultMessage={`Higher education non-enrollment`}
+  //     description={'Navigate to the Methodology page. This is the title text for the high ed enrollment dataset'}
+  //   />,
+  //   description: <FormattedMessage
+  //     id={'methodology.page.category.high.ed.enroll.rate.description.text'}
+  //     defaultMessage={`
+  //       Percent of people 15 or older who are not currently enrolled in college, university, or graduate school.
+  //     `}
+  //     description={'Navigate to the Methodology page. This is the description text for high ed enrollment'}
+  //   />,
+  //   usedIn: CATEGORIES.ALL,
+  //   responsibleParty: RESPONSIBLE_PARTIES.CENSUS,
+  //   sources: [
+  //     {
+  //       source: SOURCE_LINKS.CENSUS_ACS_15_19,
+  //       availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
+  //     },
+  //   ],
+  // },
+  // {
+  //   domID: 'median-home',
+  //   indicator: <FormattedMessage
+  //     id={'methodology.page.dataset.indicator.median.home.title.text'}
+  //     defaultMessage={`Median home value`}
+  //     description={'Navigate to the Methodology page. This is the title text for the median home dataset'}
+  //   />,
+  //   description: <FormattedMessage
+  //     id={'methodology.page.category.median.home.value.description.text'}
+  //     defaultMessage={`
+  //       Median home value of owner-occupied housing units in the census tract.
+  //      `}
+  //     description={'Navigate to the Methodology page. This is the description text for lead paint'}
+  //   />,
+  //   usedIn: CATEGORIES.AFFORDABLE_HOUSING.METHODOLOGY,
+  //   responsibleParty: RESPONSIBLE_PARTIES.CENSUS,
+  //   sources: [
+  //     {
+  //       source: SOURCE_LINKS.CENSUS_ACS_15_19,
+  //       availableFor: AVAILABLE_FOR.ALL_US_DC,
+  //     },
+  //   ],
+  // },
 ];
 
 export const RETURN_TO_TOP = {
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 6eb36b256..25cf85550 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -588,7 +588,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show transportation barriers"
   },
   "explore.map.page.side.panel.indicator.description.abandon.mines": {
-    "defaultMessage": "Presence of an abandoned mine lands within the tract",
+    "defaultMessage": "Presence of an abandoned mine land within the tract",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned mine lands within the tract"
   },
   "explore.map.page.side.panel.indicator.description.asthma": {
@@ -1152,27 +1152,27 @@
     "description": "Navigate to the FAQs page, this will be the page title text"
   },
   "indicator.categories.afford.house.title": {
-    "defaultMessage": "Affordable and sustainable housing",
+    "defaultMessage": "Housing",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the category title"
   },
   "indicator.categories.clean.energy.title": {
-    "defaultMessage": "Clean energy and energy efficiency",
+    "defaultMessage": "Energy",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the category title"
   },
   "indicator.categories.clean.transport.title": {
-    "defaultMessage": "Clean transit",
+    "defaultMessage": "Transportation",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the category title"
   },
   "indicator.categories.clean.water.title": {
-    "defaultMessage": "Critical clean water and wastewater infrastructure",
+    "defaultMessage": "Water and wastewater",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the category title"
   },
   "indicator.categories.health.burdens.title": {
-    "defaultMessage": "Health burdens",
+    "defaultMessage": "Health",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the category title"
   },
   "indicator.categories.legacy.pollution.title": {
-    "defaultMessage": "Reduction and remediation of legacy pollution",
+    "defaultMessage": "Legacy pollution",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the category title"
   },
   "indicator.categories.work.dev.title": {
@@ -1183,114 +1183,146 @@
     "defaultMessage": "Focus on {territory}",
     "description": "Focus on the bounds of a specific territory"
   },
-  "methodology.page.categories.title": {
-    "defaultMessage": "Communities are identified as disadvantaged by the current version of the tool for the purposes of the Justice40 Initiative if they are located in census tracts that are at or above the thresholds in one or more of eight categories of criteria below.",
-    "description": "Navigate to the methodology page. This is the methodology page explanation of the categories"
-  },
   "methodology.page.category.and.clause.hs.ed.higher.ed": {
-    "defaultMessage": "<boldtag>AND</boldtag> 10% or more of adults 25 or older have not attained a <link1>high school degree</link1> AND 80% or more of individuals 15 or older are not enrolled in <link2>higher education</link2>",
+    "defaultMessage": "<boldtag>AND</boldtag> have 10% or more of adults have a <link1>high school education</link1> level less than a high school degree",
     "description": "Navigate to the methodology page. Navigate to the category section. This is the portion of the formula dealing with higher ed enrollment and high school degree rate"
   },
-  "methodology.page.category.and.clause.low.inc.hs.ed": {
-    "defaultMessage": "<boldtag>AND</boldtag> is at or above the 65th percentile for <link1>low income</link1> AND 80% or more of individuals 15 or older are not enrolled in <link2>higher education</link2>",
-    "description": "Navigate to the methodology page. Navigate to the category section. This is category portion of the formula dealing with lower income and high school degree rate"
+  "methodology.page.category.and.clause.low.inc": {
+    "defaultMessage": "<boldtag>AND</boldtag> are at or above the 65th percentile for <link1>low income</link1>",
+    "description": "Navigate to the methodology page. Navigate to the category section. This is category portion of the formula dealing with lower income"
   },
   "methodology.page.category.asthma.description.text": {
-    "defaultMessage": "Weighted percent of people who answer “yes” to both of the following questions: “Have you ever been told by a doctor, nurse, or other health professional that you have asthma?” and “Do you still have asthma?”",
+    "defaultMessage": "Share of people who answer “yes” to both of these questions: “Have you ever been told by a health professional that you have asthma?” and “Do you still have asthma?”.",
     "description": "Navigate to the Methodology page. This is the description text for asthma"
   },
   "methodology.page.category.card.title": {
-    "defaultMessage": "Communities are <boldtag>identified as disadvantaged</boldtag>",
+    "defaultMessage": "Communities are <boldtag>identified as disadvantaged</boldtag> if they are in census tracts that:",
     "description": "Navigate to the methodology page. Navigate to the category section. This is category heading"
   },
   "methodology.page.category.diabetes.description.text": {
-    "defaultMessage": "Weighted percent of people ages 18 years and older who report having ever been told by a doctor, nurse, or other health professionals that they have diabetes other than diabetes during pregnancy.",
+    "defaultMessage": "Share of people ages 18 years and older who have been told by a health professional that they have diabetes other than diabetes during pregnancy.",
     "description": "Navigate to the Methodology page. This is the description text for diabetes"
   },
   "methodology.page.category.diesel.pm.description.text": {
-    "defaultMessage": "Mixture of particles that is part of diesel exhaust in the air. The value in the fields is the weight of these particles in micrograms per cubic meter.",
+    "defaultMessage": "Mixture of particles in diesel exhaust in the air, measured as micrograms per cubic meter.",
     "description": "Navigate to the Methodology page. This is the description text for diesel pm"
   },
   "methodology.page.category.energy.burden.description.text": {
-    "defaultMessage": "Average annual energy cost per household ($) divided by average household income.",
+    "defaultMessage": "Average household annual energy cost in dollars divided by the average household income.",
     "description": "Navigate to the Methodology page. This is the description text for energy burden"
   },
   "methodology.page.category.exp.agr.loss.rate.description.text": {
-    "defaultMessage": "Percent of agricultural value at risk from losses due to fourteen types of natural hazards that have some link to climate change: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Rate calculated by dividing the agricultural value at risk in a census tract by the total agricultural value in that census tract.",
+    "defaultMessage": "Expected agricultural value at risk from losses due to fourteen types of natural hazards. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. The rate is calculated by dividing the agricultural value at risk by the total agricultural value.",
     "description": "Navigate to the Methodology page. This is the description text for exp agr loss rate"
   },
   "methodology.page.category.exp.bld.loss.rate.description.text": {
-    "defaultMessage": "Percent of building value at risk from losses due to fourteen types of natural hazards that have some link to climate change: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Rate calculated by dividing the building value at risk in a census tract by the total building value in that census tract.",
+    "defaultMessage": "Expected building value at risk from losses due to fourteen types of natural hazards. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. The rate is calculated by dividing the building value at risk by the total building value.",
     "description": "Navigate to the Methodology page. This is the description text for exp bld loss rate"
   },
   "methodology.page.category.exp.pop.loss.rate.description.text": {
-    "defaultMessage": "Rate relative to the population of fatalities and injuries due to fourteen types of natural hazards each year that have some link to climate change: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined as the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI) reported number of fatalities and injuries caused by the hazard occurrence. To combine fatalities and injuries for the computation of population loss value, an injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies injuries and fatalities as direct or indirect. Both direct and indirect injuries and fatalities are counted as population loss. This total number of injuries and fatalities is then divided by the population in the census tract to get a per-capita rate of population risk.",
+    "defaultMessage": "Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate of population loss.",
     "description": "Navigate to the Methodology page. This is the description text for exp pop loss rate"
   },
+  "methodology.page.category.flood.risk.rate.description.text": {
+    "defaultMessage": "A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not include property value.",
+    "description": "Navigate to the Methodology page. This is the description text for exp bld loss rate"
+  },
+  "methodology.page.category.fuds.description.text": {
+    "defaultMessage": "Properties that were owned, leased, or possessed by the United States, under the jurisdiction of the Secretary of Defense prior to October 1986.",
+    "description": "Navigate to the Methodology page. This is the description text for Formerly Used Defense Sites"
+  },
+  "methodology.page.category.green.space.description.text": {
+    "defaultMessage": "Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes.",
+    "description": "Navigate to the Methodology page. This is the description text for housing burden"
+  },
   "methodology.page.category.heart.disease.description.text": {
-    "defaultMessage": "Weighted percent of people ages 18 years and older who report ever having been told by a doctor, nurse, or other health professionals that they had angina or coronary heart disease.",
+    "defaultMessage": "Share of people ages 18 years and older who have been told by a health professional that they had angina or coronary heart disease.",
     "description": "Navigate to the Methodology page. This is the description text for heart disease"
   },
-  "methodology.page.category.high.ed.enroll.rate.description.text": {
-    "defaultMessage": "Percent of people 15 or older who are not currently enrolled in college, university, or graduate school.",
-    "description": "Navigate to the Methodology page. This is the description text for high ed enrollment"
-  },
   "methodology.page.category.highschool.description.text": {
-    "defaultMessage": "Percent of people age 25 years or older in a census tract whose education level is less than a high school diploma.",
+    "defaultMessage": "Share of people aged 25 years or older who didn’t graduate from high school.",
     "description": "Navigate to the Methodology page. This is the description text for high school"
   },
   "methodology.page.category.house.burden.description.text": {
-    "defaultMessage": "Percent of households in a census tract that are both earning less than 80% of HUD Area Median Family Income by county and are spending more than 30% of their income on housing costs.",
+    "defaultMessage": "Share of households that are both earning less than 80% of Housing and Urban Development’s Area Median Family Income and are spending more than 30% of their income on housing costs.",
+    "description": "Navigate to the Methodology page. This is the description text for housing burden"
+  },
+  "methodology.page.category.indoor.plumb.description.text": {
+    "defaultMessage": "Housing without complete kitchen facilities or complete plumbing facilities.",
     "description": "Navigate to the Methodology page. This is the description text for housing burden"
   },
   "methodology.page.category.lead.paint.description.text": {
-    "defaultMessage": "Percent of housing units built pre-1960, used as an indicator of potential lead paint exposure in census tracts with median home values less than the 90th percentile.",
+    "defaultMessage": "Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are not likely to have lead paint exposure and are not included.",
     "description": "Navigate to the Methodology page. This is the description text for lead paint"
   },
+  "methodology.page.category.leaky.uwt.description.text": {
+    "defaultMessage": "Weighted formula of number of leaking underground storage tanks and the number of underground storage tanks within 1,500 feet.",
+    "description": "Navigate to the Methodology page. This is the description text for Leaking underground storage tanks"
+  },
   "methodology.page.category.linguistic.iso.description.text": {
-    "defaultMessage": "Percent of households where no one over the age 14 speaks English well.",
+    "defaultMessage": "Share of households where no one over the age 14 speaks English well.",
     "description": "Navigate to the Methodology page. This is the description text for linguistic isolation"
   },
+  "methodology.page.category.linguistic.iso.note.text": {
+    "defaultMessage": "<boldtag>Note: </boldtag>Linguistic isolation was removed from Puerto Rico based on feedback during the beta period.",
+    "description": "Navigate to the Methodology page. This is the note text for linguistic.iso"
+  },
+  "methodology.page.category.low.hist.underinvestectancy.description.text": {
+    "defaultMessage": "Census tracts that experienced historic underinvestment as determined by the National Community Reinvestment Coalition’s (NCRC) historic redlining score. It is determined using the <link1>NCRC’s methodology</link1> for identifying areas with the most historic redlining (i.e. a score of 3.25 or more out of 4). This means that people in the tract had high barriers to accessing home loans.",
+    "description": "Navigate to the Methodology page. This is the description text for Historic Underinvestment"
+  },
+  "methodology.page.category.low.hist.underinvestectancy.note.text": {
+    "defaultMessage": "<boldtag>Note: </boldtag>The historic underinvestment data indicator <boldtag>does not</boldtag> appear on the map for tracts <boldtag>that were not</boldtag> evaluated by the National Community Reinvestment Coalition. It is shown in tracts that are most commonly in larger metropolitan areas.",
+    "description": "Navigate to the Methodology page. This is the note text for Historic Underinvestment"
+  },
   "methodology.page.category.low.income.description.text": {
-    "defaultMessage": "Percent of a census tract's population in households where household income is at or below 200% of the Federal poverty level.",
+    "defaultMessage": "Percent of a census tract's population in households where household income is at or below 200% of the Federal poverty level, not including students enrolled in higher education.",
     "description": "Navigate to the Methodology page. This is the description text for low income"
   },
   "methodology.page.category.low.life.expectancy.description.text": {
-    "defaultMessage": "Average number of years of life a person who has attained a given age can expect to live.",
+    "defaultMessage": "Average number of years people have left in their lives.",
     "description": "Navigate to the Methodology page. This is the description text for low life expectancy"
   },
   "methodology.page.category.low.life.expectancy.note.text": {
-    "defaultMessage": "<boldtag>Note: </boldtag>The percentiles for this dataset have been reversed so that census tracts with lower numbers have higher life expectancies and the census tracts with higher numbers have lower life expectancy when compared to life expectancy in the area.",
+    "defaultMessage": "<boldtag>Note: </boldtag>The tool reverses the percentiles for this burden. This means that census tracts with lower numbers have higher life expectancies and that census tracts with higher numbers have lower life expectancies.",
     "description": "Navigate to the Methodology page. This is the note text for low life expectancy"
   },
-  "methodology.page.category.low.median.expectancy.note.text": {
-    "defaultMessage": "<boldtag>Note: </boldtag>The percentiles for this dataset have been reversed so that census tracts with lower numbers have higher median incomes and census tracts with the higher numbers have lower median income when compared to area median income.",
+  "methodology.page.category.low.median.note.text": {
+    "defaultMessage": "<boldtag>Note: </boldtag>The tool reverses the percentiles for this burden. This means that census tracts with lower numbers have higher median incomes and census tracts with the higher numbers have lower median incomes.",
     "description": "Navigate to the Methodology page. This is the note text for low median expectancy"
   },
-  "methodology.page.category.median.home.value.description.text": {
-    "defaultMessage": "Median home value of owner-occupied housing units in the census tract.",
-    "description": "Navigate to the Methodology page. This is the description text for lead paint"
+  "methodology.page.category.mine.land.description.text": {
+    "defaultMessage": "Presence of an abandoned mine left by legacy coal mining operations.",
+    "description": "Navigate to the Methodology page. This is the description text for Abandoned mine lands"
   },
   "methodology.page.category.pm2.5.description.text": {
-    "defaultMessage": "Fine inhalable particles, with diameters that are generally 2.5 micrometers and smaller. The value in the fields is the weight of these particles in micrograms per cubic meter.",
+    "defaultMessage": "Fine inhalable particles with 2.5 or smaller micrometer diameters. The percentile is the weight of the particles per cubic meter.",
     "description": "Navigate to the Methodology page. This is the description text for pm 2.5"
   },
   "methodology.page.category.poverty.description.text": {
-    "defaultMessage": "Percent of a census tract's population in households where the household income is at or below 100% of the Federal poverty level.",
+    "defaultMessage": "Share of people living at or below 100% of the Federal poverty level.",
     "description": "Navigate to the Methodology page. This is the description text for poverty"
   },
   "methodology.page.category.prox.haz.description.text": {
-    "defaultMessage": "Count of hazardous waste facilities (Treatment, Storage, and Disposal Facilities and Large Quantity Generators) within 5 kilometers (or nearest beyond 5 kilometers), each divided by distance in kilometers.",
+    "defaultMessage": "Number of hazardous waste facilities (Treatment, Storage, and Disposal Facilities and Large Quantity Generators) within 5 kilometers (or nearest beyond 5 kilometers), each divided by distance in kilometers.",
     "description": "Navigate to the Methodology page. This is the description text for proximity to hazards"
   },
   "methodology.page.category.prox.npl.description.text": {
-    "defaultMessage": "Count of proposed or listed NPL - also known as Superfund - sites within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.",
+    "defaultMessage": "Number of proposed or listed Superfund or National Priorities list (NPL) sites within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.",
     "description": "Navigate to the Methodology page. This is the description text for proximity to npl"
   },
   "methodology.page.category.prox.rmp.description.text": {
-    "defaultMessage": "Count of RMP (potential chemical accident management plan) facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.",
+    "defaultMessage": "Count of RMP, or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.",
     "description": "Navigate to the Methodology page. This is the description text for proximity to rmp"
   },
+  "methodology.page.category.source.aml.link": {
+    "defaultMessage": "<link1>Abandoned Mine Land Inventory System (e-AMLIS)</link1> from {date17}",
+    "description": "Navigate to the Methodology page. This is the source link for CDC Sleep"
+  },
+  "methodology.page.category.source.bia.lar.link": {
+    "defaultMessage": "<link1>Land Area Representation (LAR) dataset</link1> from {date18}",
+    "description": "Navigate to the Methodology page. This is the source link for BIA data"
+  },
   "methodology.page.category.source.cdc.places.link": {
     "defaultMessage": "<link1>PLACES data</link1> from {date16_19}",
     "description": "Navigate to the Methodology page. This is the source link for CDC Places"
@@ -1343,29 +1375,85 @@
     "defaultMessage": "<link1>National Risk Index</link1> from {date14_21}",
     "description": "Navigate to the Methodology page. This is the source link for FEMA"
   },
+  "methodology.page.category.source.first.street.link": {
+    "defaultMessage": "<link1>Climate Risk Data Access</link1> from {date22}",
+    "description": "Navigate to the Methodology page. This is the source link for CDC Sleep"
+  },
+  "methodology.page.category.source.fuds.link": {
+    "defaultMessage": "<link1>Formerly Used Defense Sites (FUDS) </link1> from {date19}",
+    "description": "Navigate to the Methodology page. This is the source link for CDC Sleep"
+  },
+  "methodology.page.category.source.holc.link": {
+    "defaultMessage": "<link1>Dataset of formerly redlined areas</link1> using digitized maps from the Home Owners Loan Corporation from {date10}",
+    "description": "Navigate to the Methodology page. This is the source link for CDC Sleep"
+  },
   "methodology.page.category.source.hud.link": {
     "defaultMessage": "<link1>Comprehensive Housing Affordability Strategy dataset</link1> from {date14_18}",
     "description": "Navigate to the Methodology page. This is the source link for HUD"
   },
+  "methodology.page.category.source.pdi.link": {
+    "defaultMessage": "<link1>Percent Developed Imperviousness (CONUS) </link1> from {date19}",
+    "description": "Navigate to the Methodology page. This is the source link for CDC Sleep"
+  },
+  "methodology.page.category.source.trans.bur.link": {
+    "defaultMessage": "<link1>Transportation Burdens indicator (need link)</link1> from {date22}",
+    "description": "Navigate to the Methodology page. This is the source link for Transportation burdens"
+  },
+  "methodology.page.category.source.ust.find.link": {
+    "defaultMessage": "Calculated from EPA’s <link1>UST Finder</link1> from {date21} as compiled by EPA's EJScreen",
+    "description": "Navigate to the Methodology page. This is the source link for UST Find"
+  },
   "methodology.page.category.traffic.vol.description.text": {
-    "defaultMessage": "Count of vehicles (average annual daily traffic) at major roads within 500 meters, divided by distance in meters.",
+    "defaultMessage": "Number of vehicles (average annual daily traffic) at major roads within 500 meters, divided by distance in meters.",
     "description": "Navigate to the Methodology page. This is the description text for traffic volume"
   },
+  "methodology.page.category.trans.barrier.description.text": {
+    "defaultMessage": "Average relative cost and time spent on transportation relative to all other tracts.",
+    "description": "Navigate to the Methodology page. This is the description text for Transportation barriers"
+  },
+  "methodology.page.category.tribal.lands.description.text": {
+    "defaultMessage": "The Land Area Representation (LAR) dataset depicts the exterior extent of a Federal Indian land area.",
+    "description": "Navigate to the Methodology page. This is the description text for Tribal lands"
+  },
+  "methodology.page.category.tribal.lands.note.text": {
+    "defaultMessage": "<boldtag>Note: </boldtag>The LAR dataset depicts the exterior extent of a Federal Indian land area. Not all Federally recognized tribes have a designated land area; therefore, they may not have an associated land area represented in the land area dataset.",
+    "description": "Navigate to the Methodology page. This is the note text for low median expectancy"
+  },
   "methodology.page.category.unemploy.description.text": {
-    "defaultMessage": "Number of unemployed people as a percentage of the civilian labor force.",
+    "defaultMessage": "Number of unemployed people as a share of the labor force.",
     "description": "Navigate to the Methodology page. This is the description text for unemployment"
   },
   "methodology.page.category.waste.water.description.text": {
     "defaultMessage": "Risk-Screening Environmental Indicators (RSEI) modeled toxic concentrations at stream segments within 500 meters, divided by distance in kilometers.",
     "description": "Navigate to the Methodology page. This is the description text for waste water"
   },
+  "methodology.page.category.wildfire.risk.rate.description.text": {
+    "defaultMessage": "A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not include property value.",
+    "description": "Navigate to the Methodology page. This is the description text for exp bld loss rate"
+  },
   "methodology.page.category.workforce.dev.description.text": {
-    "defaultMessage": "Median income of the census tract calculated as a percent of the area’s median income.",
+    "defaultMessage": "Low median income calculated as a share of the area’s median income.",
     "description": "Navigate to the Methodology page. This is the description text for workforce dev"
   },
+  "methodology.page.dataset.card.availableFor.ALL_ISLDS": {
+    "defaultMessage": "American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands",
+    "description": "Methodology page dataset card available for ALL_ISLDS"
+  },
   "methodology.page.dataset.card.availableFor.AS_NMI": {
     "defaultMessage": "American Samoa and the Northern Mariana Islands",
-    "description": "Methodology page dataset card available for American Samoa and Northern Mariana Islands type"
+    "description": "Methodology page dataset card available for AS_NMI"
+  },
+  "methodology.page.dataset.card.availableFor.CONUS_DC": {
+    "defaultMessage": "All contiguous U.S. states and the District of Columbia",
+    "description": "Methodology page dataset card available for CONUS and DC"
+  },
+  "methodology.page.dataset.card.availableFor.FRT": {
+    "defaultMessage": "Federally-Recognized Tribes, including Alaskan Native villages",
+    "description": "Methodology page dataset card available for FRT"
+  },
+  "methodology.page.dataset.card.availableFor.METRO_US_HOLC": {
+    "defaultMessage": "Metro areas of US that were HOLC graded",
+    "description": "Methodology page dataset card available for METRO_US_HOLC"
   },
   "methodology.page.dataset.card.availableFor.US_DC": {
     "defaultMessage": "All U.S. states and the District of Columbia",
@@ -1388,7 +1476,7 @@
     "description": "Navigate to the Methodology page. This is the title text for the diesel pm dataset"
   },
   "methodology.page.dataset.indicator.energy.burden.title.text": {
-    "defaultMessage": "Energy burden",
+    "defaultMessage": "Energy cost",
     "description": "Navigate to the Methodology page. This is the title text for the energy burden dataset"
   },
   "methodology.page.dataset.indicator.exp.bld.loss.title.text": {
@@ -1403,26 +1491,46 @@
     "defaultMessage": "Expected agriculture loss rate",
     "description": "Navigate to the Methodology page. This is the title text for the expected agr loss rate income dataset"
   },
+  "methodology.page.dataset.indicator.flood.risk.title.text": {
+    "defaultMessage": "NEW Projected flood risk",
+    "description": "Navigate to the Methodology page. This is the title text for the NEW Projected flood risk"
+  },
+  "methodology.page.dataset.indicator.fuds.title.text": {
+    "defaultMessage": "NEW Formerly Used Defense Sites",
+    "description": "Navigate to the Methodology page. This is the title text for the Formerly Used Defense Sites"
+  },
+  "methodology.page.dataset.indicator.green.space.title.text": {
+    "defaultMessage": "NEW Lack of green space",
+    "description": "Navigate to the Methodology page. This is the title text for the house burden dataset"
+  },
   "methodology.page.dataset.indicator.heart.disease.title.text": {
     "defaultMessage": "Heart disease",
     "description": "Navigate to the Methodology page. This is the title text for the heart disease dataset"
   },
-  "methodology.page.dataset.indicator.high.ed.enroll.title.text": {
-    "defaultMessage": "Higher education non-enrollment",
-    "description": "Navigate to the Methodology page. This is the title text for the high ed enrollment dataset"
-  },
   "methodology.page.dataset.indicator.high.school.title.text": {
-    "defaultMessage": "High school degree non-attainment",
+    "defaultMessage": "High school education",
     "description": "Navigate to the Methodology page. This is the title text for the high school dataset"
   },
+  "methodology.page.dataset.indicator.hist.underinvest.title.text": {
+    "defaultMessage": "New Historic underinvestment",
+    "description": "Navigate to the Methodology page. This is the title text for the Historic Underinvestment"
+  },
   "methodology.page.dataset.indicator.house.burden.title.text": {
-    "defaultMessage": "Housing cost burden",
+    "defaultMessage": "Housing cost",
     "description": "Navigate to the Methodology page. This is the title text for the house burden dataset"
   },
+  "methodology.page.dataset.indicator.indoor.plumb.title.text": {
+    "defaultMessage": "NEW Lack of indoor plumbing",
+    "description": "Navigate to the Methodology page. This is the title text for the indoor plumbing"
+  },
   "methodology.page.dataset.indicator.lead.paint.title.text": {
     "defaultMessage": "Lead paint",
     "description": "Navigate to the Methodology page. This is the title text for the lead paint dataset"
   },
+  "methodology.page.dataset.indicator.leaky.uwt.title.text": {
+    "defaultMessage": "NEW Leaking underground storage tanks",
+    "description": "Navigate to the Methodology page. This is the title text for the Leaking underground storage tanks"
+  },
   "methodology.page.dataset.indicator.life.exp.title.text": {
     "defaultMessage": "Low life expectancy",
     "description": "Navigate to the Methodology page. This is the title text for the life exp dataset"
@@ -1439,9 +1547,9 @@
     "defaultMessage": "Low median income",
     "description": "Navigate to the Methodology page. This is the title text for the low median income dataset"
   },
-  "methodology.page.dataset.indicator.median.home.title.text": {
-    "defaultMessage": "Median home value",
-    "description": "Navigate to the Methodology page. This is the title text for the median home dataset"
+  "methodology.page.dataset.indicator.mine.land.title.text": {
+    "defaultMessage": "NEW Abandoned mine lands",
+    "description": "Navigate to the Methodology page. This is the title text for the Abandoned mine lands"
   },
   "methodology.page.dataset.indicator.pm25.title.text": {
     "defaultMessage": "PM2.5 in the air",
@@ -1452,11 +1560,11 @@
     "description": "Navigate to the Methodology page. This is the title text for the poverty dataset"
   },
   "methodology.page.dataset.indicator.prox.haz.title.text": {
-    "defaultMessage": "Proximity to hazardous waste facilities",
+    "defaultMessage": "Proximity to hazardous waste sites",
     "description": "Navigate to the Methodology page. This is the title text for the prox haz dataset"
   },
   "methodology.page.dataset.indicator.prox.npl.title.text": {
-    "defaultMessage": "Proximity to National Priorities List (NPL) sites",
+    "defaultMessage": "Proximity to Superfund sites",
     "description": "Navigate to the Methodology page. This is the title text for the prox npl dataset"
   },
   "methodology.page.dataset.indicator.prox.rpm.title.text": {
@@ -1467,6 +1575,14 @@
     "defaultMessage": "Traffic proximity and volume",
     "description": "Navigate to the Methodology page. This is the title text for the traffic.volume dataset"
   },
+  "methodology.page.dataset.indicator.trans.barrier.title.text": {
+    "defaultMessage": "NEW Transportation barriers",
+    "description": "Navigate to the Methodology page. This is the title text for the Transportation barriers"
+  },
+  "methodology.page.dataset.indicator.tribal.lands.title.text": {
+    "defaultMessage": "NEW Tribal lands",
+    "description": "Navigate to the Methodology page. This is the title text for the Tribal lands"
+  },
   "methodology.page.dataset.indicator.unemploy.title.text": {
     "defaultMessage": "Unemployment",
     "description": "Navigate to the Methodology page. This is the title text for the unemployment dataset"
@@ -1475,6 +1591,10 @@
     "defaultMessage": "Wastewater discharge",
     "description": "Navigate to the Methodology page. This is the title text for the waste water dataset"
   },
+  "methodology.page.dataset.indicator.wildfire.risk.title.text": {
+    "defaultMessage": "NEW Projected wildfire risk",
+    "description": "Navigate to the Methodology page. This is the title text for the NEW Projected wildfire risk"
+  },
   "methodology.page.datasetCard.available.for": {
     "defaultMessage": "Available for:",
     "description": "Navigate to the Methodology page. This is the label associated with available for which regions of the card"
@@ -1503,12 +1623,20 @@
     "defaultMessage": "These datasets provide additional information about each community.",
     "description": "Navigate to the Methodology page. This is the additional indicator info"
   },
+  "methodology.page.datasetContainer.button.text": {
+    "defaultMessage": "Share data sources with CEQ",
+    "description": "Navigate to the Methodology page. This is the section heading of which datasets are used in cumulative score with a button labeled: Share data sources with CEQ"
+  },
   "methodology.page.datasetContainer.heading": {
     "defaultMessage": "Datasets used in beta methodology",
     "description": "Navigate to the Methodology page. This is the section heading of which datasets are used in cumulative score"
   },
+  "methodology.page.datasetContainer.heading.rich.text": {
+    "defaultMessage": "Datasets used in v{version} methodology",
+    "description": "Navigate to the Methodology page. This is the section heading of which datasets are used in cumulative score"
+  },
   "methodology.page.datasetContainer.info": {
-    "defaultMessage": "The datasets used in the current version of the tool come from a variety of sources and were selected based on relevance, availability, and quality. The datasets seek to identify a range of human health, environmental, climate-related, and other impacts on communities.",
+    "defaultMessage": "The tool's datasets are public and consistent nationwide. They come from different sources and are high quality. The Council on Environmental Quality (CEQ) chose them based on relevance, availability, and quality. They identify climate, environmental, and other burdens on communities.",
     "description": "Navigate to the Methodology page. This is the description of the dataset section"
   },
   "methodology.page.datasets.all.except.workforce.used.in.text": {
@@ -1536,39 +1664,39 @@
     "description": "Navigate to the methodology page. This is the methodology page header text"
   },
   "methodology.page.indicator.categories.afford.house.if": {
-    "defaultMessage": "<boldtag>IF</boldtag> at or above the 90th percentile for <link1>lead paint</link1> AND <link2>median home value</link2> is at or less than the 90th percentile OR at or above the 90th percentile for the <link3>housing cost burden</link3>",
+    "defaultMessage": "Experienced <link0>historic underinvestment</link0> OR are at or above the 90th percentile for the <link1>housing cost</link1> OR <link2>lack of green space</link2> OR <link3>lack of indoor plumbing</link3> OR <link4>lead paint</link4>",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula"
   },
   "methodology.page.indicator.categories.afford.housing.methodology": {
-    "defaultMessage": "Affordable and sustainable housing category",
+    "defaultMessage": "Housing category",
     "description": "Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Affordable and sustainable housing methodology"
   },
   "methodology.page.indicator.categories.clean.energy.if": {
-    "defaultMessage": "<boldtag>IF</boldtag> at or above the 90th percentile for <link1>energy burden</link1> OR <link2>PM2.5 in the air</link2>",
+    "defaultMessage": "<boldtag>ARE</boldtag> at or above the 90th percentile for <link1>energy cost</link1> OR <link2>PM2.5 in the air</link2>",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the if if portion of the formula"
   },
   "methodology.page.indicator.categories.clean.energy.methodology": {
-    "defaultMessage": "Clean energy and energy efficiency category",
+    "defaultMessage": "Energy category",
     "description": "Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Clean energy and energy efficiency methodology"
   },
   "methodology.page.indicator.categories.clean.transport.if": {
-    "defaultMessage": "<boldtag>IF</boldtag> at or above the 90th percentile for <link1>diesel particulate matter exposure</link1> or <link2>traffic proximity and volume</link2>",
+    "defaultMessage": "<boldtag>ARE</boldtag> at or above the 90th percentile for <link1>diesel particulate matter exposure</link1> OR <link3>transportation barriers</link3> OR <link2>traffic proximity and volume</link2>",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula"
   },
   "methodology.page.indicator.categories.clean.transport.methodology": {
-    "defaultMessage": "Clean transit category",
+    "defaultMessage": "Transportation category",
     "description": "Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Clean transportation methodology"
   },
   "methodology.page.indicator.categories.clean.water.if": {
-    "defaultMessage": "<boldtag>IF</boldtag> at or above the 90th percentile for <link1>wastewater discharge</link1>",
+    "defaultMessage": "<boldtag>ARE</boldtag> at or above the 90th percentile for <link0>leaking underground storage tanks</link0> OR <link1>wastewater discharge</link1>",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula"
   },
   "methodology.page.indicator.categories.clean.water.methodology": {
-    "defaultMessage": "Critical clean water and wastewater infrastructure category",
-    "description": "Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Critical clean water and wastewater infrastructure methodology"
+    "defaultMessage": "Water and wastewater category",
+    "description": "Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Water and wastewater methodology"
   },
   "methodology.page.indicator.categories.climate.change.if": {
-    "defaultMessage": "<boldtag>IF</boldtag> at or above the 90th percentile for <link1>expected agriculture loss rate</link1> OR <link2>expected building loss rate</link2> OR <link3>expected population loss rate</link3>",
+    "defaultMessage": "<boldtag>ARE</boldtag> at or above the 90th percentile for <link1>expected agriculture loss rate</link1> OR <link2>expected building loss rate</link2> OR <link3>expected population loss rate</link3> OR <link4>projected flood risk</link4> OR <link5>projected wildfire risk</link5>",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula"
   },
   "methodology.page.indicator.categories.climate.change.methodology": {
@@ -1580,41 +1708,73 @@
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the category title"
   },
   "methodology.page.indicator.categories.heading": {
-    "defaultMessage": "Categories",
+    "defaultMessage": "Categories of Burdens",
     "description": "Navigate to the methodology page. Navigate to the category section. This is category heading"
   },
   "methodology.page.indicator.categories.health.burdens.if": {
-    "defaultMessage": "<boldtag>IF</boldtag> at or above the 90th percentile for <link1>asthma</link1> OR <link2>diabetes</link2> OR <link3>heart disease</link3> OR <link4>low life expectancy</link4>",
+    "defaultMessage": "<boldtag>ARE</boldtag> at or above the 90th percentile for <link1>asthma</link1> OR <link2>diabetes</link2> OR <link3>heart disease</link3> OR <link4>low life expectancy</link4>",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula"
   },
   "methodology.page.indicator.categories.health.burdens.methodology": {
-    "defaultMessage": "Health burdens category",
+    "defaultMessage": "Health category",
     "description": "Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Health burdens methodology"
   },
   "methodology.page.indicator.categories.legacy.pollute.methodology": {
-    "defaultMessage": "Reduction and remediation of legacy pollution category",
+    "defaultMessage": "Legacy pollution category",
     "description": "Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Reduction and remediation of legacy pollution methodology"
   },
   "methodology.page.indicator.categories.legacy.pollution.if": {
-    "defaultMessage": "<boldtag>IF</boldtag> at or above the 90th percentile for <link1>proximity to hazardous waste facilities</link1> OR <link2>proximity to National Priorities List (NPL) sites</link2> OR <link3>proximity to Risk Management Plan (RMP) facilities</link3>",
+    "defaultMessage": "Have at least one <link0>abandoned mine land</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites</link3> OR <link4>proximity to Risk Management Plan facilities</link4>",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula"
   },
+  "methodology.page.indicator.categories.tribal.lands.methodology": {
+    "defaultMessage": "Displaying Federally recognized tribal boundaries and Alaska Native Villages on the map",
+    "description": "Displaying Federally recognized tribal boundaries and Alaska Native Villages on the map"
+  },
   "methodology.page.indicator.categories.work.dev.if": {
-    "defaultMessage": "<boldtag>IF</boldtag> at or above the 90th percentile for <link1>low median income</link1> as a percentage of area median income OR <link2>linguistic isolation</link2> OR <link3>unemployment</link3> OR percentage of individuals in households at or below 100% Federal <link4>poverty</link4> level",
+    "defaultMessage": "<boldtag>ARE</boldtag> at or above the 90th percentile for <link2>linguistic isolation</link2> OR <link1>low median income</link1> OR <link4>poverty</link4> OR <link3>unemployment</link3>",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula"
   },
   "methodology.page.indicator.categories.workforce.dev.methodology": {
-    "defaultMessage": "Training and workforce development category",
+    "defaultMessage": "Workforce development category",
     "description": "Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Training and workforce development"
   },
-  "methodology.page.paragraph": {
-    "defaultMessage": "The current version of the tool identifies communities that are disadvantaged for the purposes of the Justice40 Initiative using census tracts, which are the smallest geographic unit for which publicly-available and nationally-consistent datasets can be consistently displayed on the tool. Census tract geographical boundaries are determined by the U.S. Census Bureau once every ten years. This tool utilizes the census tract boundaries from 2010 because they match the datasets used in the tool.",
-    "description": "Navigate to the methodology page. This is the methodology page paragraph"
+  "methodology.page.paragraph.1": {
+    "defaultMessage": "The tool highlights disadvantaged census tracts across all 50 states, the District of Columbia, and the U.S. territories. A community is considered disadvantaged:",
+    "description": "Navigate to the methodology page. This is the methodology paragraph 1"
+  },
+  "methodology.page.paragraph.1.bullet.1": {
+    "defaultMessage": "If they are in a census tract that meets the thresholds for at least one of tool’s categories of burden, or",
+    "description": "Navigate to the methodology page. This is the methodology paragraph 1, bullet 1"
+  },
+  "methodology.page.paragraph.1.bullet.2": {
+    "defaultMessage": "If they are on Federally-Recognized Tribal land",
+    "description": "Navigate to the methodology page. This is the methodology paragraph 1, bullet 2"
+  },
+  "methodology.page.paragraph.3": {
+    "defaultMessage": "The tool uses datasets as indicators of burdens. The burdens are organized into categories. A community is highlighted as disadvantaged on the CEJST map if it is in a census tract that is (1) at or above the threshold for one or more environmental, climate, or other burdens, and (2) at or above the threshold for an associated socioeconomic burden. In addition, a census tract that is completely surrounded by disadvantaged communities that meet the burden thresholds, and is at or above the 50% percentile for low income, is also considered disadvantaged.",
+    "description": "Navigate to the methodology page. This is the methodology paragraph 3"
+  },
+  "methodology.page.paragraph.4": {
+    "defaultMessage": "Census tracts are small units of geography. Census tract boundaries are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.",
+    "description": "Navigate to the methodology page. This is the methodology paragraph 4"
+  },
+  "methodology.page.paragraph.5": {
+    "defaultMessage": "Federally-Recognized Tribal lands, including Alaska Native Villages, are also considered disadvantaged and highlighted on the map.",
+    "description": "Navigate to the methodology page. This is the methodology paragraph 5"
   },
   "methodology.page.return.to.top.link": {
     "defaultMessage": "Return to top",
     "description": "Navigate to the Methodology page. This is the link text to return to top"
   },
+  "methodology.page.sub.heading.1": {
+    "defaultMessage": "Categories of Burdens",
+    "description": "Navigate to the methodology page. This is sub-heading 1"
+  },
+  "methodology.page.sub.heading.2": {
+    "defaultMessage": "Tribal lands",
+    "description": "Navigate to the methodology page. This is sub-heading 2"
+  },
   "methodology.page.title.text": {
     "defaultMessage": "Methodology & data",
     "description": "Navigate to the methodology page. This is the methodology page title text"
diff --git a/client/src/pages/methodology.tsx b/client/src/pages/methodology.tsx
index 57b5d0e50..b9970f222 100644
--- a/client/src/pages/methodology.tsx
+++ b/client/src/pages/methodology.tsx
@@ -6,7 +6,6 @@ import {useWindowSize} from 'react-use';
 import Categories from '../components/Categories';
 import DatasetContainer from '../components/DatasetContainer';
 import J40MainGridContainer from '../components/J40MainGridContainer';
-import MethodologyFormula from '../components/MethodologyFormula';
 import Layout from '../components/layout';
 import SubPageNav from '../components/SubPageNav';
 import PublicEngageButton from '../components/PublicEngageButton';
@@ -33,24 +32,25 @@ const IndexPage = ({location}: MethodPageProps) => {
           <PublicEngageButton />
         </section>
 
-        <Grid row gap className={'j40-mb5-mt3'}>
+        <Grid row gap className={'j40-mt3'}>
 
           {/* First column */}
           <Grid col={12} tablet={{col: 8}}>
             <section>
               <p>
-                {intl.formatMessage(METHODOLOGY_COPY.PAGE.DESCRIPTION)}
+                {intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA1)}
               </p>
-            </section>
-
-            {/* Formula section */}
-            <MethodologyFormula />
 
-            {/* Category description */}
-            <section>
-              <p>
-                {intl.formatMessage(METHODOLOGY_COPY.PAGE.CATEGORY_TEXT)}
-              </p>
+              <div>
+                <ul>
+                  <li>
+                    {intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA1_BULLET1)}
+                  </li>
+                  <li>
+                    {intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA1_BULLET2)}
+                  </li>
+                </ul>
+              </div>
             </section>
           </Grid>
 
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 07dc5127a..9944b757e 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -400,7 +400,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         </div>
       </section>
       <div
-        class="grid-row grid-gap j40-mb5-mt3"
+        class="grid-row grid-gap j40-mt3"
         data-testid="grid"
       >
         <div
@@ -410,49 +410,23 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <section>
             <p>
               
-      The current version of the tool identifies communities that are disadvantaged for the purposes of 
-      the Justice40 Initiative using census tracts, which are the smallest geographic unit for 
-      which publicly-available and nationally-consistent datasets can be consistently displayed on the 
-      tool. Census tract geographical boundaries are determined by the U.S. Census Bureau once every ten 
-      years. This tool utilizes the census tract boundaries from 2010 because they match the datasets used 
-      in the tool.
+      The tool highlights disadvantaged census tracts across all 50 states, the District of Columbia, and the U.S. territories. A community is considered disadvantaged:
     
             </p>
-          </section>
-          <section>
-            <p>
-              
-      Under the current formula, a census tract will be identified as disadvantaged in one or more 
-      categories of criteria: 
-    
-            </p>
-            <p>
-              
-      
-              <strong>
-                IF
-              </strong>
-               the census tract is above the threshold for one or more environmental or climate indicators
-      
-            </p>
-            <p>
-              
-      
-              <strong>
-                AND
-              </strong>
-               the census tract is above the threshold for the socioeconomic indicators
+            <div>
+              <ul>
+                <li>
+                  
+      If they are in a census tract that meets the thresholds for at least one of tool’s categories of burden, or
     
-            </p>
-          </section>
-          <section>
-            <p>
-              
-      Communities are identified as disadvantaged by the current version of the tool for the purposes of 
-      the Justice40 Initiative if they are located in census tracts that are at or above the 
-      thresholds in one or more of eight categories of criteria below. 
+                </li>
+                <li>
+                  
+      If they are on Federally-Recognized Tribal land
     
-            </p>
+                </li>
+              </ul>
+            </div>
           </section>
         </div>
         <div
@@ -470,12 +444,25 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         data-testid="grid"
       >
         <div
-          class="grid-col-12"
+          class="grid-col-8"
           data-testid="grid"
         >
           <h2>
-            Categories
+            Categories of Burdens
           </h2>
+          <p>
+            
+      The tool uses datasets as indicators of burdens. The burdens are organized into categories. A community is highlighted as disadvantaged on the CEJST map if it is in a census tract that is (1) at or above the threshold for one or more environmental, climate, or other burdens, and (2) at or
+      above the threshold for an associated socioeconomic burden. In addition, a census tract that is completely surrounded by disadvantaged communities that meet the burden thresholds, and is at or above 
+      the 50% percentile for low income, is also considered disadvantaged. 
+    
+          </p>
+          <p>
+            
+      Census tracts are small units of geography. Census tract boundaries are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
+      census boundaries.    
+    
+          </p>
         </div>
       </div>
     </div>
@@ -493,12 +480,12 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             identified as disadvantaged
           </strong>
-          
+           if they are in census tracts that:
     
         </p>
         <p>
           <strong>
-            IF
+            ARE
           </strong>
            at or above the 90th percentile for 
           <a
@@ -521,6 +508,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           >
             expected population loss rate
           </a>
+            OR 
+          <a
+            class="usa-link"
+            href="#flood-risk"
+          >
+            projected flood risk
+          </a>
+           OR 
+          <a
+            class="usa-link"
+            href="#wildfire-risk"
+          >
+            projected wildfire risk
+          </a>
         </p>
         <p>
           
@@ -528,28 +529,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             AND
           </strong>
-           is at or above the 65th percentile for 
+           are at or above the 65th percentile for 
           <a
             class="usa-link"
             href="#low-income"
           >
             low income
           </a>
-           AND 80% or more of individuals 15 or older are not enrolled in 
-          <a
-            class="usa-link"
-            href="#high-ed-enroll-rate"
-          >
-            higher education
-          </a>
-           
+          
     
         </p>
-        <p />
       </div>
       <div>
         <h3>
-          Clean energy and energy efficiency
+          Energy
         </h3>
         <p>
           
@@ -557,19 +550,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             identified as disadvantaged
           </strong>
-          
+           if they are in census tracts that:
     
         </p>
         <p>
           <strong>
-            IF
+            ARE
           </strong>
            at or above the 90th percentile for 
           <a
             class="usa-link"
             href="#energy-burden"
           >
-            energy burden
+            energy cost
           </a>
            OR 
           <a
@@ -585,28 +578,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             AND
           </strong>
-           is at or above the 65th percentile for 
+           are at or above the 65th percentile for 
           <a
             class="usa-link"
             href="#low-income"
           >
             low income
           </a>
-           AND 80% or more of individuals 15 or older are not enrolled in 
-          <a
-            class="usa-link"
-            href="#high-ed-enroll-rate"
-          >
-            higher education
-          </a>
-           
+          
     
         </p>
-        <p />
       </div>
       <div>
         <h3>
-          Clean transit
+          Health
         </h3>
         <p>
           
@@ -614,31 +599,41 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             identified as disadvantaged
           </strong>
-          
+           if they are in census tracts that:
     
         </p>
         <p>
-          
-        
           <strong>
-            IF
+            ARE
           </strong>
            at or above the 90th percentile for 
           <a
             class="usa-link"
-            href="#diesel-pm"
+            href="#asthma"
           >
-            diesel particulate matter exposure
+            asthma
           </a>
-           or 
+           OR 
           <a
             class="usa-link"
-            href="#traffic-vol"
+            href="#diabetes"
           >
-            traffic proximity and volume
+            diabetes
+          </a>
+           OR 
+          <a
+            class="usa-link"
+            href="#heart-disease"
+          >
+            heart disease
+          </a>
+           OR 
+          <a
+            class="usa-link"
+            href="#life-exp"
+          >
+            low life expectancy
           </a>
-          
-      
         </p>
         <p>
           
@@ -646,28 +641,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             AND
           </strong>
-           is at or above the 65th percentile for 
+           are at or above the 65th percentile for 
           <a
             class="usa-link"
             href="#low-income"
           >
             low income
           </a>
-           AND 80% or more of individuals 15 or older are not enrolled in 
-          <a
-            class="usa-link"
-            href="#high-ed-enroll-rate"
-          >
-            higher education
-          </a>
-           
+          
     
         </p>
-        <p />
       </div>
       <div>
         <h3>
-          Affordable and sustainable housing
+          Housing
         </h3>
         <p>
           
@@ -675,33 +662,44 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             identified as disadvantaged
           </strong>
-          
+           if they are in census tracts that:
     
         </p>
         <p>
-          <strong>
-            IF
-          </strong>
-           at or above the 90th percentile for 
+          Experienced 
           <a
             class="usa-link"
-            href="#lead-paint"
+            href="#hist-underinv"
           >
-            lead paint
+            historic underinvestment
           </a>
-           AND 
+           OR are at or above the 90th percentile for the 
           <a
             class="usa-link"
-            href="#median-home"
+            href="#house-burden"
           >
-            median home value
+            housing cost
           </a>
-           is at or less than the 90th percentile OR at or above the 90th percentile for the 
+           OR 
           <a
             class="usa-link"
-            href="#house-burden"
+            href="#green-space"
+          >
+            lack of green space
+          </a>
+           OR 
+          <a
+            class="usa-link"
+            href="#indoor-plumb"
+          >
+            lack of indoor plumbing
+          </a>
+           OR 
+          <a
+            class="usa-link"
+            href="#lead-paint"
           >
-            housing cost burden
+            lead paint
           </a>
         </p>
         <p>
@@ -710,28 +708,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             AND
           </strong>
-           is at or above the 65th percentile for 
+           are at or above the 65th percentile for 
           <a
             class="usa-link"
             href="#low-income"
           >
             low income
           </a>
-           AND 80% or more of individuals 15 or older are not enrolled in 
-          <a
-            class="usa-link"
-            href="#high-ed-enroll-rate"
-          >
-            higher education
-          </a>
-           
+          
     
         </p>
-        <p />
       </div>
       <div>
         <h3>
-          Reduction and remediation of legacy pollution
+          Legacy pollution
         </h3>
         <p>
           
@@ -739,14 +729,25 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             identified as disadvantaged
           </strong>
-          
+           if they are in census tracts that:
     
         </p>
         <p>
-          <strong>
-            IF
-          </strong>
-           at or above the 90th percentile for 
+          Have at least one 
+          <a
+            class="usa-link"
+            href="#mine-land"
+          >
+            abandoned mine land
+          </a>
+           OR 
+          <a
+            class="usa-link"
+            href="#fuds"
+          >
+            Formerly Used Defense Sites
+          </a>
+           OR are at or above the 90th percentile for 
           <a
             class="usa-link"
             href="#prox-haz"
@@ -758,14 +759,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             class="usa-link"
             href="#prox-npl"
           >
-            proximity to National Priorities List (NPL) sites
+            proximity to Superfind sites
           </a>
            OR 
           <a
             class="usa-link"
             href="#prox-rmp"
           >
-            proximity to Risk Management Plan (RMP) facilities
+            proximity to Risk Management Plan facilities
           </a>
         </p>
         <p>
@@ -774,28 +775,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             AND
           </strong>
-           is at or above the 65th percentile for 
+           are at or above the 65th percentile for 
           <a
             class="usa-link"
             href="#low-income"
           >
             low income
           </a>
-           AND 80% or more of individuals 15 or older are not enrolled in 
-          <a
-            class="usa-link"
-            href="#high-ed-enroll-rate"
-          >
-            higher education
-          </a>
-           
+          
     
         </p>
-        <p />
       </div>
       <div>
         <h3>
-          Critical clean water and wastewater infrastructure
+          Transportation
         </h3>
         <p>
           
@@ -803,20 +796,38 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             identified as disadvantaged
           </strong>
-          
+           if they are in census tracts that:
     
         </p>
         <p>
+          
+        
           <strong>
-            IF
+            ARE
           </strong>
            at or above the 90th percentile for 
           <a
             class="usa-link"
-            href="#waste-water"
+            href="#diesel-pm"
           >
-            wastewater discharge
+            diesel particulate matter exposure
+          </a>
+           OR 
+          <a
+            class="usa-link"
+            href="#trans-barrier"
+          >
+            transportation barriers
+          </a>
+           OR 
+          <a
+            class="usa-link"
+            href="#traffic-vol"
+          >
+            traffic proximity and volume
           </a>
+          
+      
         </p>
         <p>
           
@@ -824,28 +835,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             AND
           </strong>
-           is at or above the 65th percentile for 
+           are at or above the 65th percentile for 
           <a
             class="usa-link"
             href="#low-income"
           >
             low income
           </a>
-           AND 80% or more of individuals 15 or older are not enrolled in 
-          <a
-            class="usa-link"
-            href="#high-ed-enroll-rate"
-          >
-            higher education
-          </a>
-           
+          
     
         </p>
-        <p />
       </div>
       <div>
         <h3>
-          Health burdens
+          Water and wastewater
         </h3>
         <p>
           
@@ -853,40 +856,26 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             identified as disadvantaged
           </strong>
-          
+           if they are in census tracts that:
     
         </p>
         <p>
           <strong>
-            IF
+            ARE
           </strong>
            at or above the 90th percentile for 
           <a
             class="usa-link"
-            href="#asthma"
-          >
-            asthma
-          </a>
-           OR 
-          <a
-            class="usa-link"
-            href="#diabetes"
-          >
-            diabetes
-          </a>
-           OR 
-          <a
-            class="usa-link"
-            href="#heart-disease"
+            href="#leaky-uwt"
           >
-            heart disease
+            leaking underground storage tanks
           </a>
            OR 
           <a
             class="usa-link"
-            href="#life-exp"
+            href="#waste-water"
           >
-            low life expectancy
+            wastewater discharge
           </a>
         </p>
         <p>
@@ -895,24 +884,16 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             AND
           </strong>
-           is at or above the 65th percentile for 
+           are at or above the 65th percentile for 
           <a
             class="usa-link"
             href="#low-income"
           >
             low income
           </a>
-           AND 80% or more of individuals 15 or older are not enrolled in 
-          <a
-            class="usa-link"
-            href="#high-ed-enroll-rate"
-          >
-            higher education
-          </a>
-           
+          
     
         </p>
-        <p />
       </div>
       <div>
         <h3>
@@ -924,21 +905,16 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             identified as disadvantaged
           </strong>
-          
+           if they are in census tracts that:
     
         </p>
         <p>
+          
+        
           <strong>
-            IF
+            ARE
           </strong>
            at or above the 90th percentile for 
-          <a
-            class="usa-link"
-            href="#low-med-inc"
-          >
-            low median income
-          </a>
-           as a percentage of area median income OR 
           <a
             class="usa-link"
             href="#ling-iso"
@@ -948,42 +924,66 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
            OR 
           <a
             class="usa-link"
-            href="#unemploy"
+            href="#low-med-inc"
           >
-            unemployment
+            low median income
           </a>
-           OR percentage of individuals in households at or below 100% Federal 
+           OR 
           <a
             class="usa-link"
             href="#poverty"
           >
             poverty
           </a>
-           level
+           OR 
+          <a
+            class="usa-link"
+            href="#unemploy"
+          >
+            unemployment
+          </a>
+          
       
         </p>
         <p>
           <strong>
             AND
           </strong>
-           10% or more of adults 25 or older have not attained a 
+           have 10% or more of adults have a 
           <a
             class="usa-link"
             href="#high-school"
           >
-            high school degree
-          </a>
-           AND 80% or more of individuals 15 or older are not enrolled in 
-          <a
-            class="usa-link"
-            href="#high-ed-enroll-rate"
-          >
-            higher education
+            high school education
           </a>
-           
+           level less than a high school degree
   
         </p>
-        <p />
+      </div>
+    </div>
+    <div
+      class="grid-container-desktop-lg"
+      data-testid="gridContainer"
+    >
+      <div
+        class="grid-row"
+        data-testid="grid"
+      >
+        <div
+          class="grid-col-8"
+          data-testid="grid"
+        >
+          <h2>
+            
+      Tribal lands
+    
+          </h2>
+          <p>
+            
+      Federally-Recognized Tribal lands, including Alaska Native Villages, are also considered disadvantaged and highlighted on the map.   
+    
+          </p>
+        </div>
       </div>
     </div>
     <div
@@ -1003,26 +1003,50 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             data-testid="grid"
           >
             <h2>
-              Datasets used in beta methodology
+              Datasets used in v1.0 methodology
             </h2>
           </div>
         </div>
         <div
-          class="grid-row"
+          class="grid-row grid-gap"
           data-testid="grid"
         >
           <div
-            class="desktop:grid-col-9"
+            class="desktop:grid-col-7"
             data-testid="grid"
           >
             <p>
               
-      The datasets used in the current version of the tool come from a variety of sources and were 
-      selected based on relevance, availability, and quality. The datasets seek to identify a range of 
-      human health, environmental, climate-related, and other impacts on communities.
+      The tool's datasets are public and consistent nationwide. They come from different sources and are high quality. The Council on Environmental Quality (CEQ) chose them based on relevance,  availability, and quality. They identify climate, environmental, and other burdens on communities.
     
             </p>
           </div>
+          <div
+            class="desktop:grid-col-1"
+            data-testid="grid"
+          />
+          <div
+            class="desktop:grid-col-4"
+            data-testid="grid"
+          >
+            <a
+              href="https://www.surveymonkey.com/r/6G9TQJ8"
+              rel="noreferrer"
+              target="_blank"
+            >
+              <button
+                class="usa-button"
+                data-testid="button"
+                type="button"
+              >
+                Share data sources with CEQ
+                <img
+                  alt="launch icon"
+                  src="test-file-stub"
+                />
+              </button>
+            </a>
+          </div>
         </div>
         <div
           class="grid-row"
@@ -1042,7 +1066,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 <div>
                   
         Percent of a census tract's population in households where household income is at or below
-        200% of the Federal poverty level.
+        200% of the Federal poverty level, not including students enrolled in higher education.
       
                 </div>
                 <ul>
@@ -1056,7 +1080,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Responsible Party: 
                     </span>
-                    Census
+                    U.S. Census
                   </li>
                   <li>
                     <span>
@@ -1082,14 +1106,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </ul>
               </div>
               <div
-                id="high-ed-enroll-rate"
+                id="exp-agr-loss-rate"
               >
                 <h3>
-                  Higher education non-enrollment
+                  Expected agriculture loss rate
                 </h3>
                 <div>
                   
-        Percent of people 15 or older who are not currently enrolled in college, university, or graduate school.
+        Expected agricultural value at risk from losses due to fourteen types of natural hazards. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. The rate is calculated by dividing the agricultural value at risk by the total agricultural value. 
       
                 </div>
                 <ul>
@@ -1097,13 +1121,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    All categories
+                    Climate change category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Census
+                    Federal Emergency Management Agency (FEMA)
                   </li>
                   <li>
                     <span>
@@ -1112,36 +1136,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://www.census.gov/programs-surveys/acs"
+                      href="https://hazards.fema.gov/nri/expected-annual-loss"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      American Community Survey
+                      National Risk Index
                     </a>
-                     from 2015-2019
+                     from 2014-2021
                   </li>
                   <li>
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states, the District of Columbia, and Puerto Rico
+                    All U.S. states and the District of Columbia
                   </li>
                 </ul>
               </div>
               <div
-                id="exp-agr-loss-rate"
+                id="exp-bld-loss-rate"
               >
                 <h3>
-                  Expected agriculture loss rate
+                  Expected building loss rate
                 </h3>
                 <div>
                   
-        Percent of agricultural value at risk from losses due to fourteen types of 
-        natural hazards that have some link 
-        to climate change: avalanche, coastal flooding, 
-        cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong 
-        wind, tornado, wildfire, and winter weather. Rate calculated by dividing the agricultural value at risk in 
-        a census tract by the total agricultural value in that census tract.
+        Expected building value at risk from losses due to fourteen types of natural hazards. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. The rate is calculated by dividing the building value at risk by the total building value.
       
                 </div>
                 <ul>
@@ -1181,18 +1200,15 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </ul>
               </div>
               <div
-                id="exp-bld-loss-rate"
+                id="exp-pop-loss-rate"
               >
                 <h3>
-                  Expected building loss rate
+                  Expected population loss rate
                 </h3>
                 <div>
                   
-        Percent of building value at risk from losses due to fourteen types of natural hazards 
-        that have some link to climate change: avalanche, coastal flooding, 
-        cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong 
-        wind, tornado, wildfire, and winter weather. Rate calculated by dividing the building value at risk in 
-        a census tract by the total building value in that census tract.
+        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate of population loss.
+
       
                 </div>
                 <ul>
@@ -1232,25 +1248,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </ul>
               </div>
               <div
-                id="exp-pop-loss-rate"
+                id="flood-risk"
               >
                 <h3>
-                  Expected population loss rate
+                  NEW Projected flood risk
                 </h3>
                 <div>
                   
-        Rate relative to the population of fatalities and injuries due to fourteen types of
-        natural hazards each year
-        that have some link to climate change: avalanche, 
-        coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, 
-        riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined 
-        as the Spatial Hazard Events and Losses and National Centers for Environmental Information’s 
-        (NCEI) reported number of fatalities and injuries caused by the hazard occurrence. To 
-        combine fatalities and injuries for the computation of population loss value, an injury is counted 
-        as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies injuries and fatalities 
-        as direct or indirect. Both direct and indirect injuries and fatalities are counted as population 
-        loss. This total number of injuries and fatalities is then divided by the population in the 
-        census tract to get a per-capita rate of population risk. 
+        A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not include property value.
       
                 </div>
                 <ul>
@@ -1264,7 +1269,348 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Responsible Party: 
                     </span>
-                    Federal Emergency Management Agency (FEMA)
+                    First Street Foundation
+                  </li>
+                  <li>
+                    <span>
+                      Source: 
+                    </span>
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://firststreet.org/data-access/"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      Climate Risk Data Access
+                    </a>
+                     from 2022
+                  </li>
+                  <li>
+                    <span>
+                      Available for: 
+                    </span>
+                    All U.S. states, the District of Columbia, and Puerto Rico
+                  </li>
+                </ul>
+              </div>
+              <div
+                id="wildfire-risk"
+              >
+                <h3>
+                  NEW Projected wildfire risk
+                </h3>
+                <div>
+                  
+        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not include property value.
+      
+                </div>
+                <ul>
+                  <li>
+                    <span>
+                      Used in: 
+                    </span>
+                    Climate change category
+                  </li>
+                  <li>
+                    <span>
+                      Responsible Party: 
+                    </span>
+                    First Street Foundation
+                  </li>
+                  <li>
+                    <span>
+                      Source: 
+                    </span>
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://firststreet.org/data-access/"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      Climate Risk Data Access
+                    </a>
+                     from 2022
+                  </li>
+                  <li>
+                    <span>
+                      Available for: 
+                    </span>
+                    All contiguous U.S. states and the District of Columbia 
+                  </li>
+                </ul>
+              </div>
+              <div
+                id="energy-burden"
+              >
+                <h3>
+                  Energy cost
+                </h3>
+                <div>
+                  
+        Average household annual energy cost in dollars divided by the average household income.
+      
+                </div>
+                <ul>
+                  <li>
+                    <span>
+                      Used in: 
+                    </span>
+                    Energy category
+                  </li>
+                  <li>
+                    <span>
+                      Responsible Party: 
+                    </span>
+                    Department of Energy (DOE)
+                  </li>
+                  <li>
+                    <span>
+                      Source: 
+                    </span>
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.energy.gov/eere/slsc/low-income-energy-affordability-data-lead-tool"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      LEAD Score
+                    </a>
+                     from 2018
+                  </li>
+                  <li>
+                    <span>
+                      Available for: 
+                    </span>
+                    All U.S. states, the District of Columbia, and Puerto Rico
+                  </li>
+                </ul>
+              </div>
+              <div
+                id="pm-25"
+              >
+                <h3>
+                  PM2.5 in the air
+                </h3>
+                <div>
+                  
+        Fine inhalable particles with 2.5 or smaller micrometer diameters. The percentile is the weight of the particles per cubic meter.
+      
+                </div>
+                <ul>
+                  <li>
+                    <span>
+                      Used in: 
+                    </span>
+                    Energy category
+                  </li>
+                  <li>
+                    <span>
+                      Responsible Party: 
+                    </span>
+                    Environmental Protection Agency (EPA) Office of Air and Radiation (OAR)
+                  </li>
+                  <li>
+                    <span>
+                      Source: 
+                    </span>
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.epa.gov/ejscreen/technical-documentation-ejscreen"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      Fusion of model and monitor data
+                    </a>
+                     from 2017 as compiled by EPA’s EJScreen, sourced from EPA National Air Toxics Assessment (NATA) and the U.S. Department of Transportation (DOT) traffic data
+    
+                  </li>
+                  <li>
+                    <span>
+                      Available for: 
+                    </span>
+                    All U.S. states and the District of Columbia
+                  </li>
+                </ul>
+              </div>
+              <div
+                id="asthma"
+              >
+                <h3>
+                  Asthma
+                </h3>
+                <div>
+                  
+        Share of people who answer “yes” to both of these questions: “Have you ever been told by a health professional that you have asthma?” and “Do you still have asthma?”.
+      
+                </div>
+                <ul>
+                  <li>
+                    <span>
+                      Used in: 
+                    </span>
+                    Health category
+                  </li>
+                  <li>
+                    <span>
+                      Responsible Party: 
+                    </span>
+                    Centers for Disease Control and Prevention (CDC)
+                  </li>
+                  <li>
+                    <span>
+                      Source: 
+                    </span>
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.cdc.gov/places/index.html"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      PLACES data
+                    </a>
+                     from 2016-2019
+                  </li>
+                  <li>
+                    <span>
+                      Available for: 
+                    </span>
+                    All U.S. states and the District of Columbia
+                  </li>
+                </ul>
+              </div>
+              <div
+                id="diabetes"
+              >
+                <h3>
+                  Diabetes
+                </h3>
+                <div>
+                  
+        Share of people ages 18 years and older who have been told by a health professional that they have diabetes other than diabetes during pregnancy.
+      
+                </div>
+                <ul>
+                  <li>
+                    <span>
+                      Used in: 
+                    </span>
+                    Health category
+                  </li>
+                  <li>
+                    <span>
+                      Responsible Party: 
+                    </span>
+                    Centers for Disease Control and Prevention (CDC)
+                  </li>
+                  <li>
+                    <span>
+                      Source: 
+                    </span>
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.cdc.gov/places/index.html"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      PLACES data
+                    </a>
+                     from 2016-2019
+                  </li>
+                  <li>
+                    <span>
+                      Available for: 
+                    </span>
+                    All U.S. states and the District of Columbia
+                  </li>
+                </ul>
+              </div>
+              <div
+                id="heart-disease"
+              >
+                <h3>
+                  Heart disease
+                </h3>
+                <div>
+                  
+        Share of people ages 18 years and older who have been told by a health professional that they had angina or coronary heart disease.
+      
+                </div>
+                <ul>
+                  <li>
+                    <span>
+                      Used in: 
+                    </span>
+                    Health category
+                  </li>
+                  <li>
+                    <span>
+                      Responsible Party: 
+                    </span>
+                    Centers for Disease Control and Prevention (CDC)
+                  </li>
+                  <li>
+                    <span>
+                      Source: 
+                    </span>
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.cdc.gov/places/index.html"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      PLACES data
+                    </a>
+                     from 2016-2019
+                  </li>
+                  <li>
+                    <span>
+                      Available for: 
+                    </span>
+                    All U.S. states and the District of Columbia
+                  </li>
+                </ul>
+              </div>
+              <div
+                id="life-exp"
+              >
+                <h3>
+                  Low life expectancy
+                </h3>
+                <div>
+                  
+        Average number of years people have left in their lives.
+      
+                </div>
+                <div>
+                  <p>
+                    
+        
+                    <strong>
+                      Note: 
+                    </strong>
+                    The tool reverses the percentiles for this burden. This means that census tracts with lower numbers have higher life expectancies and that census tracts with higher numbers have lower life expectancies.
+      
+                  </p>
+                </div>
+                <ul>
+                  <li>
+                    <span>
+                      Used in: 
+                    </span>
+                    Health category
+                  </li>
+                  <li>
+                    <span>
+                      Responsible Party: 
+                    </span>
+                    Centers for Disease Control and Prevention (CDC)
                   </li>
                   <li>
                     <span>
@@ -1273,13 +1619,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://hazards.fema.gov/nri/expected-annual-loss"
+                      href="https://www.cdc.gov/nchs/nvss/usaleep/usaleep.html#data"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      National Risk Index
+                      U.S. Small-Area Life Expectancy Estimates Project (USALEEP)
                     </a>
-                     from 2014-2021
+                     from 2010-2015
                   </li>
                   <li>
                     <span>
@@ -1290,26 +1636,57 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </ul>
               </div>
               <div
-                id="energy-burden"
+                id="hist-underinv"
               >
                 <h3>
-                  Energy burden
+                  New Historic underinvestment
                 </h3>
                 <div>
-                  Average annual energy cost per household ($) divided by average household income.
+                  
+        Census tracts that experienced historic underinvestment as determined by the National Community Reinvestment Coalition’s (NCRC) historic redlining score. It is determined using the 
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://ncrc.org/explainer-why-we-created-a-new-method-for-measuring-the-impact-of-redlining/"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    NCRC’s methodology
+                  </a>
+                   for identifying areas with the most historic redlining (i.e. a score of 3.25 or more out of 4). This means that people in the  tract had high barriers to accessing home loans. 
+      
+                </div>
+                <div>
+                  <p>
+                    
+        
+                    <strong>
+                      Note: 
+                    </strong>
+                    The historic underinvestment data indicator 
+                    <strong>
+                      does not
+                    </strong>
+                     appear on the map for tracts 
+                    <strong>
+                      that were not
+                    </strong>
+                     evaluated by the National Community Reinvestment Coalition. It is shown in tracts that are most commonly in larger metropolitan areas.
+      
+                  </p>
                 </div>
                 <ul>
                   <li>
                     <span>
                       Used in: 
                     </span>
-                    Clean energy and energy efficiency category
+                    Housing category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Department of Energy (DOE)
+                    Nationl Community Reinvestment Coalition (NCRC)
                   </li>
                   <li>
                     <span>
@@ -1318,33 +1695,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://www.energy.gov/eere/slsc/low-income-energy-affordability-data-lead-tool"
+                      href="https://www.openicpsr.org/openicpsr/project/141121/version/V2/view"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      LEAD Score
+                      Dataset of formerly redlined areas
                     </a>
-                     from 2018
+                     using digitized maps from the Home Owners Loan Corporation from 2010
                   </li>
                   <li>
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states and the District of Columbia
+                    Metro areas of US that were HOLC graded 
                   </li>
                 </ul>
               </div>
               <div
-                id="pm-25"
+                id="house-burden"
               >
                 <h3>
-                  PM2.5 in the air
+                  Housing cost
                 </h3>
                 <div>
                   
-        Fine inhalable particles, with diameters that are generally 2.5 micrometers and smaller. The value 
-        in the fields is the weight of these particles in micrograms per cubic meter.
-
+        Share of households that are both earning less than 80% of Housing and Urban Development’s Area Median Family Income and are spending more than 30% of their income on housing costs.
       
                 </div>
                 <ul>
@@ -1352,13 +1727,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Clean energy and energy efficiency category
+                    Housing category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Environmental Protection Agency (EPA) Office of Air and Radiation (OAR)
+                    Department of Housing & Urban Development (HUD)
                   </li>
                   <li>
                     <span>
@@ -1367,33 +1742,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://www.epa.gov/ejscreen/technical-documentation-ejscreen"
+                      href="https://www.huduser.gov/portal/datasets/cp.html"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      Fusion of model and monitor data
+                      Comprehensive Housing Affordability Strategy dataset
                     </a>
-                     from 2017 as compiled by EPA’s EJScreen, sourced from EPA National Air Toxics Assessment (NATA) and the U.S. Department of Transportation (DOT) traffic data
-    
+                     from 2014-2018
                   </li>
                   <li>
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states and the District of Columbia
+                    All U.S. states, the District of Columbia, and Puerto Rico
                   </li>
                 </ul>
               </div>
               <div
-                id="diesel-pm"
+                id="green-space"
               >
                 <h3>
-                  Diesel particulate matter exposure
+                  NEW Lack of green space
                 </h3>
                 <div>
                   
-        Mixture of particles that is part of diesel exhaust in the air. The value in the fields is the 
-        weight of these particles in micrograms per cubic meter. 
+        Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes.
       
                 </div>
                 <ul>
@@ -1401,13 +1774,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Clean transit category
+                    Housing category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Environmental Protection Agency (EPA)
+                    The Trust for Public Lands and American Forestry
                   </li>
                   <li>
                     <span>
@@ -1416,32 +1789,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://www.epa.gov/ejscreen/technical-documentation-ejscreen"
+                      href="https://www.mrlc.gov/data/nlcd-2019-percent-developed-imperviousness-conus"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      National Air Toxics Assessment (NATA)
+                      Percent Developed Imperviousness (CONUS) 
                     </a>
-                     from 2014 as compiled by EPA's EJScreen
+                     from 2019
                   </li>
                   <li>
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states and the District of Columbia
+                    All contiguous U.S. states and the District of Columbia 
                   </li>
                 </ul>
               </div>
               <div
-                id="traffic-vol"
+                id="indoor-plumb"
               >
                 <h3>
-                  Traffic proximity and volume
+                  NEW Lack of indoor plumbing
                 </h3>
                 <div>
                   
-        Count of vehicles (average annual daily traffic) at major roads
-        within 500 meters, divided by distance in meters.
+        Housing without complete kitchen facilities or complete plumbing facilities.
       
                 </div>
                 <ul>
@@ -1449,13 +1821,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Clean transit category
+                    Housing category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Department of Transportation (DOT)
+                    Department of Housing & Urban Development (HUD)
                   </li>
                   <li>
                     <span>
@@ -1464,32 +1836,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://www.epa.gov/ejscreen/technical-documentation-ejscreen"
+                      href="https://www.huduser.gov/portal/datasets/cp.html"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      Traffic data
+                      Comprehensive Housing Affordability Strategy dataset
                     </a>
-                     from 2017 as compiled by EPA's EJScreen
+                     from 2014-2018
                   </li>
                   <li>
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states and the District of Columbia
+                    All U.S. states, the District of Columbia, and Puerto Rico
                   </li>
                 </ul>
               </div>
               <div
-                id="house-burden"
+                id="lead-paint"
               >
                 <h3>
-                  Housing cost burden
+                  Lead paint
                 </h3>
                 <div>
                   
-        Percent of households in a census tract that are both earning less than 80% of HUD Area Median
-        Family Income by county and are spending more than 30% of their income on housing costs.
+        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are not likely to have lead paint exposure and are not included.
       
                 </div>
                 <ul>
@@ -1497,13 +1868,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Affordable and sustainable housing category
+                    Housing category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Department of Housing & Urban Development (HUD)
+                    U.S. Census
                   </li>
                   <li>
                     <span>
@@ -1512,32 +1883,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://www.huduser.gov/portal/datasets/cp.html"
+                      href="https://www.census.gov/programs-surveys/acs"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      Comprehensive Housing Affordability Strategy dataset
+                      American Community Survey
                     </a>
-                     from 2014-2018
+                     from 2015-2019
                   </li>
                   <li>
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states and the District of Columbia
+                    All U.S. states, the District of Columbia, and Puerto Rico
                   </li>
                 </ul>
               </div>
               <div
-                id="lead-paint"
+                id="mine-land"
               >
                 <h3>
-                  Lead paint
+                  NEW Abandoned mine lands
                 </h3>
                 <div>
                   
-        Percent of housing units built pre-1960, used as an indicator of potential lead paint exposure in
-        census tracts with median home values less than the 90th percentile.
+        Presence of an abandoned mine left by legacy coal mining operations.
       
                 </div>
                 <ul>
@@ -1545,13 +1915,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Affordable and sustainable housing category
+                    Legacy pollution category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Census
+                    Department of the Interior (DOI)
                   </li>
                   <li>
                     <span>
@@ -1560,13 +1930,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://www.census.gov/programs-surveys/acs"
+                      href="https://www.osmre.gov/programs/e-amlis"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      American Community Survey
+                      Abandoned Mine Land Inventory System (e-AMLIS)
                     </a>
-                     from 2015-2019
+                     from 2017
                   </li>
                   <li>
                     <span>
@@ -1577,28 +1947,28 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </ul>
               </div>
               <div
-                id="median-home"
+                id="fuds"
               >
                 <h3>
-                  Median home value
+                  NEW Formerly Used Defense Sites
                 </h3>
                 <div>
                   
-        Median home value of owner-occupied housing units in the census tract.
-       
+      Properties that were owned, leased, or possessed by the United States, under the jurisdiction of the Secretary of Defense prior to October 1986.
+      
                 </div>
                 <ul>
                   <li>
                     <span>
                       Used in: 
                     </span>
-                    Affordable and sustainable housing category
+                    Legacy pollution category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Census
+                    U.S. Army Corps of Engineers
                   </li>
                   <li>
                     <span>
@@ -1607,13 +1977,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://www.census.gov/programs-surveys/acs"
+                      href="https://www.usace.army.mil/Missions/Environmental/Formerly-Used-Defense-Sites/"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      American Community Survey
+                      Formerly Used Defense Sites (FUDS) 
                     </a>
-                     from 2015-2019
+                      from 2019
                   </li>
                   <li>
                     <span>
@@ -1627,13 +1997,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="prox-haz"
               >
                 <h3>
-                  Proximity to hazardous waste facilities
+                  Proximity to hazardous waste sites
                 </h3>
                 <div>
                   
-        Count of hazardous waste facilities (Treatment, Storage, and Disposal Facilities and Large
-        Quantity Generators) within 5 kilometers (or nearest beyond 5 kilometers), each divided by 
-        distance in kilometers.
+        Number of hazardous waste facilities (Treatment, Storage, and Disposal Facilities and Large Quantity Generators) within 5 kilometers (or nearest beyond 5 kilometers), each divided by distance in kilometers.
       
                 </div>
                 <ul>
@@ -1641,7 +2009,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Reduction and remediation of legacy pollution category
+                    Legacy pollution category
                   </li>
                   <li>
                     <span>
@@ -1672,7 +2040,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states and the District of Columbia
+                    All U.S. states, the District of Columbia, and Puerto Rico
                   </li>
                 </ul>
               </div>
@@ -1680,12 +2048,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="prox-npl"
               >
                 <h3>
-                  Proximity to National Priorities List (NPL) sites
+                  Proximity to Superfund sites
                 </h3>
                 <div>
                   
-        Count of proposed or listed NPL - also known as Superfund - sites within 5 kilometers (or nearest one
-        beyond 5 kilometers), each divided by distance in kilometers.
+        Number of proposed or listed Superfund or National Priorities list (NPL) sites within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
         
                 </div>
                 <ul>
@@ -1693,7 +2060,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Reduction and remediation of legacy pollution category
+                    Legacy pollution category
                   </li>
                   <li>
                     <span>
@@ -1720,7 +2087,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states and the District of Columbia
+                    All U.S. states, the District of Columbia, and Puerto Rico
                   </li>
                 </ul>
               </div>
@@ -1732,8 +2099,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </h3>
                 <div>
                   
-        Count of RMP (potential chemical accident management plan) facilities within 5 kilometers (or nearest
-        one beyond 5 kilometers), each divided by distance in kilometers.
+        Count of RMP, or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
       
                 </div>
                 <ul>
@@ -1741,7 +2107,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Reduction and remediation of legacy pollution category
+                    Legacy pollution category
                   </li>
                   <li>
                     <span>
@@ -1768,20 +2134,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states and the District of Columbia
+                    All U.S. states, the District of Columbia, and Puerto Rico
                   </li>
                 </ul>
               </div>
               <div
-                id="waste-water"
+                id="diesel-pm"
               >
                 <h3>
-                  Wastewater discharge
+                  Diesel particulate matter exposure
                 </h3>
                 <div>
                   
-        Risk-Screening Environmental Indicators (RSEI) modeled toxic concentrations at
-        stream segments within 500 meters, divided by distance in kilometers.
+        Mixture of particles in diesel exhaust in the air, measured as micrograms per cubic meter.
       
                 </div>
                 <ul>
@@ -1789,7 +2154,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Critical clean water and wastewater infrastructure category
+                    Transportation category
                   </li>
                   <li>
                     <span>
@@ -1808,29 +2173,27 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       rel="noreferrer"
                       target="_blank"
                     >
-                      Risk-Screening Environmental Indicators (RSEI) Model
+                      National Air Toxics Assessment (NATA)
                     </a>
-                     from 2020 as compiled by EPA’s EJScreen
+                     from 2014 as compiled by EPA's EJScreen
                   </li>
                   <li>
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states and the District of Columbia
+                    All U.S. states, the District of Columbia, and Puerto Rico
                   </li>
                 </ul>
               </div>
               <div
-                id="asthma"
+                id="trans-barrier"
               >
                 <h3>
-                  Asthma
+                  NEW Transportation barriers
                 </h3>
                 <div>
                   
-        Weighted percent of people who answer “yes” to both of the following questions: “Have you ever
-        been told by a doctor, nurse, or other health professional that you have asthma?” and
-        “Do you still have asthma?”
+        Average relative cost and time spent on transportation relative to all other tracts.
       
                 </div>
                 <ul>
@@ -1838,13 +2201,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Health burdens category
+                    Transportation category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Centers for Disease Control and Prevention (CDC)
+                    Department of Transportation (DOT)
                   </li>
                   <li>
                     <span>
@@ -1853,33 +2216,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://www.cdc.gov/places/index.html"
+                      href="http://google.com"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      PLACES data
+                      Transportation Burdens indicator (need link)
                     </a>
-                     from 2016-2019
+                      from 2022
                   </li>
                   <li>
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states and the District of Columbia
+                    All U.S. states, the District of Columbia, and Puerto Rico
                   </li>
                 </ul>
               </div>
               <div
-                id="diabetes"
+                id="traffic-vol"
               >
                 <h3>
-                  Diabetes
+                  Traffic proximity and volume
                 </h3>
                 <div>
                   
-        Weighted percent of people ages 18 years and older who report having ever been
-        told by a doctor, nurse, or other health professionals that they have
-        diabetes other than diabetes during pregnancy.
+        Number of vehicles (average annual daily traffic) at major roads within 500 meters, divided by distance in meters.
       
                 </div>
                 <ul>
@@ -1887,13 +2248,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Health burdens category
+                    Transportation category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Centers for Disease Control and Prevention (CDC)
+                    Department of Transportation (DOT)
                   </li>
                   <li>
                     <span>
@@ -1902,33 +2263,31 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://www.cdc.gov/places/index.html"
+                      href="https://www.epa.gov/ejscreen/technical-documentation-ejscreen"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      PLACES data
+                      Traffic data
                     </a>
-                     from 2016-2019
+                     from 2017 as compiled by EPA's EJScreen
                   </li>
                   <li>
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states and the District of Columbia
+                    All U.S. states, the District of Columbia, and Puerto Rico
                   </li>
                 </ul>
               </div>
               <div
-                id="heart-disease"
+                id="leaky-uwt"
               >
                 <h3>
-                  Heart disease
+                  NEW Leaking underground storage tanks
                 </h3>
                 <div>
                   
-        Weighted percent of people ages 18 years and older who report ever having been told
-        by a doctor, nurse, or other health professionals that they had angina or
-        coronary heart disease.
+        Weighted formula of number of leaking underground storage tanks and the number of underground storage tanks within 1,500 feet.
       
                 </div>
                 <ul>
@@ -1936,71 +2295,110 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Health burdens category
+                    Water and wastewater category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Centers for Disease Control and Prevention (CDC)
+                    Environmental Protection Agency (EPA)
                   </li>
                   <li>
                     <span>
                       Source: 
                     </span>
+                    Calculated from EPA’s 
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://www.cdc.gov/places/index.html"
+                      href="https://www.epa.gov/ust/ust-finder"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      PLACES data
+                      UST Finder
                     </a>
-                     from 2016-2019
+                     from 2021 as compiled by EPA's EJScreen
+    
                   </li>
                   <li>
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states and the District of Columbia
+                    All U.S. states, the District of Columbia, and Puerto Rico
                   </li>
                 </ul>
               </div>
               <div
-                id="life-exp"
+                id="waste-water"
               >
                 <h3>
-                  Low life expectancy
+                  Wastewater discharge
                 </h3>
                 <div>
                   
-        Average number of years of life a person who has attained a given age can expect to live.
+        Risk-Screening Environmental Indicators (RSEI) modeled toxic concentrations at
+        stream segments within 500 meters, divided by distance in kilometers.
       
                 </div>
+                <ul>
+                  <li>
+                    <span>
+                      Used in: 
+                    </span>
+                    Water and wastewater category
+                  </li>
+                  <li>
+                    <span>
+                      Responsible Party: 
+                    </span>
+                    Environmental Protection Agency (EPA)
+                  </li>
+                  <li>
+                    <span>
+                      Source: 
+                    </span>
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.epa.gov/ejscreen/technical-documentation-ejscreen"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      Risk-Screening Environmental Indicators (RSEI) Model
+                    </a>
+                     from 2020 as compiled by EPA’s EJScreen
+                  </li>
+                  <li>
+                    <span>
+                      Available for: 
+                    </span>
+                    All U.S. states, the District of Columbia, and Puerto Rico
+                  </li>
+                </ul>
+              </div>
+              <div
+                id="ling-iso"
+              >
+                <h3>
+                  Linguistic isolation
+                </h3>
                 <div>
-                  <p>
-                    
-        
-                    <strong>
-                      Note: 
-                    </strong>
-                    The percentiles for this dataset have been reversed so that census tracts with lower numbers have higher life expectancies and the census tracts with higher numbers have lower life expectancy when compared to life expectancy in the area.
+                  
+        Share of households where no one over the age 14 speaks English well.
       
-                  </p>
                 </div>
                 <ul>
                   <li>
                     <span>
                       Used in: 
                     </span>
-                    Health burdens category
+                    Workforce development category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Centers for Disease Control and Prevention (CDC)
+                    U.S. Census
                   </li>
                   <li>
                     <span>
@@ -2009,13 +2407,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://www.cdc.gov/nchs/nvss/usaleep/usaleep.html#data"
+                      href="https://www.census.gov/programs-surveys/acs"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      U.S. Small-Area Life Expectancy Estimates Project (USALEEP)
+                      American Community Survey
                     </a>
-                     from 2010-2015
+                     from 2015-2019
                   </li>
                   <li>
                     <span>
@@ -2023,6 +2421,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     </span>
                     All U.S. states and the District of Columbia
                   </li>
+                  <div>
+                    <p>
+                      
+      
+                      <strong>
+                        Note: 
+                      </strong>
+                      Linguistic isolation was removed from Puerto Rico based on feedback during the beta period.
+      
+                    </p>
+                  </div>
                 </ul>
               </div>
               <div
@@ -2033,7 +2442,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </h3>
                 <div>
                   
-        Median income of the census tract calculated as a percent of the area’s median income.
+        Low median income calculated as a share of the area’s median income.
       
                 </div>
                 <div>
@@ -2043,7 +2452,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <strong>
                       Note: 
                     </strong>
-                    The percentiles for this dataset have been reversed so that census tracts with lower numbers have higher median incomes and census tracts with the higher numbers have lower median income when compared to area median income.
+                    The tool reverses the percentiles for this burden. This means that census tracts with lower numbers have higher median incomes and census tracts with the higher numbers have lower median incomes.
       
                   </p>
                 </div>
@@ -2052,13 +2461,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Training and workforce development category
+                    Workforce development category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Census
+                    U.S. Census
                   </li>
                   <li>
                     <span>
@@ -2100,19 +2509,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Available for: 
                     </span>
-                    American Samoa and the Northern Mariana Islands
+                    American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands
+    
                   </li>
                 </ul>
               </div>
               <div
-                id="ling-iso"
+                id="poverty"
               >
                 <h3>
-                  Linguistic isolation
+                  Poverty
                 </h3>
                 <div>
                   
-        Percent of households where no one over the age 14 speaks English well.
+        Share of people living at or below 100% of the Federal poverty level.
       
                 </div>
                 <ul>
@@ -2120,13 +2530,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Training and workforce development category
+                    Workforce development category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Census
+                    U.S. Census
                   </li>
                   <li>
                     <span>
@@ -2159,7 +2569,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </h3>
                 <div>
                   
-      Number of unemployed people as a percentage of the civilian labor force.
+        Number of unemployed people as a share of the  labor force.
       
                 </div>
                 <ul>
@@ -2167,13 +2577,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Training and workforce development category
+                    Workforce development category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Census
+                    U.S. Census
                   </li>
                   <li>
                     <span>
@@ -2215,20 +2625,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Available for: 
                     </span>
-                    American Samoa and the Northern Mariana Islands
+                    American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands
+    
                   </li>
                 </ul>
               </div>
               <div
-                id="poverty"
+                id="high-school"
               >
                 <h3>
-                  Poverty
+                  High school education
                 </h3>
                 <div>
                   
-        Percent of a census tract's population in households where the household income is at or below 100% of
-        the Federal poverty level.
+        Share of people aged 25 years or older who didn’t graduate from high school.
       
                 </div>
                 <ul>
@@ -2236,13 +2646,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Used in: 
                     </span>
-                    Training and workforce development category
+                    Workforce development category
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Census
+                    U.S. Census
                   </li>
                   <li>
                     <span>
@@ -2284,54 +2694,45 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Available for: 
                     </span>
-                    American Samoa and the Northern Mariana Islands
+                    American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands
+    
                   </li>
                 </ul>
               </div>
               <div
-                id="high-school"
+                id="tribal-lands"
               >
                 <h3>
-                  High school degree non-attainment
+                  NEW Tribal lands
                 </h3>
                 <div>
                   
-        Percent of people age 25 years or older in a census tract whose education level is less than a high school diploma.
+        The Land Area Representation (LAR) dataset depicts the exterior extent of a Federal Indian land area. 
+      
+                </div>
+                <div>
+                  <p>
+                    
+        
+                    <strong>
+                      Note: 
+                    </strong>
+                    The LAR dataset depicts the exterior extent of a Federal Indian land area.  Not all Federally recognized tribes have a designated land area; therefore, they may not have an associated land area represented in the land area dataset.
       
+                  </p>
                 </div>
                 <ul>
                   <li>
                     <span>
                       Used in: 
                     </span>
-                    Training and workforce development category
+                    Displaying Federally recognized tribal boundaries and Alaska Native Villages on the map
                   </li>
                   <li>
                     <span>
                       Responsible Party: 
                     </span>
-                    Census
-                  </li>
-                  <li>
-                    <span>
-                      Source: 
-                    </span>
-                    <a
-                      class="usa-link usa-link--external"
-                      data-cy=""
-                      href="https://www.census.gov/programs-surveys/acs"
-                      rel="noreferrer"
-                      target="_blank"
-                    >
-                      American Community Survey
-                    </a>
-                     from 2015-2019
-                  </li>
-                  <li>
-                    <span>
-                      Available for: 
-                    </span>
-                    All U.S. states, the District of Columbia, and Puerto Rico
+                    Bureau of Indian Affairs (BIA)
                   </li>
                   <li>
                     <span>
@@ -2340,19 +2741,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="https://www.census.gov/data/developers/data-sets/acs-5year/2010.html"
+                      href="https://www.bia.gov/bia/ots/dpmc/bogs"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      American Community Survey
+                      Land Area Representation (LAR) dataset
                     </a>
-                     from 2010
+                     from 2018
                   </li>
                   <li>
                     <span>
                       Available for: 
                     </span>
-                    American Samoa and the Northern Mariana Islands
+                    Federally-Recognized Tribes, including Alaskan Native villages 
                   </li>
                 </ul>
               </div>
diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss
index 152844605..28bd03416 100644
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@@ -166,12 +166,15 @@ li.usa-nav__primary-item a:hover::after{
       flex-direction: column;
     }
   }
-  
   .j40-mb5-mt3 {
     @include u-margin-bottom(5);
     @include u-margin-top(3);
   }
 
+  .j40-mt3 {
+    @include u-margin-top(3);
+  }
+
   .j40-p-tag {
     margin-top: 1.25rem;
     font-size: 1.06rem;

From 8dc81639c721f9203f6bc7d3088d731a696cf621 Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Thu, 13 Oct 2022 22:46:32 -0700
Subject: [PATCH 076/130] FAQS page (#2016)

* Fix a11y issue on Ling Iso card

* Add layout of new FAQs page

* Reorder SubNav links on About page

* Add NEW tag to new Burdens

* Add first 6 questions to FAQs

* Add the rest of the FAQs onto the page

* Adjust sub-nav order in About header

- update snapshots
- ensure that FAQ in SubNav is active
---
 .../components/DatasetCard/DatasetCard.tsx    |  22 +-
 .../DatasetCard/datasetCard.module.scss       |  14 +
 .../DatasetCard/datasetCard.module.scss.d.ts  |   3 +
 .../__snapshots__/datasetCard.test.tsx.snap   |  10 +-
 .../datasetContainer.test.tsx.snap            | 404 +++++++---
 client/src/components/J40Header/J40Header.tsx |  14 +-
 .../__snapshots__/J40Header.test.tsx.snap     |  12 +-
 client/src/data/copy/about.tsx                |   2 +
 client/src/data/copy/faqs.tsx                 | 586 +++++++++++++-
 client/src/data/copy/methodology.tsx          |  33 +-
 client/src/intl/en.json                       | 354 ++++++++-
 client/src/pages/about.tsx                    |   2 +-
 .../src/pages/frequently-asked-questions.tsx  | 237 +++++-
 .../tests/__snapshots__/about.test.tsx.snap   |  12 +-
 .../tests/__snapshots__/contact.test.tsx.snap |  12 +-
 .../__snapshots__/downloads.test.tsx.snap     |  12 +-
 .../freqAskedQuestions.test.tsx.snap          | 741 +++++++++++++++++-
 .../__snapshots__/methodology.test.tsx.snap   | 416 +++++++---
 .../__snapshots__/publicEng.test.tsx.snap     |  12 +-
 .../techSupportDoc.test.tsx.snap              |  12 +-
 20 files changed, 2602 insertions(+), 308 deletions(-)

diff --git a/client/src/components/DatasetCard/DatasetCard.tsx b/client/src/components/DatasetCard/DatasetCard.tsx
index b3d3c4ca6..b73c4b590 100644
--- a/client/src/components/DatasetCard/DatasetCard.tsx
+++ b/client/src/components/DatasetCard/DatasetCard.tsx
@@ -1,5 +1,6 @@
 /* eslint-disable valid-jsdoc */
 import React from 'react';
+import {Tag} from '@trussworks/react-uswds';
 import {useIntl} from 'gatsby-plugin-intl';
 
 import * as styles from './datasetCard.module.scss';
@@ -22,7 +23,16 @@ const DatasetCard = ({datasetCardProps}: IDatasetCardProps) => {
   return (
     <div className={styles.datasetCard} id={datasetCardProps.domID}>
       {/* Dataset header */}
-      <h3 className={styles.datasetCardIndicator}>{datasetCardProps.indicator}</h3>
+      <div className={datasetCardProps.isNew ? styles.datasetCardHeader : ''}>
+        {datasetCardProps.isNew &&
+          <div className={styles.tagContainer}>
+            <Tag className={styles.newTag}>{intl.formatMessage(METHODOLOGY_COPY.DATASET_CARD_LABELS.NEW)}</Tag>
+          </div>
+        }
+        <h3 className={styles.datasetCardIndicator}>
+          {datasetCardProps.indicator}
+        </h3>
+      </div>
 
       {/* Dataset description */}
       <div className={styles.datasetCardDescription}>
@@ -70,15 +80,15 @@ const DatasetCard = ({datasetCardProps}: IDatasetCardProps) => {
               </span>
               {intl.formatMessage(dataSource.availableFor)}
             </li>
-
-            {/* Dataset note */}
-            {(datasetCardProps.note && isNoteAtEnd) && <div className={styles.datasetCardDescription}>
-              <p>{datasetCardProps.note}</p>
-            </div>}
           </React.Fragment>
         ))}
 
       </ul>
+
+      {/* Dataset note */}
+      {(datasetCardProps.note && isNoteAtEnd) && <div className={styles.datasetCardDescription}>
+        <p>{datasetCardProps.note}</p>
+      </div>}
     </div>
   );
 };
diff --git a/client/src/components/DatasetCard/datasetCard.module.scss b/client/src/components/DatasetCard/datasetCard.module.scss
index 828d776a9..0b96f5493 100644
--- a/client/src/components/DatasetCard/datasetCard.module.scss
+++ b/client/src/components/DatasetCard/datasetCard.module.scss
@@ -57,3 +57,17 @@
   font-size: large;
   font-weight: bolder;
 }
+
+.datasetCardHeader{
+  display: flex;
+}
+
+.tagContainer {
+  @include u-margin-right(1);
+  @include u-margin-top("05");
+}
+
+.newTag {
+  @include u-bg('yellow-20v');
+  @include u-text('blue-70v');
+}
\ No newline at end of file
diff --git a/client/src/components/DatasetCard/datasetCard.module.scss.d.ts b/client/src/components/DatasetCard/datasetCard.module.scss.d.ts
index 6a0fdd243..53ecbe818 100644
--- a/client/src/components/DatasetCard/datasetCard.module.scss.d.ts
+++ b/client/src/components/DatasetCard/datasetCard.module.scss.d.ts
@@ -1,6 +1,7 @@
 declare namespace DatasetCardScssNamespace {
     export interface IDatasetCardScss {
         datasetCard: string;
+        datasetCardHeader: string;
         datasetCardAdditional:string;
         datasetCardIndicator:string;
         datasetCardWhatIsIt: string;
@@ -9,6 +10,8 @@ declare namespace DatasetCardScssNamespace {
         datasetCardList: string;
         datasetCardListItemSource: string;
         datasetCardListItem: string;
+        newTag: string;
+        tagContainer: string;
     }
   }
 
diff --git a/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap b/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap
index 1ef703620..182c2189a 100644
--- a/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap
+++ b/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap
@@ -5,9 +5,13 @@ exports[`rendering of indicator dataset card checks if component renders 1`] = `
   <div
     id="low-income"
   >
-    <h3>
-      Low income
-    </h3>
+    <div
+      class=""
+    >
+      <h3>
+        Low income
+      </h3>
+    </div>
     <div>
       
         Percent of a census tract's population in households where household income is at or below
diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
index 5f2bac2f9..ddd322bf1 100644
--- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
+++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
@@ -76,9 +76,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="low-income"
             >
-              <h3>
-                Low income
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Low income
+                </h3>
+              </div>
               <div>
                 
         Percent of a census tract's population in households where household income is at or below
@@ -124,9 +128,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="exp-agr-loss-rate"
             >
-              <h3>
-                Expected agriculture loss rate
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Expected agriculture loss rate
+                </h3>
+              </div>
               <div>
                 
         Expected agricultural value at risk from losses due to fourteen types of natural hazards. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. The rate is calculated by dividing the agricultural value at risk by the total agricultural value. 
@@ -171,9 +179,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="exp-bld-loss-rate"
             >
-              <h3>
-                Expected building loss rate
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Expected building loss rate
+                </h3>
+              </div>
               <div>
                 
         Expected building value at risk from losses due to fourteen types of natural hazards. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. The rate is calculated by dividing the building value at risk by the total building value.
@@ -218,9 +230,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="exp-pop-loss-rate"
             >
-              <h3>
-                Expected population loss rate
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Expected population loss rate
+                </h3>
+              </div>
               <div>
                 
         Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate of population loss.
@@ -266,9 +282,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="flood-risk"
             >
-              <h3>
-                NEW Projected flood risk
-              </h3>
+              <div>
+                <div>
+                  <span
+                    class="usa-tag"
+                    data-testid="tag"
+                  >
+                    NEW
+                  </span>
+                </div>
+                <h3>
+                  Projected flood risk
+                </h3>
+              </div>
               <div>
                 
         A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not include property value.
@@ -313,9 +339,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="wildfire-risk"
             >
-              <h3>
-                NEW Projected wildfire risk
-              </h3>
+              <div>
+                <div>
+                  <span
+                    class="usa-tag"
+                    data-testid="tag"
+                  >
+                    NEW
+                  </span>
+                </div>
+                <h3>
+                  Projected wildfire risk
+                </h3>
+              </div>
               <div>
                 
         A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not include property value.
@@ -360,9 +396,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="energy-burden"
             >
-              <h3>
-                Energy cost
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Energy cost
+                </h3>
+              </div>
               <div>
                 
         Average household annual energy cost in dollars divided by the average household income.
@@ -407,9 +447,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="pm-25"
             >
-              <h3>
-                PM2.5 in the air
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  PM2.5 in the air
+                </h3>
+              </div>
               <div>
                 
         Fine inhalable particles with 2.5 or smaller micrometer diameters. The percentile is the weight of the particles per cubic meter.
@@ -455,9 +499,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="asthma"
             >
-              <h3>
-                Asthma
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Asthma
+                </h3>
+              </div>
               <div>
                 
         Share of people who answer “yes” to both of these questions: “Have you ever been told by a health professional that you have asthma?” and “Do you still have asthma?”.
@@ -502,9 +550,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="diabetes"
             >
-              <h3>
-                Diabetes
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Diabetes
+                </h3>
+              </div>
               <div>
                 
         Share of people ages 18 years and older who have been told by a health professional that they have diabetes other than diabetes during pregnancy.
@@ -549,9 +601,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="heart-disease"
             >
-              <h3>
-                Heart disease
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Heart disease
+                </h3>
+              </div>
               <div>
                 
         Share of people ages 18 years and older who have been told by a health professional that they had angina or coronary heart disease.
@@ -596,9 +652,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="life-exp"
             >
-              <h3>
-                Low life expectancy
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Low life expectancy
+                </h3>
+              </div>
               <div>
                 
         Average number of years people have left in their lives.
@@ -654,9 +714,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="hist-underinv"
             >
-              <h3>
-                New Historic underinvestment
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  New Historic underinvestment
+                </h3>
+              </div>
               <div>
                 
         Census tracts that experienced historic underinvestment as determined by the National Community Reinvestment Coalition’s (NCRC) historic redlining score. It is determined using the 
@@ -730,9 +794,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="house-burden"
             >
-              <h3>
-                Housing cost
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Housing cost
+                </h3>
+              </div>
               <div>
                 
         Share of households that are both earning less than 80% of Housing and Urban Development’s Area Median Family Income and are spending more than 30% of their income on housing costs.
@@ -777,9 +845,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="green-space"
             >
-              <h3>
-                NEW Lack of green space
-              </h3>
+              <div>
+                <div>
+                  <span
+                    class="usa-tag"
+                    data-testid="tag"
+                  >
+                    NEW
+                  </span>
+                </div>
+                <h3>
+                  Lack of green space
+                </h3>
+              </div>
               <div>
                 
         Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes.
@@ -824,9 +902,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="indoor-plumb"
             >
-              <h3>
-                NEW Lack of indoor plumbing
-              </h3>
+              <div>
+                <div>
+                  <span
+                    class="usa-tag"
+                    data-testid="tag"
+                  >
+                    NEW
+                  </span>
+                </div>
+                <h3>
+                  Lack of indoor plumbing
+                </h3>
+              </div>
               <div>
                 
         Housing without complete kitchen facilities or complete plumbing facilities.
@@ -871,9 +959,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="lead-paint"
             >
-              <h3>
-                Lead paint
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Lead paint
+                </h3>
+              </div>
               <div>
                 
         Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are not likely to have lead paint exposure and are not included.
@@ -918,9 +1010,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="mine-land"
             >
-              <h3>
-                NEW Abandoned mine lands
-              </h3>
+              <div>
+                <div>
+                  <span
+                    class="usa-tag"
+                    data-testid="tag"
+                  >
+                    NEW
+                  </span>
+                </div>
+                <h3>
+                  Abandoned mine lands
+                </h3>
+              </div>
               <div>
                 
         Presence of an abandoned mine left by legacy coal mining operations.
@@ -965,9 +1067,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="fuds"
             >
-              <h3>
-                NEW Formerly Used Defense Sites
-              </h3>
+              <div>
+                <div>
+                  <span
+                    class="usa-tag"
+                    data-testid="tag"
+                  >
+                    NEW
+                  </span>
+                </div>
+                <h3>
+                  Formerly Used Defense Sites
+                </h3>
+              </div>
               <div>
                 
       Properties that were owned, leased, or possessed by the United States, under the jurisdiction of the Secretary of Defense prior to October 1986.
@@ -1012,9 +1124,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="prox-haz"
             >
-              <h3>
-                Proximity to hazardous waste sites
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Proximity to hazardous waste sites
+                </h3>
+              </div>
               <div>
                 
         Number of hazardous waste facilities (Treatment, Storage, and Disposal Facilities and Large Quantity Generators) within 5 kilometers (or nearest beyond 5 kilometers), each divided by distance in kilometers.
@@ -1063,9 +1179,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="prox-npl"
             >
-              <h3>
-                Proximity to Superfund sites
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Proximity to Superfund sites
+                </h3>
+              </div>
               <div>
                 
         Number of proposed or listed Superfund or National Priorities list (NPL) sites within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
@@ -1110,9 +1230,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="prox-rmp"
             >
-              <h3>
-                Proximity to Risk Management Plan (RMP) facilities
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Proximity to Risk Management Plan (RMP) facilities
+                </h3>
+              </div>
               <div>
                 
         Count of RMP, or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
@@ -1157,9 +1281,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="diesel-pm"
             >
-              <h3>
-                Diesel particulate matter exposure
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Diesel particulate matter exposure
+                </h3>
+              </div>
               <div>
                 
         Mixture of particles in diesel exhaust in the air, measured as micrograms per cubic meter.
@@ -1204,9 +1332,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="trans-barrier"
             >
-              <h3>
-                NEW Transportation barriers
-              </h3>
+              <div>
+                <div>
+                  <span
+                    class="usa-tag"
+                    data-testid="tag"
+                  >
+                    NEW
+                  </span>
+                </div>
+                <h3>
+                  Transportation barriers
+                </h3>
+              </div>
               <div>
                 
         Average relative cost and time spent on transportation relative to all other tracts.
@@ -1251,9 +1389,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="traffic-vol"
             >
-              <h3>
-                Traffic proximity and volume
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Traffic proximity and volume
+                </h3>
+              </div>
               <div>
                 
         Number of vehicles (average annual daily traffic) at major roads within 500 meters, divided by distance in meters.
@@ -1298,9 +1440,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="leaky-uwt"
             >
-              <h3>
-                NEW Leaking underground storage tanks
-              </h3>
+              <div>
+                <div>
+                  <span
+                    class="usa-tag"
+                    data-testid="tag"
+                  >
+                    NEW
+                  </span>
+                </div>
+                <h3>
+                  Leaking underground storage tanks
+                </h3>
+              </div>
               <div>
                 
         Weighted formula of number of leaking underground storage tanks and the number of underground storage tanks within 1,500 feet.
@@ -1347,9 +1499,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="waste-water"
             >
-              <h3>
-                Wastewater discharge
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Wastewater discharge
+                </h3>
+              </div>
               <div>
                 
         Risk-Screening Environmental Indicators (RSEI) modeled toxic concentrations at
@@ -1395,9 +1551,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="ling-iso"
             >
-              <h3>
-                Linguistic isolation
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Linguistic isolation
+                </h3>
+              </div>
               <div>
                 
         Share of households where no one over the age 14 speaks English well.
@@ -1437,25 +1597,29 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   </span>
                   All U.S. states and the District of Columbia
                 </li>
-                <div>
-                  <p>
-                    
+              </ul>
+              <div>
+                <p>
+                  
       
-                    <strong>
-                      Note: 
-                    </strong>
-                    Linguistic isolation was removed from Puerto Rico based on feedback during the beta period.
+                  <strong>
+                    Note: 
+                  </strong>
+                  Linguistic isolation was removed from Puerto Rico based on feedback during the beta period.
       
-                  </p>
-                </div>
-              </ul>
+                </p>
+              </div>
             </div>
             <div
               id="low-med-inc"
             >
-              <h3>
-                Low median income
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Low median income
+                </h3>
+              </div>
               <div>
                 
         Low median income calculated as a share of the area’s median income.
@@ -1533,9 +1697,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="poverty"
             >
-              <h3>
-                Poverty
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Poverty
+                </h3>
+              </div>
               <div>
                 
         Share of people living at or below 100% of the Federal poverty level.
@@ -1580,9 +1748,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="unemploy"
             >
-              <h3>
-                Unemployment
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  Unemployment
+                </h3>
+              </div>
               <div>
                 
         Number of unemployed people as a share of the  labor force.
@@ -1649,9 +1821,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="high-school"
             >
-              <h3>
-                High school education
-              </h3>
+              <div
+                class=""
+              >
+                <h3>
+                  High school education
+                </h3>
+              </div>
               <div>
                 
         Share of people aged 25 years or older who didn’t graduate from high school.
@@ -1718,9 +1894,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="tribal-lands"
             >
-              <h3>
-                NEW Tribal lands
-              </h3>
+              <div>
+                <div>
+                  <span
+                    class="usa-tag"
+                    data-testid="tag"
+                  >
+                    NEW
+                  </span>
+                </div>
+                <h3>
+                  Tribal lands
+                </h3>
+              </div>
               <div>
                 
         The Land Area Representation (LAR) dataset depicts the exterior extent of a Federal Indian land area. 
diff --git a/client/src/components/J40Header/J40Header.tsx b/client/src/components/J40Header/J40Header.tsx
index 049d9f7c9..db433e658 100644
--- a/client/src/components/J40Header/J40Header.tsx
+++ b/client/src/components/J40Header/J40Header.tsx
@@ -141,13 +141,6 @@ const J40Header = ({location}:IJ40Header) => {
       data-cy={'nav-link-about'}>
       {intl.formatMessage(COMMON_COPY.HEADER.ABOUT)}
     </Link>,
-    <Link
-      to={PAGES_ENDPOINTS.FAQS}
-      key={'faqs'}
-      activeClassName="usa-current"
-      data-cy={'nav-link-faqs'}>
-      {intl.formatMessage(COMMON_COPY.HEADER.FAQS)}
-    </Link>,
     <Link
       to={PAGES_ENDPOINTS.PUBLIC_ENG}
       key={'publicEng'}
@@ -155,6 +148,13 @@ const J40Header = ({location}:IJ40Header) => {
       data-cy={'nav-link-public-engagement'}>
       {intl.formatMessage(COMMON_COPY.HEADER.PUBLIC_ENG)}
     </Link>,
+    <Link
+      to={PAGES_ENDPOINTS.FAQS}
+      key={'faqs'}
+      activeClassName="usa-current"
+      data-cy={'nav-link-faqs'}>
+      {intl.formatMessage(COMMON_COPY.HEADER.FAQS)}
+    </Link>,
   ];
 
   // Methodology & Data Nav component
diff --git a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
index 1fb2db54d..3af81c725 100644
--- a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
+++ b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
@@ -306,20 +306,20 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
                     >
-                      Frequently asked questions
+                      Engagement calendar
                     </a>
                   </li>
                   <li
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
                     >
-                      Engagement calendar
+                      Frequently asked questions
                     </a>
                   </li>
                 </ul>
diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx
index 1443b8eb0..dca93397b 100644
--- a/client/src/data/copy/about.tsx
+++ b/client/src/data/copy/about.tsx
@@ -9,6 +9,8 @@ import {PAGES_ENDPOINTS} from '../constants';
 
 export const EXEC_ORDER_LINK = 'https://www.federalregister.gov/documents/2021/02/01/2021-02177/tackling-the-climate-crisis-at-home-and-abroad#:~:text=Sec.%20223.%20Justice40,40-percent%20goal.';
 export const FAQS_LINK = 'https://www.whitehouse.gov/wp-content/uploads/2022/02/CEQ-CEJST-QandA.pdf';
+export const FED_RECOGNIZED_INDIAN_ENTITIES = `https://www.federalregister.gov/documents/2022/01/28/2022-01789/indian-entities-recognized-by-and-eligible-to-receive-services-from-the-united-states-bureau-of`;
+export const EJSCREEN = 'https://www.epa.gov/ejscreen/how-does-epa-use-ejscreen';
 
 export const PAGE = defineMessages({
   TITLE: {
diff --git a/client/src/data/copy/faqs.tsx b/client/src/data/copy/faqs.tsx
index 630df9362..e6172af0e 100644
--- a/client/src/data/copy/faqs.tsx
+++ b/client/src/data/copy/faqs.tsx
@@ -1,6 +1,12 @@
 /* eslint-disable max-len */
-import {defineMessages} from 'react-intl';
+import React from 'react';
+import {defineMessages, FormattedMessage} from 'gatsby-plugin-intl';
 
+import LinkTypeWrapper from '../../components/LinkTypeWrapper';
+
+import {EJSCREEN, EXEC_ORDER_LINK, FED_RECOGNIZED_INDIAN_ENTITIES} from './about';
+import {boldFn, linkFn, FEEDBACK_EMAIL} from './common';
+import {PAGES_ENDPOINTS} from '../constants';
 
 export const PAGE_INTRO = defineMessages({
   PAGE_TILE: {
@@ -14,3 +20,581 @@ export const PAGE_INTRO = defineMessages({
     description: 'Navigate to the FAQs page, this will be the page coming soon text',
   },
 });
+
+// If for some reason they key prop doesn't work in the array below, this is here:
+// export const QUESTIONS = {
+//   Q1: <FormattedMessage
+//     id={ 'faqs.page.Q1'}
+//     defaultMessage={ 'Q: What is the Climate and Economic Justice Screening Tool (CEJST)?'}
+//     description={ 'Navigate to the FAQs page, this will be Q1'}
+//   />,
+//   Q2: <FormattedMessage
+//     id={ 'faqs.page.Q2'}
+//     defaultMessage={ 'Q: How does the tool identify and define communities?'}
+//     description={ 'Navigate to the FAQs page, this will be Q2'}
+//   />,
+//   Q3: <FormattedMessage
+//     id={ 'faqs.page.Q3'}
+//     defaultMessage={ 'Q: Is race included in the tool’s methodology?'}
+//     description={ 'Navigate to the FAQs page, this will be Q3'}
+//   />,
+//   Q4: <FormattedMessage
+//     id={ 'faqs.page.Q4'}
+//     defaultMessage={ 'Q: Does the Climate and Economic Justice Screening Tool (CEJST) include the U.S. territories? '}
+//     description={ 'Navigate to the FAQs page, this will be Q4'}
+//   />,
+//   Q5: <FormattedMessage
+//     id={ 'faqs.page.Q5'}
+//     defaultMessage={ 'Q: Does the tool include Tribal Nations?'}
+//     description={ 'Navigate to the FAQs page, this will be Q5'}
+//   />,
+//   Q6: <FormattedMessage
+//     id={ 'faqs.page.Q6'}
+//     defaultMessage={ 'Q: Why do some areas of the map have different shades?'}
+//     description={ 'Navigate to the FAQs page, this will be Q6'}
+//   />,
+//   Q7: <FormattedMessage
+//     id={ 'faqs.page.Q7'}
+//     defaultMessage={ 'Q: Why does the tool have “partially disadvantaged” census tracts?'}
+//     description={ 'Navigate to the FAQs page, this will be Q7'}
+//   />,
+//   Q8: <FormattedMessage
+//     id={ 'faqs.page.Q8'}
+//     defaultMessage={ 'Q: How does this tool relate to the Justice40 Initiative?'}
+//     description={ 'Navigate to the FAQs page, this will be Q8'}
+//   />,
+//   Q9: <FormattedMessage
+//     id={ 'faqs.page.Q9'}
+//     defaultMessage={ 'Q: How will Federal agencies use the Climate and Economic Justice Screening Tool (CEJST) for the Justice40 Initiative? '}
+//     description={ 'Navigate to the FAQs page, this will be Q9'}
+//   />,
+//   Q10: <FormattedMessage
+//     id={ 'faqs.page.Q10'}
+//     defaultMessage={ 'Q: How will this tool be used to inform decisions relating to new investments made through the Bipartisan Infrastructure Law and the Inflation Reduction Act?'}
+//     description={ 'Navigate to the FAQs page, this will be Q10'}
+//   />,
+//   Q11: <FormattedMessage
+//     id={ 'faqs.page.Q11'}
+//     defaultMessage={ 'Q: Will agencies use the Climate and Economic Justice Screening Tool (CEJST) if they have already created their own tools or criteria to identify disadvantaged communities?'}
+//     description={ 'Navigate to the FAQs page, this will be Q11'}
+//   />,
+//   Q12: <FormattedMessage
+//     id={ 'faqs.page.Q12'}
+//     defaultMessage={ 'Q: How is the Climate and Economic Justice Screening Tool (CEJST) different from the Environmental Protection Agency’s (EPA) EJScreen?'}
+//     description={ 'Navigate to the FAQs page, this will be Q12'}
+//   />,
+//   Q13: <FormattedMessage
+//     id={ 'faqs.page.Q13'}
+//     defaultMessage={ 'Q: How is this tool different from state screening tools?'}
+//     description={ 'Navigate to the FAQs page, this will be Q13'}
+//   />,
+//   Q14: <FormattedMessage
+//     id={ 'faqs.page.Q14'}
+//     defaultMessage={ 'Q: How were the White House Environmental Justice Advisory Council (WHEJAC) recommendations used for this tool?'}
+//     description={ 'Navigate to the FAQs page, this will be Q14'}
+//   />,
+//   Q15: <FormattedMessage
+//     id={ 'faqs.page.Q15'}
+//     defaultMessage={ 'Q: Can the public provide feedback on this tool?'}
+//     description={ 'Navigate to the FAQs page, this will be Q15'}
+//   />,
+//   Q16: <FormattedMessage
+//     id={ 'faqs.page.Q16'}
+//     defaultMessage={ 'Q: Will CEQ issue another Request for Information about the tool?'}
+//     description={ 'Navigate to the FAQs page, this will be Q16'}
+//   />,
+//   Q17: <FormattedMessage
+//     id={ 'faqs.page.Q17'}
+//     defaultMessage={ 'Q: When did the official version of the tool come out?'}
+//     description={ 'Navigate to the FAQs page, this will be Q17'}
+//   />,
+//   Q18: <FormattedMessage
+//     id={ 'faqs.page.Q18'}
+//     defaultMessage={ 'Q. How does the Council on Environmental Quality (CEQ) keep people informed about the tool?'}
+//     description={ 'Navigate to the FAQs page, this will be Q18'}
+//   />,
+//   Q19: <FormattedMessage
+//     id={ 'faqs.page.Q19'}
+//     defaultMessage={ 'Q: What files and documentation are available from the tool?'}
+//     description={ 'Navigate to the FAQs page, this will be Q19'}
+//   />,
+//   Q20: <FormattedMessage
+//     id={ 'faqs.page.Q20'}
+//     defaultMessage={ 'Q: How does the tool’s shapefile work?'}
+//     description={ 'Navigate to the FAQs page, this will be Q20'}
+//   />,
+// };
+export const QUESTIONS = [
+  <FormattedMessage
+    id={ 'faqs.page.Q1'}
+    key={ 'faqs.page.Q1'}
+    defaultMessage={ 'Q: What is the Climate and Economic Justice Screening Tool (CEJST)?'}
+    description={ 'Navigate to the FAQs page, this will be Q1'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q2'}
+    key={ 'faqs.page.Q2'}
+    defaultMessage={ 'Q: How does the tool identify and define communities?'}
+    description={ 'Navigate to the FAQs page, this will be Q2'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q3'}
+    key={ 'faqs.page.Q3'}
+    defaultMessage={ 'Q: Is race included in the tool’s methodology?'}
+    description={ 'Navigate to the FAQs page, this will be Q3'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q4'}
+    key={ 'faqs.page.Q4'}
+    defaultMessage={ 'Q: Does the Climate and Economic Justice Screening Tool (CEJST) include the U.S. territories? '}
+    description={ 'Navigate to the FAQs page, this will be Q4'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q5'}
+    key={ 'faqs.page.Q5'}
+    defaultMessage={ 'Q: Does the tool include Tribal Nations?'}
+    description={ 'Navigate to the FAQs page, this will be Q5'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q6'}
+    key={ 'faqs.page.Q6'}
+    defaultMessage={ 'Q: Why do some areas of the map have different shades?'}
+    description={ 'Navigate to the FAQs page, this will be Q6'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q7'}
+    key={ 'faqs.page.Q7'}
+    defaultMessage={ 'Q: Why does the tool have “partially disadvantaged” census tracts?'}
+    description={ 'Navigate to the FAQs page, this will be Q7'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q8'}
+    key={ 'faqs.page.Q8'}
+    defaultMessage={ 'Q: How does this tool relate to the Justice40 Initiative?'}
+    description={ 'Navigate to the FAQs page, this will be Q8'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q9'}
+    key={ 'faqs.page.Q9'}
+    defaultMessage={ 'Q: How will Federal agencies use the Climate and Economic Justice Screening Tool (CEJST) for the Justice40 Initiative? '}
+    description={ 'Navigate to the FAQs page, this will be Q9'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q10'}
+    key={ 'faqs.page.Q10'}
+    defaultMessage={ 'Q: How will this tool be used to inform decisions relating to new investments made through the Bipartisan Infrastructure Law and the Inflation Reduction Act?'}
+    description={ 'Navigate to the FAQs page, this will be Q10'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q11'}
+    key={ 'faqs.page.Q11'}
+    defaultMessage={ 'Q: Will agencies use the Climate and Economic Justice Screening Tool (CEJST) if they have already created their own tools or criteria to identify disadvantaged communities?'}
+    description={ 'Navigate to the FAQs page, this will be Q11'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q12'}
+    key={ 'faqs.page.Q12'}
+    defaultMessage={ 'Q: How is the Climate and Economic Justice Screening Tool (CEJST) different from the Environmental Protection Agency’s (EPA) EJScreen?'}
+    description={ 'Navigate to the FAQs page, this will be Q12'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q13'}
+    key={ 'faqs.page.Q13'}
+    defaultMessage={ 'Q: How is this tool different from state screening tools?'}
+    description={ 'Navigate to the FAQs page, this will be Q13'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q14'}
+    key={ 'faqs.page.Q14'}
+    defaultMessage={ 'Q: How were the White House Environmental Justice Advisory Council (WHEJAC) recommendations used for this tool?'}
+    description={ 'Navigate to the FAQs page, this will be Q14'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q15'}
+    key={ 'faqs.page.Q15'}
+    defaultMessage={ 'Q: Can the public provide feedback on this tool?'}
+    description={ 'Navigate to the FAQs page, this will be Q15'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q16'}
+    key={ 'faqs.page.Q16'}
+    defaultMessage={ 'Q: Will CEQ issue another Request for Information about the tool?'}
+    description={ 'Navigate to the FAQs page, this will be Q16'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q17'}
+    key={ 'faqs.page.Q17'}
+    defaultMessage={ 'Q: When did the official version of the tool come out?'}
+    description={ 'Navigate to the FAQs page, this will be Q17'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q18'}
+    key={ 'faqs.page.Q18'}
+    defaultMessage={ 'Q. How does the Council on Environmental Quality (CEQ) keep people informed about the tool?'}
+    description={ 'Navigate to the FAQs page, this will be Q18'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q19'}
+    key={ 'faqs.page.Q19'}
+    defaultMessage={ 'Q: What files and documentation are available from the tool?'}
+    description={ 'Navigate to the FAQs page, this will be Q19'}
+  />,
+  <FormattedMessage
+    id={ 'faqs.page.Q20'}
+    key={ 'faqs.page.Q20'}
+    defaultMessage={ 'Q: How does the tool’s shapefile work?'}
+    description={ 'Navigate to the FAQs page, this will be Q20'}
+  />,
+];
+
+export const FAQ_ANSWERS = {
+  Q1_P1: <FormattedMessage
+    id={ 'faqs.page.answers.Q1_P1'}
+    defaultMessage={ 'The CEJST is a critical component of the Biden-Harris Administration’s historic commitment to advancing environmental justice. In <link1>Executive Order 14008</link1> on Tackling the Climate Crisis at Home and Abroad, President Biden directed the White House Council on Environmental Quality (CEQ) to develop a geospatial mapping tool to identify disadvantaged communities that face burdens. The tool has an interactive map and uses datasets that are indicators of burdens.'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q1_P1'}
+    values={{
+      link1: linkFn(EXEC_ORDER_LINK, false, true),
+    }}
+  />,
+  Q1_P2: <FormattedMessage
+    id={ 'faqs.page.answers.Q1_P2'}
+    defaultMessage={ 'Federal agencies will use the tool for the Justice40 Initiative. It will help them identify disadvantaged communities that should receive 40% of the overall benefits of programs included in the Justice40 Initiative. The Justice40 Initiative seeks to deliver 40% of the overall benefits in climate, clean energy, and other related areas to disadvantaged communities.'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q1_P2'}
+  />,
+  Q1_P3: <FormattedMessage
+    id={ 'faqs.page.answers.Q1_P3'}
+    defaultMessage={ 'Other useful links for Federal agencies:'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q1_P3'}
+  />,
+  Q1_P3_1: <FormattedMessage
+    id={ 'faqs.page.answers.Q1_P3_1'}
+    defaultMessage={ 'Addendum to the Justice40 Interim Guidance'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q1_P3_1'}
+  />,
+  Q1_P3_2: <FormattedMessage
+    id={ 'faqs.page.answers.Q1_P3_2'}
+    defaultMessage={ 'Instructions to Federal Agencies on Using the CEJST'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q1_P3_2'}
+  />,
+  Q1_P4: <FormattedMessage
+    id={ 'faqs.page.answers.Q1_P4'}
+    defaultMessage={ 'The public can find communities of interest and provide feedback. This feedback will be used to improve the tool.'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q1_P4'}
+  />,
+  Q2_P1: <FormattedMessage
+    id={ 'faqs.page.answers.Q2_P1'}
+    defaultMessage={ '<link1>Executive Order 14008</link1> recognizes that some communities are disadvantaged because they face burdens. The CEJST uses datasets that are indicators of burden. These burdens are related to climate change and the environment. They are also related to health and lack of economic opportunity.'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q2_P1'}
+    values={{
+      link1: linkFn(EXEC_ORDER_LINK, false, true),
+    }}
+  />,
+  Q2_P2: <FormattedMessage
+    id={ 'faqs.page.answers.Q2_P2'}
+    defaultMessage={ 'The tool highlights disadvantaged communities across all 50 states, the District of Columbia, and the U.S. territories. A community is considered disadvantaged:'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q2_P2'}
+  />,
+  Q2_P2_1: <FormattedMessage
+    id={ 'faqs.page.answers.Q2_P2_1'}
+    defaultMessage={ 'If they are in a census tract that meets the thresholds for at least one of the tool’s categories of burden, or'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q2_P2_1'}
+  />,
+  Q2_P2_2: <FormattedMessage
+    id={ 'faqs.page.answers.Q2_P2_2'}
+    defaultMessage={ 'If they are on Federally Recognized Tribal land'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q2_P2_2'}
+  />,
+  Q2_P3: <FormattedMessage
+    id={ 'faqs.page.answers.Q2_P3'}
+    defaultMessage={ 'Not all disadvantaged communities can be shown on the map. Some communities, such as migrant workers, do not live in just one place. The Interim Implementation Guidance on the Justice40 Initiative also directs Federal agencies to consider geographically dispersed communities when implementing programs included in the Justice40 Initiative.'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q2_P3'}
+  />,
+  Q3_P1: <FormattedMessage
+    id={ 'faqs.page.answers.Q3_P1'}
+    defaultMessage={ 'No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a specific census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q3_P1'}
+  />,
+  Q3_P2: <FormattedMessage
+    id={ 'faqs.page.answers.Q3_P2'}
+    defaultMessage={ 'Although the CEJST does not use race in the methodology, it seeks to create a map that reflects the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q3_P2'}
+  />,
+  Q4_P1: <FormattedMessage
+    id={ 'faqs.page.answers.Q4_P1'}
+    defaultMessage={ 'Yes, the version 1.0 of the CEJST has some data for all the territories but not all the CEJST data are available or used for all U.S. territories. '}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q4_P1'}
+  />,
+  Q4_P2: <FormattedMessage
+    id={ 'faqs.page.answers.Q4_P2'}
+    defaultMessage={ `<boldtag>Puerto Rico:</boldtag> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period. `}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q4_P2'}
+    values={{
+      boldtag: boldFn,
+    }}
+  />,
+  Q4_P3: <FormattedMessage
+    id={ 'faqs.page.answers.Q4_P3'}
+    defaultMessage={ '<boldtag>American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands:</boldtag> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period. '}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q4_P3'}
+    values={{
+      boldtag: boldFn,
+    }}
+  />,
+  Q5_P1: <FormattedMessage
+    id={ 'faqs.page.answers.Q5_P1'}
+    defaultMessage={ 'To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, Federally Recognized Tribal lands are highlighted as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than census tracts. The tool’s census tracts and Tribal lands have different boundaries.'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q5_P1'}
+  />,
+  Q5_P2: <FormattedMessage
+    id={ 'faqs.page.answers.Q5_P2'}
+    defaultMessage={ `Federally Recognized Tribes are those that are recognized by the U.S. Bureau of Indian Affairs in the <link1>annual notice</link1> it publishes in the Federal Register:`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q5_P2'}
+    values={{
+      link1: linkFn(FED_RECOGNIZED_INDIAN_ENTITIES, false, true),
+    }}
+  />,
+  Q5_P2_1: <FormattedMessage
+    id={ 'faqs.page.answers.Q5_P2_1'}
+    defaultMessage={ `The decision to highlight Federally-recognized Tribal lands on the CEJST map and to designate them as disadvantaged communities was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s Action Plan for Consultation and Coordination with Tribal Nations, President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q5_P2_1'}
+  />,
+  Q6_P1: <FormattedMessage
+    id={ 'faqs.page.answers.Q6_P1'}
+    defaultMessage={ `Some census tracts that contain lands of Federally-recognized Tribes that are also considered disadvantaged because they meet the burden thresholds for at least one of the categories on the tool. When this happens, the areas appear darker on the tool’s map.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q6_P1'}
+  />,
+  Q6_P2: <FormattedMessage
+    id={ 'faqs.page.answers.Q6_P2'}
+    defaultMessage={ ` : Disadvantaged census tracts`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q6_P2'}
+  />,
+  Q6_P3: <FormattedMessage
+    id={ 'faqs.page.answers.Q6_P3'}
+    defaultMessage={ ` : Disadvantaged census tracts and Federally-Recognized Tribal lands`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q6_P3'}
+  />,
+  Q6_P4: <FormattedMessage
+    id={ 'faqs.page.answers.Q6_P4'}
+    defaultMessage={ `Any area that is highlighted is considered disadvantaged, regardless of whether it is a light shade or dark shade. The tool will show if a whole census tract is considered disadvantaged or just the parts that are Federally Recognized Tribal lands.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q6_P4'}
+  />,
+  Q7: <FormattedMessage
+    id={ 'faqs.page.answers.Q7'}
+    defaultMessage={ `A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains Federally Recognized Tribal lands, then the parts of the tract that are Tribal lands are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q7'}
+  />,
+  Q8_P1: <FormattedMessage
+    id={ 'faqs.page.answers.Q8_P1'}
+    defaultMessage={ `The Biden administration is advancing environmental justice across the whole-of-government. The Justice40 Initiative is a critical part of this effort. The Justice40 Initiative seeks to deliver 40% of the overall benefits of climate, clean energy, and related investments to disadvantaged communities.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q8_P1'}
+  />,
+  Q8_P2: <FormattedMessage
+    id={ 'faqs.page.answers.Q8_P2'}
+    defaultMessage={ `The CEJST will play an important role in the Justice40 Initiative. It will help to provide a single, consistent definition of disadvantaged communities for programs  included in the Justice40 Initiative.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q8_P2'}
+  />,
+  Q9_P1: <FormattedMessage
+    id={ 'faqs.page.answers.Q9_P1'}
+    defaultMessage={ `Federal agencies will use the tool to help identify disadvantaged communities that will benefit from programs included in the Justice40 Initiative. The Justice40 Initiative seeks to deliver 40% of the overall benefits of certain investments to disadvantaged communities.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q9_P1'}
+  />,
+  Q9_P2: <FormattedMessage
+    id={ 'faqs.page.answers.Q9_P2'}
+    defaultMessage={ `The CEJST will play an important role in the Justice40 Initiative. It will help to provide a single definition of disadvantaged communities for programs included in the Justice40 Initiative. This definition applies to the whole government. Federal agencies will use this definition to direct Justice40 investment benefits in the following areas:`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q9_P2'}
+  />,
+  Q9_P2_1: <FormattedMessage
+    id={ 'faqs.page.answers.Q9_P2_1'}
+    defaultMessage={ `Climate`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q9_P2_1'}
+  />,
+  Q9_P2_2: <FormattedMessage
+    id={ 'faqs.page.answers.Q9_P2_2'}
+    defaultMessage={ `Clean energy and energy efficiency`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q9_P2_2'}
+  />,
+  Q9_P2_3: <FormattedMessage
+    id={ 'faqs.page.answers.Q9_P2_3'}
+    defaultMessage={ `Clean transit`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q9_P2_3'}
+  />,
+  Q9_P2_4: <FormattedMessage
+    id={ 'faqs.page.answers.Q9_P2_4'}
+    defaultMessage={ `Affordable and sustainable housing`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q9_P2_4'}
+  />,
+  Q9_P2_5: <FormattedMessage
+    id={ 'faqs.page.answers.Q9_P2_5'}
+    defaultMessage={ `Training and workforce development`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q9_P2_5'}
+  />,
+  Q9_P2_6: <FormattedMessage
+    id={ 'faqs.page.answers.Q9_P2_6'}
+    defaultMessage={ `Remediation and reduction of legacy pollution`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q9_P2_6'}
+  />,
+  Q9_P2_7: <FormattedMessage
+    id={ 'faqs.page.answers.Q9_P2_7'}
+    defaultMessage={ `Development of clean water and wastewater infrastructure`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q9_P2_7'}
+  />,
+  Q10: <FormattedMessage
+    id={ 'faqs.page.answers.Q10'}
+    defaultMessage={ `Recent historic legislation—such as the Bipartisan Infrastructure Law and the Inflation Reduction Act—have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the CEJST to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q10'}
+  />,
+  Q11: <FormattedMessage
+    id={ 'faqs.page.answers.Q11'}
+    defaultMessage={ `The Council on Environmental Quality (CEQ), the Office of Management and Budget (OMB), and the Climate Policy Office (CPO) released the Justice40 Interim Implementation Guidance on July 20, 2021. It directed agencies to develop interim definitions of disadvantaged communities. Agencies used their interim definitions during the tool’s beta phase. Agencies will now transition to using version 1.0 of the tool to geographically identify disadvantaged communities.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q11'}
+  />,
+  Q12_P1: <FormattedMessage
+    id={ 'faqs.page.answers.Q12_P1'}
+    defaultMessage={ `The CEJST uses lessons learned from the EPA's EJScreen. EJScreen is an environmental justice mapping and screening tool. EJScreen shows environmental and demographic information. The EPA, Federal agencies, and state and local governments will continue to use EJScreen to understand and analyze environmental problems. For example, EPA uses <link1>EJScreen</link1> to:`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q12_P1'}
+    values={{
+      link1: linkFn(EJSCREEN, false, true),
+    }}
+  />,
+  Q12_P1_1: <FormattedMessage
+    id={ 'faqs.page.answers.Q12_P1_1'}
+    defaultMessage={ `Inform outreach and engagement practices`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q12_P1_1'}
+  />,
+  Q12_P1_2: <FormattedMessage
+    id={ 'faqs.page.answers.Q12_P1_2'}
+    defaultMessage={ `Implement aspects of the following programs:`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q12_P1_2'}
+  />,
+  Q12_P1_2_1: <FormattedMessage
+    id={ 'faqs.page.answers.Q12_P1_2_1'}
+    defaultMessage={ `Permitting programs`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q12_P1_2_1'}
+  />,
+  Q12_P1_2_2: <FormattedMessage
+    id={ 'faqs.page.answers.Q12_P1_2_2'}
+    defaultMessage={ `Enforcement programs`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q12_P1_2_2'}
+  />,
+  Q12_P1_2_3: <FormattedMessage
+    id={ 'faqs.page.answers.Q12_P1_2_3'}
+    defaultMessage={ `Compliance programs`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q12_P1_2_3'}
+  />,
+  Q12_P1_2_4: <FormattedMessage
+    id={ 'faqs.page.answers.Q12_P1_2_4'}
+    defaultMessage={ `Voluntary programs`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q12_P1_2_4'}
+  />,
+  Q12_P1_3: <FormattedMessage
+    id={ 'faqs.page.answers.Q12_P1_3'}
+    defaultMessage={ `Develop retrospective reports of EPA work`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q12_P1_3'}
+  />,
+  Q12_P1_4: <FormattedMessage
+    id={ 'faqs.page.answers.Q12_P1_4'}
+    defaultMessage={ `Enhance geographically based initiatives`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q12_P1_4'}
+  />,
+  Q12_P2: <FormattedMessage
+    id={ 'faqs.page.answers.Q12_P2'}
+    defaultMessage={ `However, EPA does not use EJScreen to identify or label an area as an "EJ community" or as the sole basis for agency-decision-making.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q12_P2'}
+  />,
+  Q12_P3: <FormattedMessage
+    id={ 'faqs.page.answers.Q12_P3'}
+    defaultMessage={ `In contrast, the CEJST will help Federal agencies to identify disadvantaged communities that will benefit from programs included in the Justice40 Initiative.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q12_P3'}
+  />,
+  Q13_P1: <FormattedMessage
+    id={ 'faqs.page.answers.Q13_P1'}
+    defaultMessage={ `Several states that have environmental justice screening tools. CalEnviroScreen is an environmental justice screening tool for California. Other states, like New York and Michigan have screening tools as well. The Climate and Economic Justice Screening Tool (CEJST)  incorporates lessons learned from these efforts.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q13_P1'}
+  />,
+  Q13_P2: <FormattedMessage
+    id={ 'faqs.page.answers.Q13_P2'}
+    defaultMessage={ `There is an important difference between state-based tools and the CEJST. State tools use data that may not be available for other states. The CEJST only uses data that are nationally-consistent and publicly-available.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q13_P2'}
+  />,
+  Q14: <FormattedMessage
+    id={ 'faqs.page.answers.Q14'}
+    defaultMessage={ `The WHEJAC provided recommendations on the Climate and Economic Justice Screening Tool (CEJST). The CEJST follows many of these recommendations.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q14'}
+  />,
+  Q15_P1: <FormattedMessage
+    id={ 'faqs.page.answers.Q15_P1'}
+    defaultMessage={ `Yes. The CEJST website has multiple ways to offer feedback on the tool.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q15_P1'}
+  />,
+  Q15_P1_1: <FormattedMessage
+    id={ 'faqs.page.answers.Q15_P1_1'}
+    defaultMessage={ `The public can find census tracts that they are familiar with and send feedback about those tracts. That feedback is used to “ground truth” the tool. This helps the tool to better reflect the realities for communities.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q15_P1_1'}
+  />,
+  Q15_P1_2: <FormattedMessage
+    id={ 'faqs.page.answers.Q15_P1_2'}
+    defaultMessage={ `The public can also submit data sources or ideas for consideration.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q15_P1_2'}
+  />,
+  Q15_P1_3: <FormattedMessage
+    id={ 'faqs.page.answers.Q15_P1_3'}
+    defaultMessage={ `The public may also take a short survey to help improve the experience of using the tool.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q15_P1_3'}
+  />,
+  Q15_P1_4: <FormattedMessage
+    id={ 'faqs.page.answers.Q15_P1_4'}
+    defaultMessage={ `The public can also email {general_email_address}`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q15_P1_4'}
+    values={{
+      general_email_address:
+      <LinkTypeWrapper
+        linkText={FEEDBACK_EMAIL}
+        internal={false}
+        url={`mailto:${FEEDBACK_EMAIL}`}
+        openUrlNewTab={true}
+      />,
+    }}
+  />,
+  Q16: <FormattedMessage
+    id={ 'faqs.page.answers.Q16'}
+    defaultMessage={ `Yes. CEQ plans to issue a Request for Information (RFI) about version 1.0 of the CEJST in 2023. The feedback received in that RFI will inform version 2.0 of the tool.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q16'}
+  />,
+  Q17_P1: <FormattedMessage
+    id={ 'faqs.page.answers.Q17_P1'}
+    defaultMessage={ `The tool is now considered official because Federal agencies can now use version 1.0 of the Climate and Economic Justice Screening Tool (CEJST) to help identify disadvantaged communities. The 1.0 version was released in MM, YYYY. The tool is no longer in beta.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q17_P1'}
+  />,
+  Q17_P2: <FormattedMessage
+    id={ 'faqs.page.answers.Q17_P2'}
+    defaultMessage={ `The tool will be improved over time. The Council on Environmental Quality (CEQ) will update the tool each year based on public feedback, research, and the availability of new data.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q17_P2'}
+  />,
+  Q18: <FormattedMessage
+    id={ 'faqs.page.answers.Q18'}
+    defaultMessage={ `Sign-up to receive updates on the Climate and Economic Justice Screening Tool (CEJST) and other environmental justice news from CEQ.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q18'}
+  />,
+  Q19: <FormattedMessage
+    id={ 'faqs.page.answers.Q19'}
+    defaultMessage={ `The Climate and Economic Justice Screening Tool (CEJST) has <link1>downloads</link1> available. Spreadsheets (.xlxs) and (.csv) contain the tool’s definitions and data. This data can be used for analysis. Shapefiles and geojson files can be uploaded into other mapping programs such as Esri. The downloads include information on how to use the files.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q19'}
+    values={{
+      link1: linkFn(PAGES_ENDPOINTS.DOWNLOADS, true, false),
+    }}
+  />,
+  Q20_P1: <FormattedMessage
+    id={ 'faqs.page.answers.Q20_P1'}
+    defaultMessage={ `The tool’s shapefile can be uploaded into other mapping programs such as Esri.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q20_P1'}
+  />,
+  Q20_P2: <FormattedMessage
+    id={ 'faqs.page.answers.Q20_P2'}
+    defaultMessage={ `The <link1>shapefile</link1> format is <link2>a geospatial vector data format</link2> for geographic information system (GIS) software. It can be loaded into any software that works with Esri, ArcGIS or any other compatible GIS software. You may choose to download the data in this format so that you can load the data from the Climate and Economic Justice Screening Tool (CEJST) into other tools and use those tools to combine the CEJST data with other datasets and sources.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q20_P2'}
+    values= {{
+      link1: linkFn('https://en.wikipedia.org/wiki/Shapefile', false, true),
+      link2: linkFn('https://en.wikipedia.org/wiki/GIS_file_formats', false, true),
+    }}
+  />,
+};
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index e92508dc6..fe1c94212 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -451,6 +451,11 @@ export const DATASET_CARD_LABELS = defineMessages({
     defaultMessage: 'Available for: ',
     description: 'Navigate to the Methodology page. This is the label associated with available for which regions of the card',
   },
+  NEW: {
+    id: 'methodology.page.datasetCard.new',
+    defaultMessage: 'NEW',
+    description: 'Navigate to the Methodology page. This is the label associated with a NEW card',
+  },
 });
 
 export const DATE_RANGE = {
@@ -735,6 +740,7 @@ export const AVAILABLE_FOR = defineMessages({
 export interface IIndicators {
   domID: string,
   indicator: JSX.Element,
+  isNew?: boolean,
   description: JSX.Element,
   note?: JSX.Element,
   usedIn: JSX.Element,
@@ -851,9 +857,10 @@ export const INDICATORS = [
     domID: 'flood-risk',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.flood.risk.title.text'}
-      defaultMessage={`NEW Projected flood risk`}
+      defaultMessage={`Projected flood risk`}
       description={'Navigate to the Methodology page. This is the title text for the NEW Projected flood risk'}
     />,
+    isNew: true,
     description: <FormattedMessage
       id={'methodology.page.category.flood.risk.rate.description.text'}
       defaultMessage={`
@@ -874,9 +881,10 @@ export const INDICATORS = [
     domID: 'wildfire-risk',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.wildfire.risk.title.text'}
-      defaultMessage={`NEW Projected wildfire risk`}
+      defaultMessage={`Projected wildfire risk`}
       description={'Navigate to the Methodology page. This is the title text for the NEW Projected wildfire risk'}
     />,
+    isNew: true,
     description: <FormattedMessage
       id={'methodology.page.category.wildfire.risk.rate.description.text'}
       defaultMessage={`
@@ -1110,9 +1118,10 @@ export const INDICATORS = [
     domID: 'green-space',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.green.space.title.text'}
-      defaultMessage={`NEW Lack of green space`}
+      defaultMessage={`Lack of green space`}
       description={'Navigate to the Methodology page. This is the title text for the house burden dataset'}
     />,
+    isNew: true,
     description: <FormattedMessage
       id={'methodology.page.category.green.space.description.text'}
       defaultMessage={`
@@ -1133,9 +1142,10 @@ export const INDICATORS = [
     domID: 'indoor-plumb',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.indoor.plumb.title.text'}
-      defaultMessage={`NEW Lack of indoor plumbing`}
+      defaultMessage={`Lack of indoor plumbing`}
       description={'Navigate to the Methodology page. This is the title text for the indoor plumbing'}
     />,
+    isNew: true,
     description: <FormattedMessage
       id={'methodology.page.category.indoor.plumb.description.text'}
       defaultMessage={`
@@ -1181,9 +1191,10 @@ export const INDICATORS = [
     domID: 'mine-land',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.mine.land.title.text'}
-      defaultMessage={`NEW Abandoned mine lands`}
+      defaultMessage={`Abandoned mine lands`}
       description={'Navigate to the Methodology page. This is the title text for the Abandoned mine lands'}
     />,
+    isNew: true,
     description: <FormattedMessage
       id={'methodology.page.category.mine.land.description.text'}
       defaultMessage={`
@@ -1204,9 +1215,10 @@ export const INDICATORS = [
     domID: 'fuds',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.fuds.title.text'}
-      defaultMessage={`NEW Formerly Used Defense Sites`}
+      defaultMessage={`Formerly Used Defense Sites`}
       description={'Navigate to the Methodology page. This is the title text for the Formerly Used Defense Sites'}
     />,
+    isNew: true,
     description: <FormattedMessage
       id={'methodology.page.category.fuds.description.text'}
       defaultMessage={`
@@ -1321,9 +1333,10 @@ export const INDICATORS = [
     domID: 'trans-barrier',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.trans.barrier.title.text'}
-      defaultMessage={`NEW Transportation barriers`}
+      defaultMessage={`Transportation barriers`}
       description={'Navigate to the Methodology page. This is the title text for the Transportation barriers'}
     />,
+    isNew: true,
     description: <FormattedMessage
       id={'methodology.page.category.trans.barrier.description.text'}
       defaultMessage={`
@@ -1369,9 +1382,10 @@ export const INDICATORS = [
     domID: 'leaky-uwt',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.leaky.uwt.title.text'}
-      defaultMessage={`NEW Leaking underground storage tanks`}
+      defaultMessage={`Leaking underground storage tanks`}
       description={'Navigate to the Methodology page. This is the title text for the Leaking underground storage tanks'}
     />,
+    isNew: true,
     description: <FormattedMessage
       id={'methodology.page.category.leaky.uwt.description.text'}
       defaultMessage={`
@@ -1568,9 +1582,10 @@ export const INDICATORS = [
     domID: 'tribal-lands',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.tribal.lands.title.text'}
-      defaultMessage={`NEW Tribal lands`}
+      defaultMessage={`Tribal lands`}
       description={'Navigate to the Methodology page. This is the title text for the Tribal lands'}
     />,
+    isNew: true,
     description: <FormattedMessage
       id={'methodology.page.category.tribal.lands.description.text'}
       defaultMessage={`
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 25cf85550..241e25c74 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1143,6 +1143,338 @@
     "defaultMessage": "Help improve the site & data",
     "description": "Navigate to the public engagement page, this will be the text for floating action button"
   },
+  "faqs.page.Q1": {
+    "defaultMessage": "Q: What is the Climate and Economic Justice Screening Tool (CEJST)?",
+    "description": "Navigate to the FAQs page, this will be Q1"
+  },
+  "faqs.page.Q10": {
+    "defaultMessage": "Q: How will this tool be used to inform decisions relating to new investments made through the Bipartisan Infrastructure Law and the Inflation Reduction Act?",
+    "description": "Navigate to the FAQs page, this will be Q10"
+  },
+  "faqs.page.Q11": {
+    "defaultMessage": "Q: Will agencies use the Climate and Economic Justice Screening Tool (CEJST) if they have already created their own tools or criteria to identify disadvantaged communities?",
+    "description": "Navigate to the FAQs page, this will be Q11"
+  },
+  "faqs.page.Q12": {
+    "defaultMessage": "Q: How is the Climate and Economic Justice Screening Tool (CEJST) different from the Environmental Protection Agency’s (EPA) EJScreen?",
+    "description": "Navigate to the FAQs page, this will be Q12"
+  },
+  "faqs.page.Q13": {
+    "defaultMessage": "Q: How is this tool different from state screening tools?",
+    "description": "Navigate to the FAQs page, this will be Q13"
+  },
+  "faqs.page.Q14": {
+    "defaultMessage": "Q: How were the White House Environmental Justice Advisory Council (WHEJAC) recommendations used for this tool?",
+    "description": "Navigate to the FAQs page, this will be Q14"
+  },
+  "faqs.page.Q15": {
+    "defaultMessage": "Q: Can the public provide feedback on this tool?",
+    "description": "Navigate to the FAQs page, this will be Q15"
+  },
+  "faqs.page.Q16": {
+    "defaultMessage": "Q: Will CEQ issue another Request for Information about the tool?",
+    "description": "Navigate to the FAQs page, this will be Q16"
+  },
+  "faqs.page.Q17": {
+    "defaultMessage": "Q: When did the official version of the tool come out?",
+    "description": "Navigate to the FAQs page, this will be Q17"
+  },
+  "faqs.page.Q18": {
+    "defaultMessage": "Q. How does the Council on Environmental Quality (CEQ) keep people informed about the tool?",
+    "description": "Navigate to the FAQs page, this will be Q18"
+  },
+  "faqs.page.Q19": {
+    "defaultMessage": "Q: What files and documentation are available from the tool?",
+    "description": "Navigate to the FAQs page, this will be Q19"
+  },
+  "faqs.page.Q2": {
+    "defaultMessage": "Q: How does the tool identify and define communities?",
+    "description": "Navigate to the FAQs page, this will be Q2"
+  },
+  "faqs.page.Q20": {
+    "defaultMessage": "Q: How does the tool’s shapefile work?",
+    "description": "Navigate to the FAQs page, this will be Q20"
+  },
+  "faqs.page.Q3": {
+    "defaultMessage": "Q: Is race included in the tool’s methodology?",
+    "description": "Navigate to the FAQs page, this will be Q3"
+  },
+  "faqs.page.Q4": {
+    "defaultMessage": "Q: Does the Climate and Economic Justice Screening Tool (CEJST) include the U.S. territories?",
+    "description": "Navigate to the FAQs page, this will be Q4"
+  },
+  "faqs.page.Q5": {
+    "defaultMessage": "Q: Does the tool include Tribal Nations?",
+    "description": "Navigate to the FAQs page, this will be Q5"
+  },
+  "faqs.page.Q6": {
+    "defaultMessage": "Q: Why do some areas of the map have different shades?",
+    "description": "Navigate to the FAQs page, this will be Q6"
+  },
+  "faqs.page.Q7": {
+    "defaultMessage": "Q: Why does the tool have “partially disadvantaged” census tracts?",
+    "description": "Navigate to the FAQs page, this will be Q7"
+  },
+  "faqs.page.Q8": {
+    "defaultMessage": "Q: How does this tool relate to the Justice40 Initiative?",
+    "description": "Navigate to the FAQs page, this will be Q8"
+  },
+  "faqs.page.Q9": {
+    "defaultMessage": "Q: How will Federal agencies use the Climate and Economic Justice Screening Tool (CEJST) for the Justice40 Initiative?",
+    "description": "Navigate to the FAQs page, this will be Q9"
+  },
+  "faqs.page.answers.Q10": {
+    "defaultMessage": "Recent historic legislation—such as the Bipartisan Infrastructure Law and the Inflation Reduction Act—have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the CEJST to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q10"
+  },
+  "faqs.page.answers.Q11": {
+    "defaultMessage": "The Council on Environmental Quality (CEQ), the Office of Management and Budget (OMB), and the Climate Policy Office (CPO) released the Justice40 Interim Implementation Guidance on July 20, 2021. It directed agencies to develop interim definitions of disadvantaged communities. Agencies used their interim definitions during the tool’s beta phase. Agencies will now transition to using version 1.0 of the tool to geographically identify disadvantaged communities.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q11"
+  },
+  "faqs.page.answers.Q12_P1": {
+    "defaultMessage": "The CEJST uses lessons learned from the EPA's EJScreen. EJScreen is an environmental justice mapping and screening tool. EJScreen shows environmental and demographic information. The EPA, Federal agencies, and state and local governments will continue to use EJScreen to understand and analyze environmental problems. For example, EPA uses <link1>EJScreen</link1> to:",
+    "description": "Navigate to the FAQs page, this will be an answer, Q12_P1"
+  },
+  "faqs.page.answers.Q12_P1_1": {
+    "defaultMessage": "Inform outreach and engagement practices",
+    "description": "Navigate to the FAQs page, this will be an answer, Q12_P1_1"
+  },
+  "faqs.page.answers.Q12_P1_2": {
+    "defaultMessage": "Implement aspects of the following programs:",
+    "description": "Navigate to the FAQs page, this will be an answer, Q12_P1_2"
+  },
+  "faqs.page.answers.Q12_P1_2_1": {
+    "defaultMessage": "Permitting programs",
+    "description": "Navigate to the FAQs page, this will be an answer, Q12_P1_2_1"
+  },
+  "faqs.page.answers.Q12_P1_2_2": {
+    "defaultMessage": "Enforcement programs",
+    "description": "Navigate to the FAQs page, this will be an answer, Q12_P1_2_2"
+  },
+  "faqs.page.answers.Q12_P1_2_3": {
+    "defaultMessage": "Compliance programs",
+    "description": "Navigate to the FAQs page, this will be an answer, Q12_P1_2_3"
+  },
+  "faqs.page.answers.Q12_P1_2_4": {
+    "defaultMessage": "Voluntary programs",
+    "description": "Navigate to the FAQs page, this will be an answer, Q12_P1_2_4"
+  },
+  "faqs.page.answers.Q12_P1_3": {
+    "defaultMessage": "Develop retrospective reports of EPA work",
+    "description": "Navigate to the FAQs page, this will be an answer, Q12_P1_3"
+  },
+  "faqs.page.answers.Q12_P1_4": {
+    "defaultMessage": "Enhance geographically based initiatives",
+    "description": "Navigate to the FAQs page, this will be an answer, Q12_P1_4"
+  },
+  "faqs.page.answers.Q12_P2": {
+    "defaultMessage": "However, EPA does not use EJScreen to identify or label an area as an \"EJ community\" or as the sole basis for agency-decision-making.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q12_P2"
+  },
+  "faqs.page.answers.Q12_P3": {
+    "defaultMessage": "In contrast, the CEJST will help Federal agencies to identify disadvantaged communities that will benefit from programs included in the Justice40 Initiative.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q12_P3"
+  },
+  "faqs.page.answers.Q13_P1": {
+    "defaultMessage": "Several states that have environmental justice screening tools. CalEnviroScreen is an environmental justice screening tool for California. Other states, like New York and Michigan have screening tools as well. The Climate and Economic Justice Screening Tool (CEJST) incorporates lessons learned from these efforts.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q13_P1"
+  },
+  "faqs.page.answers.Q13_P2": {
+    "defaultMessage": "There is an important difference between state-based tools and the CEJST. State tools use data that may not be available for other states. The CEJST only uses data that are nationally-consistent and publicly-available.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q13_P2"
+  },
+  "faqs.page.answers.Q14": {
+    "defaultMessage": "The WHEJAC provided recommendations on the Climate and Economic Justice Screening Tool (CEJST). The CEJST follows many of these recommendations.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q14"
+  },
+  "faqs.page.answers.Q15_P1": {
+    "defaultMessage": "Yes. The CEJST website has multiple ways to offer feedback on the tool.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q15_P1"
+  },
+  "faqs.page.answers.Q15_P1_1": {
+    "defaultMessage": "The public can find census tracts that they are familiar with and send feedback about those tracts. That feedback is used to “ground truth” the tool. This helps the tool to better reflect the realities for communities.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q15_P1_1"
+  },
+  "faqs.page.answers.Q15_P1_2": {
+    "defaultMessage": "The public can also submit data sources or ideas for consideration.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q15_P1_2"
+  },
+  "faqs.page.answers.Q15_P1_3": {
+    "defaultMessage": "The public may also take a short survey to help improve the experience of using the tool.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q15_P1_3"
+  },
+  "faqs.page.answers.Q15_P1_4": {
+    "defaultMessage": "The public can also email {general_email_address}",
+    "description": "Navigate to the FAQs page, this will be an answer, Q15_P1_4"
+  },
+  "faqs.page.answers.Q16": {
+    "defaultMessage": "Yes. CEQ plans to issue a Request for Information (RFI) about version 1.0 of the CEJST in 2023. The feedback received in that RFI will inform version 2.0 of the tool.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q16"
+  },
+  "faqs.page.answers.Q17_P1": {
+    "defaultMessage": "The tool is now considered official because Federal agencies can now use version 1.0 of the Climate and Economic Justice Screening Tool (CEJST) to help identify disadvantaged communities. The 1.0 version was released in MM, YYYY. The tool is no longer in beta.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q17_P1"
+  },
+  "faqs.page.answers.Q17_P2": {
+    "defaultMessage": "The tool will be improved over time. The Council on Environmental Quality (CEQ) will update the tool each year based on public feedback, research, and the availability of new data.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q17_P2"
+  },
+  "faqs.page.answers.Q18": {
+    "defaultMessage": "Sign-up to receive updates on the Climate and Economic Justice Screening Tool (CEJST) and other environmental justice news from CEQ.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q18"
+  },
+  "faqs.page.answers.Q19": {
+    "defaultMessage": "The Climate and Economic Justice Screening Tool (CEJST) has <link1>downloads</link1> available. Spreadsheets (.xlxs) and (.csv) contain the tool’s definitions and data. This data can be used for analysis. Shapefiles and geojson files can be uploaded into other mapping programs such as Esri. The downloads include information on how to use the files.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q19"
+  },
+  "faqs.page.answers.Q1_P1": {
+    "defaultMessage": "The CEJST is a critical component of the Biden-Harris Administration’s historic commitment to advancing environmental justice. In <link1>Executive Order 14008</link1> on Tackling the Climate Crisis at Home and Abroad, President Biden directed the White House Council on Environmental Quality (CEQ) to develop a geospatial mapping tool to identify disadvantaged communities that face burdens. The tool has an interactive map and uses datasets that are indicators of burdens.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q1_P1"
+  },
+  "faqs.page.answers.Q1_P2": {
+    "defaultMessage": "Federal agencies will use the tool for the Justice40 Initiative. It will help them identify disadvantaged communities that should receive 40% of the overall benefits of programs included in the Justice40 Initiative. The Justice40 Initiative seeks to deliver 40% of the overall benefits in climate, clean energy, and other related areas to disadvantaged communities.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q1_P2"
+  },
+  "faqs.page.answers.Q1_P3": {
+    "defaultMessage": "Other useful links for Federal agencies:",
+    "description": "Navigate to the FAQs page, this will be an answer, Q1_P3"
+  },
+  "faqs.page.answers.Q1_P3_1": {
+    "defaultMessage": "Addendum to the Justice40 Interim Guidance",
+    "description": "Navigate to the FAQs page, this will be an answer, Q1_P3_1"
+  },
+  "faqs.page.answers.Q1_P3_2": {
+    "defaultMessage": "Instructions to Federal Agencies on Using the CEJST",
+    "description": "Navigate to the FAQs page, this will be an answer, Q1_P3_2"
+  },
+  "faqs.page.answers.Q1_P4": {
+    "defaultMessage": "The public can find communities of interest and provide feedback. This feedback will be used to improve the tool.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q1_P4"
+  },
+  "faqs.page.answers.Q20_P1": {
+    "defaultMessage": "The tool’s shapefile can be uploaded into other mapping programs such as Esri.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q20_P1"
+  },
+  "faqs.page.answers.Q20_P2": {
+    "defaultMessage": "The <link1>shapefile</link1> format is <link2>a geospatial vector data format</link2> for geographic information system (GIS) software. It can be loaded into any software that works with Esri, ArcGIS or any other compatible GIS software. You may choose to download the data in this format so that you can load the data from the Climate and Economic Justice Screening Tool (CEJST) into other tools and use those tools to combine the CEJST data with other datasets and sources.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q20_P2"
+  },
+  "faqs.page.answers.Q2_P1": {
+    "defaultMessage": "<link1>Executive Order 14008</link1> recognizes that some communities are disadvantaged because they face burdens. The CEJST uses datasets that are indicators of burden. These burdens are related to climate change and the environment. They are also related to health and lack of economic opportunity.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q2_P1"
+  },
+  "faqs.page.answers.Q2_P2": {
+    "defaultMessage": "The tool highlights disadvantaged communities across all 50 states, the District of Columbia, and the U.S. territories. A community is considered disadvantaged:",
+    "description": "Navigate to the FAQs page, this will be an answer, Q2_P2"
+  },
+  "faqs.page.answers.Q2_P2_1": {
+    "defaultMessage": "If they are in a census tract that meets the thresholds for at least one of the tool’s categories of burden, or",
+    "description": "Navigate to the FAQs page, this will be an answer, Q2_P2_1"
+  },
+  "faqs.page.answers.Q2_P2_2": {
+    "defaultMessage": "If they are on Federally Recognized Tribal land",
+    "description": "Navigate to the FAQs page, this will be an answer, Q2_P2_2"
+  },
+  "faqs.page.answers.Q2_P3": {
+    "defaultMessage": "Not all disadvantaged communities can be shown on the map. Some communities, such as migrant workers, do not live in just one place. The Interim Implementation Guidance on the Justice40 Initiative also directs Federal agencies to consider geographically dispersed communities when implementing programs included in the Justice40 Initiative.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q2_P3"
+  },
+  "faqs.page.answers.Q3_P1": {
+    "defaultMessage": "No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a specific census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q3_P1"
+  },
+  "faqs.page.answers.Q3_P2": {
+    "defaultMessage": "Although the CEJST does not use race in the methodology, it seeks to create a map that reflects the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q3_P2"
+  },
+  "faqs.page.answers.Q4_P1": {
+    "defaultMessage": "Yes, the version 1.0 of the CEJST has some data for all the territories but not all the CEJST data are available or used for all U.S. territories.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q4_P1"
+  },
+  "faqs.page.answers.Q4_P2": {
+    "defaultMessage": "<boldtag>Puerto Rico:</boldtag> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q4_P2"
+  },
+  "faqs.page.answers.Q4_P3": {
+    "defaultMessage": "<boldtag>American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands:</boldtag> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q4_P3"
+  },
+  "faqs.page.answers.Q5_P1": {
+    "defaultMessage": "To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, Federally Recognized Tribal lands are highlighted as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than census tracts. The tool’s census tracts and Tribal lands have different boundaries.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q5_P1"
+  },
+  "faqs.page.answers.Q5_P2": {
+    "defaultMessage": "Federally Recognized Tribes are those that are recognized by the U.S. Bureau of Indian Affairs in the <link1>annual notice</link1> it publishes in the Federal Register:",
+    "description": "Navigate to the FAQs page, this will be an answer, Q5_P2"
+  },
+  "faqs.page.answers.Q5_P2_1": {
+    "defaultMessage": "The decision to highlight Federally-recognized Tribal lands on the CEJST map and to designate them as disadvantaged communities was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s Action Plan for Consultation and Coordination with Tribal Nations, President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q5_P2_1"
+  },
+  "faqs.page.answers.Q6_P1": {
+    "defaultMessage": "Some census tracts that contain lands of Federally-recognized Tribes that are also considered disadvantaged because they meet the burden thresholds for at least one of the categories on the tool. When this happens, the areas appear darker on the tool’s map.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q6_P1"
+  },
+  "faqs.page.answers.Q6_P2": {
+    "defaultMessage": ": Disadvantaged census tracts",
+    "description": "Navigate to the FAQs page, this will be an answer, Q6_P2"
+  },
+  "faqs.page.answers.Q6_P3": {
+    "defaultMessage": ": Disadvantaged census tracts and Federally-Recognized Tribal lands",
+    "description": "Navigate to the FAQs page, this will be an answer, Q6_P3"
+  },
+  "faqs.page.answers.Q6_P4": {
+    "defaultMessage": "Any area that is highlighted is considered disadvantaged, regardless of whether it is a light shade or dark shade. The tool will show if a whole census tract is considered disadvantaged or just the parts that are Federally Recognized Tribal lands.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q6_P4"
+  },
+  "faqs.page.answers.Q7": {
+    "defaultMessage": "A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains Federally Recognized Tribal lands, then the parts of the tract that are Tribal lands are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”",
+    "description": "Navigate to the FAQs page, this will be an answer, Q7"
+  },
+  "faqs.page.answers.Q8_P1": {
+    "defaultMessage": "The Biden administration is advancing environmental justice across the whole-of-government. The Justice40 Initiative is a critical part of this effort. The Justice40 Initiative seeks to deliver 40% of the overall benefits of climate, clean energy, and related investments to disadvantaged communities.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q8_P1"
+  },
+  "faqs.page.answers.Q8_P2": {
+    "defaultMessage": "The CEJST will play an important role in the Justice40 Initiative. It will help to provide a single, consistent definition of disadvantaged communities for programs included in the Justice40 Initiative.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q8_P2"
+  },
+  "faqs.page.answers.Q9_P1": {
+    "defaultMessage": "Federal agencies will use the tool to help identify disadvantaged communities that will benefit from programs included in the Justice40 Initiative. The Justice40 Initiative seeks to deliver 40% of the overall benefits of certain investments to disadvantaged communities.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q9_P1"
+  },
+  "faqs.page.answers.Q9_P2": {
+    "defaultMessage": "The CEJST will play an important role in the Justice40 Initiative. It will help to provide a single definition of disadvantaged communities for programs included in the Justice40 Initiative. This definition applies to the whole government. Federal agencies will use this definition to direct Justice40 investment benefits in the following areas:",
+    "description": "Navigate to the FAQs page, this will be an answer, Q9_P2"
+  },
+  "faqs.page.answers.Q9_P2_1": {
+    "defaultMessage": "Climate",
+    "description": "Navigate to the FAQs page, this will be an answer, Q9_P2_1"
+  },
+  "faqs.page.answers.Q9_P2_2": {
+    "defaultMessage": "Clean energy and energy efficiency",
+    "description": "Navigate to the FAQs page, this will be an answer, Q9_P2_2"
+  },
+  "faqs.page.answers.Q9_P2_3": {
+    "defaultMessage": "Clean transit",
+    "description": "Navigate to the FAQs page, this will be an answer, Q9_P2_3"
+  },
+  "faqs.page.answers.Q9_P2_4": {
+    "defaultMessage": "Affordable and sustainable housing",
+    "description": "Navigate to the FAQs page, this will be an answer, Q9_P2_4"
+  },
+  "faqs.page.answers.Q9_P2_5": {
+    "defaultMessage": "Training and workforce development",
+    "description": "Navigate to the FAQs page, this will be an answer, Q9_P2_5"
+  },
+  "faqs.page.answers.Q9_P2_6": {
+    "defaultMessage": "Remediation and reduction of legacy pollution",
+    "description": "Navigate to the FAQs page, this will be an answer, Q9_P2_6"
+  },
+  "faqs.page.answers.Q9_P2_7": {
+    "defaultMessage": "Development of clean water and wastewater infrastructure",
+    "description": "Navigate to the FAQs page, this will be an answer, Q9_P2_7"
+  },
   "faqs.page.coming.soon.text": {
     "defaultMessage": "Coming Soon!",
     "description": "Navigate to the FAQs page, this will be the page coming soon text"
@@ -1492,15 +1824,15 @@
     "description": "Navigate to the Methodology page. This is the title text for the expected agr loss rate income dataset"
   },
   "methodology.page.dataset.indicator.flood.risk.title.text": {
-    "defaultMessage": "NEW Projected flood risk",
+    "defaultMessage": "Projected flood risk",
     "description": "Navigate to the Methodology page. This is the title text for the NEW Projected flood risk"
   },
   "methodology.page.dataset.indicator.fuds.title.text": {
-    "defaultMessage": "NEW Formerly Used Defense Sites",
+    "defaultMessage": "Formerly Used Defense Sites",
     "description": "Navigate to the Methodology page. This is the title text for the Formerly Used Defense Sites"
   },
   "methodology.page.dataset.indicator.green.space.title.text": {
-    "defaultMessage": "NEW Lack of green space",
+    "defaultMessage": "Lack of green space",
     "description": "Navigate to the Methodology page. This is the title text for the house burden dataset"
   },
   "methodology.page.dataset.indicator.heart.disease.title.text": {
@@ -1520,7 +1852,7 @@
     "description": "Navigate to the Methodology page. This is the title text for the house burden dataset"
   },
   "methodology.page.dataset.indicator.indoor.plumb.title.text": {
-    "defaultMessage": "NEW Lack of indoor plumbing",
+    "defaultMessage": "Lack of indoor plumbing",
     "description": "Navigate to the Methodology page. This is the title text for the indoor plumbing"
   },
   "methodology.page.dataset.indicator.lead.paint.title.text": {
@@ -1528,7 +1860,7 @@
     "description": "Navigate to the Methodology page. This is the title text for the lead paint dataset"
   },
   "methodology.page.dataset.indicator.leaky.uwt.title.text": {
-    "defaultMessage": "NEW Leaking underground storage tanks",
+    "defaultMessage": "Leaking underground storage tanks",
     "description": "Navigate to the Methodology page. This is the title text for the Leaking underground storage tanks"
   },
   "methodology.page.dataset.indicator.life.exp.title.text": {
@@ -1548,7 +1880,7 @@
     "description": "Navigate to the Methodology page. This is the title text for the low median income dataset"
   },
   "methodology.page.dataset.indicator.mine.land.title.text": {
-    "defaultMessage": "NEW Abandoned mine lands",
+    "defaultMessage": "Abandoned mine lands",
     "description": "Navigate to the Methodology page. This is the title text for the Abandoned mine lands"
   },
   "methodology.page.dataset.indicator.pm25.title.text": {
@@ -1576,11 +1908,11 @@
     "description": "Navigate to the Methodology page. This is the title text for the traffic.volume dataset"
   },
   "methodology.page.dataset.indicator.trans.barrier.title.text": {
-    "defaultMessage": "NEW Transportation barriers",
+    "defaultMessage": "Transportation barriers",
     "description": "Navigate to the Methodology page. This is the title text for the Transportation barriers"
   },
   "methodology.page.dataset.indicator.tribal.lands.title.text": {
-    "defaultMessage": "NEW Tribal lands",
+    "defaultMessage": "Tribal lands",
     "description": "Navigate to the Methodology page. This is the title text for the Tribal lands"
   },
   "methodology.page.dataset.indicator.unemploy.title.text": {
@@ -1592,7 +1924,7 @@
     "description": "Navigate to the Methodology page. This is the title text for the waste water dataset"
   },
   "methodology.page.dataset.indicator.wildfire.risk.title.text": {
-    "defaultMessage": "NEW Projected wildfire risk",
+    "defaultMessage": "Projected wildfire risk",
     "description": "Navigate to the Methodology page. This is the title text for the NEW Projected wildfire risk"
   },
   "methodology.page.datasetCard.available.for": {
@@ -1603,6 +1935,10 @@
     "defaultMessage": "Date range:",
     "description": "Navigate to the Methodology page. This is the label associated with explaining the card"
   },
+  "methodology.page.datasetCard.new": {
+    "defaultMessage": "NEW",
+    "description": "Navigate to the Methodology page. This is the label associated with a NEW card"
+  },
   "methodology.page.datasetCard.responsible.party": {
     "defaultMessage": "Responsible Party:",
     "description": "Navigate to the Methodology page. This is the label associated with explaining the card"
diff --git a/client/src/pages/about.tsx b/client/src/pages/about.tsx
index 377e0cbd9..e1b4269a3 100644
--- a/client/src/pages/about.tsx
+++ b/client/src/pages/about.tsx
@@ -82,8 +82,8 @@ const AboutPage = ({location}: IAboutPageProps) => {
             <SubPageNav
               endPoints={[
                 PAGES_ENDPOINTS.ABOUT,
-                PAGES_ENDPOINTS.FAQS,
                 PAGES_ENDPOINTS.PUBLIC_ENG,
+                PAGES_ENDPOINTS.FAQS,
               ]}
             />
           </Grid> : ''}
diff --git a/client/src/pages/frequently-asked-questions.tsx b/client/src/pages/frequently-asked-questions.tsx
index 00a234f73..0741727d1 100644
--- a/client/src/pages/frequently-asked-questions.tsx
+++ b/client/src/pages/frequently-asked-questions.tsx
@@ -1,28 +1,257 @@
 import * as React from 'react';
-import {Grid} from '@trussworks/react-uswds';
+import {Accordion, Grid} from '@trussworks/react-uswds';
+import {AccordionItemProps} from '@trussworks/react-uswds/lib/components/Accordion/Accordion';
 import {useIntl} from 'gatsby-plugin-intl';
+import {useWindowSize} from 'react-use';
 
 import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
+import SubPageNav from '../components/SubPageNav';
 
+import * as CONSTANTS from '../data/constants';
 import * as FAQS_COPY from '../data/copy/faqs';
+import {PAGES_ENDPOINTS} from '../data/constants';
+import {SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT} from '../data/copy/explore';
+
+// @ts-ignore
+import censusDotIcon from '../images/sidePanelIcons/census-tract.svg';
+// @ts-ignore
+import tribalDotIcon from '../images/sidePanelIcons/tribal-tract.svg';
 
 interface IFAQPageProps {
   location: Location;
 }
 
+const dotStyles = {
+  display: 'flex',
+  p: {
+    paddingLeft: '2px',
+  },
+};
+
+const accordionContainerStyle = {
+  marginTop: `1.2rem`,
+};
+
 const FAQPage = ({location}: IFAQPageProps) => {
   const intl = useIntl();
+  const {width} = useWindowSize();
+  const ANSWERS = [
+    (
+      <>
+        <p key={1}>{FAQS_COPY.FAQ_ANSWERS.Q1_P1}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q1_P2}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q1_P3}</p>
+        <ul>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q1_P3_1}</li>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q1_P3_2}</li>
+        </ul>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q1_P4}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={2}>{FAQS_COPY.FAQ_ANSWERS.Q2_P1}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q2_P2}</p>
+        <ul>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q2_P2_1}</li>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q2_P2_2}</li>
+        </ul>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q2_P3}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={3}>{FAQS_COPY.FAQ_ANSWERS.Q3_P1}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q3_P2}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={4}>{FAQS_COPY.FAQ_ANSWERS.Q4_P1}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q4_P2}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q4_P3}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={5}>{FAQS_COPY.FAQ_ANSWERS.Q5_P1}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q5_P2}</p>
+        <ul>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q5_P2_1}</li>
+        </ul>
+      </>
+    ),
+    (
+      <>
+        <p key={6}>{FAQS_COPY.FAQ_ANSWERS.Q6_P1}</p>
+        <div style={dotStyles}>
+          <img src={censusDotIcon}
+            alt={intl.formatMessage(SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.DAC_CIRCLE)}
+          />
+          <div style={dotStyles.p}>{FAQS_COPY.FAQ_ANSWERS.Q6_P2}</div>
+        </div>
+        <div style={dotStyles}>
+          <img src={tribalDotIcon}
+            alt={intl.formatMessage(SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.DAC_CIRCLE)}
+          />
+          <div style={dotStyles.p}>{FAQS_COPY.FAQ_ANSWERS.Q6_P3}</div>
+        </div>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q6_P4}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={7}>{FAQS_COPY.FAQ_ANSWERS.Q7}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={8}>{FAQS_COPY.FAQ_ANSWERS.Q8_P1}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q8_P2}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={9}>{FAQS_COPY.FAQ_ANSWERS.Q9_P1}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q9_P2}</p>
+        <ul>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q9_P2_1}</li>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q9_P2_2}</li>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q9_P2_3}</li>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q9_P2_4}</li>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q9_P2_5}</li>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q9_P2_6}</li>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q9_P2_7}</li>
+        </ul>
+      </>
+    ),
+    (
+      <>
+        <p key={10}>{FAQS_COPY.FAQ_ANSWERS.Q10}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={11}>{FAQS_COPY.FAQ_ANSWERS.Q11}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={12}>{FAQS_COPY.FAQ_ANSWERS.Q12_P1}</p>
+        <ul>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q12_P1_1}</li>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q12_P1_2}</li>
+          <ul>
+            <li>{FAQS_COPY.FAQ_ANSWERS.Q12_P1_2_1}</li>
+            <li>{FAQS_COPY.FAQ_ANSWERS.Q12_P1_2_2}</li>
+            <li>{FAQS_COPY.FAQ_ANSWERS.Q12_P1_2_3}</li>
+            <li>{FAQS_COPY.FAQ_ANSWERS.Q12_P1_2_4}</li>
+          </ul>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q12_P1_3}</li>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q12_P1_4}</li>
+        </ul>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q12_P2}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q12_P3}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={13}>{FAQS_COPY.FAQ_ANSWERS.Q13_P1}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q13_P2}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={14}>{FAQS_COPY.FAQ_ANSWERS.Q14}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={15}>{FAQS_COPY.FAQ_ANSWERS.Q15_P1}</p>
+        <ul>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q15_P1_1}</li>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q15_P1_2}</li>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q15_P1_3}</li>
+          <li>{FAQS_COPY.FAQ_ANSWERS.Q15_P1_4}</li>
+        </ul>
+      </>
+    ),
+    (
+      <>
+        <p key={16}>{FAQS_COPY.FAQ_ANSWERS.Q16}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={17}>{FAQS_COPY.FAQ_ANSWERS.Q17_P1}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q17_P2}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={18}>{FAQS_COPY.FAQ_ANSWERS.Q18}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={19}>{FAQS_COPY.FAQ_ANSWERS.Q19}</p>
+      </>
+    ),
+    (
+      <>
+        <p key={20}>{FAQS_COPY.FAQ_ANSWERS.Q20_P1}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q20_P2}</p>
+      </>
+    ),
+
+  ];
+
+  const numberOfQuestions = Object.keys(FAQS_COPY.QUESTIONS).length;
+
+  const faqItems: AccordionItemProps[] = [...Array(numberOfQuestions).keys()].map((questionNum) => {
+    return {
+      id: `faq-id-${questionNum}`,
+      title: FAQS_COPY.QUESTIONS[questionNum],
+      content: ANSWERS[questionNum],
+      expanded: false,
+      headingLevel: 'h2',
+    };
+  });
 
   return (
     <Layout location={location} title={intl.formatMessage(FAQS_COPY.PAGE_INTRO.PAGE_TILE)}>
 
       <J40MainGridContainer>
-
         <h1>{intl.formatMessage(FAQS_COPY.PAGE_INTRO.PAGE_TILE)}</h1>
 
-        <Grid row>
-          {intl.formatMessage(FAQS_COPY.PAGE_INTRO.COMING_SOON)}
+        <Grid row gap className={'j40-mb5-mt3'}>
+
+          {/* First column */}
+          <Grid col={12} tablet={{col: 7}}>
+            <section style={accordionContainerStyle}>
+              {/* Enabling multiselect true fails a11y using axe tool */}
+              <Accordion items={faqItems}/>
+            </section>
+          </Grid>
+
+          {/* Second column */}
+          <Grid col={12} tablet={{col: 2}}>
+            {/* Spacer column */}
+          </Grid>
+
+          {/* Third column */}
+          {width > CONSTANTS.USWDS_BREAKPOINTS.DESKTOP ?
+          <Grid col={12} tablet={{col: 3}}>
+            <SubPageNav
+              activeSubPageIndex={2}
+              endPoints={[
+                PAGES_ENDPOINTS.ABOUT,
+                PAGES_ENDPOINTS.PUBLIC_ENG,
+                PAGES_ENDPOINTS.FAQS,
+              ]}
+            />
+          </Grid> : ''}
         </Grid>
       </J40MainGridContainer>
     </Layout>
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index c1eedd0ac..eaf9720a6 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -306,20 +306,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
                     >
-                      Frequently asked questions
+                      Engagement calendar
                     </a>
                   </li>
                   <li
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
                     >
-                      Engagement calendar
+                      Frequently asked questions
                     </a>
                   </li>
                 </ul>
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index 03133a992..1b739478f 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -306,20 +306,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
                     >
-                      Frequently asked questions
+                      Engagement calendar
                     </a>
                   </li>
                   <li
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
                     >
-                      Engagement calendar
+                      Frequently asked questions
                     </a>
                   </li>
                 </ul>
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index fe375bb0e..0c0111ab1 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -306,20 +306,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
                     >
-                      Frequently asked questions
+                      Engagement calendar
                     </a>
                   </li>
                   <li
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
                     >
-                      Engagement calendar
+                      Frequently asked questions
                     </a>
                   </li>
                 </ul>
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index e80e2a245..418623cc8 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -306,20 +306,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
                     >
-                      Frequently asked questions
+                      Engagement calendar
                     </a>
                   </li>
                   <li
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
                     >
-                      Engagement calendar
+                      Frequently asked questions
                     </a>
                   </li>
                 </ul>
@@ -375,10 +375,735 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         Frequently asked questions
       </h1>
       <div
-        class="grid-row"
+        class="grid-row grid-gap j40-mb5-mt3"
         data-testid="grid"
       >
-        Coming Soon!
+        <div
+          class="grid-col-12 tablet:grid-col-7"
+          data-testid="grid"
+        >
+          <section
+            style="margin-top: 1.2rem;"
+          >
+            <div
+              class="usa-accordion"
+              data-testid="accordion"
+            >
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-0"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-0"
+                  type="button"
+                >
+                  Q: What is the Climate and Economic Justice Screening Tool (CEJST)?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-0"
+                hidden=""
+                id="faq-id-0"
+              >
+                <p>
+                  The CEJST is a critical component of the Biden-Harris Administration’s historic commitment to advancing environmental justice. In 
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.federalregister.gov/documents/2021/02/01/2021-02177/tackling-the-climate-crisis-at-home-and-abroad#:~:text=Sec.%20223.%20Justice40,40-percent%20goal."
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Executive Order 14008
+                  </a>
+                   on Tackling the Climate Crisis at Home and Abroad, President Biden directed the White House Council on Environmental Quality (CEQ) to develop a geospatial mapping tool to identify disadvantaged communities that face burdens. The tool has an interactive map and uses datasets that are indicators of burdens.
+                </p>
+                <p>
+                  Federal agencies will use the tool for the Justice40 Initiative. It will help them identify disadvantaged communities that should receive 40% of the overall benefits of programs included in the Justice40 Initiative. The Justice40 Initiative seeks to deliver 40% of the overall benefits in climate, clean energy, and other related areas to disadvantaged communities.
+                </p>
+                <p>
+                  Other useful links for Federal agencies:
+                </p>
+                <ul>
+                  <li>
+                    Addendum to the Justice40 Interim Guidance
+                  </li>
+                  <li>
+                    Instructions to Federal Agencies on Using the CEJST
+                  </li>
+                </ul>
+                <p>
+                  The public can find communities of interest and provide feedback. This feedback will be used to improve the tool.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-1"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-1"
+                  type="button"
+                >
+                  Q: How does the tool identify and define communities?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-1"
+                hidden=""
+                id="faq-id-1"
+              >
+                <p>
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.federalregister.gov/documents/2021/02/01/2021-02177/tackling-the-climate-crisis-at-home-and-abroad#:~:text=Sec.%20223.%20Justice40,40-percent%20goal."
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Executive Order 14008
+                  </a>
+                   recognizes that some communities are disadvantaged because they face burdens. The CEJST uses datasets that are indicators of burden. These burdens are related to climate change and the environment. They are also related to health and lack of economic opportunity.
+                </p>
+                <p>
+                  The tool highlights disadvantaged communities across all 50 states, the District of Columbia, and the U.S. territories. A community is considered disadvantaged:
+                </p>
+                <ul>
+                  <li>
+                    If they are in a census tract that meets the thresholds for at least one of the tool’s categories of burden, or
+                  </li>
+                  <li>
+                    If they are on Federally Recognized Tribal land
+                  </li>
+                </ul>
+                <p>
+                  Not all disadvantaged communities can be shown on the map. Some communities, such as migrant workers, do not live in just one place. The Interim Implementation Guidance on the Justice40 Initiative also directs Federal agencies to consider geographically dispersed communities when implementing programs included in the Justice40 Initiative.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-2"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-2"
+                  type="button"
+                >
+                  Q: Is race included in the tool’s methodology?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-2"
+                hidden=""
+                id="faq-id-2"
+              >
+                <p>
+                  No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a specific census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.
+                </p>
+                <p>
+                  Although the CEJST does not use race in the methodology, it seeks to create a map that reflects the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-3"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-3"
+                  type="button"
+                >
+                  Q: Does the Climate and Economic Justice Screening Tool (CEJST) include the U.S. territories? 
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-3"
+                hidden=""
+                id="faq-id-3"
+              >
+                <p>
+                  Yes, the version 1.0 of the CEJST has some data for all the territories but not all the CEJST data are available or used for all U.S. territories. 
+                </p>
+                <p>
+                  <strong>
+                    Puerto Rico:
+                  </strong>
+                   The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period. 
+                </p>
+                <p>
+                  <strong>
+                    American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands:
+                  </strong>
+                   The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period. 
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-4"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-4"
+                  type="button"
+                >
+                  Q: Does the tool include Tribal Nations?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-4"
+                hidden=""
+                id="faq-id-4"
+              >
+                <p>
+                  To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, Federally Recognized Tribal lands are highlighted as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than census tracts. The tool’s census tracts and Tribal lands have different boundaries.
+                </p>
+                <p>
+                  Federally Recognized Tribes are those that are recognized by the U.S. Bureau of Indian Affairs in the 
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.federalregister.gov/documents/2022/01/28/2022-01789/indian-entities-recognized-by-and-eligible-to-receive-services-from-the-united-states-bureau-of"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    annual notice
+                  </a>
+                   it publishes in the Federal Register:
+                </p>
+                <ul>
+                  <li>
+                    The decision to highlight Federally-recognized Tribal lands on the CEJST map and to designate them as disadvantaged communities was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s Action Plan for Consultation and Coordination with Tribal Nations, President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments.
+                  </li>
+                </ul>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-5"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-5"
+                  type="button"
+                >
+                  Q: Why do some areas of the map have different shades?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-5"
+                hidden=""
+                id="faq-id-5"
+              >
+                <p>
+                  Some census tracts that contain lands of Federally-recognized Tribes that are also considered disadvantaged because they meet the burden thresholds for at least one of the categories on the tool. When this happens, the areas appear darker on the tool’s map.
+                </p>
+                <div
+                  style="display: flex;"
+                >
+                  <img
+                    alt="
+      a blue circle icon informing the user of what a disadvantaged community is depicted as
+    "
+                    src="test-file-stub"
+                  />
+                  <div
+                    style="padding-left: 2px;"
+                  >
+                     : Disadvantaged census tracts
+                  </div>
+                </div>
+                <div
+                  style="display: flex;"
+                >
+                  <img
+                    alt="
+      a blue circle icon informing the user of what a disadvantaged community is depicted as
+    "
+                    src="test-file-stub"
+                  />
+                  <div
+                    style="padding-left: 2px;"
+                  >
+                     : Disadvantaged census tracts and Federally-Recognized Tribal lands
+                  </div>
+                </div>
+                <p>
+                  Any area that is highlighted is considered disadvantaged, regardless of whether it is a light shade or dark shade. The tool will show if a whole census tract is considered disadvantaged or just the parts that are Federally Recognized Tribal lands.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-6"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-6"
+                  type="button"
+                >
+                  Q: Why does the tool have “partially disadvantaged” census tracts?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-6"
+                hidden=""
+                id="faq-id-6"
+              >
+                <p>
+                  A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains Federally Recognized Tribal lands, then the parts of the tract that are Tribal lands are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-7"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-7"
+                  type="button"
+                >
+                  Q: How does this tool relate to the Justice40 Initiative?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-7"
+                hidden=""
+                id="faq-id-7"
+              >
+                <p>
+                  The Biden administration is advancing environmental justice across the whole-of-government. The Justice40 Initiative is a critical part of this effort. The Justice40 Initiative seeks to deliver 40% of the overall benefits of climate, clean energy, and related investments to disadvantaged communities.
+                </p>
+                <p>
+                  The CEJST will play an important role in the Justice40 Initiative. It will help to provide a single, consistent definition of disadvantaged communities for programs  included in the Justice40 Initiative.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-8"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-8"
+                  type="button"
+                >
+                  Q: How will Federal agencies use the Climate and Economic Justice Screening Tool (CEJST) for the Justice40 Initiative? 
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-8"
+                hidden=""
+                id="faq-id-8"
+              >
+                <p>
+                  Federal agencies will use the tool to help identify disadvantaged communities that will benefit from programs included in the Justice40 Initiative. The Justice40 Initiative seeks to deliver 40% of the overall benefits of certain investments to disadvantaged communities.
+                </p>
+                <p>
+                  The CEJST will play an important role in the Justice40 Initiative. It will help to provide a single definition of disadvantaged communities for programs included in the Justice40 Initiative. This definition applies to the whole government. Federal agencies will use this definition to direct Justice40 investment benefits in the following areas:
+                </p>
+                <ul>
+                  <li>
+                    Climate
+                  </li>
+                  <li>
+                    Clean energy and energy efficiency
+                  </li>
+                  <li>
+                    Clean transit
+                  </li>
+                  <li>
+                    Affordable and sustainable housing
+                  </li>
+                  <li>
+                    Training and workforce development
+                  </li>
+                  <li>
+                    Remediation and reduction of legacy pollution
+                  </li>
+                  <li>
+                    Development of clean water and wastewater infrastructure
+                  </li>
+                </ul>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-9"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-9"
+                  type="button"
+                >
+                  Q: How will this tool be used to inform decisions relating to new investments made through the Bipartisan Infrastructure Law and the Inflation Reduction Act?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-9"
+                hidden=""
+                id="faq-id-9"
+              >
+                <p>
+                  Recent historic legislation—such as the Bipartisan Infrastructure Law and the Inflation Reduction Act—have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the CEJST to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-10"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-10"
+                  type="button"
+                >
+                  Q: Will agencies use the Climate and Economic Justice Screening Tool (CEJST) if they have already created their own tools or criteria to identify disadvantaged communities?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-10"
+                hidden=""
+                id="faq-id-10"
+              >
+                <p>
+                  The Council on Environmental Quality (CEQ), the Office of Management and Budget (OMB), and the Climate Policy Office (CPO) released the Justice40 Interim Implementation Guidance on July 20, 2021. It directed agencies to develop interim definitions of disadvantaged communities. Agencies used their interim definitions during the tool’s beta phase. Agencies will now transition to using version 1.0 of the tool to geographically identify disadvantaged communities.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-11"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-11"
+                  type="button"
+                >
+                  Q: How is the Climate and Economic Justice Screening Tool (CEJST) different from the Environmental Protection Agency’s (EPA) EJScreen?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-11"
+                hidden=""
+                id="faq-id-11"
+              >
+                <p>
+                  The CEJST uses lessons learned from the EPA's EJScreen. EJScreen is an environmental justice mapping and screening tool. EJScreen shows environmental and demographic information. The EPA, Federal agencies, and state and local governments will continue to use EJScreen to understand and analyze environmental problems. For example, EPA uses 
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.epa.gov/ejscreen/how-does-epa-use-ejscreen"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    EJScreen
+                  </a>
+                   to:
+                </p>
+                <ul>
+                  <li>
+                    Inform outreach and engagement practices
+                  </li>
+                  <li>
+                    Implement aspects of the following programs:
+                  </li>
+                  <ul>
+                    <li>
+                      Permitting programs
+                    </li>
+                    <li>
+                      Enforcement programs
+                    </li>
+                    <li>
+                      Compliance programs
+                    </li>
+                    <li>
+                      Voluntary programs
+                    </li>
+                  </ul>
+                  <li>
+                    Develop retrospective reports of EPA work
+                  </li>
+                  <li>
+                    Enhance geographically based initiatives
+                  </li>
+                </ul>
+                <p>
+                  However, EPA does not use EJScreen to identify or label an area as an "EJ community" or as the sole basis for agency-decision-making.
+                </p>
+                <p>
+                  In contrast, the CEJST will help Federal agencies to identify disadvantaged communities that will benefit from programs included in the Justice40 Initiative.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-12"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-12"
+                  type="button"
+                >
+                  Q: How is this tool different from state screening tools?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-12"
+                hidden=""
+                id="faq-id-12"
+              >
+                <p>
+                  Several states that have environmental justice screening tools. CalEnviroScreen is an environmental justice screening tool for California. Other states, like New York and Michigan have screening tools as well. The Climate and Economic Justice Screening Tool (CEJST)  incorporates lessons learned from these efforts.
+                </p>
+                <p>
+                  There is an important difference between state-based tools and the CEJST. State tools use data that may not be available for other states. The CEJST only uses data that are nationally-consistent and publicly-available.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-13"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-13"
+                  type="button"
+                >
+                  Q: How were the White House Environmental Justice Advisory Council (WHEJAC) recommendations used for this tool?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-13"
+                hidden=""
+                id="faq-id-13"
+              >
+                <p>
+                  The WHEJAC provided recommendations on the Climate and Economic Justice Screening Tool (CEJST). The CEJST follows many of these recommendations.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-14"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-14"
+                  type="button"
+                >
+                  Q: Can the public provide feedback on this tool?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-14"
+                hidden=""
+                id="faq-id-14"
+              >
+                <p>
+                  Yes. The CEJST website has multiple ways to offer feedback on the tool.
+                </p>
+                <ul>
+                  <li>
+                    The public can find census tracts that they are familiar with and send feedback about those tracts. That feedback is used to “ground truth” the tool. This helps the tool to better reflect the realities for communities.
+                  </li>
+                  <li>
+                    The public can also submit data sources or ideas for consideration.
+                  </li>
+                  <li>
+                    The public may also take a short survey to help improve the experience of using the tool.
+                  </li>
+                  <li>
+                    The public can also email 
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="mailto:Screeningtool-Support@omb.eop.gov"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      Screeningtool-Support@omb.eop.gov
+                    </a>
+                  </li>
+                </ul>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-15"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-15"
+                  type="button"
+                >
+                  Q: Will CEQ issue another Request for Information about the tool?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-15"
+                hidden=""
+                id="faq-id-15"
+              >
+                <p>
+                  Yes. CEQ plans to issue a Request for Information (RFI) about version 1.0 of the CEJST in 2023. The feedback received in that RFI will inform version 2.0 of the tool.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-16"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-16"
+                  type="button"
+                >
+                  Q: When did the official version of the tool come out?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-16"
+                hidden=""
+                id="faq-id-16"
+              >
+                <p>
+                  The tool is now considered official because Federal agencies can now use version 1.0 of the Climate and Economic Justice Screening Tool (CEJST) to help identify disadvantaged communities. The 1.0 version was released in MM, YYYY. The tool is no longer in beta.
+                </p>
+                <p>
+                  The tool will be improved over time. The Council on Environmental Quality (CEQ) will update the tool each year based on public feedback, research, and the availability of new data.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-17"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-17"
+                  type="button"
+                >
+                  Q. How does the Council on Environmental Quality (CEQ) keep people informed about the tool?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-17"
+                hidden=""
+                id="faq-id-17"
+              >
+                <p>
+                  Sign-up to receive updates on the Climate and Economic Justice Screening Tool (CEJST) and other environmental justice news from CEQ.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-18"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-18"
+                  type="button"
+                >
+                  Q: What files and documentation are available from the tool?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-18"
+                hidden=""
+                id="faq-id-18"
+              >
+                <p>
+                  The Climate and Economic Justice Screening Tool (CEJST) has 
+                  <a
+                    class="usa-link"
+                    href="/en/downloads"
+                  >
+                    downloads
+                  </a>
+                   available. Spreadsheets (.xlxs) and (.csv) contain the tool’s definitions and data. This data can be used for analysis. Shapefiles and geojson files can be uploaded into other mapping programs such as Esri. The downloads include information on how to use the files.
+                </p>
+              </div>
+              <h2
+                class="usa-accordion__heading"
+              >
+                <button
+                  aria-controls="faq-id-19"
+                  aria-expanded="false"
+                  class="usa-accordion__button"
+                  data-testid="accordionButton_faq-id-19"
+                  type="button"
+                >
+                  Q: How does the tool’s shapefile work?
+                </button>
+              </h2>
+              <div
+                class="usa-accordion__content usa-prose"
+                data-testid="accordionItem_faq-id-19"
+                hidden=""
+                id="faq-id-19"
+              >
+                <p>
+                  The tool’s shapefile can be uploaded into other mapping programs such as Esri.
+                </p>
+                <p>
+                  The 
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://en.wikipedia.org/wiki/Shapefile"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    shapefile
+                  </a>
+                   format is 
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://en.wikipedia.org/wiki/GIS_file_formats"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    a geospatial vector data format
+                  </a>
+                   for geographic information system (GIS) software. It can be loaded into any software that works with Esri, ArcGIS or any other compatible GIS software. You may choose to download the data in this format so that you can load the data from the Climate and Economic Justice Screening Tool (CEJST) into other tools and use those tools to combine the CEJST data with other datasets and sources.
+                </p>
+              </div>
+            </div>
+          </section>
+        </div>
+        <div
+          class="grid-col-12 tablet:grid-col-2"
+          data-testid="grid"
+        />
       </div>
     </div>
   </main>
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 9944b757e..c2a6c5cfe 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -306,20 +306,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
                     >
-                      Frequently asked questions
+                      Engagement calendar
                     </a>
                   </li>
                   <li
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
                     >
-                      Engagement calendar
+                      Frequently asked questions
                     </a>
                   </li>
                 </ul>
@@ -1060,9 +1060,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="low-income"
               >
-                <h3>
-                  Low income
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Low income
+                  </h3>
+                </div>
                 <div>
                   
         Percent of a census tract's population in households where household income is at or below
@@ -1108,9 +1112,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="exp-agr-loss-rate"
               >
-                <h3>
-                  Expected agriculture loss rate
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Expected agriculture loss rate
+                  </h3>
+                </div>
                 <div>
                   
         Expected agricultural value at risk from losses due to fourteen types of natural hazards. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. The rate is calculated by dividing the agricultural value at risk by the total agricultural value. 
@@ -1155,9 +1163,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="exp-bld-loss-rate"
               >
-                <h3>
-                  Expected building loss rate
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Expected building loss rate
+                  </h3>
+                </div>
                 <div>
                   
         Expected building value at risk from losses due to fourteen types of natural hazards. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. The rate is calculated by dividing the building value at risk by the total building value.
@@ -1202,9 +1214,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="exp-pop-loss-rate"
               >
-                <h3>
-                  Expected population loss rate
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Expected population loss rate
+                  </h3>
+                </div>
                 <div>
                   
         Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate of population loss.
@@ -1250,9 +1266,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="flood-risk"
               >
-                <h3>
-                  NEW Projected flood risk
-                </h3>
+                <div>
+                  <div>
+                    <span
+                      class="usa-tag"
+                      data-testid="tag"
+                    >
+                      NEW
+                    </span>
+                  </div>
+                  <h3>
+                    Projected flood risk
+                  </h3>
+                </div>
                 <div>
                   
         A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not include property value.
@@ -1297,9 +1323,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="wildfire-risk"
               >
-                <h3>
-                  NEW Projected wildfire risk
-                </h3>
+                <div>
+                  <div>
+                    <span
+                      class="usa-tag"
+                      data-testid="tag"
+                    >
+                      NEW
+                    </span>
+                  </div>
+                  <h3>
+                    Projected wildfire risk
+                  </h3>
+                </div>
                 <div>
                   
         A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not include property value.
@@ -1344,9 +1380,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="energy-burden"
               >
-                <h3>
-                  Energy cost
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Energy cost
+                  </h3>
+                </div>
                 <div>
                   
         Average household annual energy cost in dollars divided by the average household income.
@@ -1391,9 +1431,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="pm-25"
               >
-                <h3>
-                  PM2.5 in the air
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    PM2.5 in the air
+                  </h3>
+                </div>
                 <div>
                   
         Fine inhalable particles with 2.5 or smaller micrometer diameters. The percentile is the weight of the particles per cubic meter.
@@ -1439,9 +1483,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="asthma"
               >
-                <h3>
-                  Asthma
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Asthma
+                  </h3>
+                </div>
                 <div>
                   
         Share of people who answer “yes” to both of these questions: “Have you ever been told by a health professional that you have asthma?” and “Do you still have asthma?”.
@@ -1486,9 +1534,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="diabetes"
               >
-                <h3>
-                  Diabetes
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Diabetes
+                  </h3>
+                </div>
                 <div>
                   
         Share of people ages 18 years and older who have been told by a health professional that they have diabetes other than diabetes during pregnancy.
@@ -1533,9 +1585,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="heart-disease"
               >
-                <h3>
-                  Heart disease
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Heart disease
+                  </h3>
+                </div>
                 <div>
                   
         Share of people ages 18 years and older who have been told by a health professional that they had angina or coronary heart disease.
@@ -1580,9 +1636,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="life-exp"
               >
-                <h3>
-                  Low life expectancy
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Low life expectancy
+                  </h3>
+                </div>
                 <div>
                   
         Average number of years people have left in their lives.
@@ -1638,9 +1698,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="hist-underinv"
               >
-                <h3>
-                  New Historic underinvestment
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    New Historic underinvestment
+                  </h3>
+                </div>
                 <div>
                   
         Census tracts that experienced historic underinvestment as determined by the National Community Reinvestment Coalition’s (NCRC) historic redlining score. It is determined using the 
@@ -1714,9 +1778,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="house-burden"
               >
-                <h3>
-                  Housing cost
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Housing cost
+                  </h3>
+                </div>
                 <div>
                   
         Share of households that are both earning less than 80% of Housing and Urban Development’s Area Median Family Income and are spending more than 30% of their income on housing costs.
@@ -1761,9 +1829,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="green-space"
               >
-                <h3>
-                  NEW Lack of green space
-                </h3>
+                <div>
+                  <div>
+                    <span
+                      class="usa-tag"
+                      data-testid="tag"
+                    >
+                      NEW
+                    </span>
+                  </div>
+                  <h3>
+                    Lack of green space
+                  </h3>
+                </div>
                 <div>
                   
         Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes.
@@ -1808,9 +1886,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="indoor-plumb"
               >
-                <h3>
-                  NEW Lack of indoor plumbing
-                </h3>
+                <div>
+                  <div>
+                    <span
+                      class="usa-tag"
+                      data-testid="tag"
+                    >
+                      NEW
+                    </span>
+                  </div>
+                  <h3>
+                    Lack of indoor plumbing
+                  </h3>
+                </div>
                 <div>
                   
         Housing without complete kitchen facilities or complete plumbing facilities.
@@ -1855,9 +1943,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="lead-paint"
               >
-                <h3>
-                  Lead paint
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Lead paint
+                  </h3>
+                </div>
                 <div>
                   
         Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are not likely to have lead paint exposure and are not included.
@@ -1902,9 +1994,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="mine-land"
               >
-                <h3>
-                  NEW Abandoned mine lands
-                </h3>
+                <div>
+                  <div>
+                    <span
+                      class="usa-tag"
+                      data-testid="tag"
+                    >
+                      NEW
+                    </span>
+                  </div>
+                  <h3>
+                    Abandoned mine lands
+                  </h3>
+                </div>
                 <div>
                   
         Presence of an abandoned mine left by legacy coal mining operations.
@@ -1949,9 +2051,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="fuds"
               >
-                <h3>
-                  NEW Formerly Used Defense Sites
-                </h3>
+                <div>
+                  <div>
+                    <span
+                      class="usa-tag"
+                      data-testid="tag"
+                    >
+                      NEW
+                    </span>
+                  </div>
+                  <h3>
+                    Formerly Used Defense Sites
+                  </h3>
+                </div>
                 <div>
                   
       Properties that were owned, leased, or possessed by the United States, under the jurisdiction of the Secretary of Defense prior to October 1986.
@@ -1996,9 +2108,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="prox-haz"
               >
-                <h3>
-                  Proximity to hazardous waste sites
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Proximity to hazardous waste sites
+                  </h3>
+                </div>
                 <div>
                   
         Number of hazardous waste facilities (Treatment, Storage, and Disposal Facilities and Large Quantity Generators) within 5 kilometers (or nearest beyond 5 kilometers), each divided by distance in kilometers.
@@ -2047,9 +2163,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="prox-npl"
               >
-                <h3>
-                  Proximity to Superfund sites
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Proximity to Superfund sites
+                  </h3>
+                </div>
                 <div>
                   
         Number of proposed or listed Superfund or National Priorities list (NPL) sites within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
@@ -2094,9 +2214,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="prox-rmp"
               >
-                <h3>
-                  Proximity to Risk Management Plan (RMP) facilities
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Proximity to Risk Management Plan (RMP) facilities
+                  </h3>
+                </div>
                 <div>
                   
         Count of RMP, or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
@@ -2141,9 +2265,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="diesel-pm"
               >
-                <h3>
-                  Diesel particulate matter exposure
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Diesel particulate matter exposure
+                  </h3>
+                </div>
                 <div>
                   
         Mixture of particles in diesel exhaust in the air, measured as micrograms per cubic meter.
@@ -2188,9 +2316,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="trans-barrier"
               >
-                <h3>
-                  NEW Transportation barriers
-                </h3>
+                <div>
+                  <div>
+                    <span
+                      class="usa-tag"
+                      data-testid="tag"
+                    >
+                      NEW
+                    </span>
+                  </div>
+                  <h3>
+                    Transportation barriers
+                  </h3>
+                </div>
                 <div>
                   
         Average relative cost and time spent on transportation relative to all other tracts.
@@ -2235,9 +2373,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="traffic-vol"
               >
-                <h3>
-                  Traffic proximity and volume
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Traffic proximity and volume
+                  </h3>
+                </div>
                 <div>
                   
         Number of vehicles (average annual daily traffic) at major roads within 500 meters, divided by distance in meters.
@@ -2282,9 +2424,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="leaky-uwt"
               >
-                <h3>
-                  NEW Leaking underground storage tanks
-                </h3>
+                <div>
+                  <div>
+                    <span
+                      class="usa-tag"
+                      data-testid="tag"
+                    >
+                      NEW
+                    </span>
+                  </div>
+                  <h3>
+                    Leaking underground storage tanks
+                  </h3>
+                </div>
                 <div>
                   
         Weighted formula of number of leaking underground storage tanks and the number of underground storage tanks within 1,500 feet.
@@ -2331,9 +2483,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="waste-water"
               >
-                <h3>
-                  Wastewater discharge
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Wastewater discharge
+                  </h3>
+                </div>
                 <div>
                   
         Risk-Screening Environmental Indicators (RSEI) modeled toxic concentrations at
@@ -2379,9 +2535,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="ling-iso"
               >
-                <h3>
-                  Linguistic isolation
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Linguistic isolation
+                  </h3>
+                </div>
                 <div>
                   
         Share of households where no one over the age 14 speaks English well.
@@ -2421,25 +2581,29 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     </span>
                     All U.S. states and the District of Columbia
                   </li>
-                  <div>
-                    <p>
-                      
+                </ul>
+                <div>
+                  <p>
+                    
       
-                      <strong>
-                        Note: 
-                      </strong>
-                      Linguistic isolation was removed from Puerto Rico based on feedback during the beta period.
+                    <strong>
+                      Note: 
+                    </strong>
+                    Linguistic isolation was removed from Puerto Rico based on feedback during the beta period.
       
-                    </p>
-                  </div>
-                </ul>
+                  </p>
+                </div>
               </div>
               <div
                 id="low-med-inc"
               >
-                <h3>
-                  Low median income
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Low median income
+                  </h3>
+                </div>
                 <div>
                   
         Low median income calculated as a share of the area’s median income.
@@ -2517,9 +2681,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="poverty"
               >
-                <h3>
-                  Poverty
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Poverty
+                  </h3>
+                </div>
                 <div>
                   
         Share of people living at or below 100% of the Federal poverty level.
@@ -2564,9 +2732,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="unemploy"
               >
-                <h3>
-                  Unemployment
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    Unemployment
+                  </h3>
+                </div>
                 <div>
                   
         Number of unemployed people as a share of the  labor force.
@@ -2633,9 +2805,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="high-school"
               >
-                <h3>
-                  High school education
-                </h3>
+                <div
+                  class=""
+                >
+                  <h3>
+                    High school education
+                  </h3>
+                </div>
                 <div>
                   
         Share of people aged 25 years or older who didn’t graduate from high school.
@@ -2702,9 +2878,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="tribal-lands"
               >
-                <h3>
-                  NEW Tribal lands
-                </h3>
+                <div>
+                  <div>
+                    <span
+                      class="usa-tag"
+                      data-testid="tag"
+                    >
+                      NEW
+                    </span>
+                  </div>
+                  <h3>
+                    Tribal lands
+                  </h3>
+                </div>
                 <div>
                   
         The Land Area Representation (LAR) dataset depicts the exterior extent of a Federal Indian land area. 
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index 04a8ae99a..b9ac5a6b3 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -306,20 +306,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
                     >
-                      Frequently asked questions
+                      Engagement calendar
                     </a>
                   </li>
                   <li
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
                     >
-                      Engagement calendar
+                      Frequently asked questions
                     </a>
                   </li>
                 </ul>
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index 579a50860..43a78835c 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -306,20 +306,20 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
+                      data-cy="nav-link-public-engagement"
+                      href="/en/public-engagement"
                     >
-                      Frequently asked questions
+                      Engagement calendar
                     </a>
                   </li>
                   <li
                     class="usa-nav__submenu-item"
                   >
                     <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
+                      data-cy="nav-link-faqs"
+                      href="/en/frequently-asked-questions"
                     >
-                      Engagement calendar
+                      Frequently asked questions
                     </a>
                   </li>
                 </ul>

From b321b267fc71b8570e7d5b850d3b325e59f53de2 Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Fri, 14 Oct 2022 16:23:42 -0700
Subject: [PATCH 077/130] Previous versions page narwal (#2018)

* Add Previous Version page

- Create a new DownloadButton component
- Add PreviousVersion link to main nav
- Extract out download button from PublicVideo component
- Update SidePageNav to render PrevVersion
- Add Beta start date
- Create previous-version page
- Add public eng to all pages
- update snapshots

* Update cypress test to test prev version page

- Add <ul> around card as it fails a11y without it.

* Add updated tribal base map

- this removes the LAR suffix in MapBox studio
---
 .../integration/LegacyTests/constants.js      |  1 +
 .../DownloadButton/DownloadButton.module.scss | 49 ++++++++++
 .../DownloadButton.module.scss.d.ts           | 18 ++++
 .../DownloadButton/DownloadButton.test.tsx    | 19 ++++
 .../DownloadButton/DownloadButton.tsx         | 34 +++++++
 .../DownloadButton.test.tsx.snap              | 26 ++++++
 client/src/components/DownloadButton/index.ts |  2 +
 client/src/components/J40Header/J40Header.tsx | 14 +--
 .../__snapshots__/J40Header.test.tsx.snap     | 10 ++
 client/src/components/J40Map.tsx              |  9 +-
 .../PublicVideoBox/PublicVideoBox.tsx         | 34 ++-----
 .../src/components/SubPageNav/SubPageNav.tsx  | 18 ++--
 client/src/data/constants.tsx                 |  1 +
 client/src/data/copy/common.tsx               |  8 +-
 client/src/data/copy/previousVer.tsx          | 83 +++++++++++++++++
 client/src/intl/en.json                       | 26 +++++-
 client/src/pages/downloads.tsx                |  7 +-
 .../src/pages/frequently-asked-questions.tsx  |  7 +-
 client/src/pages/methodology.tsx              |  1 +
 client/src/pages/previous-versions.tsx        | 92 +++++++++++++++++++
 .../tests/__snapshots__/about.test.tsx.snap   | 10 ++
 .../tests/__snapshots__/contact.test.tsx.snap | 10 ++
 .../__snapshots__/downloads.test.tsx.snap     | 31 +++++++
 .../freqAskedQuestions.test.tsx.snap          | 41 ++++++++-
 .../__snapshots__/methodology.test.tsx.snap   | 10 ++
 .../__snapshots__/publicEng.test.tsx.snap     | 10 ++
 .../techSupportDoc.test.tsx.snap              | 10 ++
 client/src/styles/global.scss                 | 15 +++
 28 files changed, 547 insertions(+), 49 deletions(-)
 create mode 100644 client/src/components/DownloadButton/DownloadButton.module.scss
 create mode 100644 client/src/components/DownloadButton/DownloadButton.module.scss.d.ts
 create mode 100644 client/src/components/DownloadButton/DownloadButton.test.tsx
 create mode 100644 client/src/components/DownloadButton/DownloadButton.tsx
 create mode 100644 client/src/components/DownloadButton/__snapshots__/DownloadButton.test.tsx.snap
 create mode 100644 client/src/components/DownloadButton/index.ts
 create mode 100644 client/src/data/copy/previousVer.tsx
 create mode 100644 client/src/pages/previous-versions.tsx

diff --git a/client/cypress/integration/LegacyTests/constants.js b/client/cypress/integration/LegacyTests/constants.js
index b0e45f6d2..e8b10468a 100644
--- a/client/cypress/integration/LegacyTests/constants.js
+++ b/client/cypress/integration/LegacyTests/constants.js
@@ -7,4 +7,5 @@ export const PAGES_ENDPOINTS = {
   FAQS: '/frequently-asked-questions',
   PUBLIC_ENG: '/public-engagement',
   CONTACT: '/contact',
+  PREVIOUS_VERSIONS: '/previous-versions',
 };
diff --git a/client/src/components/DownloadButton/DownloadButton.module.scss b/client/src/components/DownloadButton/DownloadButton.module.scss
new file mode 100644
index 000000000..1577c7d31
--- /dev/null
+++ b/client/src/components/DownloadButton/DownloadButton.module.scss
@@ -0,0 +1,49 @@
+@use '../../styles/design-system.scss' as *;
+
+@mixin buttonImageBase {
+    width: 21px;
+    margin-top: -3px;
+};
+
+@mixin downloadButtonBase {
+    height: 40px;
+    @include u-margin-top(3);
+    
+    .buttonContainer {
+        display: flex;
+
+        .buttonText {
+            @include u-margin-right(1);
+            }
+        
+        .buttonImageYellow {
+            @include buttonImageBase();
+            filter: invert(13%) sepia(76%) saturate(5142%) hue-rotate(192deg) brightness(80%) contrast(106%);
+        }
+
+        .buttonImageBlue {
+            @include buttonImageBase();
+            filter: invert(100%) sepia(100%) saturate(1%) hue-rotate(137deg) brightness(103%) contrast(101%);
+        }
+    }
+}
+
+.downloadButtonLink{
+    display: flex;
+    text-decoration: none;
+    justify-content: center;
+
+    .buttonComponentYellow {
+        @include downloadButtonBase;
+        @include u-text("blue-70v");
+        @include u-bg("yellow-20v");
+        &:hover {
+            @include u-bg("yellow-20");
+            @include u-text("gray-90");
+            }
+    }
+    
+    .buttonComponent {
+       @include downloadButtonBase;
+    }
+}
diff --git a/client/src/components/DownloadButton/DownloadButton.module.scss.d.ts b/client/src/components/DownloadButton/DownloadButton.module.scss.d.ts
new file mode 100644
index 000000000..1cdea6b99
--- /dev/null
+++ b/client/src/components/DownloadButton/DownloadButton.module.scss.d.ts
@@ -0,0 +1,18 @@
+declare namespace DownloadButtonNamespace {
+    export interface IDownloadButtonScss {
+      downloadButtonLink: string;
+      buttonComponent: string;
+      buttonComponentYellow: string;
+      buttonContainer: string;
+      buttonText: string;
+      buttonImageBlue: string;
+      buttonImageYellow: string;
+    }
+  }
+
+declare const DownloadButtonScssModule: DownloadButtonNamespace.IDownloadButtonScss & {
+    /** WARNING: Only available when "css-loader" is used without "style-loader" or "mini-css-extract-plugin" */
+    locals: DownloadButtonNamespace.IDownloadButtonScss;
+  };
+
+  export = DownloadButtonScssModule;
diff --git a/client/src/components/DownloadButton/DownloadButton.test.tsx b/client/src/components/DownloadButton/DownloadButton.test.tsx
new file mode 100644
index 000000000..22cb80777
--- /dev/null
+++ b/client/src/components/DownloadButton/DownloadButton.test.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import {render} from '@testing-library/react';
+import {LocalizedComponent} from '../../test/testHelpers';
+import DownloadButton from './DownloadButton';
+
+describe('rendering of DownloadButton Component', () => {
+  const {asFragment} = render(
+      <LocalizedComponent>
+        <DownloadButton
+          downloadLink='https://google.com'
+          buttonText='Hello'
+          imageAltTagText='download button'
+        />
+      </LocalizedComponent>,
+  );
+  it('checks if component renders', () => {
+    expect(asFragment()).toMatchSnapshot();
+  });
+});
diff --git a/client/src/components/DownloadButton/DownloadButton.tsx b/client/src/components/DownloadButton/DownloadButton.tsx
new file mode 100644
index 000000000..8cc81f94e
--- /dev/null
+++ b/client/src/components/DownloadButton/DownloadButton.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import {Button} from '@trussworks/react-uswds';
+
+import * as styles from './DownloadButton.module.scss';
+// @ts-ignore
+import fileDownloadIcon from '/node_modules/uswds/dist/img/usa-icons/file_download.svg';
+
+export interface IDownloadButtonProps {
+  downloadLink: string,
+  buttonText: string
+  imageAltTagText: string,
+  isYellow?: boolean
+}
+
+const DownloadButton = ({downloadLink, buttonText, imageAltTagText, isYellow = false}: IDownloadButtonProps) => {
+  return (
+    <a className={styles.downloadButtonLink} href={downloadLink} download>
+      <Button type="button" className={isYellow ? styles.buttonComponentYellow : styles.buttonComponent}>
+        <div className={styles.buttonContainer}>
+          <div className={styles.buttonText}>
+            {buttonText}
+          </div>
+          <img
+            className={isYellow ? styles.buttonImageYellow : styles.buttonImageBlue}
+            src={fileDownloadIcon}
+            alt={imageAltTagText}
+          />
+        </div>
+      </Button>
+    </a>
+  );
+};
+
+export default DownloadButton;
diff --git a/client/src/components/DownloadButton/__snapshots__/DownloadButton.test.tsx.snap b/client/src/components/DownloadButton/__snapshots__/DownloadButton.test.tsx.snap
new file mode 100644
index 000000000..1cbe94e09
--- /dev/null
+++ b/client/src/components/DownloadButton/__snapshots__/DownloadButton.test.tsx.snap
@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`rendering of DownloadButton Component checks if component renders 1`] = `
+<DocumentFragment>
+  <a
+    download=""
+    href="https://google.com"
+  >
+    <button
+      class="usa-button"
+      data-testid="button"
+      type="button"
+    >
+      <div>
+        <div>
+          Hello
+        </div>
+        <img
+          alt="download button"
+          src="test-file-stub"
+        />
+      </div>
+    </button>
+  </a>
+</DocumentFragment>
+`;
diff --git a/client/src/components/DownloadButton/index.ts b/client/src/components/DownloadButton/index.ts
new file mode 100644
index 000000000..85b3e0189
--- /dev/null
+++ b/client/src/components/DownloadButton/index.ts
@@ -0,0 +1,2 @@
+import DownloadButton from './DownloadButton';
+export default DownloadButton;
diff --git a/client/src/components/J40Header/J40Header.tsx b/client/src/components/J40Header/J40Header.tsx
index db433e658..4582d8562 100644
--- a/client/src/components/J40Header/J40Header.tsx
+++ b/client/src/components/J40Header/J40Header.tsx
@@ -120,13 +120,13 @@ const J40Header = ({location}:IJ40Header) => {
       data-cy={'nav-link-downloads'}>
       {intl.formatMessage(COMMON_COPY.HEADER.DOWNLOADS)}
     </Link>,
-    // <Link
-    //   to={PAGES_ENDPOINTS.TSD}
-    //   key={'tsd'}
-    //   activeClassName="usa-current"
-    //   data-cy={'nav-link-technical-support-docs'}>
-    //   {intl.formatMessage(COMMON_COPY.HEADER.TSD)}
-    // </Link>,
+    <Link
+      to={PAGES_ENDPOINTS.PREVIOUS_VERSIONS}
+      key={'previous-versions'}
+      activeClassName="usa-current"
+      data-cy={'nav-link-previous-versions'}>
+      {intl.formatMessage(COMMON_COPY.HEADER.PREVIOUS_VERSIONS)}
+    </Link>,
   ];
 
   /**
diff --git a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
index 3af81c725..95b50ce79 100644
--- a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
+++ b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
@@ -270,6 +270,16 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
                       Downloads
                     </a>
                   </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-previous-versions"
+                      href="/en/previous-versions"
+                    >
+                      Previous versions
+                    </a>
+                  </li>
                 </ul>
               </li>
               <li
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index 300ba7b51..bfa876534 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -303,7 +303,11 @@ const J40Map = ({location}: IJ40Interface) => {
     setGeolocationInProgress(true);
   };
 
-  const mapBoxBaseLayer = `mapbox://styles/justice40/cl2qimpi2000014qeb1egpox8`;
+  const mapBoxBaseLayer = {
+    streetsWithTribal: `mapbox://styles/justice40/cl2qimpi2000014qeb1egpox8`,
+    streetsWithUpdatedTribal: `mapbox://styles/justice40/cl98rlidr002c14obpsvz6zzs`,
+  };
+
 
   return (
     <>
@@ -343,7 +347,8 @@ const J40Map = ({location}: IJ40Interface) => {
           // ****** Map state props: ******
           // http://visgl.github.io/react-map-gl/docs/api-reference/interactive-map#map-state
           {...viewport}
-          mapStyle={process.env.MAPBOX_STYLES_READ_TOKEN ? mapBoxBaseLayer : getOSBaseMap()}
+          mapStyle={process.env.MAPBOX_STYLES_READ_TOKEN ?
+            mapBoxBaseLayer.streetsWithUpdatedTribal : getOSBaseMap()}
           width="100%"
           // Ajusting this height with a conditional statement will not render the map on staging.
           // The reason for this issue is unknown. Consider styling the parent container via SASS.
diff --git a/client/src/components/PublicVideoBox/PublicVideoBox.tsx b/client/src/components/PublicVideoBox/PublicVideoBox.tsx
index a0f82bf80..212b83e46 100644
--- a/client/src/components/PublicVideoBox/PublicVideoBox.tsx
+++ b/client/src/components/PublicVideoBox/PublicVideoBox.tsx
@@ -2,13 +2,14 @@ import React from 'react';
 import {Button, SummaryBox, SummaryBoxContent, SummaryBoxHeading} from '@trussworks/react-uswds';
 import {useIntl} from 'gatsby-plugin-intl';
 
-import * as PUBLIC_COPY from '../../data/copy/publicEngage';
+import DownloadButton from '../DownloadButton';
+
 import * as styles from './PublicVideoBox.module.scss';
+import * as PUBLIC_COPY from '../../data/copy/publicEngage';
 
 // @ts-ignore
 import launchIcon from '/node_modules/uswds/dist/img/usa-icons/launch.svg';
-// @ts-ignore
-import fileDownloadIcon from '/node_modules/uswds/dist/img/usa-icons/file_download.svg';
+
 
 const PublicVideoBox = () => {
   const intl = useIntl();
@@ -45,27 +46,12 @@ const PublicVideoBox = () => {
             </div>
           </Button>
         </a>
-        <a
-          className={styles.publicVideoLink}
-          href={`https://static-data-screeningtool.geoplatform.gov/data-pipeline/data/score/downloadable/technical-training-slides.pptx`}
-          download
-        >
-          <Button
-            type="button"
-            className={styles.youTubeBtn}
-          >
-            <div className={styles.buttonContainer}>
-              <div className={styles.buttonText}>
-                {intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON2_TEXT)}
-              </div>
-              <img
-                className={styles.buttonImage}
-                src={fileDownloadIcon}
-                alt={intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.IMG_ALT_TEXT2)}
-              />
-            </div>
-          </Button>
-        </a>
+        <DownloadButton
+          downloadLink={`https://static-data-screeningtool.geoplatform.gov/data-pipeline/data/score/downloadable/technical-training-slides.pptx`}
+          buttonText={intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON2_TEXT)}
+          imageAltTagText={intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.IMG_ALT_TEXT2)}
+          isYellow={true}
+        />
       </SummaryBoxContent>
     </SummaryBox>
   );
diff --git a/client/src/components/SubPageNav/SubPageNav.tsx b/client/src/components/SubPageNav/SubPageNav.tsx
index c3625d03e..97806d568 100644
--- a/client/src/components/SubPageNav/SubPageNav.tsx
+++ b/client/src/components/SubPageNav/SubPageNav.tsx
@@ -24,21 +24,23 @@ const getPageConstant = (endPoint:string) => {
   const intl = useIntl();
 
   if (endPoint === PAGES_ENDPOINTS.EXPLORE) {
-    return intl.formatMessage(COMMON_COPY.HEADER['EXPLORE']);
+    return intl.formatMessage(COMMON_COPY.HEADER.EXPLORE);
   } else if (endPoint === PAGES_ENDPOINTS.METHODOLOGY) {
-    return intl.formatMessage(COMMON_COPY.HEADER['METHODOLOGY']);
+    return intl.formatMessage(COMMON_COPY.HEADER.METHODOLOGY);
   } else if (endPoint == PAGES_ENDPOINTS.DOWNLOADS) {
-    return intl.formatMessage(COMMON_COPY.HEADER['DOWNLOADS']);
+    return intl.formatMessage(COMMON_COPY.HEADER.DOWNLOADS);
   } else if (endPoint == PAGES_ENDPOINTS.TSD) {
-    return intl.formatMessage(COMMON_COPY.HEADER['TSD']);
+    return intl.formatMessage(COMMON_COPY.HEADER.TSD);
   } else if (endPoint == PAGES_ENDPOINTS.ABOUT) {
-    return intl.formatMessage(COMMON_COPY.HEADER['ABOUT']);
+    return intl.formatMessage(COMMON_COPY.HEADER.ABOUT);
   } else if (endPoint === PAGES_ENDPOINTS.FAQS) {
-    return intl.formatMessage(COMMON_COPY.HEADER['FAQS']);
+    return intl.formatMessage(COMMON_COPY.HEADER.FAQS);
   } else if (endPoint == PAGES_ENDPOINTS.PUBLIC_ENG) {
-    return intl.formatMessage(COMMON_COPY.HEADER['PUBLIC_ENG']);
+    return intl.formatMessage(COMMON_COPY.HEADER.PUBLIC_ENG);
   } else if (endPoint == PAGES_ENDPOINTS.CONTACT) {
-    return intl.formatMessage(COMMON_COPY.HEADER['CONTACT']);
+    return intl.formatMessage(COMMON_COPY.HEADER.CONTACT);
+  } else if (endPoint == PAGES_ENDPOINTS.PREVIOUS_VERSIONS) {
+    return intl.formatMessage(COMMON_COPY.HEADER.PREVIOUS_VERSIONS);
   };
 };
 /**
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index 34bb9899a..b4ef875e1 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -14,6 +14,7 @@ export const PAGES_ENDPOINTS = {
   FAQS: '/frequently-asked-questions',
   PUBLIC_ENG: '/public-engagement',
   CONTACT: '/contact',
+  PREVIOUS_VERSIONS: '/previous-versions',
 };
 
 // Performance markers
diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx
index 6eba4a599..05ee9fb6d 100644
--- a/client/src/data/copy/common.tsx
+++ b/client/src/data/copy/common.tsx
@@ -28,7 +28,8 @@ export const linkFn = (to:string | IDefineMessage, isInternal:boolean, isOpenNew
 
 export const FEEDBACK_EMAIL = 'Screeningtool-Support@omb.eop.gov';
 
-export const METH_1_0_RELEASE_DATE = new Date(2022, 9, 25, 11, 59, 59); // Oct 25
+export const METH_1_0_RELEASE_DATE = new Date(2022, 9, 25, 11, 59, 59); // Oct 25 2022
+export const METH_BETA_RELEASE_DATE = new Date(2022, 1, 18, 11, 59, 59); // Feb 18 2022
 
 
 // Beta Banner
@@ -147,6 +148,11 @@ export const HEADER = defineMessages({
     defaultMessage: 'Technical Support Document',
     description: 'Navigate to the about page. This is Header navigate item to the technical support document page',
   },
+  PREVIOUS_VERSIONS: {
+    id: 'common.pages.header.tsd',
+    defaultMessage: 'Previous versions',
+    description: 'Navigate to the about page. This is Header navigate item to the technical support document page',
+  },
 });
 
 // Footer
diff --git a/client/src/data/copy/previousVer.tsx b/client/src/data/copy/previousVer.tsx
new file mode 100644
index 000000000..b85b77563
--- /dev/null
+++ b/client/src/data/copy/previousVer.tsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import {FormattedDate, FormattedMessage, defineMessages} from 'gatsby-plugin-intl';
+import {METH_1_0_RELEASE_DATE, METH_BETA_RELEASE_DATE} from './common';
+
+export const PAGE = defineMessages({
+  TITLE: {
+    id: 'previous.versions.page.title.text',
+    defaultMessage: 'Previous versions',
+    description: 'Navigate to the previous version page. This is the page title text',
+  },
+});
+
+export const CARD = {
+  TITLE: <FormattedMessage
+    id={'previous.versions.page.title.text'}
+    defaultMessage={'Beta version'}
+    description={'Navigate to the previous version page. This is the Cards title text'}
+  />,
+  BODY: <FormattedMessage
+    id={'previous.versions.page.body.text'}
+    defaultMessage={`The beta version of the methodology and data was used during the public 
+    beta period to get feedback on the tool from {betaDate} - {releaseDate}`}
+    description={'Navigate to the previous version page. This is the Cards body text'}
+    values={{
+      betaDate: <FormattedDate
+        value={METH_BETA_RELEASE_DATE}
+        year="numeric"
+        month="short"
+        day="numeric"
+      />,
+      releaseDate: <FormattedDate
+        value={METH_1_0_RELEASE_DATE}
+        year="numeric"
+        month="short"
+        day="numeric"
+      />,
+    }}
+  />,
+  BUTTON1: <FormattedMessage
+    id={'previous.versions.page.button1.text'}
+    defaultMessage={'Data & documentation'}
+    description={'Navigate to the previous version page. This is the Cards button1 text'}
+  />,
+  BUTTON1_ALT_TAG: <FormattedMessage
+    id={'previous.versions.page.button1.alt.tag.text'}
+    defaultMessage={'a button that allows to download the data and documentation to the tool'}
+    description={'Navigate to the previous version page. This is the Cards button1.alt.tag text'}
+  />,
+  BUTTON2: <FormattedMessage
+    id={'previous.versions.page.button2.text'}
+    defaultMessage={'Shapefile & codebook'}
+    description={'Navigate to the previous version page. This is the Cards button2 text'}
+  />,
+  BUTTON2_ALT_TAG: <FormattedMessage
+    id={'previous.versions.page.button2.alt.tag.text'}
+    defaultMessage={'a button that allows to download the shapefile and codebook to the tool'}
+    description={'Navigate to the previous version page. This is the Cards button2.alt.tag text'}
+  />,
+};
+
+export const BUTTON = defineMessages({
+  TITLE1: {
+    id: 'previous.versions.page.button1.text',
+    defaultMessage: 'Data & documentation',
+    description: 'Navigate to the previous version page. This is the Cards button1 text',
+  },
+  TITLE2: {
+    id: 'previous.versions.page.button2.text',
+    defaultMessage: 'Shapefile & codebook',
+    description: 'Navigate to the previous version page. This is the Cards button2 text',
+  },
+  BUTTON1_ALT_TAG: {
+    id: 'previous.versions.page.button1.alt.tag.text',
+    defaultMessage: 'a button that allows to download the data and documentation to the tool',
+    description: 'Navigate to the previous version page. This is the Cards button1.alt.tag text',
+  },
+  BUTTON2_ALT_TAG: {
+    id: 'previous.versions.page.button2.alt.tag.text',
+    defaultMessage: 'a button that allows to download the shapefile and codebook to the tool',
+    description: 'Navigate to the previous version page. This is the Cards button2.alt.tag text',
+  },
+
+});
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 241e25c74..bccd49d0c 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -228,7 +228,7 @@
     "description": "Navigate to the about page. This is Title in nav header"
   },
   "common.pages.header.tsd": {
-    "defaultMessage": "Technical Support Document",
+    "defaultMessage": "Previous versions",
     "description": "Navigate to the about page. This is Header navigate item to the technical support document page"
   },
   "common.pages.tsd.url": {
@@ -2131,6 +2131,30 @@
     "defaultMessage": "Page not found",
     "description": "page not found title text"
   },
+  "previous.versions.page.body.text": {
+    "defaultMessage": "The beta version of the methodology and data was used during the public beta period to get feedback on the tool from {betaDate} - {releaseDate}",
+    "description": "Navigate to the previous version page. This is the Cards body text"
+  },
+  "previous.versions.page.button1.alt.tag.text": {
+    "defaultMessage": "a button that allows to download the data and documentation to the tool",
+    "description": "Navigate to the previous version page. This is the Cards button1.alt.tag text"
+  },
+  "previous.versions.page.button1.text": {
+    "defaultMessage": "Data & documentation",
+    "description": "Navigate to the previous version page. This is the Cards button1 text"
+  },
+  "previous.versions.page.button2.alt.tag.text": {
+    "defaultMessage": "a button that allows to download the shapefile and codebook to the tool",
+    "description": "Navigate to the previous version page. This is the Cards button2.alt.tag text"
+  },
+  "previous.versions.page.button2.text": {
+    "defaultMessage": "Shapefile & codebook",
+    "description": "Navigate to the previous version page. This is the Cards button2 text"
+  },
+  "previous.versions.page.title.text": {
+    "defaultMessage": "Beta version",
+    "description": "Navigate to the previous version page. This is the Cards title text"
+  },
   "public.eng.page.button.img.alt.tag": {
     "defaultMessage": "an icon that represents a calendar",
     "description": "Navigate to the public engagement page, this will be the public engagement button icon alt tag text"
diff --git a/client/src/pages/downloads.tsx b/client/src/pages/downloads.tsx
index f93a00c0d..9182f80ee 100644
--- a/client/src/pages/downloads.tsx
+++ b/client/src/pages/downloads.tsx
@@ -1,11 +1,12 @@
 import * as React from 'react';
-import {Grid} from '@trussworks/react-uswds';
 import {useIntl} from 'gatsby-plugin-intl';
+import {Grid} from '@trussworks/react-uswds';
+import {useWindowSize} from 'react-use';
 
 import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
+import PublicEngageButton from '../components/PublicEngageButton';
 import SubPageNav from '../components/SubPageNav';
-import {useWindowSize} from 'react-use';
 
 import * as DOWNLOADS_COPY from '../data/copy/downloads';
 import * as CONSTANTS from '../data/constants';
@@ -24,6 +25,7 @@ const DownloadsPage = ({location}: IDownloadsPageProps) => {
 
         <section className={'page-heading'}>
           <h1>{intl.formatMessage(DOWNLOADS_COPY.PAGE_INTRO.PAGE_HEADING1)}</h1>
+          <PublicEngageButton />
         </section>
 
         <Grid row gap className={'j40-mb5-mt3'}>
@@ -63,6 +65,7 @@ const DownloadsPage = ({location}: IDownloadsPageProps) => {
               endPoints={[
                 CONSTANTS.PAGES_ENDPOINTS.METHODOLOGY,
                 CONSTANTS.PAGES_ENDPOINTS.DOWNLOADS,
+                CONSTANTS.PAGES_ENDPOINTS.PREVIOUS_VERSIONS,
               ]}
             />
           </Grid> : ''}
diff --git a/client/src/pages/frequently-asked-questions.tsx b/client/src/pages/frequently-asked-questions.tsx
index 0741727d1..07fd18dea 100644
--- a/client/src/pages/frequently-asked-questions.tsx
+++ b/client/src/pages/frequently-asked-questions.tsx
@@ -6,6 +6,7 @@ import {useWindowSize} from 'react-use';
 
 import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
+import PublicEngageButton from '../components/PublicEngageButton';
 import SubPageNav from '../components/SubPageNav';
 
 import * as CONSTANTS from '../data/constants';
@@ -223,7 +224,11 @@ const FAQPage = ({location}: IFAQPageProps) => {
     <Layout location={location} title={intl.formatMessage(FAQS_COPY.PAGE_INTRO.PAGE_TILE)}>
 
       <J40MainGridContainer>
-        <h1>{intl.formatMessage(FAQS_COPY.PAGE_INTRO.PAGE_TILE)}</h1>
+
+        <section className={'page-heading'}>
+          <h1>{intl.formatMessage(FAQS_COPY.PAGE_INTRO.PAGE_TILE)}</h1>
+          <PublicEngageButton />
+        </section>
 
         <Grid row gap className={'j40-mb5-mt3'}>
 
diff --git a/client/src/pages/methodology.tsx b/client/src/pages/methodology.tsx
index b9970f222..697f61014 100644
--- a/client/src/pages/methodology.tsx
+++ b/client/src/pages/methodology.tsx
@@ -66,6 +66,7 @@ const IndexPage = ({location}: MethodPageProps) => {
               endPoints={[
                 PAGES_ENDPOINTS.METHODOLOGY,
                 PAGES_ENDPOINTS.DOWNLOADS,
+                PAGES_ENDPOINTS.PREVIOUS_VERSIONS,
               ]}
             />
           </Grid> : ''}
diff --git a/client/src/pages/previous-versions.tsx b/client/src/pages/previous-versions.tsx
new file mode 100644
index 000000000..9dca3be1c
--- /dev/null
+++ b/client/src/pages/previous-versions.tsx
@@ -0,0 +1,92 @@
+import * as React from 'react';
+import {useIntl} from 'gatsby-plugin-intl';
+import {useWindowSize} from 'react-use';
+
+import {Card, CardBody, CardFooter, CardHeader, Grid} from '@trussworks/react-uswds';
+import DownloadButton from '../components/DownloadButton';
+import J40MainGridContainer from '../components/J40MainGridContainer';
+import Layout from '../components/layout';
+import PublicEngageButton from '../components/PublicEngageButton';
+import SubPageNav from '../components/SubPageNav';
+
+import * as PREV_VER_COPY from '../data/copy/previousVer';
+import * as CONSTANTS from '../data/constants';
+import {PAGES_ENDPOINTS} from '../data/constants';
+
+interface IPreviousVersionsProps {
+  location: Location;
+}
+
+const containerStyle = {
+  marginTop: `1.2rem`,
+};
+
+// markup
+const PreviousVersions = ({location}: IPreviousVersionsProps) => {
+  const intl = useIntl();
+  const {width} = useWindowSize();
+
+  return (
+    <Layout location={location} title={intl.formatMessage(PREV_VER_COPY.PAGE.TITLE)}>
+
+      <J40MainGridContainer>
+
+        <section className={'page-heading'}>
+          <h1 data-cy={'about-page-heading'}>{intl.formatMessage(PREV_VER_COPY.PAGE.TITLE)}</h1>
+          <PublicEngageButton />
+        </section>
+
+        <Grid row gap className={'j40-mb5-mt3'}>
+
+          {/* First column */}
+          <Grid col={12} tablet={{col: 8}}>
+            <section style={containerStyle}>
+              <ul>
+                <Card className={'previous-versions-container'} gridLayout={{tablet: {col: 6}}}>
+                  <CardHeader>
+                    <h2 className="usa-card__heading">{PREV_VER_COPY.CARD.TITLE}</h2>
+                  </CardHeader>
+                  <CardBody>
+                    <p> {PREV_VER_COPY.CARD.BODY}</p>
+                  </CardBody>
+                  <CardFooter>
+                    <DownloadButton
+                      downloadLink=''
+                      buttonText={intl.formatMessage(PREV_VER_COPY.BUTTON.TITLE1)}
+                      imageAltTagText={intl.formatMessage(PREV_VER_COPY.BUTTON.BUTTON1_ALT_TAG)}
+                    />
+                    <DownloadButton
+                      downloadLink=''
+                      buttonText={intl.formatMessage(PREV_VER_COPY.BUTTON.TITLE2)}
+                      imageAltTagText={intl.formatMessage(PREV_VER_COPY.BUTTON.BUTTON2_ALT_TAG)}
+                    />
+                  </CardFooter>
+                </Card>
+              </ul>
+            </section>
+          </Grid>
+
+          {/* Second column */}
+          <Grid col={12} tablet={{col: 1}}>
+            {/* Spacer column */}
+          </Grid>
+
+          {/* Third column */}
+          {width > CONSTANTS.USWDS_BREAKPOINTS.DESKTOP ?
+          <Grid col={12} tablet={{col: 3}}>
+            <SubPageNav
+              activeSubPageIndex={2}
+              endPoints={[
+                PAGES_ENDPOINTS.METHODOLOGY,
+                PAGES_ENDPOINTS.DOWNLOADS,
+                PAGES_ENDPOINTS.PREVIOUS_VERSIONS,
+              ]}
+            />
+          </Grid> : ''}
+        </Grid>
+
+      </J40MainGridContainer>
+    </Layout>);
+};
+
+export default PreviousVersions;
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index eaf9720a6..ee130de81 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -270,6 +270,16 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       Downloads
                     </a>
                   </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-previous-versions"
+                      href="/en/previous-versions"
+                    >
+                      Previous versions
+                    </a>
+                  </li>
                 </ul>
               </li>
               <li
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index 1b739478f..be29acf08 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -270,6 +270,16 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       Downloads
                     </a>
                   </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-previous-versions"
+                      href="/en/previous-versions"
+                    >
+                      Previous versions
+                    </a>
+                  </li>
                 </ul>
               </li>
               <li
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index 0c0111ab1..888b4ff4d 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -270,6 +270,16 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       Downloads
                     </a>
                   </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-previous-versions"
+                      href="/en/previous-versions"
+                    >
+                      Previous versions
+                    </a>
+                  </li>
                 </ul>
               </li>
               <li
@@ -377,6 +387,27 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <h1>
           Downloads
         </h1>
+        <div>
+          <a
+            href="/en/public-engagement"
+          >
+            <button
+              class="usa-button"
+              data-testid="button"
+              type="button"
+            >
+              <div>
+                <img
+                  alt="an icon that represents a calendar"
+                  src="test-file-stub"
+                />
+                <div>
+                  Public engagement
+                </div>
+              </div>
+            </button>
+          </a>
+        </div>
       </section>
       <div
         class="grid-row grid-gap j40-mb5-mt3"
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 418623cc8..729c2b436 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -270,6 +270,16 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       Downloads
                     </a>
                   </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-previous-versions"
+                      href="/en/previous-versions"
+                    >
+                      Previous versions
+                    </a>
+                  </li>
                 </ul>
               </li>
               <li
@@ -371,9 +381,34 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       class="grid-container-desktop-lg"
       data-testid="gridContainer"
     >
-      <h1>
-        Frequently asked questions
-      </h1>
+      <section
+        class="page-heading"
+      >
+        <h1>
+          Frequently asked questions
+        </h1>
+        <div>
+          <a
+            href="/en/public-engagement"
+          >
+            <button
+              class="usa-button"
+              data-testid="button"
+              type="button"
+            >
+              <div>
+                <img
+                  alt="an icon that represents a calendar"
+                  src="test-file-stub"
+                />
+                <div>
+                  Public engagement
+                </div>
+              </div>
+            </button>
+          </a>
+        </div>
+      </section>
       <div
         class="grid-row grid-gap j40-mb5-mt3"
         data-testid="grid"
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index c2a6c5cfe..c2e8e6d64 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -270,6 +270,16 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       Downloads
                     </a>
                   </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-previous-versions"
+                      href="/en/previous-versions"
+                    >
+                      Previous versions
+                    </a>
+                  </li>
                 </ul>
               </li>
               <li
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index b9ac5a6b3..a495ee8e8 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -270,6 +270,16 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       Downloads
                     </a>
                   </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-previous-versions"
+                      href="/en/previous-versions"
+                    >
+                      Previous versions
+                    </a>
+                  </li>
                 </ul>
               </li>
               <li
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index 43a78835c..67874fe1e 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -270,6 +270,16 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       Downloads
                     </a>
                   </li>
+                  <li
+                    class="usa-nav__submenu-item"
+                  >
+                    <a
+                      data-cy="nav-link-previous-versions"
+                      href="/en/previous-versions"
+                    >
+                      Previous versions
+                    </a>
+                  </li>
                 </ul>
               </li>
               <li
diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss
index 28bd03416..e128e4cb3 100644
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@@ -32,6 +32,7 @@ There are 3 things that should be included in this file:
   - PUBLIC EVENT STYLES
   - ABOUT CARD STYLES
   - SUMMARY BOX STYLES
+  - PREVIOUS VERSIONS STYLES
 */
 
 
@@ -506,4 +507,18 @@ button.usa-accordion__button[aria-expanded=true]:has(div[class*="disCategoryCont
 */
 .usa-summary-box__heading {
   @include u-margin-bottom(2);
+}
+
+/* 
+******************************
+*      PREVIOUS VERSIONS STYLES
+****************************** 
+*/
+
+.previous-versions-container {
+  list-style: none;
+}
+
+.previous-versions-container .usa-card__header, .usa-card__heading, .usa-card__body, .usa-card__footer {
+  font-family: "Source Sans Pro Web", "Helvetica Neue", "Helvetica", "Roboto", "Arial", "sans-serif" !important;
 }
\ No newline at end of file

From 7c6555de13de604f6364b585723160ca28dc3586 Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Tue, 18 Oct 2022 09:16:36 -0700
Subject: [PATCH 078/130] Initial Download page (#2021)

* Intial version of 1.0 download page

* fix a11y errors

* Update snapshots
---
 .../ReleaseUpdate/ReleaseUpdate.module.scss   |  45 +++++++
 .../ReleaseUpdate.module.scss.d.ts            |  18 +++
 .../ReleaseUpdate/ReleaseUpdate.test.tsx      |  15 +++
 .../ReleaseUpdate/ReleaseUpdate.tsx           | 116 ++++++++++++++++++
 .../__snapshots__/ReleaseUpdate.test.tsx.snap |  63 ++++++++++
 client/src/components/ReleaseUpdate/index.ts  |   2 +
 client/src/data/copy/downloads.tsx            |  84 +++++++++++--
 client/src/intl/en.json                       |  50 ++++++--
 client/src/pages/downloads.tsx                |   9 +-
 .../__snapshots__/downloads.test.tsx.snap     |  63 +++++++++-
 10 files changed, 445 insertions(+), 20 deletions(-)
 create mode 100644 client/src/components/ReleaseUpdate/ReleaseUpdate.module.scss
 create mode 100644 client/src/components/ReleaseUpdate/ReleaseUpdate.module.scss.d.ts
 create mode 100644 client/src/components/ReleaseUpdate/ReleaseUpdate.test.tsx
 create mode 100644 client/src/components/ReleaseUpdate/ReleaseUpdate.tsx
 create mode 100644 client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
 create mode 100644 client/src/components/ReleaseUpdate/index.ts

diff --git a/client/src/components/ReleaseUpdate/ReleaseUpdate.module.scss b/client/src/components/ReleaseUpdate/ReleaseUpdate.module.scss
new file mode 100644
index 000000000..636fabd7c
--- /dev/null
+++ b/client/src/components/ReleaseUpdate/ReleaseUpdate.module.scss
@@ -0,0 +1,45 @@
+@use '../../styles/design-system.scss' as *;
+
+.releaseUpdateComponent{
+
+    .releaseUpdateContainer{
+        @include u-margin-top(2);
+        @include u-padding(3);
+        border: 2px solid #9A9B99;
+        border-radius: 2px;
+
+        .releaseHeader{
+            font-size: x-large;
+            font-weight: 600;
+            @include u-margin-bottom(2);
+        }
+
+        .releaseSectionTitle{
+            font-size: large;
+            border-bottom: 2px solid #9A9B99;
+        }
+    }
+
+    .showHideText {
+        //remove styling of button
+        border: none;
+        background-color: white;
+
+        //emulate a link
+        cursor:pointer;
+        text-decoration:underline;
+
+        min-width: 45px;
+        padding-left: 0;
+    }
+
+    .showHideIcon{
+        vertical-align: middle;
+        height: 1rem;
+        filter: invert(8%) sepia(90%) saturate(7490%) hue-rotate(247deg) brightness(105%) contrast(143%);
+
+        &:hover{
+            cursor: pointer;
+        }
+    }
+}
diff --git a/client/src/components/ReleaseUpdate/ReleaseUpdate.module.scss.d.ts b/client/src/components/ReleaseUpdate/ReleaseUpdate.module.scss.d.ts
new file mode 100644
index 000000000..dfb22a92b
--- /dev/null
+++ b/client/src/components/ReleaseUpdate/ReleaseUpdate.module.scss.d.ts
@@ -0,0 +1,18 @@
+declare namespace ReleaseUpdateNamespace {
+    export interface IReleaseUpdateScss {
+      releaseUpdateComponent: string;
+      releaseUpdateContainer: string;
+      releaseSectionTitle:string;
+      releaseSectionBody:string;
+      releaseHeader: string;
+      showHideText: string;
+      showHideIcon: string;
+    }
+  }
+
+declare const ReleaseUpdateScssModule: ReleaseUpdateNamespace.IReleaseUpdateScss & {
+    /** WARNING: Only available when "css-loader" is used without "style-loader" or "mini-css-extract-plugin" */
+    locals: ReleaseUpdateNamespace.IReleaseUpdateScss;
+  };
+
+  export = ReleaseUpdateScssModule;
diff --git a/client/src/components/ReleaseUpdate/ReleaseUpdate.test.tsx b/client/src/components/ReleaseUpdate/ReleaseUpdate.test.tsx
new file mode 100644
index 000000000..122aa7525
--- /dev/null
+++ b/client/src/components/ReleaseUpdate/ReleaseUpdate.test.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import {render} from '@testing-library/react';
+import {LocalizedComponent} from '../../test/testHelpers';
+import ReleaseUpdate from './ReleaseUpdate';
+
+describe('rendering of ReleaseUpdate Component', () => {
+  const {asFragment} = render(
+      <LocalizedComponent>
+        <ReleaseUpdate />
+      </LocalizedComponent>,
+  );
+  it('checks if component renders', () => {
+    expect(asFragment()).toMatchSnapshot();
+  });
+});
diff --git a/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx b/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx
new file mode 100644
index 000000000..e6631066c
--- /dev/null
+++ b/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx
@@ -0,0 +1,116 @@
+import React, {useState} from 'react';
+import {useIntl} from 'gatsby-plugin-intl';
+
+import * as styles from './ReleaseUpdate.module.scss';
+import * as DOWNLOAD_COPY from '../../data/copy/downloads';
+
+// @ts-ignore
+import expandIcon from '/node_modules/uswds/dist/img/usa-icons/expand_more.svg';
+// @ts-ignore
+import collapseIcon from '/node_modules/uswds/dist/img/usa-icons/expand_less.svg';
+
+export interface IReleaseUpdateProps {
+}
+
+interface IJ40AccordionItem {
+  id: string,
+  children: React.ReactElement
+}
+
+
+/**
+ * This function will create the custom Accordion item. This will be used
+ * for the race and age demographic UI elements
+ *
+ * @param {IJ40AccordionItem} props
+ * @return {JSX.Element}
+ */
+const J40AccordionItem = ({id, children}:IJ40AccordionItem) => {
+  const intl = useIntl();
+  const [isExpanded, setIsExpanded] = useState(false);
+  return (
+    <>
+      <span>
+        {intl.formatMessage(DOWNLOAD_COPY.PAGE_INTRO.VIEW)}{' '}
+        <a
+          className={styles.showHideText ? `usa-link ${styles.showHideText}` : `usa-link`}
+          href={'javascript:void(0)'}
+          id={`${id}-header`}
+          aria-controls={`${id}-panel`}
+          // aria-expanded={isExpanded}
+          onClick={() => setIsExpanded(!isExpanded)}
+          tabIndex={0}
+        >
+          {intl.formatMessage(DOWNLOAD_COPY.PAGE_INTRO.CHANGE_LOG)}
+        </a>
+        { isExpanded ?
+          <img
+            className={styles.showHideIcon}
+            src={collapseIcon}
+            alt={'collapse icon'}
+            onClick={() => setIsExpanded(!isExpanded)}
+          /> :
+          <img
+            className={styles.showHideIcon}
+            src={expandIcon}
+            alt={'expand icon'}
+            onClick={() => setIsExpanded(!isExpanded)}
+          />
+        }
+      </span>
+
+      <section
+        id={`${id}-panel`}
+        aria-labelledby={`${id}-header`}
+        hidden={!isExpanded}
+        className={styles.releaseUpdateContainer}
+      >{children}
+      </section>
+    </>
+  );
+};
+
+const ReleaseUpdate = ({}: IReleaseUpdateProps) => {
+  return (
+    <div className={styles.releaseUpdateComponent}>
+      <J40AccordionItem id={'releaseUpdate'}>
+        <div>
+
+          <div className={styles.releaseHeader}>
+            {DOWNLOAD_COPY.RELEASE.UPDATE_1}
+          </div>
+
+          <div className={styles.releaseSectionTitle}>
+            {DOWNLOAD_COPY.RELEASE.SECTION1}
+          </div>
+
+          <div className={styles.releaseSectionBody}>
+            <ul>
+              <li>{DOWNLOAD_COPY.RELEASE.SECTION1_P1}</li>
+              <ul>
+                <li>{DOWNLOAD_COPY.RELEASE.SECTION1_P1_1}</li>
+              </ul>
+            </ul>
+          </div>
+
+          <div className={styles.releaseSectionTitle}>
+            {DOWNLOAD_COPY.RELEASE.SECTION2}
+          </div>
+
+          <div className={styles.releaseSectionBody}>
+            <ul>
+              <li>{DOWNLOAD_COPY.RELEASE.SECTION2_P1}</li>
+            </ul>
+          </div>
+
+          <div>
+            {DOWNLOAD_COPY.RELEASE.FOOTER}
+          </div>
+
+        </div>
+      </J40AccordionItem>
+    </div>
+  );
+};
+
+export default ReleaseUpdate;
diff --git a/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
new file mode 100644
index 000000000..ec382bcf1
--- /dev/null
+++ b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
@@ -0,0 +1,63 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`rendering of ReleaseUpdate Component checks if component renders 1`] = `
+<DocumentFragment>
+  <div>
+    <span>
+      View 
+      <a
+        aria-controls="releaseUpdate-panel"
+        class="usa-link"
+        href="javascript:void(0)"
+        id="releaseUpdate-header"
+        tabindex="0"
+      >
+        change log
+      </a>
+      <img
+        alt="expand icon"
+        src="test-file-stub"
+      />
+    </span>
+    <section
+      aria-labelledby="releaseUpdate-header"
+      hidden=""
+      id="releaseUpdate-panel"
+    >
+      <div>
+        <div>
+          Release update - Oct 25, 2022
+        </div>
+        <div>
+          New & improved
+        </div>
+        <div>
+          <ul>
+            <li>
+              Updates to the methodology based on feedback recieved during the beta period.
+            </li>
+            <ul>
+              <li>
+                Additional data sources now available for Puerto Rico. Linguistic isolation as removed from the methodology for Puerto Rico.
+              </li>
+            </ul>
+          </ul>
+        </div>
+        <div>
+          Fixes
+        </div>
+        <div>
+          <ul>
+            <li>
+              Fixed an issue with zoom and select to show census boundaries at a higher zoom level.
+            </li>
+          </ul>
+        </div>
+        <div>
+          release version 1.0
+        </div>
+      </div>
+    </section>
+  </div>
+</DocumentFragment>
+`;
diff --git a/client/src/components/ReleaseUpdate/index.ts b/client/src/components/ReleaseUpdate/index.ts
new file mode 100644
index 000000000..78f536b12
--- /dev/null
+++ b/client/src/components/ReleaseUpdate/index.ts
@@ -0,0 +1,2 @@
+import ReleaseUpdate from './ReleaseUpdate';
+export default ReleaseUpdate;
diff --git a/client/src/data/copy/downloads.tsx b/client/src/data/copy/downloads.tsx
index 9c3586b07..72e1df532 100644
--- a/client/src/data/copy/downloads.tsx
+++ b/client/src/data/copy/downloads.tsx
@@ -1,8 +1,9 @@
 /* eslint-disable max-len */
 import React from 'react';
 import {defineMessages} from 'react-intl';
-import {FormattedMessage, FormattedNumber} from 'gatsby-plugin-intl';
+import {FormattedDate, FormattedMessage, FormattedNumber} from 'gatsby-plugin-intl';
 import * as COMMON_COPY from './common';
+import {VERSION_NUMBER} from './methodology';
 
 export const PAGE_INTRO = defineMessages({
   PAGE_TILE: {
@@ -15,15 +16,15 @@ export const PAGE_INTRO = defineMessages({
     defaultMessage: 'Downloads',
     description: 'Navigate to the Downloads page, this will be the page heading1 text',
   },
-  PAGE_HEADING2: {
-    id: 'downloads.page.heading2.text',
-    defaultMessage: 'File formats',
-    description: 'Navigate to the Downloads page, this will be the page heading2 text',
+  VIEW: {
+    id: 'downloads.page.view.text',
+    defaultMessage: 'View',
+    description: 'Navigate to the Downloads page, this will be the view of change log',
   },
-  PAGE_DESCRIPTION1: {
-    id: 'downloads.page.description1.text',
-    defaultMessage: 'The dataset used in the tool, along with a data dictionary and information about how to use the list of communities (.pdf) are available in the following file formats:',
-    description: 'Navigate to the Downloads page, this will be the page description1 text',
+  CHANGE_LOG: {
+    id: 'downloads.page.change.log.text',
+    defaultMessage: 'change log',
+    description: 'Navigate to the Downloads page, this will be the view of change log',
   },
 });
 
@@ -83,7 +84,72 @@ export const getDownloadIconAltTag = () => defineMessages({
   },
 });
 
+export const RELEASE = {
+  UPDATE_1: <FormattedMessage
+    id={'download.page.release.update.title.1'}
+    defaultMessage={`Release update - {date}`}
+    description={'Navigate to the download page. This is first download file link'}
+    values={{
+      date: <FormattedDate
+        value={COMMON_COPY.METH_1_0_RELEASE_DATE}
+        year="numeric"
+        month="short"
+        day="numeric"
+      />,
+    }}
+  />,
+  SECTION1: <FormattedMessage
+    id={'download.page.release.update.section.1'}
+    defaultMessage={`New & improved`}
+    description={'Navigate to the download page. This is first section of the release update section'}
+  />,
+  SECTION1_P1: <FormattedMessage
+    id={'download.page.release.update.section.1.p.1'}
+    defaultMessage={`Updates to the methodology based on feedback recieved during the beta period.`}
+    description={'Navigate to the download page. This is first section of the release update section'}
+  />,
+  SECTION1_P1_1: <FormattedMessage
+    id={'download.page.release.update.section.1.p.1.1'}
+    defaultMessage={`Additional data sources now available for Puerto Rico. Linguistic isolation as removed from the methodology for Puerto Rico.`}
+    description={'Navigate to the download page. This is first section of the release update section'}
+  />,
+  SECTION2: <FormattedMessage
+    id={'download.page.release.update.section.2'}
+    defaultMessage={`Fixes`}
+    description={'Navigate to the download page. This is second section of the release update section'}
+  />,
+  SECTION2_P1: <FormattedMessage
+    id={'download.page.release.update.section.2.p1'}
+    defaultMessage={`Fixed an issue with zoom and select to show census boundaries at a higher zoom level.`}
+    description={'Navigate to the download page. This is second section of the release update section'}
+  />,
+  FOOTER: <FormattedMessage
+    id={'download.page.release.update.footer'}
+    defaultMessage={`release version {version}`}
+    description={'Navigate to the download page. This is second section of the release update section'}
+    values={{
+      version: VERSION_NUMBER,
+    }}
+  />,
+};
+
 export const DOWNLOAD_LINKS = {
+  TITLE: <FormattedMessage
+    id={'download.page.files.section.title'}
+    defaultMessage={`Version {version} file formats`}
+    description={'Navigate to the download page. This is first download file link'}
+    values={{
+      version: VERSION_NUMBER,
+    }}
+  />,
+  TEXT: <FormattedMessage
+    id={'downloads.page.files.section.text'}
+    defaultMessage={ 'The dataset used in the {version} version of the tool, along with a codebook, and information about how to use the list of communities (.pdf) are available for download:'}
+    description={ 'Navigate to the Downloads page, this will be the page description1 text'}
+    values={{
+      version: VERSION_NUMBER,
+    }}
+  />,
   LINK1: <FormattedMessage
     id={'download.page.download.file.1'}
     defaultMessage={`
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index bccd49d0c..c25cbd7a8 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -303,26 +303,62 @@
     "defaultMessage": "<link5>How to use the list of communities</link5> (.pdf {howToCommFileSize})",
     "description": "Navigate to the download page. This is fifth download file link"
   },
-  "downloads.page.description1.text": {
-    "defaultMessage": "The dataset used in the tool, along with a data dictionary and information about how to use the list of communities (.pdf) are available in the following file formats:",
-    "description": "Navigate to the Downloads page, this will be the page description1 text"
+  "download.page.files.section.title": {
+    "defaultMessage": "Version {version} file formats",
+    "description": "Navigate to the download page. This is first download file link"
+  },
+  "download.page.release.update.footer": {
+    "defaultMessage": "release version {version}",
+    "description": "Navigate to the download page. This is second section of the release update section"
+  },
+  "download.page.release.update.section.1": {
+    "defaultMessage": "New & improved",
+    "description": "Navigate to the download page. This is first section of the release update section"
+  },
+  "download.page.release.update.section.1.p.1": {
+    "defaultMessage": "Updates to the methodology based on feedback recieved during the beta period.",
+    "description": "Navigate to the download page. This is first section of the release update section"
+  },
+  "download.page.release.update.section.1.p.1.1": {
+    "defaultMessage": "Additional data sources now available for Puerto Rico. Linguistic isolation as removed from the methodology for Puerto Rico.",
+    "description": "Navigate to the download page. This is first section of the release update section"
+  },
+  "download.page.release.update.section.2": {
+    "defaultMessage": "Fixes",
+    "description": "Navigate to the download page. This is second section of the release update section"
+  },
+  "download.page.release.update.section.2.p1": {
+    "defaultMessage": "Fixed an issue with zoom and select to show census boundaries at a higher zoom level.",
+    "description": "Navigate to the download page. This is second section of the release update section"
+  },
+  "download.page.release.update.title.1": {
+    "defaultMessage": "Release update - {date}",
+    "description": "Navigate to the download page. This is first download file link"
+  },
+  "downloads.page.change.log.text": {
+    "defaultMessage": "change log",
+    "description": "Navigate to the Downloads page, this will be the view of change log"
   },
   "downloads.page.download.icon.alt.tag": {
     "defaultMessage": "The icon used to indicate that the file is downloadable",
     "description": "Navigate to the Downloads page, this is the icon used to indicate that the file is downloadable"
   },
+  "downloads.page.files.section.text": {
+    "defaultMessage": "The dataset used in the {version} version of the tool, along with a codebook, and information about how to use the list of communities (.pdf) are available for download:",
+    "description": "Navigate to the Downloads page, this will be the page description1 text"
+  },
   "downloads.page.heading1.text": {
     "defaultMessage": "Downloads",
     "description": "Navigate to the Downloads page, this will be the page heading1 text"
   },
-  "downloads.page.heading2.text": {
-    "defaultMessage": "File formats",
-    "description": "Navigate to the Downloads page, this will be the page heading2 text"
-  },
   "downloads.page.title.text": {
     "defaultMessage": "Downloads",
     "description": "Navigate to the Downloads page, this will be the page title text"
   },
+  "downloads.page.view.text": {
+    "defaultMessage": "View",
+    "description": "Navigate to the Downloads page, this will be the view of change log"
+  },
   "explore.map.page.description.1": {
     "defaultMessage": "Census tracts that are overburdened and underserved census tracts are highlighted as being disadvantaged on the map. These include Federally-Recognized Tribal lands, including Alaska Native Villages.",
     "description": "On the explore the map page, the first description of the page"
diff --git a/client/src/pages/downloads.tsx b/client/src/pages/downloads.tsx
index 9182f80ee..9bbe532f7 100644
--- a/client/src/pages/downloads.tsx
+++ b/client/src/pages/downloads.tsx
@@ -6,6 +6,7 @@ import {useWindowSize} from 'react-use';
 import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
 import PublicEngageButton from '../components/PublicEngageButton';
+import ReleaseUpdate from '../components/ReleaseUpdate';
 import SubPageNav from '../components/SubPageNav';
 
 import * as DOWNLOADS_COPY from '../data/copy/downloads';
@@ -31,9 +32,13 @@ const DownloadsPage = ({location}: IDownloadsPageProps) => {
         <Grid row gap className={'j40-mb5-mt3'}>
 
           <Grid col={12} tablet={{col: 8}}>
-            <h2>{intl.formatMessage(DOWNLOADS_COPY.PAGE_INTRO.PAGE_HEADING2)}</h2>
+            <section>
+              <ReleaseUpdate />
+            </section>
+
+            <h2>{DOWNLOADS_COPY.DOWNLOAD_LINKS.TITLE}</h2>
             <p>
-              {intl.formatMessage(DOWNLOADS_COPY.PAGE_INTRO.PAGE_DESCRIPTION1)}
+              {DOWNLOADS_COPY.DOWNLOAD_LINKS.TEXT}
             </p>
             <p>
               {DOWNLOADS_COPY.DOWNLOAD_LINKS.LINK1}
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index 888b4ff4d..bf31f396b 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -417,11 +417,70 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           class="grid-col-12 tablet:grid-col-8"
           data-testid="grid"
         >
+          <section>
+            <div>
+              <span>
+                View 
+                <a
+                  aria-controls="releaseUpdate-panel"
+                  class="usa-link"
+                  href="javascript:void(0)"
+                  id="releaseUpdate-header"
+                  tabindex="0"
+                >
+                  change log
+                </a>
+                <img
+                  alt="expand icon"
+                  src="test-file-stub"
+                />
+              </span>
+              <section
+                aria-labelledby="releaseUpdate-header"
+                hidden=""
+                id="releaseUpdate-panel"
+              >
+                <div>
+                  <div>
+                    Release update - Oct 25, 2022
+                  </div>
+                  <div>
+                    New & improved
+                  </div>
+                  <div>
+                    <ul>
+                      <li>
+                        Updates to the methodology based on feedback recieved during the beta period.
+                      </li>
+                      <ul>
+                        <li>
+                          Additional data sources now available for Puerto Rico. Linguistic isolation as removed from the methodology for Puerto Rico.
+                        </li>
+                      </ul>
+                    </ul>
+                  </div>
+                  <div>
+                    Fixes
+                  </div>
+                  <div>
+                    <ul>
+                      <li>
+                        Fixed an issue with zoom and select to show census boundaries at a higher zoom level.
+                      </li>
+                    </ul>
+                  </div>
+                  <div>
+                    release version 1.0
+                  </div>
+                </div>
+              </section>
+            </div>
+          </section>
           <h2>
-            File formats
+            Version 1.0 file formats
           </h2>
           <p>
-            The dataset used in the tool, along with a data dictionary and information about how to use the list of communities (.pdf) are available in the following file formats:
+            The dataset used in the 1.0 version of the tool, along with a codebook, and information about how to use the list of communities (.pdf) are available for download:
           </p>
           <p>
             

From a4c9d84c9943653d21dd0463c43adb66a4fb4767 Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Wed, 19 Oct 2022 16:08:21 -0700
Subject: [PATCH 079/130] FRT copy update, isDAC to use SN_C and new base map
 of custom colors + updated tribal names (#2029)

* Update FRT copy in isDAC copy in side panel

* Update base map
- custom colors + updated tribal names
- closes #2005

* Update isDAC logic to use SN_C

- update component props
- update test cases
- closes #2024

* Update snapshots
---
 .../src/components/AreaDetail/AreaDetail.tsx  |   5 +-
 client/src/components/J40Map.tsx              |   4 +-
 .../PrioritizationCopy2.test.tsx              |   4 +-
 .../PrioritizationCopy2.test.tsx.snap         |   8 +-
 .../TractPrioritization.test.tsx              |  80 +----
 .../TractPrioritization.tsx                   |  22 +-
 .../TractPrioritization.test.tsx.snap         | 312 +-----------------
 client/src/data/constants.tsx                 |   2 +
 client/src/data/copy/explore.tsx              |   8 +-
 client/src/intl/en.json                       |   4 +-
 10 files changed, 52 insertions(+), 397 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 464bc106b..4836e4a44 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -803,9 +803,8 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
         {/* YES, NO or PARTIALLY disadvantaged  */}
         <div className={styles.communityOfFocus}>
           <TractPrioritization
-            totalCategoriesPrioritized={properties[constants.COUNT_OF_CATEGORIES_DISADV]}
-            isAdjacencyThreshMet={properties[constants.ADJACENCY_EXCEEDS_THRESH]}
-            isAdjacencyLowIncome={properties[constants.ADJACENCY_LOW_INCOME_EXCEEDS_THRESH]}
+            scoreNCommunities={properties[constants.SCORE_N_COMMUNITIES] === true ?
+              properties[constants.SCORE_N_COMMUNITIES] : false}
             tribalCountAK={properties[constants.TRIBAL_AREAS_COUNT_AK] >= 1 ?
               properties[constants.TRIBAL_AREAS_COUNT_AK] : null}
             tribalCountUS={properties[constants.TRIBAL_AREAS_COUNT_CONUS] >= 1 ?
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index bfa876534..675428f3e 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -304,7 +304,7 @@ const J40Map = ({location}: IJ40Interface) => {
   };
 
   const mapBoxBaseLayer = {
-    streetsWithTribal: `mapbox://styles/justice40/cl2qimpi2000014qeb1egpox8`,
+    customColorsWithUpdatedTribal: `mapbox://styles/justice40/cl9g30qh7000p15l9cp1ftw16`,
     streetsWithUpdatedTribal: `mapbox://styles/justice40/cl98rlidr002c14obpsvz6zzs`,
   };
 
@@ -348,7 +348,7 @@ const J40Map = ({location}: IJ40Interface) => {
           // http://visgl.github.io/react-map-gl/docs/api-reference/interactive-map#map-state
           {...viewport}
           mapStyle={process.env.MAPBOX_STYLES_READ_TOKEN ?
-            mapBoxBaseLayer.streetsWithUpdatedTribal : getOSBaseMap()}
+            mapBoxBaseLayer.customColorsWithUpdatedTribal : getOSBaseMap()}
           width="100%"
           // Ajusting this height with a conditional statement will not render the map on staging.
           // The reason for this issue is unknown. Consider styling the parent container via SASS.
diff --git a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.test.tsx b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.test.tsx
index 6d26e57ee..652e65b9c 100644
--- a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.test.tsx
+++ b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.test.tsx
@@ -14,7 +14,7 @@ describe('rendering of PrioritizationCopy2 Component', () => {
       tribalCountUS: null,
       percentTractTribal: 2,
       // eslint-disable-next-line max-len
-      para1: `The 2% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+      para1: `The Federally-Recognized Tribal lands that cover 2% of this tract are also considered disadvantaged.`,
     },
     {
       totalCategoriesPrioritized: 0,
@@ -25,7 +25,7 @@ describe('rendering of PrioritizationCopy2 Component', () => {
       tribalCountUS: 3,
       percentTractTribal: 4,
       // eslint-disable-next-line max-len
-      para1: `The 4% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.`,
+      para1: `The Federally-Recognized Tribal lands that cover 4% of this tract are also considered disadvantaged.`,
     },
   ];
 
diff --git a/client/src/components/PrioritizationCopy2/__snapshots__/PrioritizationCopy2.test.tsx.snap b/client/src/components/PrioritizationCopy2/__snapshots__/PrioritizationCopy2.test.tsx.snap
index dc0c0ea92..01c77615c 100644
--- a/client/src/components/PrioritizationCopy2/__snapshots__/PrioritizationCopy2.test.tsx.snap
+++ b/client/src/components/PrioritizationCopy2/__snapshots__/PrioritizationCopy2.test.tsx.snap
@@ -1,17 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`rendering of PrioritizationCopy2 Component checks if component renders The 2% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged. when totCats = 0, totBurds = 0, isAdj = true, isAdjLI = true, tribal % = 2, 1`] = `
+exports[`rendering of PrioritizationCopy2 Component checks if component renders The Federally-Recognized Tribal lands that cover 2% of this tract are also considered disadvantaged. when totCats = 0, totBurds = 0, isAdj = true, isAdjLI = true, tribal % = 2, 1`] = `
 <DocumentFragment>
   <div>
-    The 2% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    The Federally-Recognized Tribal lands that cover 2% of this tract are also considered disadvantaged.
   </div>
 </DocumentFragment>
 `;
 
-exports[`rendering of PrioritizationCopy2 Component checks if component renders The 4% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged. when totCats = 0, totBurds = 1, isAdj = true, isAdjLI = true, tribal % = 4, 1`] = `
+exports[`rendering of PrioritizationCopy2 Component checks if component renders The Federally-Recognized Tribal lands that cover 4% of this tract are also considered disadvantaged. when totCats = 0, totBurds = 1, isAdj = true, isAdjLI = true, tribal % = 4, 1`] = `
 <DocumentFragment>
   <div>
-    The 4% of this tract that are Federally-Recognized Tribal lands are also considered disadvantaged.
+    The Federally-Recognized Tribal lands that cover 4% of this tract are also considered disadvantaged.
   </div>
 </DocumentFragment>
 `;
diff --git a/client/src/components/TractPrioritization/TractPrioritization.test.tsx b/client/src/components/TractPrioritization/TractPrioritization.test.tsx
index d1822cc0d..adfe3c6b3 100644
--- a/client/src/components/TractPrioritization/TractPrioritization.test.tsx
+++ b/client/src/components/TractPrioritization/TractPrioritization.test.tsx
@@ -5,79 +5,29 @@ import TractPrioritization from './TractPrioritization';
 
 describe('rendering of TractPrioritization Component', () => {
   const testCases = [
-    // total categories >= 1 all other are don't care
-    {totCats: 1, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: null, percentTribal: null, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: null, percentTribal: 0, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: null, percentTribal: .45, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: 1, percentTribal: null, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: 2, percentTribal: 0, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: 3, percentTribal: .45, isDAC: 'YES'},
-
-    {totCats: 1, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: null, percentTribal: null, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: null, percentTribal: 0, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: null, percentTribal: .45, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: 1, percentTribal: null, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: 2, percentTribal: 0, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: 3, percentTribal: .45, isDAC: 'YES'},
-
-    {totCats: 1, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: null, percentTribal: null, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: null, percentTribal: 0, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: null, percentTribal: .45, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: 1, percentTribal: null, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: 2, percentTribal: 0, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: 3, percentTribal: .45, isDAC: 'YES'},
-
-    {totCats: 1, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: null, percentTribal: null, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: null, percentTribal: 0, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: null, percentTribal: .45, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: 1, percentTribal: null, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: 2, percentTribal: 0, isDAC: 'YES'},
-    {totCats: 1, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: 3, percentTribal: .45, isDAC: 'YES'},
-
-    // Total categories == 0, while Adjacency index = True and Adjacency low income = True
-    {totCats: 0, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: null, percentTribal: null, isDAC: 'YES'},
-    {totCats: 0, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: null, percentTribal: 0, isDAC: 'YES'},
-    {totCats: 0, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: null, percentTribal: .13, isDAC: 'YES'},
-    {totCats: 0, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: 1, percentTribal: null, isDAC: 'YES'},
-    {totCats: 0, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: 2, percentTribal: 0, isDAC: 'YES'},
-    {totCats: 0, ADJ_ET: true, AJDLI_ET: true, tribalCountAK: 3, percentTribal: .13, isDAC: 'YES'},
-
-    // Total categories == 0, while Adjacency index = True and Adjacency low income = False
-    {totCats: 0, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: null, percentTribal: null, isDAC: 'No'},
-    {totCats: 0, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: null, percentTribal: 0, isDAC: 'Partially'},
-    {totCats: 0, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: null, percentTribal: .13, isDAC: 'Partially'},
-    {totCats: 0, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: 1, percentTribal: null, isDAC: 'Partially'},
-    {totCats: 0, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: 2, percentTribal: 0, isDAC: 'Partially'},
-    {totCats: 0, ADJ_ET: true, AJDLI_ET: false, tribalCountAK: 3, percentTribal: .13, isDAC: 'Partially'},
-
-    // Total categories == 0, while Adjacency index = False and Adjacency low income = True
-    {totCats: 0, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: null, percentTribal: null, isDAC: 'No'},
-    {totCats: 0, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: null, percentTribal: 0, isDAC: 'Partially'},
-    {totCats: 0, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: null, percentTribal: .13, isDAC: 'Partially'},
-    {totCats: 0, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: 1, percentTribal: null, isDAC: 'Partially'},
-    {totCats: 0, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: 2, percentTribal: 0, isDAC: 'Partially'},
-    {totCats: 0, ADJ_ET: false, AJDLI_ET: true, tribalCountAK: 3, percentTribal: .13, isDAC: 'Partially'},
-
-    // Total categories == 0, while Adjacency index = False
-    {totCats: 0, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: null, percentTribal: null, isDAC: 'No'},
-    {totCats: 0, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: null, percentTribal: 0, isDAC: 'Partially'},
-    {totCats: 0, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: null, percentTribal: .13, isDAC: 'Partially'},
-    {totCats: 0, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: 1, percentTribal: null, isDAC: 'Partially'},
-    {totCats: 0, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: 2, percentTribal: 0, isDAC: 'Partially'},
-    {totCats: 0, ADJ_ET: false, AJDLI_ET: false, tribalCountAK: 3, percentTribal: .13, isDAC: 'Partially'},
-
+    {scoreNComm: true, tribalCountAK: null, percentTribal: null, isDAC: 'YES'},
+    {scoreNComm: true, tribalCountAK: null, percentTribal: 0, isDAC: 'YES'},
+    {scoreNComm: true, tribalCountAK: null, percentTribal: .45, isDAC: 'YES'},
+    {scoreNComm: true, tribalCountAK: 1, percentTribal: null, isDAC: 'YES'},
+    {scoreNComm: true, tribalCountAK: 2, percentTribal: 0, isDAC: 'YES'},
+    {scoreNComm: true, tribalCountAK: 3, percentTribal: .45, isDAC: 'YES'},
+
+    {scoreNComm: false, tribalCountAK: null, percentTribal: null, isDAC: 'No'},
+    {scoreNComm: false, tribalCountAK: null, percentTribal: 0, isDAC: 'Partially'},
+    {scoreNComm: false, tribalCountAK: null, percentTribal: .13, isDAC: 'Partially'},
+    {scoreNComm: false, tribalCountAK: 1, percentTribal: null, isDAC: 'Partially'},
+    {scoreNComm: false, tribalCountAK: 2, percentTribal: 0, isDAC: 'Partially'},
+    {scoreNComm: false, tribalCountAK: 3, percentTribal: .13, isDAC: 'Partially'},
 
   ];
 
   testCases.forEach((testCase) => {
     // eslint-disable-next-line max-len
-    it(`checks if component renders ${testCase.isDAC} when category count = ${testCase.totCats}, isAdjacency = ${testCase.ADJ_ET}, isAdjLowInc = ${testCase.AJDLI_ET}, tribal points in AK = ${testCase.tribalCountAK} tribal % = ${testCase.percentTribal}`, () => {
+    it(`checks if component renders ${testCase.isDAC} when score N communities = ${testCase.scoreNComm}, tribal points in AK = ${testCase.tribalCountAK} tribal % = ${testCase.percentTribal}`, () => {
       const {asFragment} = render(
           <LocalizedComponent>
             <TractPrioritization
-              totalCategoriesPrioritized={testCase.totCats}
-              isAdjacencyThreshMet={testCase.ADJ_ET}
-              isAdjacencyLowIncome={testCase.AJDLI_ET}
+              scoreNCommunities={testCase.scoreNComm}
               tribalCountAK={testCase.tribalCountAK}
               tribalCountUS={null}
               percentTractTribal={testCase.percentTribal}
diff --git a/client/src/components/TractPrioritization/TractPrioritization.tsx b/client/src/components/TractPrioritization/TractPrioritization.tsx
index 5aab11f54..c959520ed 100644
--- a/client/src/components/TractPrioritization/TractPrioritization.tsx
+++ b/client/src/components/TractPrioritization/TractPrioritization.tsx
@@ -5,9 +5,7 @@ import * as styles from './TractPrioritization.module.scss';
 import * as EXPLORE_COPY from '../../data/copy/explore';
 
 interface ITractPrioritization {
-  totalCategoriesPrioritized: number
-  isAdjacencyThreshMet: boolean,
-  isAdjacencyLowIncome: boolean,
+  scoreNCommunities: boolean,
   tribalCountAK: number | null,
   tribalCountUS: number | null,
   percentTractTribal: number | null,
@@ -16,31 +14,25 @@ interface ITractPrioritization {
 /**
  * This component will return the appropriate designation for the tract's prioritization
  *
- * @param {number} totalCategoriesPrioritized
- * @param {boolean} isAdjacencyThreshMet
- * @param {boolean} isAdjacencyLowIncome
+ * @param {boolean} scoreNCommunities
  * @param {number | null} tribalCountAK
  * @param {number | null} tribalCountUS
  * @param {number | null} percentTractTribal
  * @return {JSX}
  */
 const TractPrioritization = (
-    {totalCategoriesPrioritized,
-      isAdjacencyThreshMet,
-      isAdjacencyLowIncome,
+    {scoreNCommunities,
       tribalCountAK,
       tribalCountUS,
       percentTractTribal}:ITractPrioritization) => {
-  if (totalCategoriesPrioritized === 0) {
-    if (isAdjacencyThreshMet && isAdjacencyLowIncome) {
-      return <h3 className={styles.invert}>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>;
-    } else if (percentTractTribal === null && tribalCountAK === null && tribalCountUS === null) {
+  if (scoreNCommunities === true) {
+    return <h3 className={styles.invert}>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>;
+  } else {
+    if (percentTractTribal === null && tribalCountAK === null && tribalCountUS === null) {
       return <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>;
     } else {
       return <h3>{EXPLORE_COPY.COMMUNITY.PARTIAL}</h3>;
     }
-  } else {
-    return <h3 className={styles.invert}>{EXPLORE_COPY.COMMUNITY.OF_FOCUS}</h3>;
   }
 };
 
diff --git a/client/src/components/TractPrioritization/__snapshots__/TractPrioritization.test.tsx.snap b/client/src/components/TractPrioritization/__snapshots__/TractPrioritization.test.tsx.snap
index 0c73f7d8a..a794b7acc 100644
--- a/client/src/components/TractPrioritization/__snapshots__/TractPrioritization.test.tsx.snap
+++ b/client/src/components/TractPrioritization/__snapshots__/TractPrioritization.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`rendering of TractPrioritization Component checks if component renders No when category count = 0, isAdjacency = false, isAdjLowInc = false, tribal points in AK = null tribal % = null 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders No when score N communities = false, tribal points in AK = null tribal % = null 1`] = `
 <DocumentFragment>
   <h3>
     No
@@ -8,79 +8,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders No when category count = 0, isAdjacency = false, isAdjLowInc = true, tribal points in AK = null tribal % = null 1`] = `
-<DocumentFragment>
-  <h3>
-    No
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders No when category count = 0, isAdjacency = true, isAdjLowInc = false, tribal points in AK = null tribal % = null 1`] = `
-<DocumentFragment>
-  <h3>
-    No
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = false, tribal points in AK = 1 tribal % = null 1`] = `
-<DocumentFragment>
-  <h3>
-    Partially
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = false, tribal points in AK = 2 tribal % = 0 1`] = `
-<DocumentFragment>
-  <h3>
-    Partially
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = false, tribal points in AK = 3 tribal % = 0.13 1`] = `
-<DocumentFragment>
-  <h3>
-    Partially
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = false, tribal points in AK = null tribal % = 0 1`] = `
-<DocumentFragment>
-  <h3>
-    Partially
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = false, tribal points in AK = null tribal % = 0.13 1`] = `
-<DocumentFragment>
-  <h3>
-    Partially
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = true, tribal points in AK = 1 tribal % = null 1`] = `
-<DocumentFragment>
-  <h3>
-    Partially
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = true, tribal points in AK = 2 tribal % = 0 1`] = `
-<DocumentFragment>
-  <h3>
-    Partially
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = true, tribal points in AK = 3 tribal % = 0.13 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders Partially when score N communities = false, tribal points in AK = 1 tribal % = null 1`] = `
 <DocumentFragment>
   <h3>
     Partially
@@ -88,7 +16,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = true, tribal points in AK = null tribal % = 0 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders Partially when score N communities = false, tribal points in AK = 2 tribal % = 0 1`] = `
 <DocumentFragment>
   <h3>
     Partially
@@ -96,7 +24,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = false, isAdjLowInc = true, tribal points in AK = null tribal % = 0.13 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders Partially when score N communities = false, tribal points in AK = 3 tribal % = 0.13 1`] = `
 <DocumentFragment>
   <h3>
     Partially
@@ -104,7 +32,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = true, isAdjLowInc = false, tribal points in AK = 1 tribal % = null 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders Partially when score N communities = false, tribal points in AK = null tribal % = 0 1`] = `
 <DocumentFragment>
   <h3>
     Partially
@@ -112,7 +40,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = true, isAdjLowInc = false, tribal points in AK = 2 tribal % = 0 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders Partially when score N communities = false, tribal points in AK = null tribal % = 0.13 1`] = `
 <DocumentFragment>
   <h3>
     Partially
@@ -120,223 +48,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = true, isAdjLowInc = false, tribal points in AK = 3 tribal % = 0.13 1`] = `
-<DocumentFragment>
-  <h3>
-    Partially
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = true, isAdjLowInc = false, tribal points in AK = null tribal % = 0 1`] = `
-<DocumentFragment>
-  <h3>
-    Partially
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders Partially when category count = 0, isAdjacency = true, isAdjLowInc = false, tribal points in AK = null tribal % = 0.13 1`] = `
-<DocumentFragment>
-  <h3>
-    Partially
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isAdjacency = true, isAdjLowInc = true, tribal points in AK = 1 tribal % = null 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isAdjacency = true, isAdjLowInc = true, tribal points in AK = 2 tribal % = 0 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isAdjacency = true, isAdjLowInc = true, tribal points in AK = 3 tribal % = 0.13 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isAdjacency = true, isAdjLowInc = true, tribal points in AK = null tribal % = 0 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isAdjacency = true, isAdjLowInc = true, tribal points in AK = null tribal % = 0.13 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 0, isAdjacency = true, isAdjLowInc = true, tribal points in AK = null tribal % = null 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = false, tribal points in AK = 1 tribal % = null 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = false, tribal points in AK = 2 tribal % = 0 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = false, tribal points in AK = 3 tribal % = 0.45 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = false, tribal points in AK = null tribal % = 0 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = false, tribal points in AK = null tribal % = 0.45 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = false, tribal points in AK = null tribal % = null 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = true, tribal points in AK = 1 tribal % = null 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = true, tribal points in AK = 2 tribal % = 0 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = true, tribal points in AK = 3 tribal % = 0.45 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = true, tribal points in AK = null tribal % = 0 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = true, tribal points in AK = null tribal % = 0.45 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = false, isAdjLowInc = true, tribal points in AK = null tribal % = null 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = false, tribal points in AK = 1 tribal % = null 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = false, tribal points in AK = 2 tribal % = 0 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = false, tribal points in AK = 3 tribal % = 0.45 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = false, tribal points in AK = null tribal % = 0 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = false, tribal points in AK = null tribal % = 0.45 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = false, tribal points in AK = null tribal % = null 1`] = `
-<DocumentFragment>
-  <h3>
-    YES
-  </h3>
-</DocumentFragment>
-`;
-
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = true, tribal points in AK = 1 tribal % = null 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when score N communities = true, tribal points in AK = 1 tribal % = null 1`] = `
 <DocumentFragment>
   <h3>
     YES
@@ -344,7 +56,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = true, tribal points in AK = 2 tribal % = 0 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when score N communities = true, tribal points in AK = 2 tribal % = 0 1`] = `
 <DocumentFragment>
   <h3>
     YES
@@ -352,7 +64,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = true, tribal points in AK = 3 tribal % = 0.45 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when score N communities = true, tribal points in AK = 3 tribal % = 0.45 1`] = `
 <DocumentFragment>
   <h3>
     YES
@@ -360,7 +72,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = true, tribal points in AK = null tribal % = 0 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when score N communities = true, tribal points in AK = null tribal % = 0 1`] = `
 <DocumentFragment>
   <h3>
     YES
@@ -368,7 +80,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = true, tribal points in AK = null tribal % = 0.45 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when score N communities = true, tribal points in AK = null tribal % = 0.45 1`] = `
 <DocumentFragment>
   <h3>
     YES
@@ -376,7 +88,7 @@ exports[`rendering of TractPrioritization Component checks if component renders
 </DocumentFragment>
 `;
 
-exports[`rendering of TractPrioritization Component checks if component renders YES when category count = 1, isAdjacency = true, isAdjLowInc = true, tribal points in AK = null tribal % = null 1`] = `
+exports[`rendering of TractPrioritization Component checks if component renders YES when score N communities = true, tribal points in AK = null tribal % = null 1`] = `
 <DocumentFragment>
   <h3>
     YES
diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index b4ef875e1..cc6dc79e6 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -70,6 +70,8 @@ export const SCORE_BOUNDARY_THRESHOLD = 0.6;
 export const TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS = 'TC';
 export const TOTAL_NUMBER_OF_INDICATORS = 'THRHLD';
 export const COUNT_OF_CATEGORIES_DISADV = 'CC';
+export const SCORE_N_COMMUNITIES = 'SN_C';
+export const SCORE_N_TRIBAL = 'SN_T';
 
 export const SIDE_PANEL_STATE = 'UI_EXP';
 export const SIDE_PANEL_STATE_VALUES = {
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 4976142e0..cf8066fdd 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -640,8 +640,8 @@ export const getPrioFRTCopy = (amount:string, isAlso:boolean = false) => {
   return (
     <FormattedMessage
       id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
-      defaultMessage={ 'The {amount} of this tract that are Federally-Recognized Tribal lands are {also} considered disadvantaged.'}
-      description={`Navigate to the explore the map page. Click on tract, The {amount} of this tract that are Federally-Recognized Tribal lands are {also} considered disadvantaged.`}
+      defaultMessage={ 'The Federally-Recognized Tribal lands that cover {amount} of this tract are {also} considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The Federally-Recognized Tribal lands that cover [#%] of this tract are considered disadvantaged.`}
       values={{
         amount: amount,
         also: isAlso? 'also' : '',
@@ -686,8 +686,8 @@ export const getPrioPercAndNumPointsAlsoCopy = (amount:string, numPoints:number)
   return (
     <FormattedMessage
       id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
-      defaultMessage={ 'The {amount} of this tract that are Federally-Recognized Tribal lands and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged.'}
-      description={`Navigate to the explore the map page. Click on tract, The {amount} of this tract that are Federally-Recognized Tribal lands and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged.`}
+      defaultMessage={ 'The Federally-Recognized Tribal lands that cover {amount} of this tract and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The Federally-Recognized Tribal lands that cover {amount} of this tract and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged.`}
       values={{
         amount: amount,
         numPoints: numPoints,
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index c25cbd7a8..28346f8b8 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1108,8 +1108,8 @@
     "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. The adjustment does not apply to any of the categories."
   },
   "explore.map.page.side.panel.prio.copy.prio.frt.n.perc": {
-    "defaultMessage": "The {amount} of this tract that are Federally-Recognized Tribal lands and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged.",
-    "description": "Navigate to the explore the map page. Click on tract, The {amount} of this tract that are Federally-Recognized Tribal lands and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged."
+    "defaultMessage": "The Federally-Recognized Tribal lands that cover {amount} of this tract and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged.",
+    "description": "Navigate to the explore the map page. Click on tract, The Federally-Recognized Tribal lands that cover {amount} of this tract and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged."
   },
   "explore.map.page.side.panel.prio.copy.prio.n.burden": {
     "defaultMessage": "This tract is considered disadvantaged because it meets {burdens} burden threshold AND the associated socio-economic threshold.",

From 9ddf7c3ec8c78bb37e318e50fbd8ed9c850636d3 Mon Sep 17 00:00:00 2001
From: Matt Bowen <83967628+mattbowen-usds@users.noreply.github.com>
Date: Fri, 21 Oct 2022 09:02:13 -0400
Subject: [PATCH 080/130] Remove unused vars from the constants (#2020) (#2023)

---
 client/src/data/constants.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index cc6dc79e6..38c5dfb84 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -154,14 +154,11 @@ export const IS_EXCEEDS_THRESH_KITCHEN_PLUMB = 'KP_ET';
 export const LEAD_PAINT_PERCENTILE = 'LPF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_LEAD_PAINT_AND_MEDIAN_HOME_VAL = 'LPP_ET';
 
-// export const MEDIAN_HOME_VALUE_PERCENTILE = 'MHVF_PFS'; // No longer showing in UI
-
 
 // Pollution category
 export const IS_POLLUTION_FACTOR_DISADVANTAGED = 'N_PLN';
 export const IS_POLLUTION_EXCEED_ONE_OR_MORE_INDICATORS = 'N_PLN_EOMI';
 
-export const ABANDON_LAND_MINES_RAW_VALUE = 'AML_RAW';
 export const AML_RAW_YES = 1;
 export const ABANDON_LAND_MINES_EXCEEDS_THRESH = 'AML_ET';
 
@@ -186,7 +183,6 @@ export const IS_WATER_EXCEED_ONE_OR_MORE_INDICATORS = 'N_WTR_EOMI';
 
 export const LEAKY_UNDER_PERCENTILE = 'UST_PFS';
 export const IS_EXCEEDS_THRESH_LEAKY_UNDER = 'UST_ET';
-export const LEAKY_UNDER_LOW_INCOME = 'USTLI';
 
 export const WASTEWATER_PERCENTILE = 'WF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_WASTEWATER = 'WD_ET';
@@ -239,7 +235,6 @@ export const ISLAND_AREAS_HS_EDU_PERCENTAGE_FIELD= 'IAHSEF';
 export const ISLAND_AREA_LOW_HS_EDU = 'IALHE';
 
 // Misc category
-export const ADJACENCY_PERCENTILE = 'ADJ_PFS';
 export const ADJACENCY_EXCEEDS_THRESH = 'ADJ_ET';
 export const ADJACENCY_LOW_INCOME_EXCEEDS_THRESH = 'AJDLI_ET';
 

From 389ea79e9b272f1500bbf6630a55653b8b3d4dd3 Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Tue, 25 Oct 2022 17:13:35 -0700
Subject: [PATCH 081/130] Update release copy (#2036)

---
 .../ReleaseUpdate/ReleaseUpdate.tsx           | 174 ++++++++-
 .../__snapshots__/ReleaseUpdate.test.tsx.snap | 328 ++++++++++++++++-
 client/src/data/copy/downloads.tsx            | 346 +++++++++++++++++-
 client/src/intl/en.json                       | 282 +++++++++++++-
 .../__snapshots__/downloads.test.tsx.snap     | 328 ++++++++++++++++-
 5 files changed, 1420 insertions(+), 38 deletions(-)

diff --git a/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx b/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx
index e6631066c..b1c078ce4 100644
--- a/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx
+++ b/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx
@@ -77,34 +77,194 @@ const ReleaseUpdate = ({}: IReleaseUpdateProps) => {
         <div>
 
           <div className={styles.releaseHeader}>
-            {DOWNLOAD_COPY.RELEASE.UPDATE_1}
+            {DOWNLOAD_COPY.RELEASE_1_0.UPDATE_1}
           </div>
 
           <div className={styles.releaseSectionTitle}>
-            {DOWNLOAD_COPY.RELEASE.SECTION1}
+            {DOWNLOAD_COPY.RELEASE_1_0.SECTION1}
           </div>
 
           <div className={styles.releaseSectionBody}>
             <ul>
-              <li>{DOWNLOAD_COPY.RELEASE.SECTION1_P1}</li>
+              <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B1}</li>
+
+              <ul>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2}</li>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_1}</li>
+                <ul>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_1_1}</li>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_1_2}</li>
+                </ul>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_2}</li>
+                <ul>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_2_1}</li>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_2_2}</li>
+                </ul>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_3}</li>
+                <ul>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_3_1}</li>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_3_2}</li>
+                </ul>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_4}</li>
+                <ul>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_4_1}</li>
+                </ul>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_5}</li>
+                <ul>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_5_1}</li>
+                </ul>
+              </ul>
+              <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B3}</li>
+              <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B4}</li>
+              <ul>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B4_1}</li>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B4_2}</li>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B4_3}</li>
+              </ul>
+              <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B5}</li>
+              <ul>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B5_1}</li>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B5_2}</li>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B5_3}</li>
+              </ul>
+
+              <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6}</li>
+              <ul>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1}</li>
+                <ul>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_1}</li>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2}</li>
+                  <ul>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_1}</li>
+                    <ul>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_1_1}</li>
+                    </ul>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2}</li>
+                    <ul>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_1}</li>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_2}</li>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_3}</li>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_4}</li>
+                    </ul>
+                  </ul>
+                </ul>
+
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_2}</li>
+                <ul>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_2_1}</li>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2}</li>
+                  <ul>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_1}</li>
+                    <ul>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_1_1}</li>
+                    </ul>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2}</li>
+                    <ul>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_1}</li>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_2}</li>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_3}</li>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_4}</li>
+                    </ul>
+                  </ul>
+                </ul>
+
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_3}</li>
+                <ul>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2}</li>
+                  <ul>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_1}</li>
+                    <ul>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_1_1}</li>
+                    </ul>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2}</li>
+                    <ul>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_2}</li>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_4}</li>
+                    </ul>
+                  </ul>
+                </ul>
+
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_4}</li>
+                <ul>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2}</li>
+                  <ul>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_1}</li>
+                    <ul>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_1_1}</li>
+                    </ul>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2}</li>
+                    <ul>
+                      <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_4}</li>
+                    </ul>
+                  </ul>
+                </ul>
+
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_5}</li>
+                <ul>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_5_1}</li>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_5_2}</li>
+                  <ul>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_5_2_1}</li>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_5_2_2}</li>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_5_2_3}</li>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_5_2_4}</li>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_1}</li>
+                    <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_2}</li>
+                  </ul>
+                </ul>
+              </ul>
+
+              <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B7}</li>
               <ul>
-                <li>{DOWNLOAD_COPY.RELEASE.SECTION1_P1_1}</li>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_1}</li>
+                <ul>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B7_1_1}</li>
+                </ul>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2}</li>
+                <ul>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B7_2_1}</li>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B7_2_2}</li>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B7_2_3}</li>
+                </ul>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B7_3}</li>
+                <ul>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B7_3_1}</li>
+                </ul>
               </ul>
+
+              <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B8}</li>
+              <ul>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B8_1}</li>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B8_2}</li>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B8_3}</li>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B8_4}</li>
+              </ul>
+
+              <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B9}</li>
+              <ul>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B9_1}</li>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B9_2}</li>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B9_3}</li>
+                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B9_4}</li>
+              </ul>
+
+              <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B10}</li>
             </ul>
           </div>
 
           <div className={styles.releaseSectionTitle}>
-            {DOWNLOAD_COPY.RELEASE.SECTION2}
+            {DOWNLOAD_COPY.RELEASE_1_0.SECTION2}
           </div>
 
           <div className={styles.releaseSectionBody}>
             <ul>
-              <li>{DOWNLOAD_COPY.RELEASE.SECTION2_P1}</li>
+              <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION2_P1}</li>
+              <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION2_P2}</li>
             </ul>
           </div>
 
           <div>
-            {DOWNLOAD_COPY.RELEASE.FOOTER}
+            {DOWNLOAD_COPY.RELEASE_1_0.FOOTER}
           </div>
 
         </div>
diff --git a/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
index ec382bcf1..85d6d0391 100644
--- a/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
+++ b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
@@ -34,13 +34,332 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
         <div>
           <ul>
             <li>
-              Updates to the methodology based on feedback recieved during the beta period.
+              Added Federally Recognized Tribal Lands and Alaska Native Villages data from the Bureau of Indian Affairs at the Department of the Interior to the tool and map
             </li>
             <ul>
               <li>
-                Additional data sources now available for Puerto Rico. Linguistic isolation as removed from the methodology for Puerto Rico.
+                Added new data for indicators of burden
+              </li>
+              <li>
+                Climate change
+              </li>
+              <ul>
+                <li>
+                  Projected flood risk
+                </li>
+                <li>
+                  Projected wildfire risk
+                </li>
+              </ul>
+              <li>
+                Housing
+              </li>
+              <ul>
+                <li>
+                  Lack of plumbing
+                </li>
+                <li>
+                  Lack of green space
+                </li>
+              </ul>
+              <li>
+                Legacy pollution
+              </li>
+              <ul>
+                <li>
+                  Abandoned mine lands
+                </li>
+                <li>
+                  Formerly used defense sites
+                </li>
+              </ul>
+              <li>
+                Transportation
+              </li>
+              <ul>
+                <li>
+                  Transportation barriers
+                </li>
+              </ul>
+              <li>
+                Water
+              </li>
+              <ul>
+                <li>
+                  Leaking underground storage tanks
+                </li>
+              </ul>
+            </ul>
+            <li>
+              Added an adjacency indicator to methodology to include low income communities that had been completely surrounded by other disadvantaged communities, but which had just missed the thresholds in the beta version.
+            </li>
+            <li>
+              Made technical changes to enhance accuracy of the tool
+            </li>
+            <ul>
+              <li>
+                Removed income data for students enrolled in higher education in the low income indicator
+              </li>
+              <li>
+                Imputed income for census tracts missing that data that have a population greater than zero
+              </li>
+              <li>
+                Used transportation barriers and population loss data indicators only for census tracts with populations of 20 or more
+              </li>
+            </ul>
+            <li>
+              Improved the user interface
+            </li>
+            <ul>
+              <li>
+                Added demographics (race & age) for census tracts to map side panel
+              </li>
+              <li>
+                Improved the design of the map side panel
+              </li>
+              <li>
+                Updated the site copy of the website and associated Spanish translations
+              </li>
+            </ul>
+            <li>
+              Added new data for all the U.S. Territories, and also made a small methodology change for Puerto Rico
+            </li>
+            <ul>
+              <li>
+                USVI
+              </li>
+              <ul>
+                <li>
+                  Included data from 2010 decennial census for US Virgin Islands
+                </li>
+                <li>
+                  New data from EJScreen 2.1
+                </li>
+                <ul>
+                  <li>
+                    Sustainable Housing:
+                  </li>
+                  <ul>
+                    <li>
+                      Lead paint
+                    </li>
+                  </ul>
+                  <li>
+                    Legacy pollution:
+                  </li>
+                  <ul>
+                    <li>
+                      Proximity to Superfund (National Priorities List (NPL)) sites
+                    </li>
+                    <li>
+                      Proximity to Risk Management Plan (RMP) facilities
+                    </li>
+                    <li>
+                      Proximity to hazardous waste facilities
+                    </li>
+                    <li>
+                      Leaking underground storage tanks
+                    </li>
+                  </ul>
+                </ul>
+              </ul>
+              <li>
+                Guam
+              </li>
+              <ul>
+                <li>
+                  Included data from 2010 decennial census for Guam
+                </li>
+                <li>
+                  New data from EJScreen 2.1
+                </li>
+                <ul>
+                  <li>
+                    Sustainable Housing:
+                  </li>
+                  <ul>
+                    <li>
+                      Lead paint
+                    </li>
+                  </ul>
+                  <li>
+                    Legacy pollution:
+                  </li>
+                  <ul>
+                    <li>
+                      Proximity to Superfund (National Priorities List (NPL)) sites
+                    </li>
+                    <li>
+                      Proximity to Risk Management Plan (RMP) facilities
+                    </li>
+                    <li>
+                      Proximity to hazardous waste facilities
+                    </li>
+                    <li>
+                      Leaking underground storage tanks
+                    </li>
+                  </ul>
+                </ul>
+              </ul>
+              <li>
+                Samoa
+              </li>
+              <ul>
+                <li>
+                  New data from EJScreen 2.1
+                </li>
+                <ul>
+                  <li>
+                    Sustainable Housing:
+                  </li>
+                  <ul>
+                    <li>
+                      Lead paint
+                    </li>
+                  </ul>
+                  <li>
+                    Legacy pollution:
+                  </li>
+                  <ul>
+                    <li>
+                      Proximity to Risk Management Plan (RMP) facilities
+                    </li>
+                    <li>
+                      Leaking underground storage tanks
+                    </li>
+                  </ul>
+                </ul>
+              </ul>
+              <li>
+                Marianna Islands
+              </li>
+              <ul>
+                <li>
+                  New data from EJScreen 2.1
+                </li>
+                <ul>
+                  <li>
+                    Sustainable Housing:
+                  </li>
+                  <ul>
+                    <li>
+                      Lead paint
+                    </li>
+                  </ul>
+                  <li>
+                    Legacy pollution:
+                  </li>
+                  <ul>
+                    <li>
+                      Leaking underground storage tanks
+                    </li>
+                  </ul>
+                </ul>
+              </ul>
+              <li>
+                Puerto Rico
+              </li>
+              <ul>
+                <li>
+                  Removed linguistic isolation as an indicator in the methodology for Puerto Rico
+                </li>
+                <li>
+                  Imported additional available data for Puerto Rico
+                </li>
+                <ul>
+                  <li>
+                    Energy cost
+                  </li>
+                  <li>
+                    Housing cost
+                  </li>
+                  <li>
+                    Abandoned mine lands
+                  </li>
+                  <li>
+                    Proximity to hazardous waste sites
+                  </li>
+                  <li>
+                    Proximity to Superfund (National Priorities List (NPL)) sites
+                  </li>
+                  <li>
+                    Proximity to Risk Management Plan (RMP) facilities
+                  </li>
+                </ul>
+              </ul>
+            </ul>
+            <li>
+              Updated data from EJScreen 2.1 across the entire tool:
+            </li>
+            <ul>
+              <li>
+                Sustainable Housing:
+              </li>
+              <ul>
+                <li>
+                  Lead paint - 2016-2020
+                </li>
+              </ul>
+              <li>
+                Legacy pollution:
+              </li>
+              <ul>
+                <li>
+                  Proximity to Superfund (National Priorities List (NPL)) sites - 2022
+                </li>
+                <li>
+                  Proximity to Risk Management Plans (RMP) facilities - 2022
+                </li>
+                <li>
+                  Proximity to hazardous waste facilities - 2022
+                </li>
+              </ul>
+              <li>
+                Water and wastewater
+              </li>
+              <ul>
+                <li>
+                  Leaking underground storage tanks - 2022
+                </li>
+              </ul>
+            </ul>
+            <li>
+              Enhanced the technical files:
+            </li>
+            <ul>
+              <li>
+                Added all new data indicators and demographics to .xls, .csv, and shapefiles
+              </li>
+              <li>
+                Added versions page to house beta version of download files
+              </li>
+              <li>
+                Updated codebook
+              </li>
+              <li>
+                Updated Technical Support Document
               </li>
             </ul>
+            <li>
+              Improved the way that users provide feedback on the tool:
+            </li>
+            <ul>
+              <li>
+                Data survey
+              </li>
+              <li>
+                Site experience survey
+              </li>
+              <li>
+                Census tract feedback
+              </li>
+              <li>
+                General contact form
+              </li>
+            </ul>
+            <li>
+              Added a link to sign up for email mailing list managed by CEQ
+            </li>
           </ul>
         </div>
         <div>
@@ -49,7 +368,10 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
         <div>
           <ul>
             <li>
-              Fixed an issue with zoom and select to show census boundaries at a higher zoom level.
+              Bug fix: loaded missing life expectancy data for Maine and Wisconsin
+            </li>
+            <li>
+              Bug fix: Census tracts that have 0 land should not be included on the map
             </li>
           </ul>
         </div>
diff --git a/client/src/data/copy/downloads.tsx b/client/src/data/copy/downloads.tsx
index 72e1df532..c43dc1174 100644
--- a/client/src/data/copy/downloads.tsx
+++ b/client/src/data/copy/downloads.tsx
@@ -84,7 +84,7 @@ export const getDownloadIconAltTag = () => defineMessages({
   },
 });
 
-export const RELEASE = {
+export const RELEASE_1_0 = {
   UPDATE_1: <FormattedMessage
     id={'download.page.release.update.title.1'}
     defaultMessage={`Release update - {date}`}
@@ -99,20 +99,337 @@ export const RELEASE = {
     }}
   />,
   SECTION1: <FormattedMessage
-    id={'download.page.release.update.section.1'}
+    id={'download.page.release.update.SECTION1'}
     defaultMessage={`New & improved`}
-    description={'Navigate to the download page. This is first section of the release update section'}
+    description={'Navigate to the download page. This is first section of the release update SECTION1'}
   />,
-  SECTION1_P1: <FormattedMessage
-    id={'download.page.release.update.section.1.p.1'}
-    defaultMessage={`Updates to the methodology based on feedback recieved during the beta period.`}
-    description={'Navigate to the download page. This is first section of the release update section'}
+  SECTION1_B1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B1'}
+    defaultMessage={`Added Federally Recognized Tribal Lands and Alaska Native Villages data from the Bureau of Indian Affairs at the Department of the Interior to the tool and map`}
+    description={'Navigate to the download page. This is SECTION1_B1'}
   />,
-  SECTION1_P1_1: <FormattedMessage
-    id={'download.page.release.update.section.1.p.1.1'}
-    defaultMessage={`Additional data sources now available for Puerto Rico. Linguistic isolation as removed from the methodology for Puerto Rico.`}
-    description={'Navigate to the download page. This is first section of the release update section'}
+  SECTION1_B2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2'}
+    defaultMessage={`Added new data for indicators of burden`}
+    description={'Navigate to the download page. This is SECTION1_B2'}
   />,
+  SECTION1_B2_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_1'}
+    defaultMessage={`Climate change`}
+    description={'Navigate to the download page. This is SECTION1_B2_1'}
+  />,
+  SECTION1_B2_1_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_1_1'}
+    defaultMessage={`Projected flood risk`}
+    description={'Navigate to the download page. This is SECTION1_B2_1_1'}
+  />,
+  SECTION1_B2_1_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_1_2'}
+    defaultMessage={`Projected wildfire risk`}
+    description={'Navigate to the download page. This is SECTION1_B2_1_2'}
+  />,
+  SECTION1_B2_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_2'}
+    defaultMessage={`Housing`}
+    description={'Navigate to the download page. This is SECTION1_B2_2'}
+  />,
+  SECTION1_B2_2_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_2_1'}
+    defaultMessage={`Lack of plumbing`}
+    description={'Navigate to the download page. This is SECTION1_B2_2_1'}
+  />,
+  SECTION1_B2_2_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_2_2'}
+    defaultMessage={`Lack of green space`}
+    description={'Navigate to the download page. This is SECTION1_B2_2_2'}
+  />,
+  SECTION1_B2_2_3: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_2_3'}
+    defaultMessage={`Historic underinvestment (due to redlining)`}
+    description={'Navigate to the download page. This is SECTION1_B2_2_3'}
+  />,
+  SECTION1_B2_3: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_3'}
+    defaultMessage={`Legacy pollution`}
+    description={'Navigate to the download page. This is SECTION1_B2_3'}
+  />,
+  SECTION1_B2_3_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_3_1'}
+    defaultMessage={`Abandoned mine lands`}
+    description={'Navigate to the download page. This is SECTION1_B2_3_1'}
+  />,
+  SECTION1_B2_3_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_3_2'}
+    defaultMessage={`Formerly used defense sites`}
+    description={'Navigate to the download page. This is SECTION1_B2_3_2'}
+  />,
+  SECTION1_B2_4: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_4'}
+    defaultMessage={`Transportation`}
+    description={'Navigate to the download page. This is SECTION1_B2_4'}
+  />,
+  SECTION1_B2_4_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_4_1'}
+    defaultMessage={`Transportation barriers`}
+    description={'Navigate to the download page. This is SECTION1_B2_4_1'}
+  />,
+  SECTION1_B2_5: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_5'}
+    defaultMessage={`Water`}
+    description={'Navigate to the download page. This is SECTION1_B2_5'}
+  />,
+  SECTION1_B2_5_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_5_1'}
+    defaultMessage={`Leaking underground storage tanks`}
+    description={'Navigate to the download page. This is SECTION1_B2_5_1'}
+  />,
+  SECTION1_B3: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B3'}
+    defaultMessage={`Added an adjacency indicator to methodology to include low income communities that had been completely surrounded by other disadvantaged communities, but which had just missed the thresholds in the beta version.`}
+    description={'Navigate to the download page. This is SECTION1_B3'}
+  />,
+  SECTION1_B4: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B4'}
+    defaultMessage={`Made technical changes to enhance accuracy of the tool`}
+    description={'Navigate to the download page. This is SECTION1_B4'}
+  />,
+  SECTION1_B4_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B4_1'}
+    defaultMessage={`Removed income data for students enrolled in higher education in the low income indicator`}
+    description={'Navigate to the download page. This is SECTION1_B4_1'}
+  />,
+  SECTION1_B4_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B4_2'}
+    defaultMessage={`Imputed income for census tracts missing that data that have a population greater than zero`}
+    description={'Navigate to the download page. This is SECTION1_B4_2'}
+  />,
+  SECTION1_B4_3: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B4_3'}
+    defaultMessage={`Used transportation barriers and population loss data indicators only for census tracts with populations of 20 or more`}
+    description={'Navigate to the download page. This is SECTION1_B4_3'}
+  />,
+  SECTION1_B5: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B5'}
+    defaultMessage={`Improved the user interface`}
+    description={'Navigate to the download page. This is SECTION1_B5'}
+  />,
+  SECTION1_B5_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B5_1'}
+    defaultMessage={`Added demographics (race & age) for census tracts to map side panel`}
+    description={'Navigate to the download page. This is SECTION1_B5_1'}
+  />,
+  SECTION1_B5_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B5_2'}
+    defaultMessage={`Improved the design of the map side panel`}
+    description={'Navigate to the download page. This is SECTION1_B5_2'}
+  />,
+  SECTION1_B5_3: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B5_3'}
+    defaultMessage={`Updated the site copy of the website and associated Spanish translations`}
+    description={'Navigate to the download page. This is SECTION1_B5_3'}
+  />,
+  SECTION1_B6: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6'}
+    defaultMessage={`Added new data for all the U.S. Territories, and also made a small methodology change for Puerto Rico`}
+    description={'Navigate to the download page. This is SECTION1_B6'}
+  />,
+  SECTION1_B6_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_1'}
+    defaultMessage={`USVI`}
+    description={'Navigate to the download page. This is SECTION1_B6_1'}
+  />,
+  SECTION1_B6_1_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_1_1'}
+    defaultMessage={`Included data from 2010 decennial census for US Virgin Islands`}
+    description={'Navigate to the download page. This is SECTION1_B6_1_1'}
+  />,
+  SECTION1_B6_1_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_1_2'}
+    defaultMessage={`New data from EJScreen 2.1`}
+    description={'Navigate to the download page. This is SECTION1_B6_1_2'}
+  />,
+  SECTION1_B6_1_2_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_1_2_1'}
+    defaultMessage={`Sustainable Housing:`}
+    description={'Navigate to the download page. This is SECTION1_B6_1_2_1'}
+  />,
+  SECTION1_B6_1_2_1_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_1_2_1_1'}
+    defaultMessage={`Lead paint`}
+    description={'Navigate to the download page. This is SECTION1_B6_1_2_1_1'}
+  />,
+  SECTION1_B6_1_2_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_1_2_2'}
+    defaultMessage={`Legacy pollution:`}
+    description={'Navigate to the download page. This is SECTION1_B6_1_2_2'}
+  />,
+  SECTION1_B6_1_2_2_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_1_2_2_1'}
+    defaultMessage={`Proximity to Superfund (National Priorities List (NPL)) sites`}
+    description={'Navigate to the download page. This is SECTION1_B6_1_2_2_1'}
+  />,
+  SECTION1_B6_1_2_2_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_1_2_2_2'}
+    defaultMessage={`Proximity to Risk Management Plan (RMP) facilities`}
+    description={'Navigate to the download page. This is SECTION1_B6_1_2_2_2'}
+  />,
+  SECTION1_B6_1_2_2_3: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_1_2_2_3'}
+    defaultMessage={`Proximity to hazardous waste facilities`}
+    description={'Navigate to the download page. This is SECTION1_B6_1_2_2_3'}
+  />,
+  SECTION1_B6_1_2_2_4: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_1_2_2_4'}
+    defaultMessage={`Leaking underground storage tanks`}
+    description={'Navigate to the download page. This is SECTION1_B6_1_2_2_4'}
+  />,
+  SECTION1_B6_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_2'}
+    defaultMessage={`Guam`}
+    description={'Navigate to the download page. This is SECTION1_B6_2'}
+  />,
+  SECTION1_B6_2_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_2_1'}
+    defaultMessage={`Included data from 2010 decennial census for Guam`}
+    description={'Navigate to the download page. This is SECTION1_B6_2_1'}
+  />,
+  SECTION1_B6_3: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_3'}
+    defaultMessage={`Samoa`}
+    description={'Navigate to the download page. This is SECTION1_B6_3'}
+  />,
+  SECTION1_B6_4: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_4'}
+    defaultMessage={`Marianna Islands`}
+    description={'Navigate to the download page. This is SECTION1_B6_4'}
+  />,
+  SECTION1_B6_5: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_5'}
+    defaultMessage={`Puerto Rico`}
+    description={'Navigate to the download page. This is SECTION1_B6_5'}
+  />,
+  SECTION1_B6_5_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_5_1'}
+    defaultMessage={`Removed linguistic isolation as an indicator in the methodology for Puerto Rico`}
+    description={'Navigate to the download page. This is SECTION1_B6_5_1'}
+  />,
+  SECTION1_B6_5_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_5_2'}
+    defaultMessage={`Imported additional available data for Puerto Rico`}
+    description={'Navigate to the download page. This is SECTION1_B6_5_2'}
+  />,
+  SECTION1_B6_5_2_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_5_2_1'}
+    defaultMessage={`Energy cost`}
+    description={'Navigate to the download page. This is SECTION1_B6_5_2_1'}
+  />,
+  SECTION1_B6_5_2_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_5_2_2'}
+    defaultMessage={`Housing cost`}
+    description={'Navigate to the download page. This is SECTION1_B6_5_2_2'}
+  />,
+  SECTION1_B6_5_2_3: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_5_2_3'}
+    defaultMessage={`Abandoned mine lands`}
+    description={'Navigate to the download page. This is SECTION1_B6_5_2_3'}
+  />,
+  SECTION1_B6_5_2_4: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B6_5_2_4'}
+    defaultMessage={`Proximity to hazardous waste sites`}
+    description={'Navigate to the download page. This is SECTION1_B6_5_2_4'}
+  />,
+  SECTION1_B7: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B7'}
+    defaultMessage={`Updated data from EJScreen 2.1 across the entire tool:`}
+    description={'Navigate to the download page. This is SECTION1_B7'}
+  />,
+  SECTION1_B7_1_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B7_1_1'}
+    defaultMessage={`Lead paint - 2016-2020`}
+    description={'Navigate to the download page. This is SECTION1_B7_1_1'}
+  />,
+  SECTION1_B7_2_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B7_2_1'}
+    defaultMessage={`Proximity to Superfund (National Priorities List (NPL)) sites - 2022`}
+    description={'Navigate to the download page. This is SECTION1_B7_2_1'}
+  />,
+  SECTION1_B7_2_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B7_2_2'}
+    defaultMessage={`Proximity to Risk Management Plans (RMP) facilities - 2022`}
+    description={'Navigate to the download page. This is SECTION1_B7_2_2'}
+  />,
+  SECTION1_B7_2_3: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B7_2_3'}
+    defaultMessage={`Proximity to hazardous waste facilities - 2022`}
+    description={'Navigate to the download page. This is SECTION1_B7_2_3'}
+  />,
+  SECTION1_B7_3: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B7_3'}
+    defaultMessage={`Water and wastewater`}
+    description={'Navigate to the download page. This is SECTION1_B7_3'}
+  />,
+  SECTION1_B7_3_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B7_3_1'}
+    defaultMessage={`Leaking underground storage tanks - 2022`}
+    description={'Navigate to the download page. This is SECTION1_B7_3_1'}
+  />,
+  SECTION1_B8: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B8'}
+    defaultMessage={`Enhanced the technical files:`}
+    description={'Navigate to the download page. This is SECTION1_B8'}
+  />,
+  SECTION1_B8_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B8_1'}
+    defaultMessage={`Added all new data indicators and demographics to .xls, .csv, and shapefiles`}
+    description={'Navigate to the download page. This is SECTION1_B8_1'}
+  />,
+  SECTION1_B8_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B8_2'}
+    defaultMessage={`Added versions page to house beta version of download files`}
+    description={'Navigate to the download page. This is SECTION1_B8_2'}
+  />,
+  SECTION1_B8_3: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B8_3'}
+    defaultMessage={`Updated codebook`}
+    description={'Navigate to the download page. This is SECTION1_B8_3'}
+  />,
+  SECTION1_B8_4: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B8_4'}
+    defaultMessage={`Updated Technical Support Document`}
+    description={'Navigate to the download page. This is SECTION1_B8_4'}
+  />,
+  SECTION1_B9: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B9'}
+    defaultMessage={`Improved the way that users provide feedback on the tool:`}
+    description={'Navigate to the download page. This is SECTION1_B9'}
+  />,
+  SECTION1_B9_1: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B9_1'}
+    defaultMessage={`Data survey`}
+    description={'Navigate to the download page. This is SECTION1_B9_1'}
+  />,
+  SECTION1_B9_2: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B9_2'}
+    defaultMessage={`Site experience survey`}
+    description={'Navigate to the download page. This is SECTION1_B9_2'}
+  />,
+  SECTION1_B9_3: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B9_3'}
+    defaultMessage={`Census tract feedback`}
+    description={'Navigate to the download page. This is SECTION1_B9_3'}
+  />,
+  SECTION1_B9_4: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B9_4'}
+    defaultMessage={`General contact form`}
+    description={'Navigate to the download page. This is SECTION1_B9_4 '}
+  />,
+  SECTION1_B10: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B10'}
+    defaultMessage={`Added a link to sign up for email mailing list managed by CEQ`}
+    description={'Navigate to the download page. This is SECTION1_B10 '}
+  />,
+
+
   SECTION2: <FormattedMessage
     id={'download.page.release.update.section.2'}
     defaultMessage={`Fixes`}
@@ -120,7 +437,12 @@ export const RELEASE = {
   />,
   SECTION2_P1: <FormattedMessage
     id={'download.page.release.update.section.2.p1'}
-    defaultMessage={`Fixed an issue with zoom and select to show census boundaries at a higher zoom level.`}
+    defaultMessage={`Bug fix: loaded missing life expectancy data for Maine and Wisconsin`}
+    description={'Navigate to the download page. This is second section of the release update section'}
+  />,
+  SECTION2_P2: <FormattedMessage
+    id={'download.page.release.update.section.2.p2'}
+    defaultMessage={`Bug fix: Census tracts that have 0 land should not be included on the map`}
     description={'Navigate to the download page. This is second section of the release update section'}
   />,
   FOOTER: <FormattedMessage
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 28346f8b8..db6f1bf0d 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -307,28 +307,284 @@
     "defaultMessage": "Version {version} file formats",
     "description": "Navigate to the download page. This is first download file link"
   },
-  "download.page.release.update.footer": {
-    "defaultMessage": "release version {version}",
-    "description": "Navigate to the download page. This is second section of the release update section"
-  },
-  "download.page.release.update.section.1": {
+  "download.page.release.update.SECTION1": {
     "defaultMessage": "New & improved",
-    "description": "Navigate to the download page. This is first section of the release update section"
+    "description": "Navigate to the download page. This is first section of the release update SECTION1"
+  },
+  "download.page.release.update.SECTION1_B1": {
+    "defaultMessage": "Added Federally Recognized Tribal Lands and Alaska Native Villages data from the Bureau of Indian Affairs at the Department of the Interior to the tool and map",
+    "description": "Navigate to the download page. This is SECTION1_B1"
+  },
+  "download.page.release.update.SECTION1_B10": {
+    "defaultMessage": "Added a link to sign up for email mailing list managed by CEQ",
+    "description": "Navigate to the download page. This is SECTION1_B10 "
+  },
+  "download.page.release.update.SECTION1_B2": {
+    "defaultMessage": "Added new data for indicators of burden",
+    "description": "Navigate to the download page. This is SECTION1_B2"
+  },
+  "download.page.release.update.SECTION1_B2_1": {
+    "defaultMessage": "Climate change",
+    "description": "Navigate to the download page. This is SECTION1_B2_1"
+  },
+  "download.page.release.update.SECTION1_B2_1_1": {
+    "defaultMessage": "Projected flood risk",
+    "description": "Navigate to the download page. This is SECTION1_B2_1_1"
+  },
+  "download.page.release.update.SECTION1_B2_1_2": {
+    "defaultMessage": "Projected wildfire risk",
+    "description": "Navigate to the download page. This is SECTION1_B2_1_2"
+  },
+  "download.page.release.update.SECTION1_B2_2": {
+    "defaultMessage": "Housing",
+    "description": "Navigate to the download page. This is SECTION1_B2_2"
+  },
+  "download.page.release.update.SECTION1_B2_2_1": {
+    "defaultMessage": "Lack of plumbing",
+    "description": "Navigate to the download page. This is SECTION1_B2_2_1"
+  },
+  "download.page.release.update.SECTION1_B2_2_2": {
+    "defaultMessage": "Lack of green space",
+    "description": "Navigate to the download page. This is SECTION1_B2_2_2"
+  },
+  "download.page.release.update.SECTION1_B2_2_3": {
+    "defaultMessage": "Historic underinvestment (due to redlining)",
+    "description": "Navigate to the download page. This is SECTION1_B2_2_3"
+  },
+  "download.page.release.update.SECTION1_B2_3": {
+    "defaultMessage": "Legacy pollution",
+    "description": "Navigate to the download page. This is SECTION1_B2_3"
+  },
+  "download.page.release.update.SECTION1_B2_3_1": {
+    "defaultMessage": "Abandoned mine lands",
+    "description": "Navigate to the download page. This is SECTION1_B2_3_1"
+  },
+  "download.page.release.update.SECTION1_B2_3_2": {
+    "defaultMessage": "Formerly used defense sites",
+    "description": "Navigate to the download page. This is SECTION1_B2_3_2"
   },
-  "download.page.release.update.section.1.p.1": {
-    "defaultMessage": "Updates to the methodology based on feedback recieved during the beta period.",
-    "description": "Navigate to the download page. This is first section of the release update section"
+  "download.page.release.update.SECTION1_B2_4": {
+    "defaultMessage": "Transportation",
+    "description": "Navigate to the download page. This is SECTION1_B2_4"
+  },
+  "download.page.release.update.SECTION1_B2_4_1": {
+    "defaultMessage": "Transportation barriers",
+    "description": "Navigate to the download page. This is SECTION1_B2_4_1"
+  },
+  "download.page.release.update.SECTION1_B2_5": {
+    "defaultMessage": "Water",
+    "description": "Navigate to the download page. This is SECTION1_B2_5"
+  },
+  "download.page.release.update.SECTION1_B2_5_1": {
+    "defaultMessage": "Leaking underground storage tanks",
+    "description": "Navigate to the download page. This is SECTION1_B2_5_1"
+  },
+  "download.page.release.update.SECTION1_B3": {
+    "defaultMessage": "Added an adjacency indicator to methodology to include low income communities that had been completely surrounded by other disadvantaged communities, but which had just missed the thresholds in the beta version.",
+    "description": "Navigate to the download page. This is SECTION1_B3"
+  },
+  "download.page.release.update.SECTION1_B4": {
+    "defaultMessage": "Made technical changes to enhance accuracy of the tool",
+    "description": "Navigate to the download page. This is SECTION1_B4"
+  },
+  "download.page.release.update.SECTION1_B4_1": {
+    "defaultMessage": "Removed income data for students enrolled in higher education in the low income indicator",
+    "description": "Navigate to the download page. This is SECTION1_B4_1"
+  },
+  "download.page.release.update.SECTION1_B4_2": {
+    "defaultMessage": "Imputed income for census tracts missing that data that have a population greater than zero",
+    "description": "Navigate to the download page. This is SECTION1_B4_2"
+  },
+  "download.page.release.update.SECTION1_B4_3": {
+    "defaultMessage": "Used transportation barriers and population loss data indicators only for census tracts with populations of 20 or more",
+    "description": "Navigate to the download page. This is SECTION1_B4_3"
+  },
+  "download.page.release.update.SECTION1_B5": {
+    "defaultMessage": "Improved the user interface",
+    "description": "Navigate to the download page. This is SECTION1_B5"
   },
-  "download.page.release.update.section.1.p.1.1": {
-    "defaultMessage": "Additional data sources now available for Puerto Rico. Linguistic isolation as removed from the methodology for Puerto Rico.",
-    "description": "Navigate to the download page. This is first section of the release update section"
+  "download.page.release.update.SECTION1_B5_1": {
+    "defaultMessage": "Added demographics (race & age) for census tracts to map side panel",
+    "description": "Navigate to the download page. This is SECTION1_B5_1"
+  },
+  "download.page.release.update.SECTION1_B5_2": {
+    "defaultMessage": "Improved the design of the map side panel",
+    "description": "Navigate to the download page. This is SECTION1_B5_2"
+  },
+  "download.page.release.update.SECTION1_B5_3": {
+    "defaultMessage": "Updated the site copy of the website and associated Spanish translations",
+    "description": "Navigate to the download page. This is SECTION1_B5_3"
+  },
+  "download.page.release.update.SECTION1_B6": {
+    "defaultMessage": "Added new data for all the U.S. Territories, and also made a small methodology change for Puerto Rico",
+    "description": "Navigate to the download page. This is SECTION1_B6"
+  },
+  "download.page.release.update.SECTION1_B6_1": {
+    "defaultMessage": "USVI",
+    "description": "Navigate to the download page. This is SECTION1_B6_1"
+  },
+  "download.page.release.update.SECTION1_B6_1_1": {
+    "defaultMessage": "Included data from 2010 decennial census for US Virgin Islands",
+    "description": "Navigate to the download page. This is SECTION1_B6_1_1"
+  },
+  "download.page.release.update.SECTION1_B6_1_2": {
+    "defaultMessage": "New data from EJScreen 2.1",
+    "description": "Navigate to the download page. This is SECTION1_B6_1_2"
+  },
+  "download.page.release.update.SECTION1_B6_1_2_1": {
+    "defaultMessage": "Sustainable Housing:",
+    "description": "Navigate to the download page. This is SECTION1_B6_1_2_1"
+  },
+  "download.page.release.update.SECTION1_B6_1_2_1_1": {
+    "defaultMessage": "Lead paint",
+    "description": "Navigate to the download page. This is SECTION1_B6_1_2_1_1"
+  },
+  "download.page.release.update.SECTION1_B6_1_2_2": {
+    "defaultMessage": "Legacy pollution:",
+    "description": "Navigate to the download page. This is SECTION1_B6_1_2_2"
+  },
+  "download.page.release.update.SECTION1_B6_1_2_2_1": {
+    "defaultMessage": "Proximity to Superfund (National Priorities List (NPL)) sites",
+    "description": "Navigate to the download page. This is SECTION1_B6_1_2_2_1"
+  },
+  "download.page.release.update.SECTION1_B6_1_2_2_2": {
+    "defaultMessage": "Proximity to Risk Management Plan (RMP) facilities",
+    "description": "Navigate to the download page. This is SECTION1_B6_1_2_2_2"
+  },
+  "download.page.release.update.SECTION1_B6_1_2_2_3": {
+    "defaultMessage": "Proximity to hazardous waste facilities",
+    "description": "Navigate to the download page. This is SECTION1_B6_1_2_2_3"
+  },
+  "download.page.release.update.SECTION1_B6_1_2_2_4": {
+    "defaultMessage": "Leaking underground storage tanks",
+    "description": "Navigate to the download page. This is SECTION1_B6_1_2_2_4"
+  },
+  "download.page.release.update.SECTION1_B6_2": {
+    "defaultMessage": "Guam",
+    "description": "Navigate to the download page. This is SECTION1_B6_2"
+  },
+  "download.page.release.update.SECTION1_B6_2_1": {
+    "defaultMessage": "Included data from 2010 decennial census for Guam",
+    "description": "Navigate to the download page. This is SECTION1_B6_2_1"
+  },
+  "download.page.release.update.SECTION1_B6_3": {
+    "defaultMessage": "Samoa",
+    "description": "Navigate to the download page. This is SECTION1_B6_3"
+  },
+  "download.page.release.update.SECTION1_B6_4": {
+    "defaultMessage": "Marianna Islands",
+    "description": "Navigate to the download page. This is SECTION1_B6_4"
+  },
+  "download.page.release.update.SECTION1_B6_5": {
+    "defaultMessage": "Puerto Rico",
+    "description": "Navigate to the download page. This is SECTION1_B6_5"
+  },
+  "download.page.release.update.SECTION1_B6_5_1": {
+    "defaultMessage": "Removed linguistic isolation as an indicator in the methodology for Puerto Rico",
+    "description": "Navigate to the download page. This is SECTION1_B6_5_1"
+  },
+  "download.page.release.update.SECTION1_B6_5_2": {
+    "defaultMessage": "Imported additional available data for Puerto Rico",
+    "description": "Navigate to the download page. This is SECTION1_B6_5_2"
+  },
+  "download.page.release.update.SECTION1_B6_5_2_1": {
+    "defaultMessage": "Energy cost",
+    "description": "Navigate to the download page. This is SECTION1_B6_5_2_1"
+  },
+  "download.page.release.update.SECTION1_B6_5_2_2": {
+    "defaultMessage": "Housing cost",
+    "description": "Navigate to the download page. This is SECTION1_B6_5_2_2"
+  },
+  "download.page.release.update.SECTION1_B6_5_2_3": {
+    "defaultMessage": "Abandoned mine lands",
+    "description": "Navigate to the download page. This is SECTION1_B6_5_2_3"
+  },
+  "download.page.release.update.SECTION1_B6_5_2_4": {
+    "defaultMessage": "Proximity to hazardous waste sites",
+    "description": "Navigate to the download page. This is SECTION1_B6_5_2_4"
+  },
+  "download.page.release.update.SECTION1_B7": {
+    "defaultMessage": "Updated data from EJScreen 2.1 across the entire tool:",
+    "description": "Navigate to the download page. This is SECTION1_B7"
+  },
+  "download.page.release.update.SECTION1_B7_1_1": {
+    "defaultMessage": "Lead paint - 2016-2020",
+    "description": "Navigate to the download page. This is SECTION1_B7_1_1"
+  },
+  "download.page.release.update.SECTION1_B7_2_1": {
+    "defaultMessage": "Proximity to Superfund (National Priorities List (NPL)) sites - 2022",
+    "description": "Navigate to the download page. This is SECTION1_B7_2_1"
+  },
+  "download.page.release.update.SECTION1_B7_2_2": {
+    "defaultMessage": "Proximity to Risk Management Plans (RMP) facilities - 2022",
+    "description": "Navigate to the download page. This is SECTION1_B7_2_2"
+  },
+  "download.page.release.update.SECTION1_B7_2_3": {
+    "defaultMessage": "Proximity to hazardous waste facilities - 2022",
+    "description": "Navigate to the download page. This is SECTION1_B7_2_3"
+  },
+  "download.page.release.update.SECTION1_B7_3": {
+    "defaultMessage": "Water and wastewater",
+    "description": "Navigate to the download page. This is SECTION1_B7_3"
+  },
+  "download.page.release.update.SECTION1_B7_3_1": {
+    "defaultMessage": "Leaking underground storage tanks - 2022",
+    "description": "Navigate to the download page. This is SECTION1_B7_3_1"
+  },
+  "download.page.release.update.SECTION1_B8": {
+    "defaultMessage": "Enhanced the technical files:",
+    "description": "Navigate to the download page. This is SECTION1_B8"
+  },
+  "download.page.release.update.SECTION1_B8_1": {
+    "defaultMessage": "Added all new data indicators and demographics to .xls, .csv, and shapefiles",
+    "description": "Navigate to the download page. This is SECTION1_B8_1"
+  },
+  "download.page.release.update.SECTION1_B8_2": {
+    "defaultMessage": "Added versions page to house beta version of download files",
+    "description": "Navigate to the download page. This is SECTION1_B8_2"
+  },
+  "download.page.release.update.SECTION1_B8_3": {
+    "defaultMessage": "Updated codebook",
+    "description": "Navigate to the download page. This is SECTION1_B8_3"
+  },
+  "download.page.release.update.SECTION1_B8_4": {
+    "defaultMessage": "Updated Technical Support Document",
+    "description": "Navigate to the download page. This is SECTION1_B8_4"
+  },
+  "download.page.release.update.SECTION1_B9": {
+    "defaultMessage": "Improved the way that users provide feedback on the tool:",
+    "description": "Navigate to the download page. This is SECTION1_B9"
+  },
+  "download.page.release.update.SECTION1_B9_1": {
+    "defaultMessage": "Data survey",
+    "description": "Navigate to the download page. This is SECTION1_B9_1"
+  },
+  "download.page.release.update.SECTION1_B9_2": {
+    "defaultMessage": "Site experience survey",
+    "description": "Navigate to the download page. This is SECTION1_B9_2"
+  },
+  "download.page.release.update.SECTION1_B9_3": {
+    "defaultMessage": "Census tract feedback",
+    "description": "Navigate to the download page. This is SECTION1_B9_3"
+  },
+  "download.page.release.update.SECTION1_B9_4": {
+    "defaultMessage": "General contact form",
+    "description": "Navigate to the download page. This is SECTION1_B9_4 "
+  },
+  "download.page.release.update.footer": {
+    "defaultMessage": "release version {version}",
+    "description": "Navigate to the download page. This is second section of the release update section"
   },
   "download.page.release.update.section.2": {
     "defaultMessage": "Fixes",
     "description": "Navigate to the download page. This is second section of the release update section"
   },
   "download.page.release.update.section.2.p1": {
-    "defaultMessage": "Fixed an issue with zoom and select to show census boundaries at a higher zoom level.",
+    "defaultMessage": "Bug fix: loaded missing life expectancy data for Maine and Wisconsin",
+    "description": "Navigate to the download page. This is second section of the release update section"
+  },
+  "download.page.release.update.section.2.p2": {
+    "defaultMessage": "Bug fix: Census tracts that have 0 land should not be included on the map",
     "description": "Navigate to the download page. This is second section of the release update section"
   },
   "download.page.release.update.title.1": {
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index bf31f396b..1ebca376b 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -450,13 +450,332 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <div>
                     <ul>
                       <li>
-                        Updates to the methodology based on feedback recieved during the beta period.
+                        Added Federally Recognized Tribal Lands and Alaska Native Villages data from the Bureau of Indian Affairs at the Department of the Interior to the tool and map
                       </li>
                       <ul>
                         <li>
-                          Additional data sources now available for Puerto Rico. Linguistic isolation as removed from the methodology for Puerto Rico.
+                          Added new data for indicators of burden
+                        </li>
+                        <li>
+                          Climate change
+                        </li>
+                        <ul>
+                          <li>
+                            Projected flood risk
+                          </li>
+                          <li>
+                            Projected wildfire risk
+                          </li>
+                        </ul>
+                        <li>
+                          Housing
+                        </li>
+                        <ul>
+                          <li>
+                            Lack of plumbing
+                          </li>
+                          <li>
+                            Lack of green space
+                          </li>
+                        </ul>
+                        <li>
+                          Legacy pollution
+                        </li>
+                        <ul>
+                          <li>
+                            Abandoned mine lands
+                          </li>
+                          <li>
+                            Formerly used defense sites
+                          </li>
+                        </ul>
+                        <li>
+                          Transportation
+                        </li>
+                        <ul>
+                          <li>
+                            Transportation barriers
+                          </li>
+                        </ul>
+                        <li>
+                          Water
+                        </li>
+                        <ul>
+                          <li>
+                            Leaking underground storage tanks
+                          </li>
+                        </ul>
+                      </ul>
+                      <li>
+                        Added an adjacency indicator to methodology to include low income communities that had been completely surrounded by other disadvantaged communities, but which had just missed the thresholds in the beta version.
+                      </li>
+                      <li>
+                        Made technical changes to enhance accuracy of the tool
+                      </li>
+                      <ul>
+                        <li>
+                          Removed income data for students enrolled in higher education in the low income indicator
+                        </li>
+                        <li>
+                          Imputed income for census tracts missing that data that have a population greater than zero
+                        </li>
+                        <li>
+                          Used transportation barriers and population loss data indicators only for census tracts with populations of 20 or more
+                        </li>
+                      </ul>
+                      <li>
+                        Improved the user interface
+                      </li>
+                      <ul>
+                        <li>
+                          Added demographics (race & age) for census tracts to map side panel
+                        </li>
+                        <li>
+                          Improved the design of the map side panel
+                        </li>
+                        <li>
+                          Updated the site copy of the website and associated Spanish translations
+                        </li>
+                      </ul>
+                      <li>
+                        Added new data for all the U.S. Territories, and also made a small methodology change for Puerto Rico
+                      </li>
+                      <ul>
+                        <li>
+                          USVI
+                        </li>
+                        <ul>
+                          <li>
+                            Included data from 2010 decennial census for US Virgin Islands
+                          </li>
+                          <li>
+                            New data from EJScreen 2.1
+                          </li>
+                          <ul>
+                            <li>
+                              Sustainable Housing:
+                            </li>
+                            <ul>
+                              <li>
+                                Lead paint
+                              </li>
+                            </ul>
+                            <li>
+                              Legacy pollution:
+                            </li>
+                            <ul>
+                              <li>
+                                Proximity to Superfund (National Priorities List (NPL)) sites
+                              </li>
+                              <li>
+                                Proximity to Risk Management Plan (RMP) facilities
+                              </li>
+                              <li>
+                                Proximity to hazardous waste facilities
+                              </li>
+                              <li>
+                                Leaking underground storage tanks
+                              </li>
+                            </ul>
+                          </ul>
+                        </ul>
+                        <li>
+                          Guam
+                        </li>
+                        <ul>
+                          <li>
+                            Included data from 2010 decennial census for Guam
+                          </li>
+                          <li>
+                            New data from EJScreen 2.1
+                          </li>
+                          <ul>
+                            <li>
+                              Sustainable Housing:
+                            </li>
+                            <ul>
+                              <li>
+                                Lead paint
+                              </li>
+                            </ul>
+                            <li>
+                              Legacy pollution:
+                            </li>
+                            <ul>
+                              <li>
+                                Proximity to Superfund (National Priorities List (NPL)) sites
+                              </li>
+                              <li>
+                                Proximity to Risk Management Plan (RMP) facilities
+                              </li>
+                              <li>
+                                Proximity to hazardous waste facilities
+                              </li>
+                              <li>
+                                Leaking underground storage tanks
+                              </li>
+                            </ul>
+                          </ul>
+                        </ul>
+                        <li>
+                          Samoa
+                        </li>
+                        <ul>
+                          <li>
+                            New data from EJScreen 2.1
+                          </li>
+                          <ul>
+                            <li>
+                              Sustainable Housing:
+                            </li>
+                            <ul>
+                              <li>
+                                Lead paint
+                              </li>
+                            </ul>
+                            <li>
+                              Legacy pollution:
+                            </li>
+                            <ul>
+                              <li>
+                                Proximity to Risk Management Plan (RMP) facilities
+                              </li>
+                              <li>
+                                Leaking underground storage tanks
+                              </li>
+                            </ul>
+                          </ul>
+                        </ul>
+                        <li>
+                          Marianna Islands
+                        </li>
+                        <ul>
+                          <li>
+                            New data from EJScreen 2.1
+                          </li>
+                          <ul>
+                            <li>
+                              Sustainable Housing:
+                            </li>
+                            <ul>
+                              <li>
+                                Lead paint
+                              </li>
+                            </ul>
+                            <li>
+                              Legacy pollution:
+                            </li>
+                            <ul>
+                              <li>
+                                Leaking underground storage tanks
+                              </li>
+                            </ul>
+                          </ul>
+                        </ul>
+                        <li>
+                          Puerto Rico
+                        </li>
+                        <ul>
+                          <li>
+                            Removed linguistic isolation as an indicator in the methodology for Puerto Rico
+                          </li>
+                          <li>
+                            Imported additional available data for Puerto Rico
+                          </li>
+                          <ul>
+                            <li>
+                              Energy cost
+                            </li>
+                            <li>
+                              Housing cost
+                            </li>
+                            <li>
+                              Abandoned mine lands
+                            </li>
+                            <li>
+                              Proximity to hazardous waste sites
+                            </li>
+                            <li>
+                              Proximity to Superfund (National Priorities List (NPL)) sites
+                            </li>
+                            <li>
+                              Proximity to Risk Management Plan (RMP) facilities
+                            </li>
+                          </ul>
+                        </ul>
+                      </ul>
+                      <li>
+                        Updated data from EJScreen 2.1 across the entire tool:
+                      </li>
+                      <ul>
+                        <li>
+                          Sustainable Housing:
+                        </li>
+                        <ul>
+                          <li>
+                            Lead paint - 2016-2020
+                          </li>
+                        </ul>
+                        <li>
+                          Legacy pollution:
+                        </li>
+                        <ul>
+                          <li>
+                            Proximity to Superfund (National Priorities List (NPL)) sites - 2022
+                          </li>
+                          <li>
+                            Proximity to Risk Management Plans (RMP) facilities - 2022
+                          </li>
+                          <li>
+                            Proximity to hazardous waste facilities - 2022
+                          </li>
+                        </ul>
+                        <li>
+                          Water and wastewater
+                        </li>
+                        <ul>
+                          <li>
+                            Leaking underground storage tanks - 2022
+                          </li>
+                        </ul>
+                      </ul>
+                      <li>
+                        Enhanced the technical files:
+                      </li>
+                      <ul>
+                        <li>
+                          Added all new data indicators and demographics to .xls, .csv, and shapefiles
+                        </li>
+                        <li>
+                          Added versions page to house beta version of download files
+                        </li>
+                        <li>
+                          Updated codebook
+                        </li>
+                        <li>
+                          Updated Technical Support Document
                         </li>
                       </ul>
+                      <li>
+                        Improved the way that users provide feedback on the tool:
+                      </li>
+                      <ul>
+                        <li>
+                          Data survey
+                        </li>
+                        <li>
+                          Site experience survey
+                        </li>
+                        <li>
+                          Census tract feedback
+                        </li>
+                        <li>
+                          General contact form
+                        </li>
+                      </ul>
+                      <li>
+                        Added a link to sign up for email mailing list managed by CEQ
+                      </li>
                     </ul>
                   </div>
                   <div>
@@ -465,7 +784,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <div>
                     <ul>
                       <li>
-                        Fixed an issue with zoom and select to show census boundaries at a higher zoom level.
+                        Bug fix: loaded missing life expectancy data for Maine and Wisconsin
+                      </li>
+                      <li>
+                        Bug fix: Census tracts that have 0 land should not be included on the map
                       </li>
                     </ul>
                   </div>

From 744292831dee646b8ec2aa83fd9909f5d824463e Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Wed, 26 Oct 2022 19:33:18 -0700
Subject: [PATCH 082/130] Update Pub Eng page (#2043)

- Refactor download button to have gray buttons also
- Add a beta version of the PublicVideoBox in SCSS
- Update copy on Pub Eng page
---
 .../DownloadButton/DownloadButton.module.scss |  15 ++
 .../DownloadButton.module.scss.d.ts           |   2 +
 .../DownloadButton/DownloadButton.tsx         |  17 ++-
 .../PublicVideoBox/PublicVideoBox.module.scss |  45 ++++++
 .../PublicVideoBox.module.scss.d.ts           |   1 +
 .../PublicVideoBox/PublicVideoBox.tsx         |  27 +++-
 .../PublicVideoBox.test.tsx.snap              |  10 +-
 .../ReleaseUpdate/ReleaseUpdate.tsx           |   4 +-
 client/src/data/copy/publicEngage.tsx         |  96 +++++++++---
 client/src/intl/en.json                       |  34 ++++-
 client/src/pages/previous-versions.tsx        |   2 +
 client/src/pages/public-engagement.tsx        |  31 +++-
 .../__snapshots__/publicEng.test.tsx.snap     | 143 ++++++++++++++++--
 13 files changed, 364 insertions(+), 63 deletions(-)

diff --git a/client/src/components/DownloadButton/DownloadButton.module.scss b/client/src/components/DownloadButton/DownloadButton.module.scss
index 1577c7d31..73a9a1adf 100644
--- a/client/src/components/DownloadButton/DownloadButton.module.scss
+++ b/client/src/components/DownloadButton/DownloadButton.module.scss
@@ -21,6 +21,11 @@
             filter: invert(13%) sepia(76%) saturate(5142%) hue-rotate(192deg) brightness(80%) contrast(106%);
         }
 
+        .buttonImageGray {
+            @include buttonImageBase();
+            filter: invert(100%) sepia(0%) saturate(7489%) hue-rotate(232deg) brightness(101%) contrast(101%);
+        }
+
         .buttonImageBlue {
             @include buttonImageBase();
             filter: invert(100%) sepia(100%) saturate(1%) hue-rotate(137deg) brightness(103%) contrast(101%);
@@ -42,6 +47,16 @@
             @include u-text("gray-90");
             }
     }
+
+    .buttonComponentGray {
+        @include downloadButtonBase;
+        @include u-text("white");
+        @include u-bg("gray-60");
+        &:hover {
+            @include u-bg("gray-90");
+            @include u-text("gray-10");
+            }
+    }
     
     .buttonComponent {
        @include downloadButtonBase;
diff --git a/client/src/components/DownloadButton/DownloadButton.module.scss.d.ts b/client/src/components/DownloadButton/DownloadButton.module.scss.d.ts
index 1cdea6b99..29c86c9cc 100644
--- a/client/src/components/DownloadButton/DownloadButton.module.scss.d.ts
+++ b/client/src/components/DownloadButton/DownloadButton.module.scss.d.ts
@@ -3,10 +3,12 @@ declare namespace DownloadButtonNamespace {
       downloadButtonLink: string;
       buttonComponent: string;
       buttonComponentYellow: string;
+      buttonComponentGray: string;
       buttonContainer: string;
       buttonText: string;
       buttonImageBlue: string;
       buttonImageYellow: string;
+      buttonImageGray: string;
     }
   }
 
diff --git a/client/src/components/DownloadButton/DownloadButton.tsx b/client/src/components/DownloadButton/DownloadButton.tsx
index 8cc81f94e..d397a3de3 100644
--- a/client/src/components/DownloadButton/DownloadButton.tsx
+++ b/client/src/components/DownloadButton/DownloadButton.tsx
@@ -9,19 +9,28 @@ export interface IDownloadButtonProps {
   downloadLink: string,
   buttonText: string
   imageAltTagText: string,
-  isYellow?: boolean
+  color : 'gray' | 'yellow' | 'default'
 }
 
-const DownloadButton = ({downloadLink, buttonText, imageAltTagText, isYellow = false}: IDownloadButtonProps) => {
+const DownloadButton = ({downloadLink, buttonText, imageAltTagText, color}: IDownloadButtonProps) => {
   return (
     <a className={styles.downloadButtonLink} href={downloadLink} download>
-      <Button type="button" className={isYellow ? styles.buttonComponentYellow : styles.buttonComponent}>
+      <Button
+        type="button"
+        className={
+          color === 'yellow' ? styles.buttonComponentYellow :
+          color === 'gray' ? styles.buttonComponentGray :
+          styles.buttonComponent
+        }>
         <div className={styles.buttonContainer}>
           <div className={styles.buttonText}>
             {buttonText}
           </div>
           <img
-            className={isYellow ? styles.buttonImageYellow : styles.buttonImageBlue}
+            className={
+              color === 'yellow' ? styles.buttonImageYellow :
+              color === 'gray' ? styles.buttonImageGray :
+              styles.buttonImageBlue}
             src={fileDownloadIcon}
             alt={imageAltTagText}
           />
diff --git a/client/src/components/PublicVideoBox/PublicVideoBox.module.scss b/client/src/components/PublicVideoBox/PublicVideoBox.module.scss
index fd8575288..644ba2aa2 100644
--- a/client/src/components/PublicVideoBox/PublicVideoBox.module.scss
+++ b/client/src/components/PublicVideoBox/PublicVideoBox.module.scss
@@ -41,3 +41,48 @@
     }
   }
 };
+
+.publicVideoContainerBeta {
+  background-color: #F0F0F0;
+  border-color: #D8D9DA;
+  
+  @include u-margin-top(3);
+
+  @include at-media-max('desktop'){
+    @include u-margin-bottom(3);
+  }
+
+  .publicVideoLink {
+      display: flex;
+      text-decoration: none;
+
+      .youTubeBtn {
+        @include u-text("white");
+        @include u-bg("gray-60");
+        height: 40px;
+        @include u-margin-top(3);
+        margin-left: auto;
+        margin-right: auto;
+        width: 14rem;
+        
+        &:hover {
+          @include u-bg("gray-90");
+          @include u-text("gray-10");
+        }
+        .buttonContainer {
+            display: flex;
+
+          .buttonText {
+            @include u-margin-right(1);
+            }
+        
+        .buttonImage {
+            width: 21px;
+            margin-top: -3px;
+
+            filter: invert(100%) sepia(0%) saturate(7489%) hue-rotate(232deg) brightness(101%) contrast(101%);
+        }
+      }
+    }
+  }
+};
\ No newline at end of file
diff --git a/client/src/components/PublicVideoBox/PublicVideoBox.module.scss.d.ts b/client/src/components/PublicVideoBox/PublicVideoBox.module.scss.d.ts
index 753c957c0..18c50d61f 100644
--- a/client/src/components/PublicVideoBox/PublicVideoBox.module.scss.d.ts
+++ b/client/src/components/PublicVideoBox/PublicVideoBox.module.scss.d.ts
@@ -1,6 +1,7 @@
 declare namespace PublicVideoBoxNamespace {
     export interface IPublicVideoBoxScss {
         publicVideoContainer: string;
+        publicVideoContainerBeta: string;
         publicVideoLink: string;
         youTubeBtn: string;
         buttonContainer: string;
diff --git a/client/src/components/PublicVideoBox/PublicVideoBox.tsx b/client/src/components/PublicVideoBox/PublicVideoBox.tsx
index 212b83e46..07b965df9 100644
--- a/client/src/components/PublicVideoBox/PublicVideoBox.tsx
+++ b/client/src/components/PublicVideoBox/PublicVideoBox.tsx
@@ -10,20 +10,25 @@ import * as PUBLIC_COPY from '../../data/copy/publicEngage';
 // @ts-ignore
 import launchIcon from '/node_modules/uswds/dist/img/usa-icons/launch.svg';
 
+interface IPublicVideoBox {
+  isBeta: boolean,
+}
 
-const PublicVideoBox = () => {
+const PublicVideoBox = ({isBeta}:IPublicVideoBox) => {
   const intl = useIntl();
 
   return (
     <SummaryBox
-      className={styles.publicVideoContainer}>
+      className={isBeta ? styles.publicVideoContainerBeta : styles.publicVideoContainer}>
 
-      <SummaryBoxHeading headingLevel='h3'>
-        {intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.TITLE)}
+      <SummaryBoxHeading headingLevel='h2'>
+        {isBeta ?
+        intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.TITLE_BETA) :
+        intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.TITLE)}
       </SummaryBoxHeading>
 
       <SummaryBoxContent>
-        {intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BODY)}
+        {isBeta ? PUBLIC_COPY.RICH_COPY.VIDEO_BOX_BODY2 : PUBLIC_COPY.RICH_COPY.VIDEO_BOX_BODY1}
         <a
           className={styles.publicVideoLink}
           href={`https://www.youtube.com/watch?v=QwHWcXbhw28`}
@@ -36,7 +41,10 @@ const PublicVideoBox = () => {
           >
             <div className={styles.buttonContainer}>
               <div className={styles.buttonText}>
-                {intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON1_TEXT)}
+                {isBeta ?
+                  intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON1_BETA_TEXT) :
+                  intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON1_TEXT)
+                }
               </div>
               <img
                 className={styles.buttonImage}
@@ -48,9 +56,12 @@ const PublicVideoBox = () => {
         </a>
         <DownloadButton
           downloadLink={`https://static-data-screeningtool.geoplatform.gov/data-pipeline/data/score/downloadable/technical-training-slides.pptx`}
-          buttonText={intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON2_TEXT)}
+          buttonText={isBeta ?
+            intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON2_BETA_TEXT) :
+            intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON2_TEXT)
+          }
           imageAltTagText={intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.IMG_ALT_TEXT2)}
-          isYellow={true}
+          color={isBeta ? 'gray' : 'yellow'}
         />
       </SummaryBoxContent>
     </SummaryBox>
diff --git a/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap b/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap
index 2e49f8de4..d75255947 100644
--- a/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap
+++ b/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap
@@ -9,15 +9,17 @@ exports[`rendering of the PublicVideoBox checks if component renders 1`] = `
     <div
       class="usa-summary-box__body"
     >
-      <h3
+      <h2
         class="usa-summary-box__heading"
       >
-        Can't make an upcoming session?
-      </h3>
+        Need information about the latest version of the tool?
+      </h2>
       <div
         class="usa-summary-box__text"
       >
-        Watch a recorded version of the CEJST training on YouTube.
+        
+    See what's new in the version 1.0 of the Climate and Economic Justice Screening tool.
+  
         <a
           href="https://www.youtube.com/watch?v=QwHWcXbhw28"
           rel="noreferrer"
diff --git a/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx b/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx
index b1c078ce4..b93d8370c 100644
--- a/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx
+++ b/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx
@@ -84,7 +84,7 @@ const ReleaseUpdate = ({}: IReleaseUpdateProps) => {
             {DOWNLOAD_COPY.RELEASE_1_0.SECTION1}
           </div>
 
-          <div className={styles.releaseSectionBody}>
+          <div>
             <ul>
               <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B1}</li>
 
@@ -256,7 +256,7 @@ const ReleaseUpdate = ({}: IReleaseUpdateProps) => {
             {DOWNLOAD_COPY.RELEASE_1_0.SECTION2}
           </div>
 
-          <div className={styles.releaseSectionBody}>
+          <div>
             <ul>
               <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION2_P1}</li>
               <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION2_P2}</li>
diff --git a/client/src/data/copy/publicEngage.tsx b/client/src/data/copy/publicEngage.tsx
index e384bc7fa..26128165e 100644
--- a/client/src/data/copy/publicEngage.tsx
+++ b/client/src/data/copy/publicEngage.tsx
@@ -1,5 +1,11 @@
 /* eslint-disable max-len */
-import {defineMessages} from 'react-intl';
+import React from 'react';
+import {FormattedMessage} from 'gatsby-plugin-intl';
+import {defineMessages} from 'gatsby-plugin-intl';
+
+import {linkFn} from './common';
+import {VERSION_NUMBER} from './methodology';
+
 import mar9 from '../../images/eventDates/mar9.svg';
 import mar10 from '../../images/eventDates/mar10.svg';
 import mar16 from '../../images/eventDates/mar16.svg';
@@ -31,18 +37,10 @@ export const PAGE_INTRO = defineMessages({
     defaultMessage: 'Public engagement opportunities',
     description: 'Navigate to the public engagement page, this will be the publiceng page header text',
   },
-  PAGE_HEADING2: {
-    id: 'public.eng.page.sub.header2.text',
-    defaultMessage: 'Find an event',
-    description: 'Navigate to the public engagement page, this will be the publiceng page sub header text',
-  },
   PAGE_DESCRIPTION1: {
     id: 'public.eng.page.description1.text',
     defaultMessage: `
-      CEQ is hosting engagement opportunities to connect with the public about the current version of the 
-      tool. These sessions are an opportunity to obtain training on the tool or to provide feedback on the 
-      beta version of the tool. CEQ hopes that members of the public will join these engagements to learn 
-      about the tool, have their questions answered, and share feedback.
+      The Council on Environmental Quality (CEQ) is hosting engagement opportunities to connect with the public about the current versions of the Climate and Economic Justice Screening Tool (CEJST). These sessions are an opportunity to obtain training on the tool or to provide the feedback on the latest version of the tool. CEQ hopes that members of the public will join these engagements to learn about the tool, ask questions, an share feedback.
     `,
     description: 'Navigate to the public engagement page, this will be the publiceng page description 1 text',
   },
@@ -53,13 +51,12 @@ export const PAGE_INTRO = defineMessages({
     `,
     description: 'Navigate to the public engagement page, this will be the publiceng page description 2 text',
   },
-  PAGE_DESCRIPTION3: {
-    id: 'public.eng.page.description3.text',
+  PAGE_COMING_SOON: {
+    id: 'public.eng.page.coming.soon.text',
     defaultMessage: `
-      As they become available, additional public trainings and engagement opportunities on the Climate 
-      and Economic Justice Screening Tool will also be posted on this page.
+      Coming soon!
     `,
-    description: 'Navigate to the public engagement page, this will be the publiceng page description 3 text',
+    description: 'Navigate to the public engagement page, this will be the publiceng page coming soon text',
   },
   SURVEY_TEXT: {
     id: 'fab.survey.text',
@@ -68,22 +65,76 @@ export const PAGE_INTRO = defineMessages({
   },
 });
 
+export const RICH_COPY = {
+  PAGE_DESCRIPTION3: <FormattedMessage
+    id= {`public.eng.page.description3.text`}
+    defaultMessage={`
+    As they become available, additional public trainings and engagement opportunities on the  Climate and Economic Justice Screening Tool will also be posted on this page. <link1>Sign-up</link1> for updates from CEQ
+  `}
+    description={`Navigate to the public engagement page, this will be the publiceng page description 3 text`}
+    values={{
+      link1: linkFn('https://www.surveymonkey.com/r/whceqej', false, true),
+    }}
+  />,
+  PAGE_HEADING2: <FormattedMessage
+    id={'public.eng.page.sub.header2.text'}
+    defaultMessage={'Upcoming events for CEJST version {version}'}
+    description={'Navigate to the public engagement page, this will be the publiceng page sub header text'}
+    values={{
+      version: VERSION_NUMBER,
+    }}
+  />,
+  PAGE_HEADING3: <FormattedMessage
+    id={'public.eng.page.sub.header3.text'}
+    defaultMessage={'Previous events for public beta'}
+    description={'Navigate to the public engagement page, this will be the publiceng page sub header text'}
+    values={{
+      version: VERSION_NUMBER,
+    }}
+  />,
+  VIDEO_BOX_BODY1: <FormattedMessage
+    id={ 'public.eng.page.video.box.body.text'}
+    defaultMessage={ `
+    See what's new in the version {version} of the Climate and Economic Justice Screening tool.
+  `}
+    description={'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box body text.'}
+    values={{
+      version: VERSION_NUMBER,
+    }}
+  />,
+  VIDEO_BOX_BODY2: <FormattedMessage
+    id={ 'public.eng.page.video.box.body2.text'}
+    defaultMessage={ `
+      Watch a recorded version of the beta version of the CEJST training on YouTube.
+  `}
+    description={'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box body text.'}
+    values={{
+      version: VERSION_NUMBER,
+    }}
+  />,
+};
+
 export const PUBLIC_ENG_VIDEO = defineMessages({
   TITLE: {
     id: 'public.eng.page.video.box.title.text',
-    defaultMessage: `Can't make an upcoming session?`,
+    defaultMessage: `Need information about the latest version of the tool?`,
     description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box title text.',
   },
-  BODY: {
-    id: 'public.eng.page.video.box.body.text',
-    defaultMessage: `Watch a recorded version of the CEJST training on YouTube.`,
-    description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box body text.',
+  TITLE_BETA: {
+    id: 'public.eng.page.video.box.title.beta.text',
+    defaultMessage: `Need information about the public beta?`,
+    description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box title text.',
   },
   BUTTON1_TEXT: {
     id: 'public.eng.page.video.box.button1.text',
     defaultMessage: `Watch on YouTube`,
     description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box button text.',
   },
+  BUTTON1_BETA_TEXT: {
+    id: 'public.eng.page.video.box.button1.beta.text',
+    defaultMessage: `Watch on beta demo`,
+    description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box button text.',
+  },
   IMG_ALT_TEXT1: {
     id: 'public.eng.page.video.box.button.img.alt.text1',
     defaultMessage: `the icon to show that this button will open in a new tab`,
@@ -94,6 +145,11 @@ export const PUBLIC_ENG_VIDEO = defineMessages({
     defaultMessage: `Download slide deck`,
     description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is the button text for the second button.',
   },
+  BUTTON2_BETA_TEXT: {
+    id: 'public.eng.page.video.box.button2.beta.text',
+    defaultMessage: `Download beta slide deck`,
+    description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is the button text for the second button.',
+  },
   IMG_ALT_TEXT2: {
     id: 'public.eng.page.video.box.button.img.alt.text2',
     defaultMessage: `the icon to show that this button will download the file`,
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index db6f1bf0d..855c41568 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -2455,8 +2455,12 @@
     "defaultMessage": "Public engagement",
     "description": "Navigate to the public engagement page, this will be the public engagement button label"
   },
+  "public.eng.page.coming.soon.text": {
+    "defaultMessage": "Coming soon!",
+    "description": "Navigate to the public engagement page, this will be the publiceng page coming soon text"
+  },
   "public.eng.page.description1.text": {
-    "defaultMessage": "CEQ is hosting engagement opportunities to connect with the public about the current version of the tool. These sessions are an opportunity to obtain training on the tool or to provide feedback on the beta version of the tool. CEQ hopes that members of the public will join these engagements to learn about the tool, have their questions answered, and share feedback.",
+    "defaultMessage": "The Council on Environmental Quality (CEQ) is hosting engagement opportunities to connect with the public about the current versions of the Climate and Economic Justice Screening Tool (CEJST). These sessions are an opportunity to obtain training on the tool or to provide the feedback on the latest version of the tool. CEQ hopes that members of the public will join these engagements to learn about the tool, ask questions, an share feedback.",
     "description": "Navigate to the public engagement page, this will be the publiceng page description 1 text"
   },
   "public.eng.page.description2.text": {
@@ -2464,7 +2468,7 @@
     "description": "Navigate to the public engagement page, this will be the publiceng page description 2 text"
   },
   "public.eng.page.description3.text": {
-    "defaultMessage": "As they become available, additional public trainings and engagement opportunities on the Climate and Economic Justice Screening Tool will also be posted on this page.",
+    "defaultMessage": "As they become available, additional public trainings and engagement opportunities on the Climate and Economic Justice Screening Tool will also be posted on this page. <link1>Sign-up</link1> for updates from CEQ",
     "description": "Navigate to the public engagement page, this will be the publiceng page description 3 text"
   },
   "public.eng.page.event.info.label": {
@@ -2540,7 +2544,11 @@
     "description": "Navigate to the public engagement page, this will be the publiceng page header text"
   },
   "public.eng.page.sub.header2.text": {
-    "defaultMessage": "Find an event",
+    "defaultMessage": "Upcoming events for CEJST version {version}",
+    "description": "Navigate to the public engagement page, this will be the publiceng page sub header text"
+  },
+  "public.eng.page.sub.header3.text": {
+    "defaultMessage": "Previous events for public beta",
     "description": "Navigate to the public engagement page, this will be the publiceng page sub header text"
   },
   "public.eng.page.tag.label": {
@@ -2552,7 +2560,11 @@
     "description": "Navigate to the public engagement page, this will be the publiceng page title text"
   },
   "public.eng.page.video.box.body.text": {
-    "defaultMessage": "Watch a recorded version of the CEJST training on YouTube.",
+    "defaultMessage": "See what's new in the version {version} of the Climate and Economic Justice Screening tool.",
+    "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box body text."
+  },
+  "public.eng.page.video.box.body2.text": {
+    "defaultMessage": "Watch a recorded version of the beta version of the CEJST training on YouTube.",
     "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box body text."
   },
   "public.eng.page.video.box.button.img.alt.text1": {
@@ -2563,16 +2575,28 @@
     "defaultMessage": "the icon to show that this button will download the file",
     "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is alt tag of the image in the 2nd button."
   },
+  "public.eng.page.video.box.button1.beta.text": {
+    "defaultMessage": "Watch on beta demo",
+    "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box button text."
+  },
   "public.eng.page.video.box.button1.text": {
     "defaultMessage": "Watch on YouTube",
     "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box button text."
   },
+  "public.eng.page.video.box.button2.beta.text": {
+    "defaultMessage": "Download beta slide deck",
+    "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is the button text for the second button."
+  },
   "public.eng.page.video.box.button2.text": {
     "defaultMessage": "Download slide deck",
     "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is the button text for the second button."
   },
+  "public.eng.page.video.box.title.beta.text": {
+    "defaultMessage": "Need information about the public beta?",
+    "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box title text."
+  },
   "public.eng.page.video.box.title.text": {
-    "defaultMessage": "Can't make an upcoming session?",
+    "defaultMessage": "Need information about the latest version of the tool?",
     "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box title text."
   },
   "public.eng.page.whejac.meeting.day.1.info": {
diff --git a/client/src/pages/previous-versions.tsx b/client/src/pages/previous-versions.tsx
index 9dca3be1c..2cdadfa9e 100644
--- a/client/src/pages/previous-versions.tsx
+++ b/client/src/pages/previous-versions.tsx
@@ -54,11 +54,13 @@ const PreviousVersions = ({location}: IPreviousVersionsProps) => {
                       downloadLink=''
                       buttonText={intl.formatMessage(PREV_VER_COPY.BUTTON.TITLE1)}
                       imageAltTagText={intl.formatMessage(PREV_VER_COPY.BUTTON.BUTTON1_ALT_TAG)}
+                      color={'default'}
                     />
                     <DownloadButton
                       downloadLink=''
                       buttonText={intl.formatMessage(PREV_VER_COPY.BUTTON.TITLE2)}
                       imageAltTagText={intl.formatMessage(PREV_VER_COPY.BUTTON.BUTTON2_ALT_TAG)}
+                      color={'default'}
                     />
                   </CardFooter>
                 </Card>
diff --git a/client/src/pages/public-engagement.tsx b/client/src/pages/public-engagement.tsx
index 5c98715aa..0fd361401 100644
--- a/client/src/pages/public-engagement.tsx
+++ b/client/src/pages/public-engagement.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {Collection, Grid} from '@trussworks/react-uswds';
+import {Collection, CollectionHeading, CollectionItem, Grid} from '@trussworks/react-uswds';
 import {useIntl} from 'gatsby-plugin-intl';
 
 import J40MainGridContainer from '../components/J40MainGridContainer';
@@ -27,7 +27,7 @@ const PublicEngagementPage = ({location}: IPublicEngagementPageProps) => {
 
         <h1>{intl.formatMessage(PUBLIC_ENG_COPY.PAGE_INTRO.PAGE_HEADING1)}</h1>
 
-        <Grid row>
+        <Grid row gap={6}>
           <Grid desktop={{col: 8}}>
             <p>
               {intl.formatMessage(PUBLIC_ENG_COPY.PAGE_INTRO.PAGE_DESCRIPTION1)}
@@ -36,14 +36,35 @@ const PublicEngagementPage = ({location}: IPublicEngagementPageProps) => {
               {intl.formatMessage(PUBLIC_ENG_COPY.PAGE_INTRO.PAGE_DESCRIPTION2)}
             </p>
             <p>
-              {intl.formatMessage(PUBLIC_ENG_COPY.PAGE_INTRO.PAGE_DESCRIPTION3)}
+              {PUBLIC_ENG_COPY.RICH_COPY.PAGE_DESCRIPTION3}
             </p>
           </Grid>
+          <Grid desktop={{col: 4}}>
+            <PublicVideoBox isBeta={false}/>
+          </Grid>
+        </Grid>
+
+        <Grid row>
+          <h2>
+            {PUBLIC_ENG_COPY.RICH_COPY.PAGE_HEADING2}
+          </h2>
+        </Grid>
+
+        <Grid row gap={6}>
+          <Grid desktop={{col: 8}}>
+            <Collection>
+              <CollectionItem>
+                <CollectionHeading headingLevel='h2'>
+                  {intl.formatMessage(PUBLIC_ENG_COPY.PAGE_INTRO.PAGE_COMING_SOON)}
+                </CollectionHeading>
+              </CollectionItem>
+            </Collection>
+          </Grid>
         </Grid>
 
         <Grid row>
           <h2>
-            {intl.formatMessage(PUBLIC_ENG_COPY.PAGE_INTRO.PAGE_HEADING2)}
+            {PUBLIC_ENG_COPY.RICH_COPY.PAGE_HEADING3}
           </h2>
         </Grid>
 
@@ -55,7 +76,7 @@ const PublicEngagementPage = ({location}: IPublicEngagementPageProps) => {
             </Collection>
           </Grid>
           <Grid desktop={{col: 4}}>
-            <PublicVideoBox />
+            <PublicVideoBox isBeta={true}/>
           </Grid>
         </Grid>
 
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index a495ee8e8..4b83c9043 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -385,7 +385,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         Public engagement opportunities
       </h1>
       <div
-        class="grid-row"
+        class="grid-row grid-gap-6"
         data-testid="grid"
       >
         <div
@@ -394,10 +394,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         >
           <p>
             
-      CEQ is hosting engagement opportunities to connect with the public about the current version of the 
-      tool. These sessions are an opportunity to obtain training on the tool or to provide feedback on the 
-      beta version of the tool. CEQ hopes that members of the public will join these engagements to learn 
-      about the tool, have their questions answered, and share feedback.
+      The Council on Environmental Quality (CEQ) is hosting engagement opportunities to connect with the public about the current versions of the Climate and Economic Justice Screening Tool (CEJST). These sessions are an opportunity to obtain training on the tool or to provide the feedback on the latest version of the tool. CEQ hopes that members of the public will join these engagements to learn about the tool, ask questions, an share feedback.
     
           </p>
           <p>
@@ -407,18 +404,132 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </p>
           <p>
             
-      As they become available, additional public trainings and engagement opportunities on the Climate 
-      and Economic Justice Screening Tool will also be posted on this page.
-    
+    As they become available, additional public trainings and engagement opportunities on the  Climate and Economic Justice Screening Tool will also be posted on this page. 
+            <a
+              class="usa-link usa-link--external"
+              data-cy=""
+              href="https://www.surveymonkey.com/r/whceqej"
+              rel="noreferrer"
+              target="_blank"
+            >
+              Sign-up
+            </a>
+             for updates from CEQ
+  
           </p>
         </div>
+        <div
+          class="desktop:grid-col-4"
+          data-testid="grid"
+        >
+          <div
+            class="usa-summary-box"
+            data-testid="summary-box"
+          >
+            <div
+              class="usa-summary-box__body"
+            >
+              <h2
+                class="usa-summary-box__heading"
+              >
+                Need information about the latest version of the tool?
+              </h2>
+              <div
+                class="usa-summary-box__text"
+              >
+                
+    See what's new in the version 1.0 of the Climate and Economic Justice Screening tool.
+  
+                <a
+                  href="https://www.youtube.com/watch?v=QwHWcXbhw28"
+                  rel="noreferrer"
+                  target="_blank"
+                >
+                  <button
+                    class="usa-button"
+                    data-testid="button"
+                    type="button"
+                  >
+                    <div>
+                      <div>
+                        Watch on YouTube
+                      </div>
+                      <img
+                        alt="the icon to show that this button will open in a new tab"
+                        src="test-file-stub"
+                      />
+                    </div>
+                  </button>
+                </a>
+                <a
+                  download=""
+                  href="https://static-data-screeningtool.geoplatform.gov/data-pipeline/data/score/downloadable/technical-training-slides.pptx"
+                >
+                  <button
+                    class="usa-button"
+                    data-testid="button"
+                    type="button"
+                  >
+                    <div>
+                      <div>
+                        Download slide deck
+                      </div>
+                      <img
+                        alt="the icon to show that this button will download the file"
+                        src="test-file-stub"
+                      />
+                    </div>
+                  </button>
+                </a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="grid-row"
+        data-testid="grid"
+      >
+        <h2>
+          Upcoming events for CEJST version 1.0
+        </h2>
+      </div>
+      <div
+        class="grid-row grid-gap-6"
+        data-testid="grid"
+      >
+        <div
+          class="desktop:grid-col-8"
+          data-testid="grid"
+        >
+          <ul
+            class="usa-collection"
+            data-testid="collection"
+          >
+            <li
+              class="usa-collection__item"
+            >
+              <div
+                class="usa-collection__body"
+              >
+                <h2
+                  class="usa-collection__heading"
+                >
+                  
+      Coming soon!
+    
+                </h2>
+              </div>
+            </li>
+          </ul>
+        </div>
       </div>
       <div
         class="grid-row"
         data-testid="grid"
       >
         <h2>
-          Find an event
+          Previous events for public beta
         </h2>
       </div>
       <div
@@ -933,15 +1044,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               class="usa-summary-box__body"
             >
-              <h3
+              <h2
                 class="usa-summary-box__heading"
               >
-                Can't make an upcoming session?
-              </h3>
+                Need information about the public beta?
+              </h2>
               <div
                 class="usa-summary-box__text"
               >
-                Watch a recorded version of the CEJST training on YouTube.
+                
+      Watch a recorded version of the beta version of the CEJST training on YouTube.
+  
                 <a
                   href="https://www.youtube.com/watch?v=QwHWcXbhw28"
                   rel="noreferrer"
@@ -954,7 +1067,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   >
                     <div>
                       <div>
-                        Watch on YouTube
+                        Watch on beta demo
                       </div>
                       <img
                         alt="the icon to show that this button will open in a new tab"
@@ -974,7 +1087,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   >
                     <div>
                       <div>
-                        Download slide deck
+                        Download beta slide deck
                       </div>
                       <img
                         alt="the icon to show that this button will download the file"

From 3bc1af25136d19ad7c4daeed1ca7040968b16c04 Mon Sep 17 00:00:00 2001
From: Matt Bowen <83967628+mattbowen-usds@users.noreply.github.com>
Date: Fri, 28 Oct 2022 09:36:26 -0400
Subject: [PATCH 083/130] Change geojson to shapefile (#2044)

* geojson -> shapefile (#1931)

* Update test too (#1931)
---
 client/src/data/copy/downloads.tsx                           | 2 +-
 client/src/pages/tests/__snapshots__/downloads.test.tsx.snap | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/data/copy/downloads.tsx b/client/src/data/copy/downloads.tsx
index c43dc1174..f8a71b01e 100644
--- a/client/src/data/copy/downloads.tsx
+++ b/client/src/data/copy/downloads.tsx
@@ -504,7 +504,7 @@ export const DOWNLOAD_LINKS = {
   />,
   LINK3: <FormattedMessage
     id={'download.page.download.file.3'}
-    defaultMessage={`<link3>Shapefile</link3> (Codebook included with geojson {shapeFileSize} unzipped)`}
+    defaultMessage={`<link3>Shapefile</link3> (Codebook included with shapefile {shapeFileSize} unzipped)`}
     description={'Navigate to the download page. This is third download file link'}
     values={{
       link3: COMMON_COPY.downloadLink(DOWNLOAD_FILES.SHAPE_FILE.URL),
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index 1ebca376b..39e592a9c 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -847,7 +847,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               alt="The icon used to indicate that the file is downloadable"
               src="test-file-stub"
             />
-             (Codebook included with geojson 741MB unzipped)
+             (Codebook included with shapefile 741MB unzipped)
           </p>
           <p>
             <a

From 10601daf35d8633872729a1a7a59e02805eb7f1c Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Fri, 28 Oct 2022 13:57:11 -0700
Subject: [PATCH 084/130] Beta and narwal links (#2051)

* Update download links to 1.0

* Update previous versions with two beta links

* Add beta data doc to prod .env
---
 client/.env.development                       |  23 +++-
 client/.env.production                        |  20 ++-
 client/src/data/copy/downloads.tsx            | 121 +++++++++++-------
 client/src/data/copy/explore.tsx              |   8 +-
 client/src/intl/en.json                       |   2 +-
 client/src/pages/previous-versions.tsx        |   9 +-
 .../__snapshots__/downloads.test.tsx.snap     |  10 +-
 7 files changed, 123 insertions(+), 70 deletions(-)

diff --git a/client/.env.development b/client/.env.development
index b91ea4bd0..d9e56f739 100644
--- a/client/.env.development
+++ b/client/.env.development
@@ -10,17 +10,26 @@ GATSBY_DATA_PIPELINE_SCORE_PATH_LOCAL=data_pipeline/data/score
 GATSBY_DATA_PIPELINE_SCORE_PATH=data-pipeline/data/score
 GATSBY_DATA_PIPELINE_TRIBAL_PATH=data-pipeline/data/tribal
 
-GATSBY_FILE_DL_PATH_SCREENING_TOOL_DATA_ZIP=downloadable/Screening_Tool_Data.zip
-GATSBY_FILE_DL_PATH_SHAPE_FILE_ZIP=shapefile/usa.zip
-GATSBY_FILE_DL_PATH_TSD_PDF=downloadable/cejst_technical_support_document.pdf
+GATSBY_FILE_DL_BETA_SCORE_PATH = data-versions/beta/data/score
+GATSBY_FILE_DL_1_0_SCORE_PATH = data-versions/1.0/data/score
+
+GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_XLS=downloadable/beta-communities.xlsx
+GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_CSV=downloadable/beta-communities.csv
+GATSBY_FILE_DL_PATH_BETA_SHAPE_FILE_ZIP=downloadable/beta-shapefile-codebook.zip
+GATSBY_FILE_DL_PATH_BETA_DATA_DOC=downloadable/beta-data-documentation.zip
+
+
+GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_XLS=downloadable/1.0-communities.xlsx
+GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_CSV=downloadable/1.0-communities.csv
+GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP=downloadable/1.0-shapefile-codebook.zip
+
+GATSBY_FILE_DL_PATH_TSD_PDF=downloadable/cejst-technical-support-document.pdf
 GATSBY_FILE_DL_PATH_TSD_ES_PDF=downloadable/cejst-technical-support-document-es.pdf
-GATSBY_FILE_DL_PATH_COMMUNITIES_LIST_XLS=downloadable/communities-2022-05-12-1914GMT.xlsx
-GATSBY_FILE_DL_PATH_COMMUNITIES_LIST_CSV=downloadable/communities-2022-05-12-1914GMT.csv
-GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF=downloadable/draft_communities_list.pdf
+GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF=downloadable/draft-communities-list.pdf
 
 GATSBY_MAP_TILES_PATH=tiles
 
 # If you want the map to render a MapBox base map (as opposed to the
 # open source one from CartoDB), please create your own API TOKEN from
 # your MapBox account and add the token here:
-MAPBOX_STYLES_READ_TOKEN=pk.eyJ1IjoianVzdGljZTQwIiwiYSI6ImNreWtnenF6eDFxYmUydW12eDRrZnB4ejgifQ.KhDXm2M2vCT0tQ0DbS1ImQ
\ No newline at end of file
+MAPBOX_STYLES_READ_TOKEN=''
\ No newline at end of file
diff --git a/client/.env.production b/client/.env.production
index 93712b45c..0a313a9e9 100644
--- a/client/.env.production
+++ b/client/.env.production
@@ -8,12 +8,20 @@ GATSBY_CDN_TILES_BASE_URL=https://static-data-screeningtool.geoplatform.gov
 GATSBY_DATA_PIPELINE_SCORE_PATH=data-pipeline/data/score
 GATSBY_DATA_PIPELINE_TRIBAL_PATH=data-pipeline/data/tribal
 
-GATSBY_FILE_DL_PATH_SCREENING_TOOL_DATA_ZIP=downloadable/Screening_Tool_Data.zip
-GATSBY_FILE_DL_PATH_SHAPE_FILE_ZIP=shapefile/usa.zip
-GATSBY_FILE_DL_PATH_TSD_PDF=downloadable/cejst_technical_support_document.pdf
+GATSBY_FILE_DL_BETA_SCORE_PATH = data-versions/beta/data/score
+GATSBY_FILE_DL_1_0_SCORE_PATH = data-versions/1.0/data/score
+
+GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_XLS=downloadable/beta-communities.xlsx
+GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_CSV=downloadable/beta-communities.csv
+GATSBY_FILE_DL_PATH_BETA_SHAPE_FILE_ZIP=downloadable/beta-shapefile-codebook.zip
+GATSBY_FILE_DL_PATH_BETA_DATA_DOC=downloadable/beta-data-documentation.zip
+
+GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_XLS=downloadable/1.0-communities.xlsx
+GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_CSV=downloadable/1.0-communities.csv
+GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP=downloadable/1.0-shapefile-codebook.zip
+
+GATSBY_FILE_DL_PATH_TSD_PDF=downloadable/cejst-technical-support-document.pdf
 GATSBY_FILE_DL_PATH_TSD_ES_PDF=downloadable/cejst-technical-support-document-es.pdf
-GATSBY_FILE_DL_PATH_COMMUNITIES_LIST_XLS=downloadable/communities-2022-05-31-1915GMT.xlsx
-GATSBY_FILE_DL_PATH_COMMUNITIES_LIST_CSV=downloadable/communities-2022-05-31-1915GMT.csv
-GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF=downloadable/Draft_Communities_List.pdf
+GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF=downloadable/draft-communities-list.pdf
 
 GATSBY_MAP_TILES_PATH=tiles
diff --git a/client/src/data/copy/downloads.tsx b/client/src/data/copy/downloads.tsx
index f8a71b01e..9b842ad48 100644
--- a/client/src/data/copy/downloads.tsx
+++ b/client/src/data/copy/downloads.tsx
@@ -28,50 +28,79 @@ export const PAGE_INTRO = defineMessages({
   },
 });
 
-const getDownloadFileUrl = (filePath:string | undefined) => {
+export const getDownloadFileUrl = (filePath:string | undefined, isBeta: boolean) => {
   return [
     process.env.GATSBY_CDN_TILES_BASE_URL,
-    process.env.GATSBY_DATA_PIPELINE_SCORE_PATH,
+    (isBeta ? process.env.GATSBY_FILE_DL_BETA_SCORE_PATH : process.env.GATSBY_FILE_DL_1_0_SCORE_PATH),
     filePath,
   ].join('/');
 };
 
 // Define meta data on dowload files
 export const DOWNLOAD_FILES = {
-  SCREENING_TOOL_DATA_ZIP: {
-    SIZE: 53.7, // MB
-    URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_SCREENING_TOOL_DATA_ZIP),
-    LAST_UPDATED: new Date('5/4/2022').getTime(),
+  NARWAL: {
+    COMMUNITIES_LIST_XLS: {
+      SIZE: 35.6, // MB
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_XLS, false),
+      LAST_UPDATED: new Date('10/27/2022').getTime(),
+    },
+    COMMUNITIES_LIST_CSV: {
+      SIZE: 42, // MB
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_CSV, false),
+      LAST_UPDATED: new Date('10/27/2022').getTime(),
+    },
+    SHAPE_FILE: {
+      SIZE: 356.8, // MB
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP, false),
+      LAST_UPDATED: new Date('10/27/2022').getTime(),
+    },
+    TSD: {
+      SIZE: 2.4, // MB
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_PDF, false),
+      LAST_UPDATED: new Date('10/27/2022').getTime(),
+    },
+    TSD_ES: {
+      SIZE: 4.8, // MB
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_ES_PDF, false),
+      LAST_UPDATED: new Date('10/27/2022').getTime(),
+    },
+    HOW_TO_COMMUNITIES: {
+      SIZE: 658.3, // KB
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF, false),
+      LAST_UPDATED: new Date('10/27/2022').getTime(),
+    },
   },
-  COMMUNITIES_LIST_CSV: {
-    SIZE: 28.1, // MB
-    URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_COMMUNITIES_LIST_CSV),
-    LAST_UPDATED: new Date('5/4/2022').getTime(),
-  },
-  COMMUNITIES_LIST_XLS: {
-    SIZE: 24.9, // MB
-    URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_COMMUNITIES_LIST_XLS),
-    LAST_UPDATED: new Date('5/4/2022').getTime(),
-  },
-  SHAPE_FILE: {
-    SIZE: 741, // MB
-    URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_SHAPE_FILE_ZIP),
-    LAST_UPDATED: new Date('5/4/2022').getTime(),
-  },
-  TSD: {
-    SIZE: 2.5, // MB
-    URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_PDF),
-    LAST_UPDATED: new Date('5/4/2022').getTime(),
-  },
-  TSD_ES: {
-    SIZE: 2.5, // MB
-    URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_ES_PDF),
-    LAST_UPDATED: new Date('5/4/2022').getTime(),
-  },
-  HOW_TO_COMMUNITIES: {
-    SIZE: 674, // KB
-    URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF),
-    LAST_UPDATED: new Date('5/4/2022').getTime(),
+  BETA: {
+    COMMUNITIES_LIST_XLS: {
+      SIZE: 23.7, // MB
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_XLS, true),
+      LAST_UPDATED: new Date('10/27/2022').getTime(),
+    },
+    COMMUNITIES_LIST_CSV: {
+      SIZE: 26.8, // MB
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_CSV, true),
+      LAST_UPDATED: new Date('10/27/2022').getTime(),
+    },
+    SHAPE_FILE: {
+      SIZE: 351.4, // MB
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_BETA_SHAPE_FILE_ZIP, true),
+      LAST_UPDATED: new Date('10/27/2022').getTime(),
+    },
+    TSD: {
+      SIZE: 2.4, // MB
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_PDF, true),
+      LAST_UPDATED: new Date('10/27/2022').getTime(),
+    },
+    TSD_ES: {
+      SIZE: 4.8, // MB
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_ES_PDF, true),
+      LAST_UPDATED: new Date('10/27/2022').getTime(),
+    },
+    HOW_TO_COMMUNITIES: {
+      SIZE: 658.3, // KB
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF, true),
+      LAST_UPDATED: new Date('10/27/2022').getTime(),
+    },
   },
 };
 
@@ -479,9 +508,9 @@ export const DOWNLOAD_LINKS = {
       `}
     description={'Navigate to the download page. This is first download file link'}
     values={{
-      link1: COMMON_COPY.downloadLink(DOWNLOAD_FILES.COMMUNITIES_LIST_XLS.URL),
+      link1: COMMON_COPY.downloadLink(DOWNLOAD_FILES.NARWAL.COMMUNITIES_LIST_XLS.URL),
       cldXlsFileSize: <FormattedNumber
-        value={DOWNLOAD_FILES.COMMUNITIES_LIST_XLS.SIZE}
+        value={DOWNLOAD_FILES.NARWAL.COMMUNITIES_LIST_XLS.SIZE}
         style="unit"
         unit="megabyte"
         unitDisplay="narrow"
@@ -493,9 +522,9 @@ export const DOWNLOAD_LINKS = {
     defaultMessage={`<link2>Communities list data</link2> (.csv {cldCsvFileSize})`}
     description={'Navigate to the download page. This is second download file link'}
     values={{
-      link2: COMMON_COPY.downloadLink(DOWNLOAD_FILES.COMMUNITIES_LIST_CSV.URL),
+      link2: COMMON_COPY.downloadLink(DOWNLOAD_FILES.NARWAL.COMMUNITIES_LIST_CSV.URL),
       cldCsvFileSize: <FormattedNumber
-        value={DOWNLOAD_FILES.COMMUNITIES_LIST_CSV.SIZE}
+        value={DOWNLOAD_FILES.NARWAL.COMMUNITIES_LIST_CSV.SIZE}
         style="unit"
         unit="megabyte"
         unitDisplay="narrow"
@@ -507,9 +536,9 @@ export const DOWNLOAD_LINKS = {
     defaultMessage={`<link3>Shapefile</link3> (Codebook included with shapefile {shapeFileSize} unzipped)`}
     description={'Navigate to the download page. This is third download file link'}
     values={{
-      link3: COMMON_COPY.downloadLink(DOWNLOAD_FILES.SHAPE_FILE.URL),
+      link3: COMMON_COPY.downloadLink(DOWNLOAD_FILES.NARWAL.SHAPE_FILE.URL),
       shapeFileSize: <FormattedNumber
-        value={DOWNLOAD_FILES.SHAPE_FILE.SIZE}
+        value={DOWNLOAD_FILES.NARWAL.SHAPE_FILE.SIZE}
         style="unit"
         unit="megabyte"
         unitDisplay="narrow"
@@ -521,10 +550,10 @@ export const DOWNLOAD_LINKS = {
     defaultMessage={`<link4>Technical support document</link4> (.pdf {tsdFileSize})`}
     description={'Navigate to the download page. This is fourth download file link'}
     values={{
-      link4: COMMON_COPY.linkFn(DOWNLOAD_FILES.TSD.URL, false, true),
-      link4es: COMMON_COPY.linkFn(DOWNLOAD_FILES.TSD_ES.URL, false, true),
+      link4: COMMON_COPY.linkFn(DOWNLOAD_FILES.NARWAL.TSD.URL, false, true),
+      link4es: COMMON_COPY.linkFn(DOWNLOAD_FILES.NARWAL.TSD_ES.URL, false, true),
       tsdFileSize: <FormattedNumber
-        value={DOWNLOAD_FILES.TSD.SIZE}
+        value={DOWNLOAD_FILES.NARWAL.TSD.SIZE}
         style="unit"
         unit="megabyte"
         unitDisplay="narrow"
@@ -536,9 +565,9 @@ export const DOWNLOAD_LINKS = {
     defaultMessage={`<link5>How to use the list of communities</link5> (.pdf {howToCommFileSize})`}
     description={'Navigate to the download page. This is fifth download file link'}
     values={{
-      link5: COMMON_COPY.linkFn(DOWNLOAD_FILES.HOW_TO_COMMUNITIES.URL, false, true),
+      link5: COMMON_COPY.linkFn(DOWNLOAD_FILES.NARWAL.HOW_TO_COMMUNITIES.URL, false, true),
       howToCommFileSize: <FormattedNumber
-        value={DOWNLOAD_FILES.HOW_TO_COMMUNITIES.SIZE}
+        value={DOWNLOAD_FILES.NARWAL.HOW_TO_COMMUNITIES.SIZE}
         style="unit"
         unit="kilobyte"
         unitDisplay="narrow"
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index cf8066fdd..8f8585f34 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -1362,6 +1362,8 @@ export const LOW_INCOME_TOOLTIP = defineMessages({
     description: 'Hover over the low income icon and it will show Tracts with missing income data are given estimated incomes based on an average of the incomes of the surrounding tracts. Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold.',
   },
 });
+
+
 export const DOWNLOAD_DRAFT = {
   PARAGRAPH_1: <FormattedMessage
     id={'explore.map.page.under.map.download.draft.ptag.1'}
@@ -1373,15 +1375,15 @@ export const DOWNLOAD_DRAFT = {
       map that will download the data packet
     `}
     values={{
-      link1: COMMON_COPY.downloadLink(DOWNLOADS_COPY.DOWNLOAD_FILES.SHAPE_FILE.URL),
+      link1: COMMON_COPY.downloadLink(DOWNLOADS_COPY.DOWNLOAD_FILES.NARWAL.SHAPE_FILE.URL),
       downloadFileSize: <FormattedNumber
-        value={DOWNLOADS_COPY.DOWNLOAD_FILES.SHAPE_FILE.SIZE}
+        value={DOWNLOADS_COPY.DOWNLOAD_FILES.NARWAL.SHAPE_FILE.SIZE}
         style="unit"
         unit="megabyte"
         unitDisplay="narrow"
       />,
       dateUpdated: <FormattedDate
-        value={DOWNLOADS_COPY.DOWNLOAD_FILES.SHAPE_FILE.LAST_UPDATED}
+        value={DOWNLOADS_COPY.DOWNLOAD_FILES.NARWAL.SHAPE_FILE.LAST_UPDATED}
         year="2-digit"
         month="2-digit"
         day="2-digit"
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 855c41568..a52a2967a 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -292,7 +292,7 @@
     "description": "Navigate to the download page. This is second download file link"
   },
   "download.page.download.file.3": {
-    "defaultMessage": "<link3>Shapefile</link3> (Codebook included with geojson {shapeFileSize} unzipped)",
+    "defaultMessage": "<link3>Shapefile</link3> (Codebook included with shapefile {shapeFileSize} unzipped)",
     "description": "Navigate to the download page. This is third download file link"
   },
   "download.page.download.file.4": {
diff --git a/client/src/pages/previous-versions.tsx b/client/src/pages/previous-versions.tsx
index 2cdadfa9e..975f2a681 100644
--- a/client/src/pages/previous-versions.tsx
+++ b/client/src/pages/previous-versions.tsx
@@ -12,6 +12,7 @@ import SubPageNav from '../components/SubPageNav';
 import * as PREV_VER_COPY from '../data/copy/previousVer';
 import * as CONSTANTS from '../data/constants';
 import {PAGES_ENDPOINTS} from '../data/constants';
+import {getDownloadFileUrl} from '../data/copy/downloads';
 
 interface IPreviousVersionsProps {
   location: Location;
@@ -51,13 +52,17 @@ const PreviousVersions = ({location}: IPreviousVersionsProps) => {
                   </CardBody>
                   <CardFooter>
                     <DownloadButton
-                      downloadLink=''
+                      downloadLink={
+                        getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_BETA_DATA_DOC, true)
+                      }
                       buttonText={intl.formatMessage(PREV_VER_COPY.BUTTON.TITLE1)}
                       imageAltTagText={intl.formatMessage(PREV_VER_COPY.BUTTON.BUTTON1_ALT_TAG)}
                       color={'default'}
                     />
                     <DownloadButton
-                      downloadLink=''
+                      downloadLink={
+                        getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_BETA_SHAPE_FILE_ZIP, true)
+                      }
                       buttonText={intl.formatMessage(PREV_VER_COPY.BUTTON.TITLE2)}
                       imageAltTagText={intl.formatMessage(PREV_VER_COPY.BUTTON.BUTTON2_ALT_TAG)}
                       color={'default'}
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index 39e592a9c..c8b30296e 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -818,7 +818,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               alt="The icon used to indicate that the file is downloadable"
               src="test-file-stub"
             />
-             (.xlsx 24.9MB)
+             (.xlsx 35.6MB)
       
           </p>
           <p>
@@ -833,7 +833,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               alt="The icon used to indicate that the file is downloadable"
               src="test-file-stub"
             />
-             (.csv 28.1MB)
+             (.csv 42MB)
           </p>
           <p>
             <a
@@ -847,7 +847,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               alt="The icon used to indicate that the file is downloadable"
               src="test-file-stub"
             />
-             (Codebook included with shapefile 741MB unzipped)
+             (Codebook included with shapefile 356.8MB unzipped)
           </p>
           <p>
             <a
@@ -859,7 +859,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             >
               Technical support document
             </a>
-             (.pdf 2.5MB)
+             (.pdf 2.4MB)
           </p>
           <p>
             <a
@@ -871,7 +871,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             >
               How to use the list of communities
             </a>
-             (.pdf 674kB)
+             (.pdf 658.3kB)
           </p>
         </div>
         <div

From 8903e6b25b5c168aba16a8bca094a0837ac578ad Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 1 Nov 2022 10:55:21 -0700
Subject: [PATCH 085/130] Update PEC page

- add new icons (expired)
- create placeholder for 1.0 copy
- remove narwal links
---
 client/src/data/copy/publicEngage.tsx         |  37 ++-
 .../src/images/eventDates/oct4-inactive.svg   |   1 +
 .../src/images/eventDates/oct9-inactive.svg   |   1 +
 client/src/intl/en.json                       |   8 +
 client/src/pages/public-engagement.tsx        |   8 +-
 .../__snapshots__/publicEng.test.tsx.snap     | 245 +++++++++++-------
 6 files changed, 196 insertions(+), 104 deletions(-)
 create mode 100644 client/src/images/eventDates/oct4-inactive.svg
 create mode 100644 client/src/images/eventDates/oct9-inactive.svg

diff --git a/client/src/data/copy/publicEngage.tsx b/client/src/data/copy/publicEngage.tsx
index 26128165e..f441acc08 100644
--- a/client/src/data/copy/publicEngage.tsx
+++ b/client/src/data/copy/publicEngage.tsx
@@ -24,6 +24,8 @@ import mar31Exp from '../../images/eventDates/mar31-inactive.svg';
 import apr15Exp from '../../images/eventDates/apr15-inactive.svg';
 import may10Exp from '../../images/eventDates/may10-inactive.svg';
 import may19Exp from '../../images/eventDates/may19-inactive.svg';
+import oct4Exp from '../../images/eventDates/oct4-inactive.svg';
+import oct9Exp from '../../images/eventDates/oct9-inactive.svg';
 
 
 export const PAGE_INTRO = defineMessages({
@@ -309,7 +311,6 @@ export const EVENTS = [
     }),
     REG_LINK: `https://pitc.zoomgov.com/webinar/register/WN_q86iMtpwTESYa6f0xpIk7g`,
     DATA_CY: `mar-16-reg-link-block`,
-
   },
   {
     DATE: new Date(2022, 2, 23),
@@ -414,4 +415,38 @@ export const EVENTS = [
     REG_LINK: `https://pitc.zoomgov.com/webinar/register/WN_1PR73vLDQpq1zoAWkhKB5g`,
     DATA_CY: `may-19-reg-link-block`,
   },
+  {
+    DATE: new Date(2022, 9, 5),
+    NAME: EVENT_TYPES.TRAINING_SESS.NAME,
+    DESC: EVENT_TYPES.TRAINING_SESS.DESCRIPTION,
+    NUMBER: 4,
+    IMAGE: oct4Exp,
+    EXPIRED_IMG: oct4Exp,
+    FIELDS: defineMessages({
+      INFO: {
+        id: 'public.eng.page.event.training.4.info',
+        defaultMessage: `October 4th (4:00 - 5:00 PM EST)`,
+        description: 'Navigate to the public engagement page, this will be the public engagement page event training session 4 date',
+      },
+    }),
+    REG_LINK: `https://pitc.zoomgov.com/webinar/register/WN_q86iMtpwTESYa6f0xpIk7g`,
+    DATA_CY: `oct-4-reg-link-block`,
+  },
+  {
+    DATE: new Date(2022, 9, 10),
+    NAME: EVENT_TYPES.TRAINING_SESS.NAME,
+    DESC: EVENT_TYPES.TRAINING_SESS.DESCRIPTION,
+    NUMBER: 5,
+    IMAGE: oct9Exp,
+    EXPIRED_IMG: oct9Exp,
+    FIELDS: defineMessages({
+      INFO: {
+        id: 'public.eng.page.event.training.5.info',
+        defaultMessage: `October 9th (4:00 - 5:00 PM EST)`,
+        description: 'Navigate to the public engagement page, this will be the public engagement page event training session 5 date',
+      },
+    }),
+    REG_LINK: `https://pitc.zoomgov.com/webinar/register/WN_q86iMtpwTESYa6f0xpIk7g`,
+    DATA_CY: `oct-9-reg-link-block`,
+  },
 ];
diff --git a/client/src/images/eventDates/oct4-inactive.svg b/client/src/images/eventDates/oct4-inactive.svg
new file mode 100644
index 000000000..ad4bb8d3c
--- /dev/null
+++ b/client/src/images/eventDates/oct4-inactive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 88 83.5"><defs><style>.cls-1{fill:#c9c9c9;}.cls-2{clip-path:url(#clip-path);}.cls-3{isolation:isolate;}.cls-4{clip-path:url(#clip-path-2);}.cls-5{fill:none;stroke:#c9c9c9;stroke-miterlimit:10;}.cls-6{fill:#fff;}</style><clipPath id="clip-path" transform="translate(4.5 4.5)"><rect class="cls-1" x="0.5" y="0.5" width="78" height="39"/></clipPath><clipPath id="clip-path-2" transform="translate(4.5 4.5)"><rect class="cls-1" x="0.5" y="0.5" width="79" height="39"/></clipPath></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><rect class="cls-1" x="5" y="5" width="78" height="39"/><g class="cls-2"><g class="cls-3"><rect class="cls-1" x="5" y="5" width="79" height="39"/><g class="cls-4"><rect class="cls-1" x="5" y="5" width="78" height="39"/><g class="cls-2"><rect class="cls-1" width="88" height="49"/></g></g></g></g><rect class="cls-5" x="5" y="5" width="78" height="78"/><g class="cls-3"><path class="cls-6" d="M26.05,26.68a6.05,6.05,0,0,1-3.19-.81,5.32,5.32,0,0,1-2.08-2.29A8,8,0,0,1,20,20a7.91,7.91,0,0,1,.75-3.58,5.42,5.42,0,0,1,2.09-2.32,6,6,0,0,1,3.17-.81,6,6,0,0,1,3.15.81,5.41,5.41,0,0,1,2.07,2.31A8.1,8.1,0,0,1,32,20a8.09,8.09,0,0,1-.72,3.55,5.21,5.21,0,0,1-2.07,2.3A6,6,0,0,1,26.05,26.68Zm0-2.16a3,3,0,0,0,1.65-.45,3,3,0,0,0,1.07-1.44,7.15,7.15,0,0,0,.38-2.57,7.69,7.69,0,0,0-.38-2.64,3,3,0,0,0-1.08-1.48,2.82,2.82,0,0,0-1.64-.47,2.85,2.85,0,0,0-1.65.47,3,3,0,0,0-1.09,1.48,7.5,7.5,0,0,0-.39,2.64,7.05,7.05,0,0,0,.39,2.57,2.73,2.73,0,0,0,2.74,1.89Z" transform="translate(4.5 4.5)"/><path class="cls-6" d="M39.5,13.31a5.59,5.59,0,0,1,2.62.59A5,5,0,0,1,44,15.5a4.77,4.77,0,0,1,.83,2.3H42.05a3.53,3.53,0,0,0-.46-1.2,2.31,2.31,0,0,0-.87-.83,3,3,0,0,0-2.86.14,2.72,2.72,0,0,0-1,1.42,7.7,7.7,0,0,0-.35,2.59,6.26,6.26,0,0,0,.77,3.52,2.51,2.51,0,0,0,2.15,1.08,2.38,2.38,0,0,0,1.3-.35,2.62,2.62,0,0,0,.87-.91A4.13,4.13,0,0,0,42.05,22H44.8a6.58,6.58,0,0,1-.45,1.77,4.69,4.69,0,0,1-.94,1.5,4.25,4.25,0,0,1-1.58,1,6.42,6.42,0,0,1-2.33.38,5.65,5.65,0,0,1-3.14-.85,5.51,5.51,0,0,1-2-2.37,8.47,8.47,0,0,1-.71-3.58,8,8,0,0,1,.71-3.52,5.19,5.19,0,0,1,2-2.26A6,6,0,0,1,39.5,13.31Z" transform="translate(4.5 4.5)"/><path class="cls-6" d="M45.81,15.83V13.49H56.22v2.34H52.38V26.5H49.74V15.83Z" transform="translate(4.5 4.5)"/></g><path class="cls-1" d="M41,53.49h2.58v7.93h2v2.2h-2V66.5H41.09V63.62h-6V61.46Zm-3.5,7.93H41.1V56.65Z" transform="translate(4.5 4.5)"/></g></g></svg>
\ No newline at end of file
diff --git a/client/src/images/eventDates/oct9-inactive.svg b/client/src/images/eventDates/oct9-inactive.svg
new file mode 100644
index 000000000..7615a7162
--- /dev/null
+++ b/client/src/images/eventDates/oct9-inactive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 88 83.5"><defs><style>.cls-1{fill:#c9c9c9;}.cls-2{clip-path:url(#clip-path);}.cls-3{isolation:isolate;}.cls-4{clip-path:url(#clip-path-2);}.cls-5{fill:none;stroke:#c9c9c9;stroke-miterlimit:10;}.cls-6{fill:#fff;}</style><clipPath id="clip-path" transform="translate(4.5 4.5)"><rect class="cls-1" x="0.5" y="0.5" width="78" height="39"/></clipPath><clipPath id="clip-path-2" transform="translate(4.5 4.5)"><rect class="cls-1" x="0.5" y="0.5" width="79" height="39"/></clipPath></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><rect class="cls-1" x="5" y="5" width="78" height="39"/><g class="cls-2"><g class="cls-3"><rect class="cls-1" x="5" y="5" width="79" height="39"/><g class="cls-4"><rect class="cls-1" x="5" y="5" width="78" height="39"/><g class="cls-2"><rect class="cls-1" width="88" height="49"/></g></g></g></g><rect class="cls-5" x="5" y="5" width="78" height="78"/><g class="cls-3"><path class="cls-6" d="M26.05,26.68a6.05,6.05,0,0,1-3.19-.81,5.32,5.32,0,0,1-2.08-2.29A8,8,0,0,1,20,20a7.91,7.91,0,0,1,.75-3.58,5.42,5.42,0,0,1,2.09-2.32,6.05,6.05,0,0,1,3.17-.81,6,6,0,0,1,3.15.81,5.41,5.41,0,0,1,2.07,2.31A8.1,8.1,0,0,1,32,20a8.09,8.09,0,0,1-.73,3.55,5.25,5.25,0,0,1-2.06,2.3A6,6,0,0,1,26.05,26.68Zm0-2.16a3,3,0,0,0,1.65-.45,3,3,0,0,0,1.07-1.44,7.15,7.15,0,0,0,.38-2.57,7.45,7.45,0,0,0-.38-2.64,3,3,0,0,0-1.08-1.48,2.8,2.8,0,0,0-1.64-.47,2.85,2.85,0,0,0-1.65.47,3,3,0,0,0-1.09,1.48,7.5,7.5,0,0,0-.39,2.64,7.05,7.05,0,0,0,.39,2.57,2.73,2.73,0,0,0,2.74,1.89Z" transform="translate(4.5 4.5)"/><path class="cls-6" d="M39.5,13.31a5.59,5.59,0,0,1,2.62.59A5,5,0,0,1,44,15.5a4.77,4.77,0,0,1,.83,2.3H42.05a3.34,3.34,0,0,0-.46-1.2,2.31,2.31,0,0,0-.87-.83,2.63,2.63,0,0,0-1.3-.3,2.67,2.67,0,0,0-1.56.44,2.72,2.72,0,0,0-1,1.42,7.7,7.7,0,0,0-.35,2.59,6.17,6.17,0,0,0,.78,3.52,2.48,2.48,0,0,0,2.14,1.08,2.36,2.36,0,0,0,1.3-.35,2.62,2.62,0,0,0,.87-.91A3.89,3.89,0,0,0,42.05,22H44.8a6.58,6.58,0,0,1-.45,1.77,4.69,4.69,0,0,1-.94,1.5,4.25,4.25,0,0,1-1.58,1,6.42,6.42,0,0,1-2.33.38,5.65,5.65,0,0,1-3.14-.85,5.51,5.51,0,0,1-2-2.37,8.47,8.47,0,0,1-.71-3.58,8,8,0,0,1,.71-3.52,5.19,5.19,0,0,1,2-2.26A6,6,0,0,1,39.5,13.31Z" transform="translate(4.5 4.5)"/><path class="cls-6" d="M45.81,15.83V13.49H56.22v2.34H52.38V26.5H49.74V15.83Z" transform="translate(4.5 4.5)"/></g><path class="cls-1" d="M39.88,66.7a5.56,5.56,0,0,1-2.27-.47,4.44,4.44,0,0,1-1.72-1.32,3.42,3.42,0,0,1-.74-2h2.5a2.21,2.21,0,0,0,.72,1.23,2.11,2.11,0,0,0,1.4.47,3,3,0,0,0,1.64-.44,2.66,2.66,0,0,0,1.07-1.41,6.16,6.16,0,0,0,.24-2.52,2.63,2.63,0,0,1-.69.84,3.56,3.56,0,0,1-1,.55,4.59,4.59,0,0,1-1.33.19,5.3,5.3,0,0,1-2.34-.5,3.87,3.87,0,0,1-1.6-1.42,4,4,0,0,1-.58-2.19,4.19,4.19,0,0,1,2.32-3.85A5.63,5.63,0,0,1,40,53.31a4.85,4.85,0,0,1,4.71,3,8.4,8.4,0,0,1,.64,3.39,10,10,0,0,1-.66,3.89,4.86,4.86,0,0,1-1.9,2.32A5.46,5.46,0,0,1,39.88,66.7Zm.23-7a2.37,2.37,0,0,0,1.07-.25,2.5,2.5,0,0,0,.85-.62,1.17,1.17,0,0,0,.33-.78,3.41,3.41,0,0,0-.27-1.5,2.06,2.06,0,0,0-2-1.29,2.12,2.12,0,0,0-1.1.28,2.14,2.14,0,0,0-.77.81A2.6,2.6,0,0,0,38,57.6a2.07,2.07,0,0,0,.6,1.58A2.17,2.17,0,0,0,40.11,59.74Z" transform="translate(4.5 4.5)"/></g></g></svg>
\ No newline at end of file
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index a52a2967a..a7c506329 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -2515,6 +2515,14 @@
     "defaultMessage": "March 16th (4:00 - 5:00 PM EST)",
     "description": "Navigate to the public engagement page, this will be the public engagement page event training session 3 date"
   },
+  "public.eng.page.event.training.4.info": {
+    "defaultMessage": "October 4th (4:00 - 5:00 PM EST)",
+    "description": "Navigate to the public engagement page, this will be the public engagement page event training session 4 date"
+  },
+  "public.eng.page.event.training.5.info": {
+    "defaultMessage": "October 9th (4:00 - 5:00 PM EST)",
+    "description": "Navigate to the public engagement page, this will be the public engagement page event training session 5 date"
+  },
   "public.eng.page.event.training.description": {
     "defaultMessage": "The White House Council on Environmental Quality (CEQ), in partnership with the U.S. Digital Service, is hosting a series of 'Training Webinars' for users of the Climate and Economic Justice Screening Tool. These webinars are an opportunity for members of the public to learn how to use the current version of the tool. The presenters at these webinars will be available to provide technical support and address issues related to accessing and using the tool.",
     "description": "Navigate to the public engagement page, this will be the public engagement page event training session description"
diff --git a/client/src/pages/public-engagement.tsx b/client/src/pages/public-engagement.tsx
index 0fd361401..7721340e8 100644
--- a/client/src/pages/public-engagement.tsx
+++ b/client/src/pages/public-engagement.tsx
@@ -40,7 +40,7 @@ const PublicEngagementPage = ({location}: IPublicEngagementPageProps) => {
             </p>
           </Grid>
           <Grid desktop={{col: 4}}>
-            <PublicVideoBox isBeta={false}/>
+            {/* <PublicVideoBox isBeta={false}/> */}
           </Grid>
         </Grid>
 
@@ -60,6 +60,9 @@ const PublicEngagementPage = ({location}: IPublicEngagementPageProps) => {
               </CollectionItem>
             </Collection>
           </Grid>
+          <Grid desktop={{col: 4}}>
+            <PublicVideoBox isBeta={true}/>
+          </Grid>
         </Grid>
 
         <Grid row>
@@ -75,9 +78,6 @@ const PublicEngagementPage = ({location}: IPublicEngagementPageProps) => {
               {events.map((event, index) => <PublicEvent key={index} event={event} />)}
             </Collection>
           </Grid>
-          <Grid desktop={{col: 4}}>
-            <PublicVideoBox isBeta={true}/>
-          </Grid>
         </Grid>
 
       </J40MainGridContainer>
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index 4b83c9043..cc5b1c8e0 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -418,6 +418,48 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
   
           </p>
         </div>
+        <div
+          class="desktop:grid-col-4"
+          data-testid="grid"
+        />
+      </div>
+      <div
+        class="grid-row"
+        data-testid="grid"
+      >
+        <h2>
+          Upcoming events for CEJST version 1.0
+        </h2>
+      </div>
+      <div
+        class="grid-row grid-gap-6"
+        data-testid="grid"
+      >
+        <div
+          class="desktop:grid-col-8"
+          data-testid="grid"
+        >
+          <ul
+            class="usa-collection"
+            data-testid="collection"
+          >
+            <li
+              class="usa-collection__item"
+            >
+              <div
+                class="usa-collection__body"
+              >
+                <h2
+                  class="usa-collection__heading"
+                >
+                  
+      Coming soon!
+    
+                </h2>
+              </div>
+            </li>
+          </ul>
+        </div>
         <div
           class="desktop:grid-col-4"
           data-testid="grid"
@@ -432,13 +474,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <h2
                 class="usa-summary-box__heading"
               >
-                Need information about the latest version of the tool?
+                Need information about the public beta?
               </h2>
               <div
                 class="usa-summary-box__text"
               >
                 
-    See what's new in the version 1.0 of the Climate and Economic Justice Screening tool.
+      Watch a recorded version of the beta version of the CEJST training on YouTube.
   
                 <a
                   href="https://www.youtube.com/watch?v=QwHWcXbhw28"
@@ -452,7 +494,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   >
                     <div>
                       <div>
-                        Watch on YouTube
+                        Watch on beta demo
                       </div>
                       <img
                         alt="the icon to show that this button will open in a new tab"
@@ -472,7 +514,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   >
                     <div>
                       <div>
-                        Download slide deck
+                        Download beta slide deck
                       </div>
                       <img
                         alt="the icon to show that this button will download the file"
@@ -491,7 +533,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         data-testid="grid"
       >
         <h2>
-          Upcoming events for CEJST version 1.0
+          Previous events for public beta
         </h2>
       </div>
       <div
@@ -509,41 +551,113 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <li
               class="usa-collection__item"
             >
+              <img
+                alt="Alt text"
+                class="usa-collection__img"
+                src="test-file-stub"
+              />
               <div
                 class="usa-collection__body"
               >
-                <h2
+                <h3
                   class="usa-collection__heading"
                 >
+                  CEJST training session #5
+                </h3>
+                <p
+                  class="usa-collection__description"
+                >
                   
-      Coming soon!
-    
-                </h2>
+        The White House Council on Environmental Quality (CEQ), in partnership with the U.S. Digital 
+        Service, is hosting a series of 'Training Webinars' for users of the Climate and Economic 
+        Justice Screening Tool. These webinars are an opportunity for members of the public to learn how to 
+        use the current version of the tool. The presenters at these webinars will be available to 
+        provide technical support and address issues related to accessing and using the tool.
+      
+                </p>
+                <p
+                  class="usa-collection__description"
+                >
+                  <b>
+                    Event info
+                  </b>
+                  : October 9th (4:00 - 5:00 PM EST)
+                </p>
+                <p
+                  class="usa-collection__description"
+                >
+                  <a
+                    href="https://pitc.zoomgov.com/webinar/register/WN_q86iMtpwTESYa6f0xpIk7g"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    <button
+                      class="usa-button"
+                      data-testid="button"
+                      disabled=""
+                      type="button"
+                    >
+                      Registration link
+                    </button>
+                  </a>
+                </p>
+              </div>
+            </li>
+            <li
+              class="usa-collection__item"
+            >
+              <img
+                alt="Alt text"
+                class="usa-collection__img"
+                src="test-file-stub"
+              />
+              <div
+                class="usa-collection__body"
+              >
+                <h3
+                  class="usa-collection__heading"
+                >
+                  CEJST training session #4
+                </h3>
+                <p
+                  class="usa-collection__description"
+                >
+                  
+        The White House Council on Environmental Quality (CEQ), in partnership with the U.S. Digital 
+        Service, is hosting a series of 'Training Webinars' for users of the Climate and Economic 
+        Justice Screening Tool. These webinars are an opportunity for members of the public to learn how to 
+        use the current version of the tool. The presenters at these webinars will be available to 
+        provide technical support and address issues related to accessing and using the tool.
+      
+                </p>
+                <p
+                  class="usa-collection__description"
+                >
+                  <b>
+                    Event info
+                  </b>
+                  : October 4th (4:00 - 5:00 PM EST)
+                </p>
+                <p
+                  class="usa-collection__description"
+                >
+                  <a
+                    href="https://pitc.zoomgov.com/webinar/register/WN_q86iMtpwTESYa6f0xpIk7g"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    <button
+                      class="usa-button"
+                      data-testid="button"
+                      disabled=""
+                      type="button"
+                    >
+                      Registration link
+                    </button>
+                  </a>
+                </p>
               </div>
             </li>
-          </ul>
-        </div>
-      </div>
-      <div
-        class="grid-row"
-        data-testid="grid"
-      >
-        <h2>
-          Previous events for public beta
-        </h2>
-      </div>
-      <div
-        class="grid-row grid-gap-6"
-        data-testid="grid"
-      >
-        <div
-          class="desktop:grid-col-8"
-          data-testid="grid"
-        >
-          <ul
-            class="usa-collection"
-            data-testid="collection"
-          >
             <li
               class="usa-collection__item"
             >
@@ -1033,73 +1147,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             </li>
           </ul>
         </div>
-        <div
-          class="desktop:grid-col-4"
-          data-testid="grid"
-        >
-          <div
-            class="usa-summary-box"
-            data-testid="summary-box"
-          >
-            <div
-              class="usa-summary-box__body"
-            >
-              <h2
-                class="usa-summary-box__heading"
-              >
-                Need information about the public beta?
-              </h2>
-              <div
-                class="usa-summary-box__text"
-              >
-                
-      Watch a recorded version of the beta version of the CEJST training on YouTube.
-  
-                <a
-                  href="https://www.youtube.com/watch?v=QwHWcXbhw28"
-                  rel="noreferrer"
-                  target="_blank"
-                >
-                  <button
-                    class="usa-button"
-                    data-testid="button"
-                    type="button"
-                  >
-                    <div>
-                      <div>
-                        Watch on beta demo
-                      </div>
-                      <img
-                        alt="the icon to show that this button will open in a new tab"
-                        src="test-file-stub"
-                      />
-                    </div>
-                  </button>
-                </a>
-                <a
-                  download=""
-                  href="https://static-data-screeningtool.geoplatform.gov/data-pipeline/data/score/downloadable/technical-training-slides.pptx"
-                >
-                  <button
-                    class="usa-button"
-                    data-testid="button"
-                    type="button"
-                  >
-                    <div>
-                      <div>
-                        Download beta slide deck
-                      </div>
-                      <img
-                        alt="the icon to show that this button will download the file"
-                        src="test-file-stub"
-                      />
-                    </div>
-                  </button>
-                </a>
-              </div>
-            </div>
-          </div>
-        </div>
       </div>
     </div>
   </main>

From 7a7d38add16d40dfd906a2c577900c342d8967af Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 1 Nov 2022 13:02:01 -0700
Subject: [PATCH 086/130] Add sign-up link on About page

---
 client/src/data/copy/about.tsx                       |  3 ++-
 client/src/intl/en.json                              |  2 +-
 .../pages/tests/__snapshots__/about.test.tsx.snap    | 12 +++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx
index dca93397b..bbe2f85f2 100644
--- a/client/src/data/copy/about.tsx
+++ b/client/src/data/copy/about.tsx
@@ -73,11 +73,12 @@ export const CONTENT = {
   <FormattedMessage
     id={'about.page.paragraph.4'}
     defaultMessage={`
-      CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}.
+      CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}. <link1>Sign-up</link1> for updates from CEQ
     `}
     description={'Navigate to the About page. This is the paragraph 4'}
     values={{
       version: VERSION_NUMBER,
+      link1: linkFn('https://www.surveymonkey.com/r/whceqej', false, true),
     }}
   />,
   USE_DATA_PARA:
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index a7c506329..9a28bb87d 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -68,7 +68,7 @@
     "description": "Navigate to the About page. This is the paragraph 3"
   },
   "about.page.paragraph.4": {
-    "defaultMessage": "CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}.",
+    "defaultMessage": "CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}. <link1>Sign-up</link1> for updates from CEQ",
     "description": "Navigate to the About page. This is the paragraph 4"
   },
   "about.page.send.feedback.email.link": {
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index ee130de81..ad25ec518 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -471,7 +471,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             </div>
             <p>
               
-      CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version 1.0.
+      CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version 1.0. 
+              <a
+                class="usa-link usa-link--external"
+                data-cy=""
+                href="https://www.surveymonkey.com/r/whceqej"
+                rel="noreferrer"
+                target="_blank"
+              >
+                Sign-up
+              </a>
+               for updates from CEQ
     
             </p>
           </section>

From 4b531705df234789a073bdb3e0ebb702d710f62c Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 1 Nov 2022 19:44:37 -0700
Subject: [PATCH 087/130] Update FRT copy

---
 .../PrioritizationCopy/PrioritizationCopy.tsx |  2 +-
 .../PrioritizationCopy2.test.tsx              |  4 +--
 .../PrioritizationCopy2.tsx                   | 16 ++++++++-
 .../PrioritizationCopy2.test.tsx.snap         |  8 ++---
 client/src/data/copy/explore.tsx              | 33 ++++++++++++++-----
 client/src/intl/en.json                       |  6 ++--
 6 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
index d78f71f37..3420be6b4 100644
--- a/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
+++ b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
@@ -69,7 +69,7 @@ const PrioritizationCopy =
         tribalCountAK === null
          ) {
            if (percentTractTribal === null) {
-             prioCopyRendered = EXPLORE_COPY.getPrioFRTCopy(`${tribalCountUS}`);
+             prioCopyRendered = EXPLORE_COPY.getPrioFRTPointsCopy(`${tribalCountUS}`);
            } else if (percentTractTribal === 0) {
              prioCopyRendered = EXPLORE_COPY.getPrioFRTCopy(`less than 1%`);
            } else if (percentTractTribal >= 1) {
diff --git a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.test.tsx b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.test.tsx
index 652e65b9c..5dab1aafa 100644
--- a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.test.tsx
+++ b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.test.tsx
@@ -14,7 +14,7 @@ describe('rendering of PrioritizationCopy2 Component', () => {
       tribalCountUS: null,
       percentTractTribal: 2,
       // eslint-disable-next-line max-len
-      para1: `The Federally-Recognized Tribal lands that cover 2% of this tract are also considered disadvantaged.`,
+      para1: `The lands of Federally Recognized Tribes that cover 2% of this tract are also considered disadvantaged.`,
     },
     {
       totalCategoriesPrioritized: 0,
@@ -25,7 +25,7 @@ describe('rendering of PrioritizationCopy2 Component', () => {
       tribalCountUS: 3,
       percentTractTribal: 4,
       // eslint-disable-next-line max-len
-      para1: `The Federally-Recognized Tribal lands that cover 4% of this tract are also considered disadvantaged.`,
+      para1: `The lands of Federally Recognized Tribes that cover 4% of this tract are also considered disadvantaged.`,
     },
   ];
 
diff --git a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx
index ad4c5b8d1..435bab182 100644
--- a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx
+++ b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx
@@ -61,7 +61,7 @@ const PrioritizationCopy2 =
          prioCopy2Rendered = EXPLORE_COPY.getPrioPercAndNumPointsAlsoCopy(`less than 1%`, tribalCountUS);
        } else if (
          tribalCountAK === null &&
-        tribalCountUS !== null &&
+        tribalCountUS === null &&
         (percentTractTribal !== null && percentTractTribal == 0)
        ) {
          prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`less than 1%`, true);
@@ -80,6 +80,20 @@ const PrioritizationCopy2 =
          prioCopy2Rendered = <></>;
          noStyles = true;
        }
+     } else if (
+       (totalCategoriesPrioritized === 0 && !(isAdjacencyThreshMet && isAdjacencyLowIncome)) &&
+      tribalCountAK === null &&
+      (tribalCountUS !== null && tribalCountUS >= 1) &&
+      (percentTractTribal !== null && percentTractTribal >= 0)
+     ) {
+       prioCopy2Rendered = EXPLORE_COPY.getPrioFRTPointsCopy(tribalCountUS, true);
+     } else if (
+       (totalCategoriesPrioritized >= 1) &&
+        tribalCountAK == null &&
+        (tribalCountUS !== null && tribalCountUS >= 1) &&
+        percentTractTribal == null
+     ) {
+       prioCopy2Rendered = EXPLORE_COPY.getPrioFRTPointsCopy(tribalCountUS, true);
      } else {
        prioCopy2Rendered = <></>;
        noStyles = true;
diff --git a/client/src/components/PrioritizationCopy2/__snapshots__/PrioritizationCopy2.test.tsx.snap b/client/src/components/PrioritizationCopy2/__snapshots__/PrioritizationCopy2.test.tsx.snap
index 01c77615c..348e5bbb1 100644
--- a/client/src/components/PrioritizationCopy2/__snapshots__/PrioritizationCopy2.test.tsx.snap
+++ b/client/src/components/PrioritizationCopy2/__snapshots__/PrioritizationCopy2.test.tsx.snap
@@ -1,17 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`rendering of PrioritizationCopy2 Component checks if component renders The Federally-Recognized Tribal lands that cover 2% of this tract are also considered disadvantaged. when totCats = 0, totBurds = 0, isAdj = true, isAdjLI = true, tribal % = 2, 1`] = `
+exports[`rendering of PrioritizationCopy2 Component checks if component renders The lands of Federally Recognized Tribes that cover 2% of this tract are also considered disadvantaged. when totCats = 0, totBurds = 0, isAdj = true, isAdjLI = true, tribal % = 2, 1`] = `
 <DocumentFragment>
   <div>
-    The Federally-Recognized Tribal lands that cover 2% of this tract are also considered disadvantaged.
+    The lands of Federally Recognized Tribes that cover 2% of this tract are also considered disadvantaged.
   </div>
 </DocumentFragment>
 `;
 
-exports[`rendering of PrioritizationCopy2 Component checks if component renders The Federally-Recognized Tribal lands that cover 4% of this tract are also considered disadvantaged. when totCats = 0, totBurds = 1, isAdj = true, isAdjLI = true, tribal % = 4, 1`] = `
+exports[`rendering of PrioritizationCopy2 Component checks if component renders The lands of Federally Recognized Tribes that cover 4% of this tract are also considered disadvantaged. when totCats = 0, totBurds = 1, isAdj = true, isAdjLI = true, tribal % = 4, 1`] = `
 <DocumentFragment>
   <div>
-    The Federally-Recognized Tribal lands that cover 4% of this tract are also considered disadvantaged.
+    The lands of Federally Recognized Tribes that cover 4% of this tract are also considered disadvantaged.
   </div>
 </DocumentFragment>
 `;
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 8f8585f34..83761d70f 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -33,7 +33,7 @@ export const PAGE_INTRO = defineMessages({
 export const PAGE_DESCRIPTION1 = <FormattedMessage
   id={'explore.map.page.description.1'}
   defaultMessage={`
-    Census tracts that are overburdened and underserved census tracts are highlighted as being disadvantaged on the map. These include Federally-Recognized Tribal lands, including Alaska Native Villages. 
+    Census tracts that are overburdened and underserved census tracts are highlighted as being disadvantaged on the map. These include Federally Recognized Tribal lands, including Alaska Native Villages. 
   `}
   description={'On the explore the map page, the first description of the page'}
   // values={{
@@ -640,8 +640,8 @@ export const getPrioFRTCopy = (amount:string, isAlso:boolean = false) => {
   return (
     <FormattedMessage
       id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
-      defaultMessage={ 'The Federally-Recognized Tribal lands that cover {amount} of this tract are {also} considered disadvantaged.'}
-      description={`Navigate to the explore the map page. Click on tract, The Federally-Recognized Tribal lands that cover [#%] of this tract are considered disadvantaged.`}
+      defaultMessage={ 'The lands of Federally Recognized Tribes that cover {amount} of this tract are {also} considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The lands of Federally Recognized Tribes that cover [#%] of this tract are considered disadvantaged.`}
       values={{
         amount: amount,
         also: isAlso? 'also' : '',
@@ -650,13 +650,28 @@ export const getPrioFRTCopy = (amount:string, isAlso:boolean = false) => {
   );
 };
 
+// Copy around Federally recognized tribes points copy
+export const getPrioFRTPointsCopy = (numPoints:string, isAlso:boolean = false) => {
+  return (
+    <FormattedMessage
+      id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
+      defaultMessage={ 'The {numPoints} that are Federally Recognized Tribes in this tract are are {also} considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The {numPoints} that are Federally Recognized Tribes in this tract ares are {also} considered disadvantaged.`}
+      values={{
+        numPoints: numPoints,
+        also: isAlso? 'also' : '',
+      }}
+    />
+  );
+};
+
 // Copy around Alaska Native Villages
 export const getPrioANVCopy = (numPoints:number, isAlso:boolean = false) => {
   return (
     <FormattedMessage
       id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
-      defaultMessage={ 'The {numPoints} Alaskan Native Villages in this tract that are Federally-Recognized are {also} considered disadvantaged.'}
-      description={`Navigate to the explore the map page. Click on tract, The {numPoints} of this tract that are Federally-Recognized Tribal lands are {also} considered disadvantaged.`}
+      defaultMessage={ 'The {numPoints} Alaskan Native Villages in this tract that are Federally Recognized are {also} considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The {numPoints} of this tract that are Federally Recognized Tribal lands are {also} considered disadvantaged.`}
       values={{
         numPoints: numPoints,
         also: isAlso? 'also' : '',
@@ -670,8 +685,8 @@ export const getPrioAKUSCopy = (numAKpoints:number, numUSpoints:number, isAlso:b
   return (
     <FormattedMessage
       id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
-      defaultMessage={ 'The {numAKpoints} Alaskan Native Villages and the {numUSpoints} tribes in this tract that are Federally-Recognized are {also} considered disadvantaged.'}
-      description={`Navigate to the explore the map page. Click on tract, The {numAKpoints} Alaskan Native Villages and the {numUSpoints} tribes in this tract that are Federally-Recognized are considered disadvantaged.`}
+      defaultMessage={ 'The {numAKpoints} Alaskan Native Villages and the {numUSpoints} tribes in this tract that are Federally Recognized are {also} considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The {numAKpoints} Alaskan Native Villages and the {numUSpoints} tribes in this tract that are Federally Recognized are considered disadvantaged.`}
       values={{
         numAKpoints: numAKpoints,
         numUSpoints: numUSpoints,
@@ -686,8 +701,8 @@ export const getPrioPercAndNumPointsAlsoCopy = (amount:string, numPoints:number)
   return (
     <FormattedMessage
       id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
-      defaultMessage={ 'The Federally-Recognized Tribal lands that cover {amount} of this tract and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged.'}
-      description={`Navigate to the explore the map page. Click on tract, The Federally-Recognized Tribal lands that cover {amount} of this tract and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged.`}
+      defaultMessage={ 'The lands of Federally Recognized Tribes that cover {amount} of this tract and the {numPoints} tribes that are Federally Recognized are also considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The Federally Recognized Tribal lands that cover {amount} of this tract and the {numPoints} tribes that are Federally Recognized are also considered disadvantaged.`}
       values={{
         amount: amount,
         numPoints: numPoints,
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 9a28bb87d..4ea8dbb01 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -616,7 +616,7 @@
     "description": "Navigate to the Downloads page, this will be the view of change log"
   },
   "explore.map.page.description.1": {
-    "defaultMessage": "Census tracts that are overburdened and underserved census tracts are highlighted as being disadvantaged on the map. These include Federally-Recognized Tribal lands, including Alaska Native Villages.",
+    "defaultMessage": "Census tracts that are overburdened and underserved census tracts are highlighted as being disadvantaged on the map. These include Federally Recognized Tribal lands, including Alaska Native Villages.",
     "description": "On the explore the map page, the first description of the page"
   },
   "explore.map.page.description.2": {
@@ -1364,8 +1364,8 @@
     "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. The adjustment does not apply to any of the categories."
   },
   "explore.map.page.side.panel.prio.copy.prio.frt.n.perc": {
-    "defaultMessage": "The Federally-Recognized Tribal lands that cover {amount} of this tract and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged.",
-    "description": "Navigate to the explore the map page. Click on tract, The Federally-Recognized Tribal lands that cover {amount} of this tract and the {numPoints} tribes that are Federally-Recognized are also considered disadvantaged."
+    "defaultMessage": "The lands of Federally Recognized Tribes that cover {amount} of this tract and the {numPoints} tribes that are Federally Recognized are also considered disadvantaged.",
+    "description": "Navigate to the explore the map page. Click on tract, The Federally Recognized Tribal lands that cover {amount} of this tract and the {numPoints} tribes that are Federally Recognized are also considered disadvantaged."
   },
   "explore.map.page.side.panel.prio.copy.prio.n.burden": {
     "defaultMessage": "This tract is considered disadvantaged because it meets {burdens} burden threshold AND the associated socio-economic threshold.",

From 25b1dc96f973f31b734b2ab5d3bdfddb169be017 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 2 Nov 2022 12:45:43 -0700
Subject: [PATCH 088/130] Update contact page

---
 client/src/data/copy/contact.tsx              | 61 ++++++++----------
 client/src/intl/en.json                       | 18 +-----
 client/src/pages/contact.tsx                  |  9 +--
 .../tests/__snapshots__/contact.test.tsx.snap | 62 +++----------------
 4 files changed, 41 insertions(+), 109 deletions(-)

diff --git a/client/src/data/copy/contact.tsx b/client/src/data/copy/contact.tsx
index ca82382fd..a6cb51b0f 100644
--- a/client/src/data/copy/contact.tsx
+++ b/client/src/data/copy/contact.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import {defineMessages} from 'react-intl';
 import {FormattedDate, FormattedMessage} from 'gatsby-plugin-intl';
 import * as COMMON_COPY from './common';
-import {PAGES_ENDPOINTS} from '../constants';
 
 export const PAGE_INTRO = defineMessages({
   PAGE_TILE: {
@@ -18,12 +17,7 @@ export const PAGE_INTRO = defineMessages({
   },
   PAGE_SUB_HEADING: {
     id: 'contact.page.sub.header.text',
-    defaultMessage: 'Email us',
-    description: 'Navigate to the contact page, this is the contact page sub header text',
-  },
-  PAGE_DESCRIPTION: {
-    id: 'contact.page.sub.header.text',
-    defaultMessage: 'Email us',
+    defaultMessage: 'Contact us',
     description: 'Navigate to the contact page, this is the contact page sub header text',
   },
   SURVEY_TEXT: {
@@ -61,39 +55,38 @@ export const RFI_BOX_BODY = <FormattedMessage
 />;
 
 export const CENSUS_TRACT_FEEDBACK = {
-  TITLE: <FormattedMessage
-    id={'contact.page.census.tract.feedback.title'}
-    defaultMessage={`Census tract feedback`}
-    description={'Navigate to the contact page, this is the census tract feedback section'}
-  />,
-  PARAGRAPH1: <FormattedMessage
-    id={'contact.page.census.tract.feedback.para1'}
-    defaultMessage={`
-      To provide feedback about a specific census tract, either select the send feedback button after
-      selecting a census tract on the <link1>Explore the map</link1> page or use the email address provided above. Please include the census tract ID, county, and state or territory information, in addition to your feedback.
-    `}
-    description={'Navigate to the contact page, this is the census tract feedback section'}
-    values={{
-      link1: COMMON_COPY.linkFn(PAGES_ENDPOINTS.EXPLORE, true, false),
-    }}
-  />,
-  PARAGRAPH2: <FormattedMessage
-    id={'contact.page.census.tract.feedback.para2'}
-    defaultMessage={`
-      If there are specific data indicators that could be improved or changed, please include that
-      information in the body of the email.
-    `}
-    description={'Navigate to the contact page, this is the census tract feedback section'}
-  />,
+  // TITLE: <FormattedMessage
+  //   id={'contact.page.census.tract.feedback.title'}
+  //   defaultMessage={`Census tract feedback`}
+  //   description={'Navigate to the contact page, this is the census tract feedback section'}
+  // />,
+  // PARAGRAPH1: <FormattedMessage
+  //   id={'contact.page.census.tract.feedback.para1'}
+  //   defaultMessage={`
+  //     To provide feedback about a specific census tract, either select the send feedback button after
+  //     selecting a census tract on the <link1>Explore the map</link1> page or use the email address provided above. Please include the census tract ID, county, and state or territory information, in addition to your feedback.
+  //   `}
+  //   description={'Navigate to the contact page, this is the census tract feedback section'}
+  //   values={{
+  //     link1: COMMON_COPY.linkFn(PAGES_ENDPOINTS.EXPLORE, true, false),
+  //   }}
+  // />,
+  // PARAGRAPH2: <FormattedMessage
+  //   id={'contact.page.census.tract.feedback.para2'}
+  //   defaultMessage={`
+  //     If there are specific data indicators that could be improved or changed, please include that
+  //     information in the body of the email.
+  //   `}
+  //   description={'Navigate to the contact page, this is the census tract feedback section'}
+  // />,
   PARAGRAPH3: <FormattedMessage
     id={'contact.page.census.tract.feedback.para3'}
     defaultMessage={`
-      In addition, you can provide feedback on the tool via this <link1>survey</link1>.
+      The best way to contact the Council on Environmental Quality (CEQ) is by filling out <link1>this form</link1>.
     `}
     description={'Navigate to the survey. Spanish should substitute <link2> to get Spanish link! Already coded to support'}
     values={{
-      link1: COMMON_COPY.linkFn('https://www.surveymonkey.com/r/cejst-survey', false, true),
-      link2: COMMON_COPY.linkFn('https://www.surveymonkey.com/r/cejst-survey-es', false, true),
+      link1: COMMON_COPY.linkFn('https://www.surveymonkey.com/r/5LZ7MNB', false, true),
     }}
   />,
 };
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 4ea8dbb01..077ab5cac 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -235,22 +235,10 @@
     "defaultMessage": "https://static-data-screeningtool.geoplatform.gov/data-pipeline/data/score/downloadable/cejst_technical_support_document.pdf",
     "description": "Navigate to the Alerts on any page. This will be the link to the techinical support document."
   },
-  "contact.page.census.tract.feedback.para1": {
-    "defaultMessage": "To provide feedback about a specific census tract, either select the send feedback button after selecting a census tract on the <link1>Explore the map</link1> page or use the email address provided above. Please include the census tract ID, county, and state or territory information, in addition to your feedback.",
-    "description": "Navigate to the contact page, this is the census tract feedback section"
-  },
-  "contact.page.census.tract.feedback.para2": {
-    "defaultMessage": "If there are specific data indicators that could be improved or changed, please include that information in the body of the email.",
-    "description": "Navigate to the contact page, this is the census tract feedback section"
-  },
   "contact.page.census.tract.feedback.para3": {
-    "defaultMessage": "In addition, you can provide feedback on the tool via this <link1>survey</link1>.",
+    "defaultMessage": "The best way to contact the Council on Environmental Quality (CEQ) is by filling out <link1>this form</link1>.",
     "description": "Navigate to the survey. Spanish should substitute <link2> to get Spanish link! Already coded to support"
   },
-  "contact.page.census.tract.feedback.title": {
-    "defaultMessage": "Census tract feedback",
-    "description": "Navigate to the contact page, this is the census tract feedback section"
-  },
   "contact.page.fab.survey.link": {
     "defaultMessage": "https://www.surveymonkey.com/r/P3LWTSB",
     "description": "The footer sticky link that links to the CEJST survey"
@@ -260,7 +248,7 @@
     "description": "Navigate to the contact page, this is the text for floating action button"
   },
   "contact.page.general": {
-    "defaultMessage": "For general feedback, email {general_email_address}.",
+    "defaultMessage": "Otherwise, email CEQ at: {general_email_address}.",
     "description": "Contact page body text"
   },
   "contact.page.header.text": {
@@ -276,7 +264,7 @@
     "description": "Navigate to the contact page, this is the title of the request for information box"
   },
   "contact.page.sub.header.text": {
-    "defaultMessage": "Email us",
+    "defaultMessage": "Contact us",
     "description": "Navigate to the contact page, this is the contact page sub header text"
   },
   "contact.page.title.text": {
diff --git a/client/src/pages/contact.tsx b/client/src/pages/contact.tsx
index a89c7f356..856cd45fa 100644
--- a/client/src/pages/contact.tsx
+++ b/client/src/pages/contact.tsx
@@ -6,7 +6,6 @@ import J40MainGridContainer from '../components/J40MainGridContainer';
 import Layout from '../components/layout';
 import LinkTypeWrapper from '../components/LinkTypeWrapper';
 import PublicEngageButton from '../components/PublicEngageButton';
-import RequestForInfo from '../components/RequestForInfo';
 
 import * as CONTACT_COPY from '../data/copy/contact';
 import * as COMMON_COPY from '../data/copy/common';
@@ -34,11 +33,12 @@ const ContactPage = ({location}: IContactPageProps) => {
             <h2>
               {intl.formatMessage(CONTACT_COPY.PAGE_INTRO.PAGE_SUB_HEADING)}
             </h2>
+            <p>{CONTACT_COPY.CENSUS_TRACT_FEEDBACK.PARAGRAPH3}</p>
             <p>
               <FormattedMessage
                 id={'contact.page.general'}
                 description={'Contact page body text'}
-                defaultMessage={`For general feedback, email {general_email_address}.`}
+                defaultMessage={`Otherwise, email CEQ at: {general_email_address}.`}
                 values={{
                   general_email_address:
                     <LinkTypeWrapper
@@ -49,15 +49,10 @@ const ContactPage = ({location}: IContactPageProps) => {
                     />,
                 }} />
             </p>
-            <h3>{CONTACT_COPY.CENSUS_TRACT_FEEDBACK.TITLE}</h3>
-            <p>{CONTACT_COPY.CENSUS_TRACT_FEEDBACK.PARAGRAPH1}</p>
-            <p>{CONTACT_COPY.CENSUS_TRACT_FEEDBACK.PARAGRAPH2}</p>
-            <p>{CONTACT_COPY.CENSUS_TRACT_FEEDBACK.PARAGRAPH3}</p>
           </Grid>
 
           {/* Second Column */}
           <Grid desktop={{col: 4}} col={12}>
-            <RequestForInfo />
           </Grid>
         </Grid>
       </J40MainGridContainer>
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index be29acf08..fefcea0e3 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -418,85 +418,41 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           data-testid="grid"
         >
           <h2>
-            Email us
+            Contact us
           </h2>
           <p>
-            For general feedback, email 
+            
+      The best way to contact the Council on Environmental Quality (CEQ) is by filling out 
             <a
               class="usa-link usa-link--external"
               data-cy=""
-              href="mailto:Screeningtool-Support@omb.eop.gov"
+              href="https://www.surveymonkey.com/r/5LZ7MNB"
               rel="noreferrer"
               target="_blank"
             >
-              Screeningtool-Support@omb.eop.gov
+              this form
             </a>
             .
-          </p>
-          <h3>
-            Census tract feedback
-          </h3>
-          <p>
-            
-      To provide feedback about a specific census tract, either select the send feedback button after
-      selecting a census tract on the 
-            <a
-              class="usa-link"
-              href="/en/"
-            >
-              Explore the map
-            </a>
-             page or use the email address provided above. Please include the census tract ID, county, and state or territory information, in addition to your feedback.
     
           </p>
           <p>
-            
-      If there are specific data indicators that could be improved or changed, please include that
-      information in the body of the email.
-    
-          </p>
-          <p>
-            
-      In addition, you can provide feedback on the tool via this 
+            Otherwise, email CEQ at: 
             <a
               class="usa-link usa-link--external"
               data-cy=""
-              href="https://www.surveymonkey.com/r/cejst-survey"
+              href="mailto:Screeningtool-Support@omb.eop.gov"
               rel="noreferrer"
               target="_blank"
             >
-              survey
+              Screeningtool-Support@omb.eop.gov
             </a>
             .
-    
           </p>
         </div>
         <div
           class="grid-col-12 desktop:grid-col-4"
           data-testid="grid"
-        >
-          <div
-            class="usa-summary-box"
-            data-testid="summary-box"
-          >
-            <div
-              class="usa-summary-box__body"
-            >
-              <h3
-                class="usa-summary-box__heading"
-              >
-                Request for Information
-              </h3>
-              <div
-                class="usa-summary-box__text"
-              >
-                <p>
-                  The Request for Information on the Federal Register for the public beta period closed on May 25, 2022.
-                </p>
-              </div>
-            </div>
-          </div>
-        </div>
+        />
       </div>
     </div>
   </main>

From 99b6d9caadd8fe0a711655907d22b0fa82f14188 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 2 Nov 2022 13:16:20 -0700
Subject: [PATCH 089/130] Point map to new 1.0 versions path on S3

- remove FILE_DL prefix on from .env variables as the path is for both file download and map tiles now
- Update MapTractLayers to use 1.0 score path
- Update downloads file to use updated score path names
---
 client/.env.development                                 | 5 ++---
 client/.env.production                                  | 5 ++---
 client/src/components/MapTractLayers/MapTractLayers.tsx | 2 +-
 client/src/data/copy/downloads.tsx                      | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/client/.env.development b/client/.env.development
index d9e56f739..b365364fc 100644
--- a/client/.env.development
+++ b/client/.env.development
@@ -7,11 +7,10 @@ GATSBY_CDN_TILES_BASE_URL=https://static-data-screeningtool.geoplatform.gov
 GATSBY_LOCAL_TILES_BASE_URL=http://localhost:5000/data/data-pipeline
 
 GATSBY_DATA_PIPELINE_SCORE_PATH_LOCAL=data_pipeline/data/score
-GATSBY_DATA_PIPELINE_SCORE_PATH=data-pipeline/data/score
 GATSBY_DATA_PIPELINE_TRIBAL_PATH=data-pipeline/data/tribal
 
-GATSBY_FILE_DL_BETA_SCORE_PATH = data-versions/beta/data/score
-GATSBY_FILE_DL_1_0_SCORE_PATH = data-versions/1.0/data/score
+GATSBY_BETA_SCORE_PATH = data-versions/beta/data/score
+GATSBY_1_0_SCORE_PATH = data-versions/1.0/data/score
 
 GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_XLS=downloadable/beta-communities.xlsx
 GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_CSV=downloadable/beta-communities.csv
diff --git a/client/.env.production b/client/.env.production
index 0a313a9e9..1bddc6bcd 100644
--- a/client/.env.production
+++ b/client/.env.production
@@ -5,11 +5,10 @@
 # The TILES_BASE_URL will always point to the CDN
 GATSBY_CDN_TILES_BASE_URL=https://static-data-screeningtool.geoplatform.gov
 
-GATSBY_DATA_PIPELINE_SCORE_PATH=data-pipeline/data/score
 GATSBY_DATA_PIPELINE_TRIBAL_PATH=data-pipeline/data/tribal
 
-GATSBY_FILE_DL_BETA_SCORE_PATH = data-versions/beta/data/score
-GATSBY_FILE_DL_1_0_SCORE_PATH = data-versions/1.0/data/score
+GATSBY_BETA_SCORE_PATH = data-versions/beta/data/score
+GATSBY_1_0_SCORE_PATH = data-versions/1.0/data/score
 
 GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_XLS=downloadable/beta-communities.xlsx
 GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_CSV=downloadable/beta-communities.csv
diff --git a/client/src/components/MapTractLayers/MapTractLayers.tsx b/client/src/components/MapTractLayers/MapTractLayers.tsx
index ca83bc2ec..7970d4d19 100644
--- a/client/src/components/MapTractLayers/MapTractLayers.tsx
+++ b/client/src/components/MapTractLayers/MapTractLayers.tsx
@@ -44,7 +44,7 @@ export const featureURLForTilesetName = (tilesetName: string): string => {
 
     const featureTilePath = process.env.DATA_SOURCE === 'local' ?
       process.env.GATSBY_DATA_PIPELINE_SCORE_PATH_LOCAL :
-      process.env.GATSBY_DATA_PIPELINE_SCORE_PATH;
+      process.env.GATSBY_1_0_SCORE_PATH;
 
     return [
       featureTileBaseURL,
diff --git a/client/src/data/copy/downloads.tsx b/client/src/data/copy/downloads.tsx
index 9b842ad48..c549df92f 100644
--- a/client/src/data/copy/downloads.tsx
+++ b/client/src/data/copy/downloads.tsx
@@ -31,7 +31,7 @@ export const PAGE_INTRO = defineMessages({
 export const getDownloadFileUrl = (filePath:string | undefined, isBeta: boolean) => {
   return [
     process.env.GATSBY_CDN_TILES_BASE_URL,
-    (isBeta ? process.env.GATSBY_FILE_DL_BETA_SCORE_PATH : process.env.GATSBY_FILE_DL_1_0_SCORE_PATH),
+    (isBeta ? process.env.GATSBY_BETA_SCORE_PATH : process.env.GATSBY_1_0_SCORE_PATH),
     filePath,
   ].join('/');
 };

From 5f46b23a43d04711e4ea2685591773dd99bc8cfa Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 2 Nov 2022 15:20:39 -0700
Subject: [PATCH 090/130] Only show two rows (ADJ and ADJ threshold) if

- ADJ_ET is true AND
- total number of disadv cats is 0
---
 client/src/components/AreaDetail/AreaDetail.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 4836e4a44..23ab6f65e 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -839,8 +839,11 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
 
       </div>
 
-      {/* Only show the DonutCopy if Adjacency index is true */}
-      { properties[constants.ADJACENCY_EXCEEDS_THRESH] && <DonutCopy
+      {/* Only show the DonutCopy if Adjacency index is true and the total number of disadv ind == 0 */}
+      {
+        (properties[constants.ADJACENCY_EXCEEDS_THRESH] &&
+        properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS] === 0) &&
+      <DonutCopy
         isAdjacent={properties[constants.ADJACENCY_EXCEEDS_THRESH]}
         povertyBelow200Percentile={properties[constants.POVERTY_BELOW_200_PERCENTILE]}
       /> }

From 1855f3e9c091b9f8f41494e3711e3bbb296daa88 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 2 Nov 2022 15:22:59 -0700
Subject: [PATCH 091/130] Make 'PARTIALLY' highlighted like `YES`

---
 .../src/components/TractPrioritization/TractPrioritization.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/TractPrioritization/TractPrioritization.tsx b/client/src/components/TractPrioritization/TractPrioritization.tsx
index c959520ed..03a474eab 100644
--- a/client/src/components/TractPrioritization/TractPrioritization.tsx
+++ b/client/src/components/TractPrioritization/TractPrioritization.tsx
@@ -31,7 +31,7 @@ const TractPrioritization = (
     if (percentTractTribal === null && tribalCountAK === null && tribalCountUS === null) {
       return <h3>{EXPLORE_COPY.COMMUNITY.NOT_OF_FOCUS}</h3>;
     } else {
-      return <h3>{EXPLORE_COPY.COMMUNITY.PARTIAL}</h3>;
+      return <h3 className={styles.invert}>{EXPLORE_COPY.COMMUNITY.PARTIAL}</h3>;
     }
   }
 };

From c8218ca2ab7d1f985c3d3da0e56e416cf2b7a0f7 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 2 Nov 2022 15:34:28 -0700
Subject: [PATCH 092/130] Highlight indicator value if

- ADJ_ET is true
- Imputed poverty income is > threshold (50)
---
 client/src/components/DonutCopy/DonutCopy.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/DonutCopy/DonutCopy.tsx b/client/src/components/DonutCopy/DonutCopy.tsx
index a7b25a15d..76815de4d 100644
--- a/client/src/components/DonutCopy/DonutCopy.tsx
+++ b/client/src/components/DonutCopy/DonutCopy.tsx
@@ -28,7 +28,7 @@ const DonutCopy = ({isAdjacent, povertyBelow200Percentile}: IDonutCopyProps) =>
       <div className={styles.donutRow}>
         <div className={styles.donutRowLabel}>{intl.formatMessage(EXPLORE_COPY.DONUT_COPY.ADJ_LOW_INC)}</div>
         <div className={styles.valueSubTextContainer}>
-          <div className={isAdjacent ? styles.invert : styles.noInvert}>
+          <div className={isAdjacent && povBel200Percentile >= threshold ? styles.invert : styles.noInvert}>
             <IndicatorValue
               type={'percentile'}
               displayStat={povBel200Percentile}

From ba4e7ff70fd27239f0eb04ed0c882a831020de7e Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 2 Nov 2022 16:00:33 -0700
Subject: [PATCH 093/130] Update RAW true value for HRS_ET

---
 client/src/data/constants.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx
index 38c5dfb84..a30194fc3 100644
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@@ -140,7 +140,7 @@ export const IS_HOUSING_FACTOR_DISADVANTAGED = 'N_HSG';
 export const IS_HOUSING_EXCEED_ONE_OR_MORE_INDICATORS = 'N_HSG_EOMI';
 
 export const HISTORIC_UNDERINVESTMENT_EXCEED_THRESH = 'HRS_ET';
-export const HISTORIC_UNDERINVESTMENT_RAW_YES = 1;
+export const HISTORIC_UNDERINVESTMENT_RAW_YES = '1';
 
 export const HOUSING_BURDEN_PROPERTY_PERCENTILE = 'HBF_PFS';
 export const IS_EXCEEDS_THRESH_FOR_HOUSE_BURDEN = 'HB_ET';

From 1204a5391108f44e4a15ce9dac2fdf3c89a1788a Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 2 Nov 2022 16:41:03 -0700
Subject: [PATCH 094/130] Make the logo and title of header nav back to map

---
 client/src/components/J40Header/J40Header.tsx | 22 +++++++++++++---
 .../__snapshots__/J40Header.test.tsx.snap     | 25 +++++++++++++------
 .../tests/__snapshots__/about.test.tsx.snap   | 25 +++++++++++++------
 .../tests/__snapshots__/contact.test.tsx.snap | 25 +++++++++++++------
 .../__snapshots__/downloads.test.tsx.snap     | 25 +++++++++++++------
 .../freqAskedQuestions.test.tsx.snap          | 25 +++++++++++++------
 .../__snapshots__/methodology.test.tsx.snap   | 25 +++++++++++++------
 .../__snapshots__/publicEng.test.tsx.snap     | 25 +++++++++++++------
 .../techSupportDoc.test.tsx.snap              | 25 +++++++++++++------
 client/src/styles/global.scss                 |  4 +++
 10 files changed, 166 insertions(+), 60 deletions(-)

diff --git a/client/src/components/J40Header/J40Header.tsx b/client/src/components/J40Header/J40Header.tsx
index 4582d8562..847ec48be 100644
--- a/client/src/components/J40Header/J40Header.tsx
+++ b/client/src/components/J40Header/J40Header.tsx
@@ -20,6 +20,7 @@ import * as styles from './J40Header.module.scss';
 import * as COMMON_COPY from '../../data/copy/common';
 import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../../data/constants';
 
+
 interface IJ40Header {
   location: Location
 }
@@ -253,14 +254,27 @@ const J40Header = ({location}:IJ40Header) => {
 
           {/* Logo */}
           <Grid col={1}>
-            <img className={styles.logo} src={siteLogo} alt={`${logoLine1}`} />
+            <Link
+              to={PAGES_ENDPOINTS.EXPLORE}
+              key={'explore-map'}
+              data-cy={'nav-link-explore-the-map'}
+            >
+              <img className={styles.logo} src={siteLogo} alt={`${logoLine1}`} />
+            </Link>
           </Grid>
 
           {/* Logo Title */}
           <Grid col={6}>
-            <div className={styles.logoTitle}>
-              {logoLine1}
-            </div>
+            <Link
+              to={PAGES_ENDPOINTS.EXPLORE}
+              key={'explore-map'}
+              className="remove-link-style"
+              data-cy={'nav-link-explore-the-map'}
+            >
+              <div className={styles.logoTitle}>
+                {logoLine1}
+              </div>
+            </Link>
           </Grid>
 
           {/* Nav links */}
diff --git a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
index 95b50ce79..d0de8ae95 100644
--- a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
+++ b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
@@ -180,18 +180,29 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
           class="grid-col-1"
           data-testid="grid"
         >
-          <img
-            alt="Climate and Economic Justice Screening Tool"
-            src="test-file-stub"
-          />
+          <a
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <img
+              alt="Climate and Economic Justice Screening Tool"
+              src="test-file-stub"
+            />
+          </a>
         </div>
         <div
           class="grid-col-6"
           data-testid="grid"
         >
-          <div>
-            Climate and Economic Justice Screening Tool
-          </div>
+          <a
+            class="remove-link-style"
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <div>
+              Climate and Economic Justice Screening Tool
+            </div>
+          </a>
         </div>
         <div
           class="grid-col-fill"
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index ad25ec518..02c7ccff6 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -180,18 +180,29 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           class="grid-col-1"
           data-testid="grid"
         >
-          <img
-            alt="Climate and Economic Justice Screening Tool"
-            src="test-file-stub"
-          />
+          <a
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <img
+              alt="Climate and Economic Justice Screening Tool"
+              src="test-file-stub"
+            />
+          </a>
         </div>
         <div
           class="grid-col-6"
           data-testid="grid"
         >
-          <div>
-            Climate and Economic Justice Screening Tool
-          </div>
+          <a
+            class="remove-link-style"
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <div>
+              Climate and Economic Justice Screening Tool
+            </div>
+          </a>
         </div>
         <div
           class="grid-col-fill"
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index fefcea0e3..c5b59d401 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -180,18 +180,29 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           class="grid-col-1"
           data-testid="grid"
         >
-          <img
-            alt="Climate and Economic Justice Screening Tool"
-            src="test-file-stub"
-          />
+          <a
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <img
+              alt="Climate and Economic Justice Screening Tool"
+              src="test-file-stub"
+            />
+          </a>
         </div>
         <div
           class="grid-col-6"
           data-testid="grid"
         >
-          <div>
-            Climate and Economic Justice Screening Tool
-          </div>
+          <a
+            class="remove-link-style"
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <div>
+              Climate and Economic Justice Screening Tool
+            </div>
+          </a>
         </div>
         <div
           class="grid-col-fill"
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index c8b30296e..f79c60608 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -180,18 +180,29 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           class="grid-col-1"
           data-testid="grid"
         >
-          <img
-            alt="Climate and Economic Justice Screening Tool"
-            src="test-file-stub"
-          />
+          <a
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <img
+              alt="Climate and Economic Justice Screening Tool"
+              src="test-file-stub"
+            />
+          </a>
         </div>
         <div
           class="grid-col-6"
           data-testid="grid"
         >
-          <div>
-            Climate and Economic Justice Screening Tool
-          </div>
+          <a
+            class="remove-link-style"
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <div>
+              Climate and Economic Justice Screening Tool
+            </div>
+          </a>
         </div>
         <div
           class="grid-col-fill"
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 729c2b436..e5cd63318 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -180,18 +180,29 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           class="grid-col-1"
           data-testid="grid"
         >
-          <img
-            alt="Climate and Economic Justice Screening Tool"
-            src="test-file-stub"
-          />
+          <a
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <img
+              alt="Climate and Economic Justice Screening Tool"
+              src="test-file-stub"
+            />
+          </a>
         </div>
         <div
           class="grid-col-6"
           data-testid="grid"
         >
-          <div>
-            Climate and Economic Justice Screening Tool
-          </div>
+          <a
+            class="remove-link-style"
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <div>
+              Climate and Economic Justice Screening Tool
+            </div>
+          </a>
         </div>
         <div
           class="grid-col-fill"
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index c2e8e6d64..ef13f80b8 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -180,18 +180,29 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           class="grid-col-1"
           data-testid="grid"
         >
-          <img
-            alt="Climate and Economic Justice Screening Tool"
-            src="test-file-stub"
-          />
+          <a
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <img
+              alt="Climate and Economic Justice Screening Tool"
+              src="test-file-stub"
+            />
+          </a>
         </div>
         <div
           class="grid-col-6"
           data-testid="grid"
         >
-          <div>
-            Climate and Economic Justice Screening Tool
-          </div>
+          <a
+            class="remove-link-style"
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <div>
+              Climate and Economic Justice Screening Tool
+            </div>
+          </a>
         </div>
         <div
           class="grid-col-fill"
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index cc5b1c8e0..a1ea5c4bb 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -180,18 +180,29 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           class="grid-col-1"
           data-testid="grid"
         >
-          <img
-            alt="Climate and Economic Justice Screening Tool"
-            src="test-file-stub"
-          />
+          <a
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <img
+              alt="Climate and Economic Justice Screening Tool"
+              src="test-file-stub"
+            />
+          </a>
         </div>
         <div
           class="grid-col-6"
           data-testid="grid"
         >
-          <div>
-            Climate and Economic Justice Screening Tool
-          </div>
+          <a
+            class="remove-link-style"
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <div>
+              Climate and Economic Justice Screening Tool
+            </div>
+          </a>
         </div>
         <div
           class="grid-col-fill"
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index 67874fe1e..f8dbe5ebe 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -180,18 +180,29 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           class="grid-col-1"
           data-testid="grid"
         >
-          <img
-            alt="Climate and Economic Justice Screening Tool"
-            src="test-file-stub"
-          />
+          <a
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <img
+              alt="Climate and Economic Justice Screening Tool"
+              src="test-file-stub"
+            />
+          </a>
         </div>
         <div
           class="grid-col-6"
           data-testid="grid"
         >
-          <div>
-            Climate and Economic Justice Screening Tool
-          </div>
+          <a
+            class="remove-link-style"
+            data-cy="nav-link-explore-the-map"
+            href="/en/"
+          >
+            <div>
+              Climate and Economic Justice Screening Tool
+            </div>
+          </a>
         </div>
         <div
           class="grid-col-fill"
diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss
index e128e4cb3..fdf430ba9 100644
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@@ -138,6 +138,10 @@ li.usa-nav__primary-item a:hover::after{
     bottom: -0.25rem;
 }
 
+.remove-link-style {
+  text-decoration: none;
+  color: #1b1b1b;
+}
 
 /* 
 ******************************

From 591bbc51ac0f714cb3b2bd368d9f0c407ee1848b Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Fri, 4 Nov 2022 22:24:55 -0700
Subject: [PATCH 095/130] Content 1.0 updates, test tracts updated, some UI
 tweaks tasks (#2063)

* Content 1.0 updates

* Import variables rather than entire constant files

* Add "--" to all tract info

* Show "--" for when Adjusted low income is missing

* Add non disadvn case

- ADJ_ET is true and threshold isn't met

* Replace socio-economic with socioeconomic

* Add mouse pointer icon to side panel
- this looks like the bird lol
---
 .../src/components/AreaDetail/AreaDetail.tsx  |  24 ++--
 .../src/components/Categories/Categories.tsx  |   2 +-
 .../__snapshots__/Categories.test.tsx.snap    |  14 ++-
 .../datasetContainer.test.tsx.snap            |  56 +++++----
 client/src/components/DonutCopy/DonutCopy.tsx |  11 +-
 .../HowYouCanHelp/HowYouCanHelp.tsx           |   3 +
 .../__snapshots__/howYouCanHelp.test.tsx.snap |  21 +++-
 .../MethodologyFormula.test.tsx.snap          |  10 +-
 .../PrioritizationCopy.test.tsx               |  10 +-
 .../PrioritizationCopy/PrioritizationCopy.tsx |  14 ++-
 .../PrioritizationCopy.test.tsx.snap          |  40 +++++--
 .../SidePanelInfo/SidePanelInfo.tsx           |   4 +-
 .../__snapshots__/SidePanelInfo.test.tsx.snap |   2 +-
 .../__snapshots__/mapInfoPanel.test.tsx.snap  |   2 +-
 client/src/data/copy/about.tsx                |  26 +++--
 client/src/data/copy/explore.tsx              | 102 ++++++++++-------
 client/src/data/copy/faqs.tsx                 |  26 +++--
 client/src/data/copy/methodology.tsx          |  59 ++++------
 .../sidePanelIcons/mouse-hand-point.svg       |   1 +
 client/src/intl/en.json                       | 106 +++++++++---------
 client/src/intl/tribalRounding.js             |   3 +
 client/src/pages/about.tsx                    |   9 +-
 client/src/pages/contact.tsx                  |   7 +-
 client/src/pages/downloads.tsx                |  10 +-
 .../src/pages/frequently-asked-questions.tsx  |   8 +-
 client/src/pages/index.tsx                    |   1 +
 client/src/pages/methodology.tsx              |   4 +-
 client/src/pages/previous-versions.tsx        |   5 +-
 .../tests/__snapshots__/about.test.tsx.snap   |  34 ++++--
 .../freqAskedQuestions.test.tsx.snap          |  51 +++++++--
 .../__snapshots__/methodology.test.tsx.snap   |  76 +++++++------
 client/src/styles/global.scss                 |  12 ++
 32 files changed, 450 insertions(+), 303 deletions(-)
 create mode 100644 client/src/images/sidePanelIcons/mouse-hand-point.svg
 create mode 100644 client/src/intl/tribalRounding.js

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 23ab6f65e..ff8b31279 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -64,7 +64,7 @@ export interface indicatorInfo {
  * id: distict id
  * titleText: display text for the category title
  * indicators: an array of indicators
- * socioEcIndicators: an array of socio-economic indicators
+ * socioEcIndicators: an array of socioeconomic indicators
  * isDisadvagtaged: boolean to indicate if the category is disadvantaged
  * isExceed1MoreBurden: boolean to indicate if the category exceeds more than one burden
  * isExceedBothSocioBurdens: boolean to indicate if the category exceeds both socio-eco burdens
@@ -143,10 +143,17 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
   console.log("Tribal count in CONUS: ", properties[constants.TRIBAL_AREAS_COUNT_CONUS] >= 1 ?
   ` ${properties[constants.TRIBAL_AREAS_COUNT_CONUS]}` : ` null`);
 
-  const blockGroup = properties[constants.GEOID_PROPERTY] ? properties[constants.GEOID_PROPERTY] : "N/A";
-  const population = properties[constants.TOTAL_POPULATION] ? properties[constants.TOTAL_POPULATION] : "N/A";
-  const countyName = properties[constants.COUNTY_NAME] ? properties[constants.COUNTY_NAME] : "N/A";
-  const stateName = properties[constants.STATE_NAME] ? properties[constants.STATE_NAME] : "N/A";
+
+  // Fix constants.MISSING_DATA_STRING import
+  const blockGroup = properties[constants.GEOID_PROPERTY] ?
+   properties[constants.GEOID_PROPERTY] : constants.MISSING_DATA_STRING;
+  const population = properties[constants.TOTAL_POPULATION] ?
+   properties[constants.TOTAL_POPULATION] : constants.MISSING_DATA_STRING;
+  const countyName = properties[constants.COUNTY_NAME] ?
+   properties[constants.COUNTY_NAME] : constants.MISSING_DATA_STRING;
+  const stateName = properties[constants.STATE_NAME] ?
+   properties[constants.STATE_NAME] : constants.MISSING_DATA_STRING;
+
   const sidePanelState = properties[constants.SIDE_PANEL_STATE];
   const percentTractTribal = properties[constants.TRIBAL_AREAS_PERCENTAGE] >= 0 ?
     parseFloat((properties[constants.TRIBAL_AREAS_PERCENTAGE]*100).toFixed()) : null;
@@ -764,7 +771,7 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
           isBurdened={category.isExceedBothSocioBurdens}
         /> */}
 
-        {/* socio-economic indicators */}
+        {/* socioeconomic indicators */}
         {category.socioEcIndicators.map((indicator: any, index: number) => {
           return <Indicator
             key={`ind${index}`}
@@ -845,7 +852,10 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
         properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS] === 0) &&
       <DonutCopy
         isAdjacent={properties[constants.ADJACENCY_EXCEEDS_THRESH]}
-        povertyBelow200Percentile={properties[constants.POVERTY_BELOW_200_PERCENTILE]}
+        povertyBelow200Percentile={
+          properties[constants.POVERTY_BELOW_200_PERCENTILE] > 0 ?
+          properties[constants.POVERTY_BELOW_200_PERCENTILE] : null
+        }
       /> }
 
       {/* Send Feedback button */}
diff --git a/client/src/components/Categories/Categories.tsx b/client/src/components/Categories/Categories.tsx
index 822e22c97..fb4926c7a 100644
--- a/client/src/components/Categories/Categories.tsx
+++ b/client/src/components/Categories/Categories.tsx
@@ -30,7 +30,7 @@ const Categories = () => {
           <Grid col={8}>
             <h2>{METHODOLOGY_COPY.CATEGORY.HEADING}</h2>
             <p>{intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA3)}</p>
-            <p>{intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA4)}</p>
+            <p>{METHODOLOGY_COPY.FORMULA.PARA4}</p>
           </Grid>
         </Grid>
 
diff --git a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
index b54f17a7d..26790c79b 100644
--- a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
+++ b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
@@ -26,7 +26,17 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </p>
         <p>
           
-      Census tracts are small units of geography. Census tract boundaries are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
+      Census tracts are small units of geography. Census tract 
+          <a
+            class="usa-link usa-link--external"
+            data-cy=""
+            href="https://www.census.gov/programs-surveys/geography/about/glossary.html#par_textimage_6"
+            rel="noreferrer"
+            target="_blank"
+          >
+            boundaries
+          </a>
+           are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
       census boundaries.    
     
         </p>
@@ -547,7 +557,7 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </h2>
         <p>
           
-      Federally-Recognized Tribal lands, including Alaska Native Villages, are also considered disadvantaged and highlighted on the map.   
+      Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities. They are highlighted on the map.  
     
         </p>
       </div>
diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
index ddd322bf1..fe70e8820 100644
--- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
+++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
@@ -714,16 +714,22 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <div
               id="hist-underinv"
             >
-              <div
-                class=""
-              >
+              <div>
+                <div>
+                  <span
+                    class="usa-tag"
+                    data-testid="tag"
+                  >
+                    NEW
+                  </span>
+                </div>
                 <h3>
-                  New Historic underinvestment
+                  Historic underinvestment
                 </h3>
               </div>
               <div>
                 
-        Census tracts that experienced historic underinvestment as determined by the National Community Reinvestment Coalition’s (NCRC) historic redlining score. It is determined using the 
+        Census tracts that experienced historic underinvestment based on redlining maps created by the federal government’s Home Owners’ Loan Corporation (HOLC) between 1935 and 1940. The tool uses the 
                 <a
                   class="usa-link usa-link--external"
                   data-cy=""
@@ -731,9 +737,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   rel="noreferrer"
                   target="_blank"
                 >
-                  NCRC’s methodology
+                  National Community Reinvestment Coalition’s methodology
                 </a>
-                 for identifying areas with the most historic redlining (i.e. a score of 3.25 or more out of 4). This means that people in the  tract had high barriers to accessing home loans. 
+                 for converting boundaries in the HOLC maps to census tracts. Census tracts meet the threshold when they have a score of 3.25 or more out of 4.
       
               </div>
               <div>
@@ -743,15 +749,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <strong>
                     Note: 
                   </strong>
-                  The historic underinvestment data indicator 
-                  <strong>
-                    does not
-                  </strong>
-                   appear on the map for tracts 
+                  The historic underinvestment indicator 
                   <strong>
-                    that were not
+                    is not shown
                   </strong>
-                   evaluated by the National Community Reinvestment Coalition. It is shown in tracts that are most commonly in larger metropolitan areas.
+                   on the map for tracts that were not included in the original HOLC maps because there is no data available.
       
                 </p>
               </div>
@@ -781,7 +783,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   >
                     Dataset of formerly redlined areas
                   </a>
-                   using digitized maps from the Home Owners Loan Corporation from 2010
+                   using digitized maps from the Home Owners Loan Corporation (HOLC), using 2010 census boundaries
                 </li>
                 <li>
                   <span>
@@ -860,7 +862,8 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes.
+        Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes. Places that lack green space are also known as nature-deprived.
+
       
               </div>
               <ul>
@@ -1904,31 +1907,22 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   </span>
                 </div>
                 <h3>
-                  Tribal lands
+                  Tribes
                 </h3>
               </div>
               <div>
                 
-        The Land Area Representation (LAR) dataset depicts the exterior extent of a Federal Indian land area. 
+      The Land Area Representation (LAR) dataset depicts American Indian land areas for Federally Recognized Tribes.
       
               </div>
-              <div>
-                <p>
-                  
-        
-                  <strong>
-                    Note: 
-                  </strong>
-                  The LAR dataset depicts the exterior extent of a Federal Indian land area.  Not all Federally recognized tribes have a designated land area; therefore, they may not have an associated land area represented in the land area dataset.
-      
-                </p>
-              </div>
               <ul>
                 <li>
                   <span>
                     Used in: 
                   </span>
-                  Displaying Federally recognized tribal boundaries and Alaska Native Villages on the map
+                  
+        Displaying land within the boundaries of Federally Recognized Tribes and point locations of Alaska Native Villages on the map
+      
                 </li>
                 <li>
                   <span>
@@ -1955,7 +1949,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Available for: 
                   </span>
-                  Federally-Recognized Tribes, including Alaskan Native villages 
+                  Federally Recognized Tribes, including Alaskan Native villages 
                 </li>
               </ul>
             </div>
diff --git a/client/src/components/DonutCopy/DonutCopy.tsx b/client/src/components/DonutCopy/DonutCopy.tsx
index 76815de4d..f17e96243 100644
--- a/client/src/components/DonutCopy/DonutCopy.tsx
+++ b/client/src/components/DonutCopy/DonutCopy.tsx
@@ -9,12 +9,13 @@ import * as EXPLORE_COPY from '../../data/copy/explore';
 
 export interface IDonutCopyProps {
   isAdjacent: boolean
-  povertyBelow200Percentile: number
+  povertyBelow200Percentile: number | null
 }
 
 const DonutCopy = ({isAdjacent, povertyBelow200Percentile}: IDonutCopyProps) => {
   const intl = useIntl();
-  const povBel200Percentile = parseFloat((povertyBelow200Percentile*100).toFixed());
+  const povBel200Percentile = povertyBelow200Percentile ?
+    parseFloat((povertyBelow200Percentile*100).toFixed()) : null;
   const threshold = 50;
 
   return (
@@ -28,7 +29,9 @@ const DonutCopy = ({isAdjacent, povertyBelow200Percentile}: IDonutCopyProps) =>
       <div className={styles.donutRow}>
         <div className={styles.donutRowLabel}>{intl.formatMessage(EXPLORE_COPY.DONUT_COPY.ADJ_LOW_INC)}</div>
         <div className={styles.valueSubTextContainer}>
-          <div className={isAdjacent && povBel200Percentile >= threshold ? styles.invert : styles.noInvert}>
+          <div className={
+            isAdjacent && povBel200Percentile &&
+            povBel200Percentile >= threshold ? styles.invert : styles.noInvert}>
             <IndicatorValue
               type={'percentile'}
               displayStat={povBel200Percentile}
@@ -37,7 +40,7 @@ const DonutCopy = ({isAdjacent, povertyBelow200Percentile}: IDonutCopyProps) =>
           <div className={styles.subTextContainer}>
             <IndicatorValueSubText
               value={povBel200Percentile}
-              isAboveThresh={povBel200Percentile >= threshold ? true : false}
+              isAboveThresh={povBel200Percentile && povBel200Percentile >= threshold ? true : false}
               threshold={threshold}
               type={'percentile'}
             />
diff --git a/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx b/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx
index ebdb1d354..0f56bddb9 100644
--- a/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx
+++ b/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx
@@ -23,6 +23,9 @@ const HowYouCanHelp = () => {
           {ABOUT_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_4}
         </li>
       </ul>
+      <p>
+        {ABOUT_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.PARA1}
+      </p>
     </div>
   );
 };
diff --git a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
index 6395b8fd2..9068bb06f 100644
--- a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
+++ b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
@@ -10,8 +10,11 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl
       <li>
         Provide 
         <a
-          class="usa-link"
-          href="/en/methodology"
+          class="usa-link usa-link--external"
+          data-cy=""
+          href="https://www.surveymonkey.com/r/P3LWTSB"
+          rel="noreferrer"
+          target="_blank"
         >
           general feedback
         </a>
@@ -20,15 +23,18 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl
       <li>
         Suggest new 
         <a
-          class="usa-link"
-          href="/en/methodology"
+          class="usa-link usa-link--external"
+          data-cy=""
+          href="https://www.surveymonkey.com/r/6G9TQJ8"
+          rel="noreferrer"
+          target="_blank"
         >
           data sources
         </a>
         .
       </li>
       <li>
-        Any other questions? Email: 
+        Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email CEQ at: 
         <a
           class="usa-link"
           href="/en/methodology"
@@ -37,6 +43,11 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl
         </a>
       </li>
     </ul>
+    <p>
+      
+      The Council on Environmental Quality plans to issue a Request for Information in 2023. This will give the public time to use the tool before providing comments.    
+    
+    </p>
   </div>
 </DocumentFragment>
 `;
diff --git a/client/src/components/MethodologyFormula/__snapshots__/MethodologyFormula.test.tsx.snap b/client/src/components/MethodologyFormula/__snapshots__/MethodologyFormula.test.tsx.snap
index 054ade7e0..03da1b8dd 100644
--- a/client/src/components/MethodologyFormula/__snapshots__/MethodologyFormula.test.tsx.snap
+++ b/client/src/components/MethodologyFormula/__snapshots__/MethodologyFormula.test.tsx.snap
@@ -18,15 +18,7 @@ exports[`rendering of the MethodologyFormula checks if component renders 1`] = `
        the census tract is above the threshold for one or more environmental or climate indicators
       
     </p>
-    <p>
-      
-      
-      <strong>
-        AND
-      </strong>
-       the census tract is above the threshold for the socioeconomic indicators
-    
-    </p>
+    <p />
   </section>
 </DocumentFragment>
 `;
diff --git a/client/src/components/PrioritizationCopy/PrioritizationCopy.test.tsx b/client/src/components/PrioritizationCopy/PrioritizationCopy.test.tsx
index f52afa07b..b1e01f6d7 100644
--- a/client/src/components/PrioritizationCopy/PrioritizationCopy.test.tsx
+++ b/client/src/components/PrioritizationCopy/PrioritizationCopy.test.tsx
@@ -14,7 +14,7 @@ describe('rendering of PrioritizationCopy Component -', () => {
       tribalCountUS: null,
       percentTractTribal: null,
       // eslint-disable-next-line max-len
-      para1: `This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold.`,
+      para1: `This tract is not considered disadvantaged. It does not meet any burden thresholds `,
     },
     {
       totalCategoriesPrioritized: 0,
@@ -25,7 +25,7 @@ describe('rendering of PrioritizationCopy Component -', () => {
       tribalCountUS: null,
       percentTractTribal: null,
       // eslint-disable-next-line max-len
-      para1: `This tract is not considered disadvantaged. It meets 1 burden threshold BUT no associated socio-economic thresholds.`,
+      para1: `This tract is not considered disadvantaged. It meets 1 burden threshold`,
     },
     {
       totalCategoriesPrioritized: 0,
@@ -36,7 +36,7 @@ describe('rendering of PrioritizationCopy Component -', () => {
       tribalCountUS: null,
       percentTractTribal: null,
       // eslint-disable-next-line max-len
-      para1: `This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds.`,
+      para1: `This tract is not considered disadvantaged. It meets more than 1 burden threshold `,
     },
     {
       totalCategoriesPrioritized: 2,
@@ -47,7 +47,7 @@ describe('rendering of PrioritizationCopy Component -', () => {
       tribalCountUS: null,
       percentTractTribal: null,
       // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it meets 1 burden threshold AND the associated socio-economic threshold.`,
+      para1: `This tract is considered disadvantaged because it meets 1 burden threshold `,
     },
     {
       totalCategoriesPrioritized: 2,
@@ -58,7 +58,7 @@ describe('rendering of PrioritizationCopy Component -', () => {
       tribalCountUS: null,
       percentTractTribal: null,
       // eslint-disable-next-line max-len
-      para1: `This tract is considered disadvantaged because it meets more than 1 burden threshold AND the associated socio-economic threshold.`,
+      para1: `This tract is considered disadvantaged because it meets more than 1 burden threshold `,
     },
 
     // {
diff --git a/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
index 3420be6b4..471ec7fde 100644
--- a/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
+++ b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
@@ -40,11 +40,19 @@ const PrioritizationCopy =
      if (totalCategoriesPrioritized === 0) {
        if (isAdjacencyThreshMet && isAdjacencyLowIncome) {
          prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.PRIO_SURR_LI;
+       } else if (
+         isAdjacencyThreshMet &&
+          !isAdjacencyLowIncome &&
+          tribalCountAK === null &&
+          tribalCountUS === null &&
+          percentTractTribal === null
+       ) {
+         prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO_SURR_LI;
        } else if (
          !(isAdjacencyThreshMet && isAdjacencyLowIncome) &&
-      tribalCountAK === null &&
-      tribalCountUS === null &&
-      percentTractTribal === null
+          tribalCountAK === null &&
+          tribalCountUS === null &&
+          percentTractTribal === null
        ) {
          if (totalBurdensPrioritized === 0) {
            prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO;
diff --git a/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap b/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap
index 243d2fccc..81b2e7bb0 100644
--- a/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap
+++ b/client/src/components/PrioritizationCopy/__snapshots__/PrioritizationCopy.test.tsx.snap
@@ -1,41 +1,61 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it meets 1 burden threshold AND the associated socio-economic threshold. when totCats = 2, totBurds = 1, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it meets 1 burden threshold  when totCats = 2, totBurds = 1, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
 <DocumentFragment>
   <div>
-    This tract is considered disadvantaged because it meets 1 burden threshold AND the associated socio-economic threshold.
+    This tract is considered disadvantaged because it meets 1 burden threshold 
+    <strong>
+      AND
+    </strong>
+     the associated socioeconomic threshold.
   </div>
 </DocumentFragment>
 `;
 
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it meets more than 1 burden threshold AND the associated socio-economic threshold. when totCats = 2, totBurds = 5, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is considered disadvantaged because it meets more than 1 burden threshold  when totCats = 2, totBurds = 5, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
 <DocumentFragment>
   <div>
-    This tract is considered disadvantaged because it meets more than 1 burden threshold AND the associated socio-economic threshold.
+    This tract is considered disadvantaged because it meets more than 1 burden threshold 
+    <strong>
+      AND
+    </strong>
+     the associated socioeconomic threshold.
   </div>
 </DocumentFragment>
 `;
 
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold. when totCats = 0, totBurds = 0, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It does not meet any burden thresholds  when totCats = 0, totBurds = 0, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
 <DocumentFragment>
   <div>
-    This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold.
+    This tract is not considered disadvantaged. It does not meet any burden thresholds 
+    <strong>
+      OR
+    </strong>
+     at least one associated socioeconomic threshold.
   </div>
 </DocumentFragment>
 `;
 
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It meets 1 burden threshold BUT no associated socio-economic thresholds. when totCats = 0, totBurds = 1, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It meets 1 burden threshold when totCats = 0, totBurds = 1, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
 <DocumentFragment>
   <div>
-    This tract is not considered disadvantaged. It meets 1 burden threshold BUT no associated socio-economic thresholds.
+    This tract is not considered disadvantaged. It meets 1 burden threshold 
+    <strong>
+      BUT
+    </strong>
+     no associated socioeconomic thresholds.
   </div>
 </DocumentFragment>
 `;
 
-exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds. when totCats = 0, totBurds = 5, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
+exports[`rendering of PrioritizationCopy Component - checks if component renders This tract is not considered disadvantaged. It meets more than 1 burden threshold  when totCats = 0, totBurds = 5, isAdj = false, isAdjLI = false, tribal % = null, 1`] = `
 <DocumentFragment>
   <div>
-    This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds.
+    This tract is not considered disadvantaged. It meets more than 1 burden threshold 
+    <strong>
+      BUT
+    </strong>
+     no associated socioeconomic thresholds.
   </div>
 </DocumentFragment>
 `;
diff --git a/client/src/components/SidePanelInfo/SidePanelInfo.tsx b/client/src/components/SidePanelInfo/SidePanelInfo.tsx
index 1bd14f8ba..0ec772dac 100644
--- a/client/src/components/SidePanelInfo/SidePanelInfo.tsx
+++ b/client/src/components/SidePanelInfo/SidePanelInfo.tsx
@@ -25,7 +25,7 @@ import tribalDotIcon from '../../images/sidePanelIcons/tribal-tract.svg';
 // @ts-ignore
 import pieChartIcon from '../../images/sidePanelIcons/pie-chart.svg';
 // @ts-ignore
-import selectArrowIcon from '../../images/sidePanelIcons/select-arrow.svg';
+import handPointIcon from '../../images/sidePanelIcons/mouse-hand-point.svg';
 
 import * as styles from './SidePanelInfo.module.scss';
 import * as constants from '../../data/constants';
@@ -69,7 +69,7 @@ const SidePanelInfo = () => {
         {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA1_PART4)}
         {
           windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
-          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={selectArrowIcon}
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={handPointIcon}
             alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.MOUSE)}
           />
         }
diff --git a/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap b/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap
index 7a6da00e4..c53dfe5ff 100644
--- a/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap
+++ b/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap
@@ -166,7 +166,7 @@ exports[`rendering of the component expects the render to match snapshot 1`] = `
       tabindex="0"
     >
       
-      Federally Recognized Tribal lands are also highlighted
+      Land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages are
     
       <img
         alt="
diff --git a/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap b/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap
index 6828b1940..3f77f7adc 100644
--- a/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap
+++ b/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap
@@ -171,7 +171,7 @@ exports[`simulate app starting up, no click on map should match the snapshot of
         tabindex="0"
       >
         
-      Federally Recognized Tribal lands are also highlighted
+      Land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages are
     
         <img
           alt="
diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx
index bbe2f85f2..04cd0895b 100644
--- a/client/src/data/copy/about.tsx
+++ b/client/src/data/copy/about.tsx
@@ -25,7 +25,8 @@ export const CONTENT = {
   <FormattedMessage
     id={'about.page.paragraph.1'}
     defaultMessage={`
-      In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens.
+      In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens.These are the communities that are disadvantaged because they are overburdened and underserved.
+
     `}
     description={'Navigate to the About page. This is the paragraph 1'}
     values={{
@@ -37,7 +38,7 @@ export const CONTENT = {
   <FormattedMessage
     id={'about.page.paragraph.2'}
     defaultMessage={`
-      Federal agencies will use the tool to help identify disadvantaged communities that will benefit from programs included in <link1>Justice40 Initiative</link1>. The Justice40 Initiative seeks to deliver 40% of the overall benefits of investments in climate, clean energy, and related areas to disadvantaged communities.
+      Federal agencies will use the tool to help identify disadvantaged communities that will benefit from programs included in the <link1>Justice40 Initiative</link1>. The Justice40 Initiative seeks to deliver 40% of the overall benefits of investments in climate, clean energy, and related areas to disadvantaged communities.
     `}
     description={'Navigate to the About page. This is the paragraph 2'}
     values={{
@@ -96,7 +97,7 @@ export const CONTENT = {
   <FormattedMessage
     id={'about.page.use.data.paragraph'}
     defaultMessage={`
-    A community is considered to be disadvantaged if it meets the <link1>methodology</link1>.
+    A community is considered to be disadvantaged if it meets the tool's <link1>methodology</link1>.
     `}
     description={'Navigate to the About page. This is the paragraph 4'}
     values={{
@@ -115,7 +116,7 @@ export const HOW_TO_USE_TOOL = defineMessages({
   },
   PARA1: {
     id: 'about.page.how.to.use.tool.para1',
-    defaultMessage: 'The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tracts match the data that is currently available. The tool also shows Federally-recognized Tribal reservation lands, including Alaskan Native Villages.',
+    defaultMessage: 'The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tracts match the data that is currently available. The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaskan Native Villages.',
     description: 'Navigate to the About page. This is the sub heading of How to use the tool paragraph1',
   },
   PARA2: {
@@ -131,7 +132,7 @@ export const HOW_TO_USE_TOOL = defineMessages({
   USE_MAP_PARA: {
     id: 'about.page.use.map.para',
     defaultMessage: `
-      Zoom and select any census tract to see if it is considered disadvantaged.
+      Zoom-in and select any census tract to see if it is considered disadvantaged.
     `,
     description: 'Navigate to the About page. This is the paragraph of Using the map',
   },
@@ -185,7 +186,7 @@ export const GET_INVOLVED_COMMENTS = {
     id={'about.page.send.feedback.email.link'}
     description={'about page sub header text'}
     defaultMessage={`
-      Contact CEQ
+      Contact
     `}
   />,
 };
@@ -201,7 +202,7 @@ export const HOW_YOU_CAN_HELP_LIST_ITEMS = {
     defaultMessage={`Provide <link1>general feedback</link1> on the CEJST website`}
     description={`Navigate to the about page. You will see How you can help list item 1`}
     values={{
-      link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
+      link1: linkFn('https://www.surveymonkey.com/r/P3LWTSB', false, true),
     }}
   />,
   LIST_ITEM_2: <FormattedMessage
@@ -209,7 +210,7 @@ export const HOW_YOU_CAN_HELP_LIST_ITEMS = {
     defaultMessage={`Suggest new <link1>data sources</link1>.`}
     description={`Navigate to the about page. You will see How you can help list item 2`}
     values={{
-      link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
+      link1: linkFn('https://www.surveymonkey.com/r/6G9TQJ8', false, true),
     }}
   />,
   LIST_ITEM_3: <FormattedMessage
@@ -219,11 +220,18 @@ export const HOW_YOU_CAN_HELP_LIST_ITEMS = {
   />,
   LIST_ITEM_4: <FormattedMessage
     id={'about.page.how.you.can.help.list.item.4'}
-    defaultMessage={`Any other questions? Email: <link1>Screeningtool-Support@omb.eop.gov</link1>`}
+    defaultMessage={`Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email CEQ at: <link1>Screeningtool-Support@omb.eop.gov</link1>`}
     description={`Navigate to the about page. You will see How you can help list item 3`}
     values={{
       link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
     }}
   />,
+  PARA1: <FormattedMessage
+    id={'about.page.how.you.can.help.para.1'}
+    defaultMessage={`
+      The Council on Environmental Quality plans to issue a Request for Information in 2023. This will give the public time to use the tool before providing comments.    
+    `}
+    description={`Navigate to the about page. You will see How you can help list item 3`}
+  />,
 
 };
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 83761d70f..f5d655e4d 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -4,15 +4,15 @@ import React from 'react';
 import {defineMessages} from 'react-intl';
 import {FormattedDate, FormattedMessage, FormattedNumber} from 'gatsby-plugin-intl';
 
-import * as COMMON_COPY from './common';
-import * as DOWNLOADS_COPY from './downloads';
-import * as METHODOLOGY_COPY from './methodology';
+import {linkFn, boldFn, downloadLink} from './common';
+import {DOWNLOAD_FILES} from './downloads';
+import {VERSION_NUMBER} from './methodology';
 import {PAGES_ENDPOINTS} from '../constants';
 
 export const EXPLORE_PAGE_LINKS = {
-  TRIBAL_ACTION_PLAN: `https://www.whitehouse.gov/wp-content/uploads/2022/01/CEQ-Tribal-Consultation-Plan-04.26.2021.pdf`,
-  TRIBAL_WHITEHOUSE: `https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/26/memorandum-on-tribal-consultation-and-strengthening-nation-to-nation-relationships/`,
-  TRIBAL_FED_REGISTER: `https://www.federalregister.gov/documents/2000/11/09/00-29003/consultation-and-coordination-with-indian-tribal-governments`,
+  WH_GOV_TRIBAL_ACTION_PLAN_4_26_21: `https://www.whitehouse.gov/wp-content/uploads/2022/01/CEQ-Tribal-Consultation-Plan-04.26.2021.pdf`,
+  WH_GOV_TRIBAL_CONSULT_NATION_NATION_01_25_21: `https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/26/memorandum-on-tribal-consultation-and-strengthening-nation-to-nation-relationships/`,
+  FED_REGISTER_CONSULT_TRIBE_GOV_2000: `https://www.federalregister.gov/documents/2000/11/09/00-29003/consultation-and-coordination-with-indian-tribal-governments`,
   CENSUS_15_19: `https://www.census.gov/programs-surveys/decennial-census/data.html`,
   DECENNIAL: `https://www.census.gov/programs-surveys/decennial-census/data.html`,
 };
@@ -33,12 +33,9 @@ export const PAGE_INTRO = defineMessages({
 export const PAGE_DESCRIPTION1 = <FormattedMessage
   id={'explore.map.page.description.1'}
   defaultMessage={`
-    Census tracts that are overburdened and underserved census tracts are highlighted as being disadvantaged on the map. These include Federally Recognized Tribal lands, including Alaska Native Villages. 
+    Census tracts that are overburdened and underserved census tracts are highlighted as being disadvantaged on the map. Federally Recognized Tribes, including Alaska Native Villages are also considered disadvantaged communities. 
   `}
   description={'On the explore the map page, the first description of the page'}
-  // values={{
-  //   link1: COMMON_COPY.linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
-  // }}
 />;
 
 export const PAGE_DESCRIPTION2 = <FormattedMessage
@@ -47,9 +44,6 @@ export const PAGE_DESCRIPTION2 = <FormattedMessage
     Zooming-in and selecting shows information about each census tract. 
   `}
   description={'On the explore the map page, the fifth description of the page'}
-  // values={{
-  //   link1: COMMON_COPY.linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
-  // }}
 />;
 
 export const LEGEND = defineMessages({
@@ -85,7 +79,7 @@ export const EXPLORE_DATA_BOX_BODY = <FormattedMessage
   `}
   description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the fifth paragraph of this side pane`}
   values={{
-    link1: COMMON_COPY.linkFn(PAGES_ENDPOINTS.DOWNLOADS, true, false),
+    link1: linkFn(PAGES_ENDPOINTS.DOWNLOADS, true, false),
   }}
 />;
 
@@ -367,7 +361,7 @@ export const SIDE_PANEL_INITIAL_STATE = defineMessages({
   PARA6_PART1: {
     id: 'explore.map.page.side.panel.info.para.6',
     defaultMessage: `
-      Federally Recognized Tribal lands are also highlighted
+      Land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages are
     `,
     description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Federally Recognized Tribal lands are also highlighted on the map. These communities are also considered disadvantaged.',
   },
@@ -478,8 +472,8 @@ export const SIDE_PANEL_VERSION = {
        * Formatted Message component. Using toFixed will render the desire, however it returns a string which
        * is unacceptable by the value prop of FormattedNumber.
        */
-      // version: <FormattedNumber value={METHODOLOGY_COPY.VERSION_NUMBER} style="decimal"/>,
-      version: METHODOLOGY_COPY.VERSION_NUMBER,
+      // version: <FormattedNumber value={VERSION_NUMBER} style="decimal"/>,
+      version: VERSION_NUMBER,
     }}
   />,
 };
@@ -602,23 +596,43 @@ export const SIDE_PANEL_TRIBAL_INFO = defineMessages({
 export const PRIORITIZATION_COPY = {
   NOT_PRIO: <FormattedMessage
     id={'explore.map.page.side.panel.prio.copy.not.prio'}
-    defaultMessage={'This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold.'}
-    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold.`}
+    defaultMessage={'This tract is not considered disadvantaged. It does not meet any burden thresholds <bold>OR</bold> at least one associated socioeconomic threshold.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomic threshold.`}
+    values = {{
+      bold: boldFn,
+    }}
   />,
   NOT_PRIO_1BUR: <FormattedMessage
     id={'explore.map.page.side.panel.prio.copy.not.prio.one.burden'}
-    defaultMessage={'This tract is not considered disadvantaged. It meets 1 burden threshold BUT no associated socio-economic thresholds.'}
-    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets [1] burden threshold BUT no associated socio-economic thresholds.`}
+    defaultMessage={'This tract is not considered disadvantaged. It meets 1 burden threshold <bold>BUT</bold> no associated socioeconomic thresholds.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets [1] burden threshold <bold>BUT</bold> no associated socioeconomic thresholds.`}
+    values= {{
+      bold: boldFn,
+    }}
   />,
   NOT_PRIO_NBUR: <FormattedMessage
     id={'explore.map.page.side.panel.prio.copy.prio.one.burden'}
-    defaultMessage={'This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds.'}
-    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds.`}
+    defaultMessage={'This tract is not considered disadvantaged. It meets more than 1 burden threshold <bold>BUT</bold> no associated socioeconomic thresholds.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets more than 1 burden threshold <bold>BUT</bold> no associated socioeconomic thresholds.`}
+    values= {{
+      bold: boldFn,
+    }}
+  />,
+  NOT_PRIO_SURR_LI: <FormattedMessage
+    id={'explore.map.page.side.panel.prio.copy.prio.donut'}
+    defaultMessage={'This tract is not considered disadvantaged. It is surrounded by tracts that are disadvantaged <bold>BUT</bold> does not meet the adjusted low income threshold.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It is surrounded by tracts that are disadvantaged <bold>BUT</bold> does not meet the adjusted low income threshold.`}
+    values={{
+      bold: boldFn,
+    }}
   />,
   PRIO_SURR_LI: <FormattedMessage
     id={'explore.map.page.side.panel.prio.copy.prio.donut'}
-    defaultMessage={'This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. The adjustment does not apply to any of the categories.'}
-    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. The adjustment does not apply to any of the categories.`}
+    defaultMessage={'This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged <bold>AND</bold> meets an adjusted low income threshold. The adjustment does not apply to any of the categories.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged <bold>AND</bold> meets an adjusted low income threshold. The adjustment does not apply to any of the categories.`}
+    values={{
+      bold: boldFn,
+    }}
   />,
 };
 
@@ -626,10 +640,11 @@ export const getPrioNBurdenCopy = (burdens:string) => {
   return (
     <FormattedMessage
       id={'explore.map.page.side.panel.prio.copy.prio.n.burden'}
-      defaultMessage={ 'This tract is considered disadvantaged because it meets {burdens} burden threshold AND the associated socio-economic threshold.'}
-      description={`Navigate to the explore the map page. Click on tract, This tract is considered disadvantaged because it meets {burdens} burden thresholds AND the associated socio-economic threshold.`}
+      defaultMessage={ 'This tract is considered disadvantaged because it meets {burdens} burden threshold <bold>AND</bold> the associated socioeconomic threshold.'}
+      description={`Navigate to the explore the map page. Click on tract, This tract is considered disadvantaged because it meets {burdens} burden thresholds <bold>AND</bold> the associated socioeconomic threshold.`}
       values={{
         burdens: burdens,
+        bold: boldFn,
       }}
     />
   );
@@ -1113,7 +1128,7 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   },
   EXP_BLD_LOSS: {
     id: 'explore.map.page.side.panel.indicator.description.exp.bld.loss',
-    defaultMessage: 'Economic loss to agricultural value resulting from natural hazards each year',
+    defaultMessage: 'Economic loss to building value resulting from natural hazards each year',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side 
     panel will show an indicator description of Economic loss rate to buildings resulting from natural hazards`,
   },
@@ -1128,7 +1143,7 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   FLOODING: {
     id: 'explore.map.page.side.panel.indicator.description.flooding',
     defaultMessage: `
-      Projected risk to properties from floods from tides, rain, riverine and storm surges in 30 years
+    Projected risk to properties from projected floods, from tides, rain, riverine and storm surges within 30 years
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of flooding risk`,
   },
@@ -1206,7 +1221,7 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   },
   LACK_GREEN_SPACE: {
     id: 'explore.map.page.side.panel.indicator.description.lack.green.space',
-    defaultMessage: 'Share of non-crop land covered with artificial materials like concrete or pavement',
+    defaultMessage: 'Amount of non-crop land covered with artificial materials like concrete or pavement',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Share of non-crop land covered with artificial materials like concrete or pavement`,
   },
   LACK_PLUMBING: {
@@ -1390,15 +1405,15 @@ export const DOWNLOAD_DRAFT = {
       map that will download the data packet
     `}
     values={{
-      link1: COMMON_COPY.downloadLink(DOWNLOADS_COPY.DOWNLOAD_FILES.NARWAL.SHAPE_FILE.URL),
+      link1: downloadLink(DOWNLOAD_FILES.NARWAL.SHAPE_FILE.URL),
       downloadFileSize: <FormattedNumber
-        value={DOWNLOADS_COPY.DOWNLOAD_FILES.NARWAL.SHAPE_FILE.SIZE}
+        value={DOWNLOAD_FILES.NARWAL.SHAPE_FILE.SIZE}
         style="unit"
         unit="megabyte"
         unitDisplay="narrow"
       />,
       dateUpdated: <FormattedDate
-        value={DOWNLOADS_COPY.DOWNLOAD_FILES.NARWAL.SHAPE_FILE.LAST_UPDATED}
+        value={DOWNLOAD_FILES.NARWAL.SHAPE_FILE.LAST_UPDATED}
         year="2-digit"
         month="2-digit"
         day="2-digit"
@@ -1423,12 +1438,11 @@ export const NOTE_ON_TERRITORIES = {
   PARA_1: <FormattedMessage
     id={'explore.map.page.under.map.note.on.territories.para.1'}
     defaultMessage={`
-      <bold>Puerto Rico:</bold> The data used for Puerto Rico are from all relevant and available fields 
-      in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.
+      <bold>Puerto Rico:</bold> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period. 
     `}
     description={`Navigate to the explore the map page. Under the map, you will see territories paragraph 1`}
     values={{
-      bold: COMMON_COPY.boldFn,
+      bold: boldFn,
     }}
   />,
 
@@ -1439,7 +1453,7 @@ export const NOTE_ON_TERRITORIES = {
   `}
     description={`Navigate to the explore the map page. Under the map, you will see territories paragraph 2`}
     values={{
-      bold: COMMON_COPY.boldFn,
+      bold: boldFn,
     }}
   />,
 };
@@ -1453,8 +1467,20 @@ export const NOTE_ON_TRIBAL_NATIONS = {
   PARA_1: <FormattedMessage
     id={'explore.map.page.under.map.note.on.tribal.nations.para.1'}
     defaultMessage={`
-      To honor the Administration's commitment to the Federal trust responsibility to Tribal Nations, areas within the boundaries of Federally recognized Tribes, including Alaska Native villages, are designated as disadvantaged. In some areas, like rural Alaska, this includes Tribal areas that are smaller than a census tract. 
+      To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, land within the boundaries of Federally Recognized Tribes are designated as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than a census tract. The boundaries of census tracts and the lands of Federally Recognized Tribes are different.
     `}
     description={`Navigate to the explore the map page. Under the map, you will see tribal nations paragraph 1`}
   />,
+  PARA_2: <FormattedMessage
+    id={'explore.map.page.under.map.note.on.tribal.nations.para.2'}
+    defaultMessage={`
+      This decision was made after meaningful and robust consultation with Tribal Nations. This is consistent with CEQ’s <link1> Action Plan for Consultation and Coordination with Tribal Nations </link1>, President Biden’s <link3>Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation</link3>, and  <link2> Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments </link2> .
+    `}
+    description={`Navigate to the explore the map page. Under the map, you will see tribal nations paragraph 2`}
+    values={{
+      link1: linkFn(EXPLORE_PAGE_LINKS.WH_GOV_TRIBAL_ACTION_PLAN_4_26_21, false, true),
+      link2: linkFn(EXPLORE_PAGE_LINKS.FED_REGISTER_CONSULT_TRIBE_GOV_2000, false, true),
+      link3: linkFn(EXPLORE_PAGE_LINKS.WH_GOV_TRIBAL_CONSULT_NATION_NATION_01_25_21, false, true),
+    }}
+  />,
 };
diff --git a/client/src/data/copy/faqs.tsx b/client/src/data/copy/faqs.tsx
index e6172af0e..967b2dc62 100644
--- a/client/src/data/copy/faqs.tsx
+++ b/client/src/data/copy/faqs.tsx
@@ -7,6 +7,7 @@ import LinkTypeWrapper from '../../components/LinkTypeWrapper';
 import {EJSCREEN, EXEC_ORDER_LINK, FED_RECOGNIZED_INDIAN_ENTITIES} from './about';
 import {boldFn, linkFn, FEEDBACK_EMAIL} from './common';
 import {PAGES_ENDPOINTS} from '../constants';
+import {EXPLORE_PAGE_LINKS} from './explore';
 
 export const PAGE_INTRO = defineMessages({
   PAGE_TILE: {
@@ -291,7 +292,7 @@ export const FAQ_ANSWERS = {
   />,
   Q2_P2: <FormattedMessage
     id={ 'faqs.page.answers.Q2_P2'}
-    defaultMessage={ 'The tool highlights disadvantaged communities across all 50 states, the District of Columbia, and the U.S. territories. A community is considered disadvantaged:'}
+    defaultMessage={ 'The tool highlights disadvantaged communities across all 50 states, the District of Columbia, and the U.S. territories. Communities are considered disadvantaged:'}
     description={ 'Navigate to the FAQs page, this will be an answer, Q2_P2'}
   />,
   Q2_P2_1: <FormattedMessage
@@ -301,7 +302,7 @@ export const FAQ_ANSWERS = {
   />,
   Q2_P2_2: <FormattedMessage
     id={ 'faqs.page.answers.Q2_P2_2'}
-    defaultMessage={ 'If they are on Federally Recognized Tribal land'}
+    defaultMessage={ 'If they are on land within the boundaries of Federally Recognized Tribes'}
     description={ 'Navigate to the FAQs page, this will be an answer, Q2_P2_2'}
   />,
   Q2_P3: <FormattedMessage
@@ -342,7 +343,9 @@ export const FAQ_ANSWERS = {
   />,
   Q5_P1: <FormattedMessage
     id={ 'faqs.page.answers.Q5_P1'}
-    defaultMessage={ 'To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, Federally Recognized Tribal lands are highlighted as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than census tracts. The tool’s census tracts and Tribal lands have different boundaries.'}
+    defaultMessage={`
+      To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, land within the boundaries of Federally Recognized tribes  are highlighted as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than census tracts. The boundaries of census tracts and the lands of Federally Recognized Tribes are different.
+    `}
     description={ 'Navigate to the FAQs page, this will be an answer, Q5_P1'}
   />,
   Q5_P2: <FormattedMessage
@@ -355,12 +358,17 @@ export const FAQ_ANSWERS = {
   />,
   Q5_P2_1: <FormattedMessage
     id={ 'faqs.page.answers.Q5_P2_1'}
-    defaultMessage={ `The decision to highlight Federally-recognized Tribal lands on the CEJST map and to designate them as disadvantaged communities was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s Action Plan for Consultation and Coordination with Tribal Nations, President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments.`}
+    defaultMessage={ `This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s <link1>Action Plan for Consultation and Coordination with Tribal Nations</link1>, <link3>President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation</link3>, and <link2>Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments</link2>.`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q5_P2_1'}
+    values={{
+      link1: linkFn(EXPLORE_PAGE_LINKS.WH_GOV_TRIBAL_ACTION_PLAN_4_26_21, false, true),
+      link2: linkFn(EXPLORE_PAGE_LINKS.FED_REGISTER_CONSULT_TRIBE_GOV_2000, false, true),
+      link3: linkFn(EXPLORE_PAGE_LINKS.WH_GOV_TRIBAL_CONSULT_NATION_NATION_01_25_21, false, true),
+    }}
   />,
   Q6_P1: <FormattedMessage
     id={ 'faqs.page.answers.Q6_P1'}
-    defaultMessage={ `Some census tracts that contain lands of Federally-recognized Tribes that are also considered disadvantaged because they meet the burden thresholds for at least one of the categories on the tool. When this happens, the areas appear darker on the tool’s map.`}
+    defaultMessage={ `Some census tracts that contain land within the boundaries of Federally Recognized Tribes are also considered disadvantaged because they meet the burden thresholds for at least one of the categories on the tool. When this happens, the areas appear darker on the tool’s map.`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q6_P1'}
   />,
   Q6_P2: <FormattedMessage
@@ -370,17 +378,17 @@ export const FAQ_ANSWERS = {
   />,
   Q6_P3: <FormattedMessage
     id={ 'faqs.page.answers.Q6_P3'}
-    defaultMessage={ ` : Disadvantaged census tracts and Federally-Recognized Tribal lands`}
+    defaultMessage={ ` : Disadvantaged census tracts and land within the boundaries of Federally Recognized Tribes `}
     description={ 'Navigate to the FAQs page, this will be an answer, Q6_P3'}
   />,
   Q6_P4: <FormattedMessage
     id={ 'faqs.page.answers.Q6_P4'}
-    defaultMessage={ `Any area that is highlighted is considered disadvantaged, regardless of whether it is a light shade or dark shade. The tool will show if a whole census tract is considered disadvantaged or just the parts that are Federally Recognized Tribal lands.`}
+    defaultMessage={ `Any area that is highlighted is considered disadvantaged, regardless of whether it is a light shade or dark shade. The tool will show if a whole census tract is considered disadvantaged or just the parts that are within the boundaries of Federally Recognized Tribes.`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q6_P4'}
   />,
   Q7: <FormattedMessage
     id={ 'faqs.page.answers.Q7'}
-    defaultMessage={ `A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains Federally Recognized Tribal lands, then the parts of the tract that are Tribal lands are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”`}
+    defaultMessage={ `A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains land within the boundaries of Federally Recognized Tribes, then the parts of the tract that are within the land of Tribes are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q7'}
   />,
   Q8_P1: <FormattedMessage
@@ -450,7 +458,7 @@ export const FAQ_ANSWERS = {
   />,
   Q12_P1: <FormattedMessage
     id={ 'faqs.page.answers.Q12_P1'}
-    defaultMessage={ `The CEJST uses lessons learned from the EPA's EJScreen. EJScreen is an environmental justice mapping and screening tool. EJScreen shows environmental and demographic information. The EPA, Federal agencies, and state and local governments will continue to use EJScreen to understand and analyze environmental problems. For example, EPA uses <link1>EJScreen</link1> to:`}
+    defaultMessage={ `The CEJST uses lessons learned from the EPA's EJScreen. EJScreen is an environmental justice mapping and screening tool. EJScreen shows environmental and demographic information and combines that information together into indices. The EPA, Federal agencies, and state and local governments will continue to use EJScreen to understand and analyze for environmental and EJ issues. For example, EPA uses <link1>EJScreen</link1> to:`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q12_P1'}
     values={{
       link1: linkFn(EJSCREEN, false, true),
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index fe1c94212..25bdc7114 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -20,21 +20,21 @@ export const PAGE = defineMessages({
   PARA1: {
     id: 'methodology.page.paragraph.1',
     defaultMessage: `
-      The tool highlights disadvantaged census tracts across all 50 states, the District of Columbia, and the U.S. territories. A community is considered disadvantaged:
+      The tool highlights disadvantaged census tracts across all 50 states, the District of Columbia, and the U.S. territories. Communities are considered disadvantaged:
     `,
     description: 'Navigate to the methodology page. This is the methodology paragraph 1',
   },
   PARA1_BULLET1: {
     id: 'methodology.page.paragraph.1.bullet.1',
     defaultMessage: `
-      If they are in a census tract that meets the thresholds for at least one of tool’s categories of burden, or
+      If they are in census tracts that meet the thresholds for at least one of tool’s categories of burden, or
     `,
     description: 'Navigate to the methodology page. This is the methodology paragraph 1, bullet 1',
   },
   PARA1_BULLET2: {
     id: 'methodology.page.paragraph.1.bullet.2',
     defaultMessage: `
-      If they are on Federally-Recognized Tribal land
+      If they are on land within the boundaries of Federally Recognized Tribes
     `,
     description: 'Navigate to the methodology page. This is the methodology paragraph 1, bullet 2',
   },
@@ -61,18 +61,10 @@ export const PAGE = defineMessages({
     `,
     description: 'Navigate to the methodology page. This is the methodology paragraph 3',
   },
-  PARA4: {
-    id: 'methodology.page.paragraph.4',
-    defaultMessage: `
-      Census tracts are small units of geography. Census tract boundaries are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
-      census boundaries.    
-    `,
-    description: 'Navigate to the methodology page. This is the methodology paragraph 4',
-  },
   PARA5: {
     id: 'methodology.page.paragraph.5',
     defaultMessage: `
-      Federally-Recognized Tribal lands, including Alaska Native Villages, are also considered disadvantaged and highlighted on the map.   
+      Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities. They are highlighted on the map.  
     `,
     description: 'Navigate to the methodology page. This is the methodology paragraph 5',
   },
@@ -97,14 +89,15 @@ export const FORMULA = {
       boldtag: boldFn,
     }}
   />,
-  AND: <FormattedMessage
-    id={'methodology.page.formula.second'}
+  PARA4: <FormattedMessage
+    id={'methodology.page.paragraph.4'}
     defaultMessage={`
-      <boldtag>AND</boldtag> the census tract is above the threshold for the socioeconomic indicators
+      Census tracts are small units of geography. Census tract <link1>boundaries</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
+      census boundaries.    
     `}
-    description={'Navigate to the methodology page. This is the second part of the formula used in the methodology'}
+    description={'Navigate to the methodology page. This is the methodology paragraph 4'}
     values={{
-      boldtag: boldFn,
+      link1: linkFn('https://www.census.gov/programs-surveys/geography/about/glossary.html#par_textimage_6', false, true),
     }}
   />,
 };
@@ -376,7 +369,9 @@ export const CATEGORIES = {
   TRIBAL_LANDS: {
     METHODOLOGY: <FormattedMessage
       id={'methodology.page.indicator.categories.tribal.lands.methodology'}
-      defaultMessage={`Displaying Federally recognized tribal boundaries and Alaska Native Villages on the map`}
+      defaultMessage={`
+        Displaying land within the boundaries of Federally Recognized Tribes and point locations of Alaska Native Villages on the map
+      `}
       description={`Displaying Federally recognized tribal boundaries and Alaska Native Villages on the map`}
     />,
 
@@ -634,7 +629,7 @@ export const SOURCE_LINKS = {
   />,
   HOLC: <FormattedMessage
     id={'methodology.page.category.source.holc.link'}
-    defaultMessage={`<link1>Dataset of formerly redlined areas</link1> using digitized maps from the Home Owners Loan Corporation from {date10}`}
+    defaultMessage={`<link1>Dataset of formerly redlined areas</link1> using digitized maps from the Home Owners Loan Corporation (HOLC), using {date10} census boundaries`}
     description={'Navigate to the Methodology page. This is the source link for CDC Sleep'}
     values={{
       link1: linkFn('https://www.openicpsr.org/openicpsr/project/141121/version/V2/view', false, true),
@@ -732,7 +727,7 @@ export const AVAILABLE_FOR = defineMessages({
   },
   FRT: {
     id: 'methodology.page.dataset.card.availableFor.FRT',
-    defaultMessage: `Federally-Recognized Tribes, including Alaskan Native villages `,
+    defaultMessage: `Federally Recognized Tribes, including Alaskan Native villages `,
     description: 'Methodology page dataset card available for FRT',
   },
 });
@@ -1059,13 +1054,14 @@ export const INDICATORS = [
     domID: 'hist-underinv',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.hist.underinvest.title.text'}
-      defaultMessage={`New Historic underinvestment`}
+      defaultMessage={`Historic underinvestment`}
       description={'Navigate to the Methodology page. This is the title text for the Historic Underinvestment'}
     />,
+    isNew: true,
     description: <FormattedMessage
       id={'methodology.page.category.low.hist.underinvestectancy.description.text'}
       defaultMessage={`
-        Census tracts that experienced historic underinvestment as determined by the National Community Reinvestment Coalition’s (NCRC) historic redlining score. It is determined using the <link1>NCRC’s methodology</link1> for identifying areas with the most historic redlining (i.e. a score of 3.25 or more out of 4). This means that people in the  tract had high barriers to accessing home loans. 
+        Census tracts that experienced historic underinvestment based on redlining maps created by the federal government’s Home Owners’ Loan Corporation (HOLC) between 1935 and 1940. The tool uses the <link1>National Community Reinvestment Coalition’s methodology</link1> for converting boundaries in the HOLC maps to census tracts. Census tracts meet the threshold when they have a score of 3.25 or more out of 4.
       `}
       description={'Navigate to the Methodology page. This is the description text for Historic Underinvestment'}
       values={{
@@ -1075,7 +1071,7 @@ export const INDICATORS = [
     note: <FormattedMessage
       id={'methodology.page.category.low.hist.underinvestectancy.note.text'}
       defaultMessage={`
-        <boldtag>Note: </boldtag>The historic underinvestment data indicator <boldtag>does not</boldtag> appear on the map for tracts <boldtag>that were not</boldtag> evaluated by the National Community Reinvestment Coalition. It is shown in tracts that are most commonly in larger metropolitan areas.
+        <boldtag>Note: </boldtag>The historic underinvestment indicator <boldtag>is not shown</boldtag> on the map for tracts that were not included in the original HOLC maps because there is no data available.
       `}
       description={'Navigate to the Methodology page. This is the note text for Historic Underinvestment'}
       values={{
@@ -1125,7 +1121,8 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.green.space.description.text'}
       defaultMessage={`
-        Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes.
+        Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes. Places that lack green space are also known as nature-deprived.
+
       `}
       description={'Navigate to the Methodology page. This is the description text for housing burden'}
     />,
@@ -1582,27 +1579,17 @@ export const INDICATORS = [
     domID: 'tribal-lands',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.tribal.lands.title.text'}
-      defaultMessage={`Tribal lands`}
+      defaultMessage={`Tribes`}
       description={'Navigate to the Methodology page. This is the title text for the Tribal lands'}
     />,
     isNew: true,
     description: <FormattedMessage
       id={'methodology.page.category.tribal.lands.description.text'}
       defaultMessage={`
-        The Land Area Representation (LAR) dataset depicts the exterior extent of a Federal Indian land area. 
+      The Land Area Representation (LAR) dataset depicts American Indian land areas for Federally Recognized Tribes.
       `}
       description={'Navigate to the Methodology page. This is the description text for Tribal lands'}
     />,
-    note: <FormattedMessage
-      id={'methodology.page.category.tribal.lands.note.text'}
-      defaultMessage={`
-        <boldtag>Note: </boldtag>The LAR dataset depicts the exterior extent of a Federal Indian land area.  Not all Federally recognized tribes have a designated land area; therefore, they may not have an associated land area represented in the land area dataset.
-      `}
-      description={'Navigate to the Methodology page. This is the note text for low median expectancy'}
-      values={{
-        boldtag: boldFn,
-      }}
-    />,
     usedIn: CATEGORIES.TRIBAL_LANDS.METHODOLOGY,
     responsibleParty: RESPONSIBLE_PARTIES.BIA,
     sources: [
diff --git a/client/src/images/sidePanelIcons/mouse-hand-point.svg b/client/src/images/sidePanelIcons/mouse-hand-point.svg
new file mode 100644
index 000000000..b48047154
--- /dev/null
+++ b/client/src/images/sidePanelIcons/mouse-hand-point.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 385 525"><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path d="M192.5,455a8.75,8.75,0,0,1-8.75-8.75v-87.5a8.75,8.75,0,0,1,17.5,0v87.5A8.76,8.76,0,0,1,192.5,455Z"/><path d="M245,455a8.75,8.75,0,0,1-8.75-8.75v-87.5a8.75,8.75,0,0,1,17.5,0v87.5A8.76,8.76,0,0,1,245,455Z"/><path d="M140,455a8.75,8.75,0,0,1-8.75-8.75v-87.5a8.75,8.75,0,0,1,17.5,0v87.5A8.76,8.76,0,0,1,140,455Z"/><path d="M372.14,187.77a43.58,43.58,0,0,0-28.79-12.69A41.93,41.93,0,0,0,315,184.62v-.87a43.62,43.62,0,0,0-78.75-26,44.65,44.65,0,0,0-4.11-5A43.78,43.78,0,0,0,201.25,140,43,43,0,0,0,175,149V43.75a43.75,43.75,0,1,0-87.5,0v169.4a78.44,78.44,0,0,0-61.25-29.4A26.32,26.32,0,0,0,0,210V358.75A166.41,166.41,0,0,0,166.25,525h52.5A166.41,166.41,0,0,0,385,358.75v-140a43.88,43.88,0,0,0-12.87-31Zm-4.64,171A149,149,0,0,1,218.75,507.5h-52.5A149,149,0,0,1,17.5,358.75V210a8.75,8.75,0,0,1,8.75-8.75A61.32,61.32,0,0,1,87.5,262.5v35a8.75,8.75,0,0,0,17.5,0V43.75a26.25,26.25,0,0,1,52.5,0v192.5a8.75,8.75,0,0,0,17.5,0v-52.5a26.25,26.25,0,0,1,52.5,0v52.5a8.75,8.75,0,0,0,17.5,0v-52.5a26.25,26.25,0,0,1,52.5,0v52.5a8.75,8.75,0,0,0,17.5,0V220.76a29.37,29.37,0,0,1,9.1-21.08,24.92,24.92,0,0,1,18.38-7.18,26.93,26.93,0,0,1,17.32,7.61,26.33,26.33,0,0,1,7.7,18.64Z"/></g></g></svg>
\ No newline at end of file
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 077ab5cac..5246447e4 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -4,7 +4,7 @@
     "description": "Navigate to the About page. This is the sub heading of page"
   },
   "about.page.how.to.use.tool.para1": {
-    "defaultMessage": "The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tracts match the data that is currently available. The tool also shows Federally-recognized Tribal reservation lands, including Alaskan Native Villages.",
+    "defaultMessage": "The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tracts match the data that is currently available. The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaskan Native Villages.",
     "description": "Navigate to the About page. This is the sub heading of How to use the tool paragraph1"
   },
   "about.page.how.to.use.tool.para2": {
@@ -32,7 +32,11 @@
     "description": "Navigate to the about page. You will see How you can help list item 3"
   },
   "about.page.how.you.can.help.list.item.4": {
-    "defaultMessage": "Any other questions? Email: <link1>Screeningtool-Support@omb.eop.gov</link1>",
+    "defaultMessage": "Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email CEQ at: <link1>Screeningtool-Support@omb.eop.gov</link1>",
+    "description": "Navigate to the about page. You will see How you can help list item 3"
+  },
+  "about.page.how.you.can.help.para.1": {
+    "defaultMessage": "The Council on Environmental Quality plans to issue a Request for Information in 2023. This will give the public time to use the tool before providing comments.",
     "description": "Navigate to the about page. You will see How you can help list item 3"
   },
   "about.page.join.open.source.info": {
@@ -56,11 +60,11 @@
     "description": "Navigate to the About page. This is the list item 2"
   },
   "about.page.paragraph.1": {
-    "defaultMessage": "In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens.",
+    "defaultMessage": "In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens.These are the communities that are disadvantaged because they are overburdened and underserved.",
     "description": "Navigate to the About page. This is the paragraph 1"
   },
   "about.page.paragraph.2": {
-    "defaultMessage": "Federal agencies will use the tool to help identify disadvantaged communities that will benefit from programs included in <link1>Justice40 Initiative</link1>. The Justice40 Initiative seeks to deliver 40% of the overall benefits of investments in climate, clean energy, and related areas to disadvantaged communities.",
+    "defaultMessage": "Federal agencies will use the tool to help identify disadvantaged communities that will benefit from programs included in the <link1>Justice40 Initiative</link1>. The Justice40 Initiative seeks to deliver 40% of the overall benefits of investments in climate, clean energy, and related areas to disadvantaged communities.",
     "description": "Navigate to the About page. This is the paragraph 2"
   },
   "about.page.paragraph.3": {
@@ -72,7 +76,7 @@
     "description": "Navigate to the About page. This is the paragraph 4"
   },
   "about.page.send.feedback.email.link": {
-    "defaultMessage": "Contact CEQ",
+    "defaultMessage": "Contact",
     "description": "about page sub header text"
   },
   "about.page.send.feedback.heading": {
@@ -92,7 +96,7 @@
     "description": "Navigate to the About page. This is the sub heading of Using the data"
   },
   "about.page.use.data.paragraph": {
-    "defaultMessage": "A community is considered to be disadvantaged if it meets the <link1>methodology</link1>.",
+    "defaultMessage": "A community is considered to be disadvantaged if it meets the tool's <link1>methodology</link1>.",
     "description": "Navigate to the About page. This is the paragraph 4"
   },
   "about.page.use.map.heading": {
@@ -100,7 +104,7 @@
     "description": "Navigate to the About page. This is the sub heading of Using the map"
   },
   "about.page.use.map.para": {
-    "defaultMessage": "Zoom and select any census tract to see if it is considered disadvantaged.",
+    "defaultMessage": "Zoom-in and select any census tract to see if it is considered disadvantaged.",
     "description": "Navigate to the About page. This is the paragraph of Using the map"
   },
   "common.pages.alerts.additional_docs_available.description": {
@@ -604,7 +608,7 @@
     "description": "Navigate to the Downloads page, this will be the view of change log"
   },
   "explore.map.page.description.1": {
-    "defaultMessage": "Census tracts that are overburdened and underserved census tracts are highlighted as being disadvantaged on the map. These include Federally Recognized Tribal lands, including Alaska Native Villages.",
+    "defaultMessage": "Census tracts that are overburdened and underserved census tracts are highlighted as being disadvantaged on the map. Federally Recognized Tribes, including Alaska Native Villages are also considered disadvantaged communities.",
     "description": "On the explore the map page, the first description of the page"
   },
   "explore.map.page.description.2": {
@@ -896,7 +900,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Economic loss rate to agriculture resulting from natural hazards\n    "
   },
   "explore.map.page.side.panel.indicator.description.exp.bld.loss": {
-    "defaultMessage": "Economic loss to agricultural value resulting from natural hazards each year",
+    "defaultMessage": "Economic loss to building value resulting from natural hazards each year",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side \n    panel will show an indicator description of Economic loss rate to buildings resulting from natural hazards"
   },
   "explore.map.page.side.panel.indicator.description.exp.pop.loss": {
@@ -904,7 +908,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Economic loss rate to the population in fatalities and \n      injuries resulting from natural hazards"
   },
   "explore.map.page.side.panel.indicator.description.flooding": {
-    "defaultMessage": "Projected risk to properties from floods from tides, rain, riverine and storm surges in 30 years",
+    "defaultMessage": "Projected risk to properties from projected floods, from tides, rain, riverine and storm surges within 30 years",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of flooding risk"
   },
   "explore.map.page.side.panel.indicator.description.former.def.sites": {
@@ -932,7 +936,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of households making less than 80% of the area median family income and spending more than 30% of income on housing"
   },
   "explore.map.page.side.panel.indicator.description.lack.green.space": {
-    "defaultMessage": "Share of non-crop land covered with artificial materials like concrete or pavement",
+    "defaultMessage": "Amount of non-crop land covered with artificial materials like concrete or pavement",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Share of non-crop land covered with artificial materials like concrete or pavement"
   },
   "explore.map.page.side.panel.indicator.description.lack.plumbing": {
@@ -1340,28 +1344,28 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the communities the score currently is partially focused on"
   },
   "explore.map.page.side.panel.prio.copy.not.prio": {
-    "defaultMessage": "This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold.",
-    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socio-economic threshold."
+    "defaultMessage": "This tract is not considered disadvantaged. It does not meet any burden thresholds <bold>OR</bold> at least one associated socioeconomic threshold.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomic threshold."
   },
   "explore.map.page.side.panel.prio.copy.not.prio.one.burden": {
-    "defaultMessage": "This tract is not considered disadvantaged. It meets 1 burden threshold BUT no associated socio-economic thresholds.",
-    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets [1] burden threshold BUT no associated socio-economic thresholds."
+    "defaultMessage": "This tract is not considered disadvantaged. It meets 1 burden threshold <bold>BUT</bold> no associated socioeconomic thresholds.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets [1] burden threshold <bold>BUT</bold> no associated socioeconomic thresholds."
   },
   "explore.map.page.side.panel.prio.copy.prio.donut": {
-    "defaultMessage": "This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. The adjustment does not apply to any of the categories.",
-    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged AND meets an adjusted low income threshold. The adjustment does not apply to any of the categories."
+    "defaultMessage": "This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged <bold>AND</bold> meets an adjusted low income threshold. The adjustment does not apply to any of the categories.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged <bold>AND</bold> meets an adjusted low income threshold. The adjustment does not apply to any of the categories."
   },
   "explore.map.page.side.panel.prio.copy.prio.frt.n.perc": {
     "defaultMessage": "The lands of Federally Recognized Tribes that cover {amount} of this tract and the {numPoints} tribes that are Federally Recognized are also considered disadvantaged.",
     "description": "Navigate to the explore the map page. Click on tract, The Federally Recognized Tribal lands that cover {amount} of this tract and the {numPoints} tribes that are Federally Recognized are also considered disadvantaged."
   },
   "explore.map.page.side.panel.prio.copy.prio.n.burden": {
-    "defaultMessage": "This tract is considered disadvantaged because it meets {burdens} burden threshold AND the associated socio-economic threshold.",
-    "description": "Navigate to the explore the map page. Click on tract, This tract is considered disadvantaged because it meets {burdens} burden thresholds AND the associated socio-economic threshold."
+    "defaultMessage": "This tract is considered disadvantaged because it meets {burdens} burden threshold <bold>AND</bold> the associated socioeconomic threshold.",
+    "description": "Navigate to the explore the map page. Click on tract, This tract is considered disadvantaged because it meets {burdens} burden thresholds <bold>AND</bold> the associated socioeconomic threshold."
   },
   "explore.map.page.side.panel.prio.copy.prio.one.burden": {
-    "defaultMessage": "This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds.",
-    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets more than 1 burden threshold BUT no associated socio-economic thresholds."
+    "defaultMessage": "This tract is not considered disadvantaged. It meets more than 1 burden threshold <bold>BUT</bold> no associated socioeconomic thresholds.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets more than 1 burden threshold <bold>BUT</bold> no associated socioeconomic thresholds."
   },
   "explore.map.page.side.panel.send.feedback.alt.img": {
     "defaultMessage": "Send feedback",
@@ -1416,9 +1420,13 @@
     "description": "Navigate to the explore the map page. Under the map, you will see tribal nations intro text"
   },
   "explore.map.page.under.map.note.on.tribal.nations.para.1": {
-    "defaultMessage": "To honor the Administration's commitment to the Federal trust responsibility to Tribal Nations, areas within the boundaries of Federally recognized Tribes, including Alaska Native villages, are designated as disadvantaged. In some areas, like rural Alaska, this includes Tribal areas that are smaller than a census tract.",
+    "defaultMessage": "To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, land within the boundaries of Federally Recognized Tribes are designated as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than a census tract. The boundaries of census tracts and the lands of Federally Recognized Tribes are different.",
     "description": "Navigate to the explore the map page. Under the map, you will see tribal nations paragraph 1"
   },
+  "explore.map.page.under.map.note.on.tribal.nations.para.2": {
+    "defaultMessage": "This decision was made after meaningful and robust consultation with Tribal Nations. This is consistent with CEQ’s <link1> Action Plan for Consultation and Coordination with Tribal Nations </link1>, President Biden’s <link3>Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation</link3>, and <link2> Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments </link2> .",
+    "description": "Navigate to the explore the map page. Under the map, you will see tribal nations paragraph 2"
+  },
   "fab.survey.text": {
     "defaultMessage": "Help improve the site & data",
     "description": "Navigate to the public engagement page, this will be the text for floating action button"
@@ -1512,7 +1520,7 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q11"
   },
   "faqs.page.answers.Q12_P1": {
-    "defaultMessage": "The CEJST uses lessons learned from the EPA's EJScreen. EJScreen is an environmental justice mapping and screening tool. EJScreen shows environmental and demographic information. The EPA, Federal agencies, and state and local governments will continue to use EJScreen to understand and analyze environmental problems. For example, EPA uses <link1>EJScreen</link1> to:",
+    "defaultMessage": "The CEJST uses lessons learned from the EPA's EJScreen. EJScreen is an environmental justice mapping and screening tool. EJScreen shows environmental and demographic information and combines that information together into indices. The EPA, Federal agencies, and state and local governments will continue to use EJScreen to understand and analyze for environmental and EJ issues. For example, EPA uses <link1>EJScreen</link1> to:",
     "description": "Navigate to the FAQs page, this will be an answer, Q12_P1"
   },
   "faqs.page.answers.Q12_P1_1": {
@@ -1644,7 +1652,7 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q2_P1"
   },
   "faqs.page.answers.Q2_P2": {
-    "defaultMessage": "The tool highlights disadvantaged communities across all 50 states, the District of Columbia, and the U.S. territories. A community is considered disadvantaged:",
+    "defaultMessage": "The tool highlights disadvantaged communities across all 50 states, the District of Columbia, and the U.S. territories. Communities are considered disadvantaged:",
     "description": "Navigate to the FAQs page, this will be an answer, Q2_P2"
   },
   "faqs.page.answers.Q2_P2_1": {
@@ -1652,7 +1660,7 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q2_P2_1"
   },
   "faqs.page.answers.Q2_P2_2": {
-    "defaultMessage": "If they are on Federally Recognized Tribal land",
+    "defaultMessage": "If they are on land within the boundaries of Federally Recognized Tribes",
     "description": "Navigate to the FAQs page, this will be an answer, Q2_P2_2"
   },
   "faqs.page.answers.Q2_P3": {
@@ -1680,7 +1688,7 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q4_P3"
   },
   "faqs.page.answers.Q5_P1": {
-    "defaultMessage": "To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, Federally Recognized Tribal lands are highlighted as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than census tracts. The tool’s census tracts and Tribal lands have different boundaries.",
+    "defaultMessage": "To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, land within the boundaries of Federally Recognized tribes are highlighted as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than census tracts. The boundaries of census tracts and the lands of Federally Recognized Tribes are different.",
     "description": "Navigate to the FAQs page, this will be an answer, Q5_P1"
   },
   "faqs.page.answers.Q5_P2": {
@@ -1688,11 +1696,11 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q5_P2"
   },
   "faqs.page.answers.Q5_P2_1": {
-    "defaultMessage": "The decision to highlight Federally-recognized Tribal lands on the CEJST map and to designate them as disadvantaged communities was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s Action Plan for Consultation and Coordination with Tribal Nations, President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments.",
+    "defaultMessage": "This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s <link1>Action Plan for Consultation and Coordination with Tribal Nations</link1>, <link3>President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation</link3>, and <link2>Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments</link2>.",
     "description": "Navigate to the FAQs page, this will be an answer, Q5_P2_1"
   },
   "faqs.page.answers.Q6_P1": {
-    "defaultMessage": "Some census tracts that contain lands of Federally-recognized Tribes that are also considered disadvantaged because they meet the burden thresholds for at least one of the categories on the tool. When this happens, the areas appear darker on the tool’s map.",
+    "defaultMessage": "Some census tracts that contain land within the boundaries of Federally Recognized Tribes are also considered disadvantaged because they meet the burden thresholds for at least one of the categories on the tool. When this happens, the areas appear darker on the tool’s map.",
     "description": "Navigate to the FAQs page, this will be an answer, Q6_P1"
   },
   "faqs.page.answers.Q6_P2": {
@@ -1700,15 +1708,15 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q6_P2"
   },
   "faqs.page.answers.Q6_P3": {
-    "defaultMessage": ": Disadvantaged census tracts and Federally-Recognized Tribal lands",
+    "defaultMessage": ": Disadvantaged census tracts and land within the boundaries of Federally Recognized Tribes",
     "description": "Navigate to the FAQs page, this will be an answer, Q6_P3"
   },
   "faqs.page.answers.Q6_P4": {
-    "defaultMessage": "Any area that is highlighted is considered disadvantaged, regardless of whether it is a light shade or dark shade. The tool will show if a whole census tract is considered disadvantaged or just the parts that are Federally Recognized Tribal lands.",
+    "defaultMessage": "Any area that is highlighted is considered disadvantaged, regardless of whether it is a light shade or dark shade. The tool will show if a whole census tract is considered disadvantaged or just the parts that are within the boundaries of Federally Recognized Tribes.",
     "description": "Navigate to the FAQs page, this will be an answer, Q6_P4"
   },
   "faqs.page.answers.Q7": {
-    "defaultMessage": "A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains Federally Recognized Tribal lands, then the parts of the tract that are Tribal lands are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”",
+    "defaultMessage": "A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains land within the boundaries of Federally Recognized Tribes, then the parts of the tract that are within the land of Tribes are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”",
     "description": "Navigate to the FAQs page, this will be an answer, Q7"
   },
   "faqs.page.answers.Q8_P1": {
@@ -1844,7 +1852,7 @@
     "description": "Navigate to the Methodology page. This is the description text for Formerly Used Defense Sites"
   },
   "methodology.page.category.green.space.description.text": {
-    "defaultMessage": "Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes.",
+    "defaultMessage": "Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes. Places that lack green space are also known as nature-deprived.",
     "description": "Navigate to the Methodology page. This is the description text for housing burden"
   },
   "methodology.page.category.heart.disease.description.text": {
@@ -1880,11 +1888,11 @@
     "description": "Navigate to the Methodology page. This is the note text for linguistic.iso"
   },
   "methodology.page.category.low.hist.underinvestectancy.description.text": {
-    "defaultMessage": "Census tracts that experienced historic underinvestment as determined by the National Community Reinvestment Coalition’s (NCRC) historic redlining score. It is determined using the <link1>NCRC’s methodology</link1> for identifying areas with the most historic redlining (i.e. a score of 3.25 or more out of 4). This means that people in the tract had high barriers to accessing home loans.",
+    "defaultMessage": "Census tracts that experienced historic underinvestment based on redlining maps created by the federal government’s Home Owners’ Loan Corporation (HOLC) between 1935 and 1940. The tool uses the <link1>National Community Reinvestment Coalition’s methodology</link1> for converting boundaries in the HOLC maps to census tracts. Census tracts meet the threshold when they have a score of 3.25 or more out of 4.",
     "description": "Navigate to the Methodology page. This is the description text for Historic Underinvestment"
   },
   "methodology.page.category.low.hist.underinvestectancy.note.text": {
-    "defaultMessage": "<boldtag>Note: </boldtag>The historic underinvestment data indicator <boldtag>does not</boldtag> appear on the map for tracts <boldtag>that were not</boldtag> evaluated by the National Community Reinvestment Coalition. It is shown in tracts that are most commonly in larger metropolitan areas.",
+    "defaultMessage": "<boldtag>Note: </boldtag>The historic underinvestment indicator <boldtag>is not shown</boldtag> on the map for tracts that were not included in the original HOLC maps because there is no data available.",
     "description": "Navigate to the Methodology page. This is the note text for Historic Underinvestment"
   },
   "methodology.page.category.low.income.description.text": {
@@ -1996,7 +2004,7 @@
     "description": "Navigate to the Methodology page. This is the source link for CDC Sleep"
   },
   "methodology.page.category.source.holc.link": {
-    "defaultMessage": "<link1>Dataset of formerly redlined areas</link1> using digitized maps from the Home Owners Loan Corporation from {date10}",
+    "defaultMessage": "<link1>Dataset of formerly redlined areas</link1> using digitized maps from the Home Owners Loan Corporation (HOLC), using {date10} census boundaries",
     "description": "Navigate to the Methodology page. This is the source link for CDC Sleep"
   },
   "methodology.page.category.source.hud.link": {
@@ -2024,13 +2032,9 @@
     "description": "Navigate to the Methodology page. This is the description text for Transportation barriers"
   },
   "methodology.page.category.tribal.lands.description.text": {
-    "defaultMessage": "The Land Area Representation (LAR) dataset depicts the exterior extent of a Federal Indian land area.",
+    "defaultMessage": "The Land Area Representation (LAR) dataset depicts American Indian land areas for Federally Recognized Tribes.",
     "description": "Navigate to the Methodology page. This is the description text for Tribal lands"
   },
-  "methodology.page.category.tribal.lands.note.text": {
-    "defaultMessage": "<boldtag>Note: </boldtag>The LAR dataset depicts the exterior extent of a Federal Indian land area. Not all Federally recognized tribes have a designated land area; therefore, they may not have an associated land area represented in the land area dataset.",
-    "description": "Navigate to the Methodology page. This is the note text for low median expectancy"
-  },
   "methodology.page.category.unemploy.description.text": {
     "defaultMessage": "Number of unemployed people as a share of the labor force.",
     "description": "Navigate to the Methodology page. This is the description text for unemployment"
@@ -2060,7 +2064,7 @@
     "description": "Methodology page dataset card available for CONUS and DC"
   },
   "methodology.page.dataset.card.availableFor.FRT": {
-    "defaultMessage": "Federally-Recognized Tribes, including Alaskan Native villages",
+    "defaultMessage": "Federally Recognized Tribes, including Alaskan Native villages",
     "description": "Methodology page dataset card available for FRT"
   },
   "methodology.page.dataset.card.availableFor.METRO_US_HOLC": {
@@ -2124,7 +2128,7 @@
     "description": "Navigate to the Methodology page. This is the title text for the high school dataset"
   },
   "methodology.page.dataset.indicator.hist.underinvest.title.text": {
-    "defaultMessage": "New Historic underinvestment",
+    "defaultMessage": "Historic underinvestment",
     "description": "Navigate to the Methodology page. This is the title text for the Historic Underinvestment"
   },
   "methodology.page.dataset.indicator.house.burden.title.text": {
@@ -2192,7 +2196,7 @@
     "description": "Navigate to the Methodology page. This is the title text for the Transportation barriers"
   },
   "methodology.page.dataset.indicator.tribal.lands.title.text": {
-    "defaultMessage": "Tribal lands",
+    "defaultMessage": "Tribes",
     "description": "Navigate to the Methodology page. This is the title text for the Tribal lands"
   },
   "methodology.page.dataset.indicator.unemploy.title.text": {
@@ -2271,10 +2275,6 @@
     "defaultMessage": "Under the current formula, a census tract will be identified as disadvantaged in one or more categories of criteria:",
     "description": "Navigate to the methodology page. This is the methodology page introducing the formula"
   },
-  "methodology.page.formula.second": {
-    "defaultMessage": "<boldtag>AND</boldtag> the census tract is above the threshold for the socioeconomic indicators",
-    "description": "Navigate to the methodology page. This is the second part of the formula used in the methodology"
-  },
   "methodology.page.header.text": {
     "defaultMessage": "Methodology",
     "description": "Navigate to the methodology page. This is the methodology page header text"
@@ -2344,7 +2344,7 @@
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula"
   },
   "methodology.page.indicator.categories.tribal.lands.methodology": {
-    "defaultMessage": "Displaying Federally recognized tribal boundaries and Alaska Native Villages on the map",
+    "defaultMessage": "Displaying land within the boundaries of Federally Recognized Tribes and point locations of Alaska Native Villages on the map",
     "description": "Displaying Federally recognized tribal boundaries and Alaska Native Villages on the map"
   },
   "methodology.page.indicator.categories.work.dev.if": {
@@ -2356,15 +2356,15 @@
     "description": "Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Training and workforce development"
   },
   "methodology.page.paragraph.1": {
-    "defaultMessage": "The tool highlights disadvantaged census tracts across all 50 states, the District of Columbia, and the U.S. territories. A community is considered disadvantaged:",
+    "defaultMessage": "The tool highlights disadvantaged census tracts across all 50 states, the District of Columbia, and the U.S. territories. Communities are considered disadvantaged:",
     "description": "Navigate to the methodology page. This is the methodology paragraph 1"
   },
   "methodology.page.paragraph.1.bullet.1": {
-    "defaultMessage": "If they are in a census tract that meets the thresholds for at least one of tool’s categories of burden, or",
+    "defaultMessage": "If they are in census tracts that meet the thresholds for at least one of tool’s categories of burden, or",
     "description": "Navigate to the methodology page. This is the methodology paragraph 1, bullet 1"
   },
   "methodology.page.paragraph.1.bullet.2": {
-    "defaultMessage": "If they are on Federally-Recognized Tribal land",
+    "defaultMessage": "If they are on land within the boundaries of Federally Recognized Tribes",
     "description": "Navigate to the methodology page. This is the methodology paragraph 1, bullet 2"
   },
   "methodology.page.paragraph.3": {
@@ -2372,11 +2372,11 @@
     "description": "Navigate to the methodology page. This is the methodology paragraph 3"
   },
   "methodology.page.paragraph.4": {
-    "defaultMessage": "Census tracts are small units of geography. Census tract boundaries are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.",
+    "defaultMessage": "Census tracts are small units of geography. Census tract <link1>boundaries</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.",
     "description": "Navigate to the methodology page. This is the methodology paragraph 4"
   },
   "methodology.page.paragraph.5": {
-    "defaultMessage": "Federally-Recognized Tribal lands, including Alaska Native Villages, are also considered disadvantaged and highlighted on the map.",
+    "defaultMessage": "Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities. They are highlighted on the map.",
     "description": "Navigate to the methodology page. This is the methodology paragraph 5"
   },
   "methodology.page.return.to.top.link": {
diff --git a/client/src/intl/tribalRounding.js b/client/src/intl/tribalRounding.js
new file mode 100644
index 000000000..39fcab9c5
--- /dev/null
+++ b/client/src/intl/tribalRounding.js
@@ -0,0 +1,3 @@
+for (let i=0; i<=1.01; i+=.01) {
+  console.log(parseFloat((i*100).toFixed()));
+}
diff --git a/client/src/pages/about.tsx b/client/src/pages/about.tsx
index e1b4269a3..a6cdf89da 100644
--- a/client/src/pages/about.tsx
+++ b/client/src/pages/about.tsx
@@ -12,9 +12,8 @@ import PublicEngageButton from '../components/PublicEngageButton';
 import SubPageNav from '../components/SubPageNav';
 
 import * as ABOUT_COPY from '../data/copy/about';
-import * as COMMON_COPY from '../data/copy/common';
-import * as CONSTANTS from '../data/constants';
-import {PAGES_ENDPOINTS} from '../data/constants';
+import {FEEDBACK_EMAIL} from '../data/copy/common';
+import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants';
 
 import accountBalanceIcon // @ts-ignore
   from '/node_modules/uswds/dist/img/usa-icons/account_balance.svg';
@@ -77,7 +76,7 @@ const AboutPage = ({location}: IAboutPageProps) => {
           </Grid>
 
           {/* Third column */}
-          {width > CONSTANTS.USWDS_BREAKPOINTS.DESKTOP ?
+          {width > USWDS_BREAKPOINTS.DESKTOP ?
           <Grid col={12} tablet={{col: 3}}>
             <SubPageNav
               endPoints={[
@@ -141,7 +140,7 @@ const AboutPage = ({location}: IAboutPageProps) => {
             imgSrc={commentIcon}
             header={intl.formatMessage(ABOUT_COPY.GET_INVOLVED.SEND_FEEDBACK_HEADING)}
             linkText={ABOUT_COPY.GET_INVOLVED_COMMENTS.EMAIL}
-            url={`mailto:${COMMON_COPY.FEEDBACK_EMAIL}`}
+            url={`mailto:${FEEDBACK_EMAIL}`}
             openUrlNewTab={true}
             internal={false}>
             <p>
diff --git a/client/src/pages/contact.tsx b/client/src/pages/contact.tsx
index 856cd45fa..f4221d510 100644
--- a/client/src/pages/contact.tsx
+++ b/client/src/pages/contact.tsx
@@ -8,7 +8,8 @@ import LinkTypeWrapper from '../components/LinkTypeWrapper';
 import PublicEngageButton from '../components/PublicEngageButton';
 
 import * as CONTACT_COPY from '../data/copy/contact';
-import * as COMMON_COPY from '../data/copy/common';
+import {FEEDBACK_EMAIL} from '../data/copy/common';
+
 interface IContactPageProps {
   location: Location;
 }
@@ -42,9 +43,9 @@ const ContactPage = ({location}: IContactPageProps) => {
                 values={{
                   general_email_address:
                     <LinkTypeWrapper
-                      linkText={COMMON_COPY.FEEDBACK_EMAIL}
+                      linkText={FEEDBACK_EMAIL}
                       internal={false}
-                      url={`mailto:${COMMON_COPY.FEEDBACK_EMAIL}`}
+                      url={`mailto:${FEEDBACK_EMAIL}`}
                       openUrlNewTab={true}
                     />,
                 }} />
diff --git a/client/src/pages/downloads.tsx b/client/src/pages/downloads.tsx
index 9bbe532f7..790a3657b 100644
--- a/client/src/pages/downloads.tsx
+++ b/client/src/pages/downloads.tsx
@@ -10,7 +10,7 @@ import ReleaseUpdate from '../components/ReleaseUpdate';
 import SubPageNav from '../components/SubPageNav';
 
 import * as DOWNLOADS_COPY from '../data/copy/downloads';
-import * as CONSTANTS from '../data/constants';
+import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants';
 interface IDownloadsPageProps {
   location: Location;
 }
@@ -63,14 +63,14 @@ const DownloadsPage = ({location}: IDownloadsPageProps) => {
           </Grid>
 
           {/* Third column - Only show the SubPagNav component on desktop width */}
-          {width > CONSTANTS.USWDS_BREAKPOINTS.DESKTOP ?
+          {width > USWDS_BREAKPOINTS.DESKTOP ?
           <Grid col={12} tablet={{col: 3}}>
             <SubPageNav
               activeSubPageIndex={1}
               endPoints={[
-                CONSTANTS.PAGES_ENDPOINTS.METHODOLOGY,
-                CONSTANTS.PAGES_ENDPOINTS.DOWNLOADS,
-                CONSTANTS.PAGES_ENDPOINTS.PREVIOUS_VERSIONS,
+                PAGES_ENDPOINTS.METHODOLOGY,
+                PAGES_ENDPOINTS.DOWNLOADS,
+                PAGES_ENDPOINTS.PREVIOUS_VERSIONS,
               ]}
             />
           </Grid> : ''}
diff --git a/client/src/pages/frequently-asked-questions.tsx b/client/src/pages/frequently-asked-questions.tsx
index 07fd18dea..800d7e1f7 100644
--- a/client/src/pages/frequently-asked-questions.tsx
+++ b/client/src/pages/frequently-asked-questions.tsx
@@ -9,7 +9,7 @@ import Layout from '../components/layout';
 import PublicEngageButton from '../components/PublicEngageButton';
 import SubPageNav from '../components/SubPageNav';
 
-import * as CONSTANTS from '../data/constants';
+import {USWDS_BREAKPOINTS} from '../data/constants';
 import * as FAQS_COPY from '../data/copy/faqs';
 import {PAGES_ENDPOINTS} from '../data/constants';
 import {SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT} from '../data/copy/explore';
@@ -87,7 +87,9 @@ const FAQPage = ({location}: IFAQPageProps) => {
       <>
         <p key={6}>{FAQS_COPY.FAQ_ANSWERS.Q6_P1}</p>
         <div style={dotStyles}>
-          <img src={censusDotIcon}
+          <img
+            className={'faqs-dot-alignment'}
+            src={censusDotIcon}
             alt={intl.formatMessage(SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.DAC_CIRCLE)}
           />
           <div style={dotStyles.p}>{FAQS_COPY.FAQ_ANSWERS.Q6_P2}</div>
@@ -246,7 +248,7 @@ const FAQPage = ({location}: IFAQPageProps) => {
           </Grid>
 
           {/* Third column */}
-          {width > CONSTANTS.USWDS_BREAKPOINTS.DESKTOP ?
+          {width > USWDS_BREAKPOINTS.DESKTOP ?
           <Grid col={12} tablet={{col: 3}}>
             <SubPageNav
               activeSubPageIndex={2}
diff --git a/client/src/pages/index.tsx b/client/src/pages/index.tsx
index 1ec6e653a..b8d034e75 100644
--- a/client/src/pages/index.tsx
+++ b/client/src/pages/index.tsx
@@ -64,6 +64,7 @@ const ExporeToolPage = ({location}: IMapPageProps) => {
       <Grid desktop={{col: 7}} tablet={{col: 10}} col={12}>
         <h2>{EXPLORE_COPY.NOTE_ON_TRIBAL_NATIONS.INTRO}</h2>
         <p>{EXPLORE_COPY.NOTE_ON_TRIBAL_NATIONS.PARA_1}</p>
+        <p>{EXPLORE_COPY.NOTE_ON_TRIBAL_NATIONS.PARA_2}</p>
       </Grid>
     </J40MainGridContainer>
 
diff --git a/client/src/pages/methodology.tsx b/client/src/pages/methodology.tsx
index 697f61014..06684c3b0 100644
--- a/client/src/pages/methodology.tsx
+++ b/client/src/pages/methodology.tsx
@@ -10,7 +10,7 @@ import Layout from '../components/layout';
 import SubPageNav from '../components/SubPageNav';
 import PublicEngageButton from '../components/PublicEngageButton';
 
-import * as CONSTANTS from '../data/constants';
+import {USWDS_BREAKPOINTS} from '../data/constants';
 import * as METHODOLOGY_COPY from '../data/copy/methodology';
 import {PAGES_ENDPOINTS} from '../data/constants';
 
@@ -60,7 +60,7 @@ const IndexPage = ({location}: MethodPageProps) => {
           </Grid>
 
           {/* Third column */}
-          {width > CONSTANTS.USWDS_BREAKPOINTS.DESKTOP ?
+          {width > USWDS_BREAKPOINTS.DESKTOP ?
           <Grid col={12} tablet={{col: 3}}>
             <SubPageNav
               endPoints={[
diff --git a/client/src/pages/previous-versions.tsx b/client/src/pages/previous-versions.tsx
index 975f2a681..10bae9b7c 100644
--- a/client/src/pages/previous-versions.tsx
+++ b/client/src/pages/previous-versions.tsx
@@ -10,8 +10,7 @@ import PublicEngageButton from '../components/PublicEngageButton';
 import SubPageNav from '../components/SubPageNav';
 
 import * as PREV_VER_COPY from '../data/copy/previousVer';
-import * as CONSTANTS from '../data/constants';
-import {PAGES_ENDPOINTS} from '../data/constants';
+import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants';
 import {getDownloadFileUrl} from '../data/copy/downloads';
 
 interface IPreviousVersionsProps {
@@ -79,7 +78,7 @@ const PreviousVersions = ({location}: IPreviousVersionsProps) => {
           </Grid>
 
           {/* Third column */}
-          {width > CONSTANTS.USWDS_BREAKPOINTS.DESKTOP ?
+          {width > USWDS_BREAKPOINTS.DESKTOP ?
           <Grid col={12} tablet={{col: 3}}>
             <SubPageNav
               activeSubPageIndex={2}
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index 02c7ccff6..d3997c932 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -443,12 +443,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 Executive Order 14008
               </a>
-              . The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens.
+              . The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens.These are the communities that are disadvantaged because they are overburdened and underserved.
+
     
             </p>
             <p>
               
-      Federal agencies will use the tool to help identify disadvantaged communities that will benefit from programs included in 
+      Federal agencies will use the tool to help identify disadvantaged communities that will benefit from programs included in the 
               <a
                 class="usa-link usa-link--external"
                 data-cy=""
@@ -518,14 +519,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             How to use the tool
           </h2>
           <p>
-            The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tracts match the data that is currently available. The tool also shows Federally-recognized Tribal reservation lands, including Alaskan Native Villages.
+            The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tracts match the data that is currently available. The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaskan Native Villages.
           </p>
           <p>
             The tool ranks most of the burdens using percentiles. Percentiles show how much burden each tract experiences compared to other tracts. Certain burdens use percentages or a simple yes/no.
           </p>
           <p>
             
-    A community is considered to be disadvantaged if it meets the 
+    A community is considered to be disadvantaged if it meets the tool's 
             <a
               class="usa-link"
               href="/en/methodology"
@@ -572,7 +573,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   </h3>
                   <p>
                     
-      Zoom and select any census tract to see if it is considered disadvantaged.
+      Zoom-in and select any census tract to see if it is considered disadvantaged.
     
                   </p>
                   <div
@@ -703,7 +704,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     target="_blank"
                   >
                     
-      Contact CEQ
+      Contact
     
                   </a>
                 </div>
@@ -788,8 +789,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <li>
               Provide 
               <a
-                class="usa-link"
-                href="/en/methodology"
+                class="usa-link usa-link--external"
+                data-cy=""
+                href="https://www.surveymonkey.com/r/P3LWTSB"
+                rel="noreferrer"
+                target="_blank"
               >
                 general feedback
               </a>
@@ -798,15 +802,18 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <li>
               Suggest new 
               <a
-                class="usa-link"
-                href="/en/methodology"
+                class="usa-link usa-link--external"
+                data-cy=""
+                href="https://www.surveymonkey.com/r/6G9TQJ8"
+                rel="noreferrer"
+                target="_blank"
               >
                 data sources
               </a>
               .
             </li>
             <li>
-              Any other questions? Email: 
+              Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email CEQ at: 
               <a
                 class="usa-link"
                 href="/en/methodology"
@@ -815,6 +822,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </a>
             </li>
           </ul>
+          <p>
+            
+      The Council on Environmental Quality plans to issue a Request for Information in 2023. This will give the public time to use the tool before providing comments.    
+    
+          </p>
         </div>
       </div>
     </div>
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index e5cd63318..8e6303103 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -517,14 +517,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                    recognizes that some communities are disadvantaged because they face burdens. The CEJST uses datasets that are indicators of burden. These burdens are related to climate change and the environment. They are also related to health and lack of economic opportunity.
                 </p>
                 <p>
-                  The tool highlights disadvantaged communities across all 50 states, the District of Columbia, and the U.S. territories. A community is considered disadvantaged:
+                  The tool highlights disadvantaged communities across all 50 states, the District of Columbia, and the U.S. territories. Communities are considered disadvantaged:
                 </p>
                 <ul>
                   <li>
                     If they are in a census tract that meets the thresholds for at least one of the tool’s categories of burden, or
                   </li>
                   <li>
-                    If they are on Federally Recognized Tribal land
+                    If they are on land within the boundaries of Federally Recognized Tribes
                   </li>
                 </ul>
                 <p>
@@ -612,7 +612,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-4"
               >
                 <p>
-                  To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, Federally Recognized Tribal lands are highlighted as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than census tracts. The tool’s census tracts and Tribal lands have different boundaries.
+                  
+      To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, land within the boundaries of Federally Recognized tribes  are highlighted as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than census tracts. The boundaries of census tracts and the lands of Federally Recognized Tribes are different.
+    
                 </p>
                 <p>
                   Federally Recognized Tribes are those that are recognized by the U.S. Bureau of Indian Affairs in the 
@@ -629,7 +631,37 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </p>
                 <ul>
                   <li>
-                    The decision to highlight Federally-recognized Tribal lands on the CEJST map and to designate them as disadvantaged communities was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s Action Plan for Consultation and Coordination with Tribal Nations, President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments.
+                    This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s 
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.whitehouse.gov/wp-content/uploads/2022/01/CEQ-Tribal-Consultation-Plan-04.26.2021.pdf"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      Action Plan for Consultation and Coordination with Tribal Nations
+                    </a>
+                    , 
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/26/memorandum-on-tribal-consultation-and-strengthening-nation-to-nation-relationships/"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation
+                    </a>
+                    , and 
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.federalregister.gov/documents/2000/11/09/00-29003/consultation-and-coordination-with-indian-tribal-governments"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments
+                    </a>
+                    .
                   </li>
                 </ul>
               </div>
@@ -653,7 +685,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-5"
               >
                 <p>
-                  Some census tracts that contain lands of Federally-recognized Tribes that are also considered disadvantaged because they meet the burden thresholds for at least one of the categories on the tool. When this happens, the areas appear darker on the tool’s map.
+                  Some census tracts that contain land within the boundaries of Federally Recognized Tribes are also considered disadvantaged because they meet the burden thresholds for at least one of the categories on the tool. When this happens, the areas appear darker on the tool’s map.
                 </p>
                 <div
                   style="display: flex;"
@@ -662,6 +694,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     alt="
       a blue circle icon informing the user of what a disadvantaged community is depicted as
     "
+                    class="faqs-dot-alignment"
                     src="test-file-stub"
                   />
                   <div
@@ -682,11 +715,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <div
                     style="padding-left: 2px;"
                   >
-                     : Disadvantaged census tracts and Federally-Recognized Tribal lands
+                     : Disadvantaged census tracts and land within the boundaries of Federally Recognized Tribes 
                   </div>
                 </div>
                 <p>
-                  Any area that is highlighted is considered disadvantaged, regardless of whether it is a light shade or dark shade. The tool will show if a whole census tract is considered disadvantaged or just the parts that are Federally Recognized Tribal lands.
+                  Any area that is highlighted is considered disadvantaged, regardless of whether it is a light shade or dark shade. The tool will show if a whole census tract is considered disadvantaged or just the parts that are within the boundaries of Federally Recognized Tribes.
                 </p>
               </div>
               <h2
@@ -709,7 +742,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-6"
               >
                 <p>
-                  A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains Federally Recognized Tribal lands, then the parts of the tract that are Tribal lands are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”
+                  A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains land within the boundaries of Federally Recognized Tribes, then the parts of the tract that are within the land of Tribes are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”
                 </p>
               </div>
               <h2
@@ -853,7 +886,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-11"
               >
                 <p>
-                  The CEJST uses lessons learned from the EPA's EJScreen. EJScreen is an environmental justice mapping and screening tool. EJScreen shows environmental and demographic information. The EPA, Federal agencies, and state and local governments will continue to use EJScreen to understand and analyze environmental problems. For example, EPA uses 
+                  The CEJST uses lessons learned from the EPA's EJScreen. EJScreen is an environmental justice mapping and screening tool. EJScreen shows environmental and demographic information and combines that information together into indices. The EPA, Federal agencies, and state and local governments will continue to use EJScreen to understand and analyze for environmental and EJ issues. For example, EPA uses 
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index ef13f80b8..14fd2c025 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -431,19 +431,19 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <section>
             <p>
               
-      The tool highlights disadvantaged census tracts across all 50 states, the District of Columbia, and the U.S. territories. A community is considered disadvantaged:
+      The tool highlights disadvantaged census tracts across all 50 states, the District of Columbia, and the U.S. territories. Communities are considered disadvantaged:
     
             </p>
             <div>
               <ul>
                 <li>
                   
-      If they are in a census tract that meets the thresholds for at least one of tool’s categories of burden, or
+      If they are in census tracts that meet the thresholds for at least one of tool’s categories of burden, or
     
                 </li>
                 <li>
                   
-      If they are on Federally-Recognized Tribal land
+      If they are on land within the boundaries of Federally Recognized Tribes
     
                 </li>
               </ul>
@@ -480,7 +480,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </p>
           <p>
             
-      Census tracts are small units of geography. Census tract boundaries are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
+      Census tracts are small units of geography. Census tract 
+            <a
+              class="usa-link usa-link--external"
+              data-cy=""
+              href="https://www.census.gov/programs-surveys/geography/about/glossary.html#par_textimage_6"
+              rel="noreferrer"
+              target="_blank"
+            >
+              boundaries
+            </a>
+             are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
       census boundaries.    
     
           </p>
@@ -1001,7 +1011,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </h2>
           <p>
             
-      Federally-Recognized Tribal lands, including Alaska Native Villages, are also considered disadvantaged and highlighted on the map.   
+      Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities. They are highlighted on the map.  
     
           </p>
         </div>
@@ -1719,16 +1729,22 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <div
                 id="hist-underinv"
               >
-                <div
-                  class=""
-                >
+                <div>
+                  <div>
+                    <span
+                      class="usa-tag"
+                      data-testid="tag"
+                    >
+                      NEW
+                    </span>
+                  </div>
                   <h3>
-                    New Historic underinvestment
+                    Historic underinvestment
                   </h3>
                 </div>
                 <div>
                   
-        Census tracts that experienced historic underinvestment as determined by the National Community Reinvestment Coalition’s (NCRC) historic redlining score. It is determined using the 
+        Census tracts that experienced historic underinvestment based on redlining maps created by the federal government’s Home Owners’ Loan Corporation (HOLC) between 1935 and 1940. The tool uses the 
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
@@ -1736,9 +1752,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     rel="noreferrer"
                     target="_blank"
                   >
-                    NCRC’s methodology
+                    National Community Reinvestment Coalition’s methodology
                   </a>
-                   for identifying areas with the most historic redlining (i.e. a score of 3.25 or more out of 4). This means that people in the  tract had high barriers to accessing home loans. 
+                   for converting boundaries in the HOLC maps to census tracts. Census tracts meet the threshold when they have a score of 3.25 or more out of 4.
       
                 </div>
                 <div>
@@ -1748,15 +1764,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <strong>
                       Note: 
                     </strong>
-                    The historic underinvestment data indicator 
-                    <strong>
-                      does not
-                    </strong>
-                     appear on the map for tracts 
+                    The historic underinvestment indicator 
                     <strong>
-                      that were not
+                      is not shown
                     </strong>
-                     evaluated by the National Community Reinvestment Coalition. It is shown in tracts that are most commonly in larger metropolitan areas.
+                     on the map for tracts that were not included in the original HOLC maps because there is no data available.
       
                   </p>
                 </div>
@@ -1786,7 +1798,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     >
                       Dataset of formerly redlined areas
                     </a>
-                     using digitized maps from the Home Owners Loan Corporation from 2010
+                     using digitized maps from the Home Owners Loan Corporation (HOLC), using 2010 census boundaries
                   </li>
                   <li>
                     <span>
@@ -1865,7 +1877,8 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes.
+        Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes. Places that lack green space are also known as nature-deprived.
+
       
                 </div>
                 <ul>
@@ -2909,31 +2922,22 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     </span>
                   </div>
                   <h3>
-                    Tribal lands
+                    Tribes
                   </h3>
                 </div>
                 <div>
                   
-        The Land Area Representation (LAR) dataset depicts the exterior extent of a Federal Indian land area. 
-      
-                </div>
-                <div>
-                  <p>
-                    
-        
-                    <strong>
-                      Note: 
-                    </strong>
-                    The LAR dataset depicts the exterior extent of a Federal Indian land area.  Not all Federally recognized tribes have a designated land area; therefore, they may not have an associated land area represented in the land area dataset.
+      The Land Area Representation (LAR) dataset depicts American Indian land areas for Federally Recognized Tribes.
       
-                  </p>
                 </div>
                 <ul>
                   <li>
                     <span>
                       Used in: 
                     </span>
-                    Displaying Federally recognized tribal boundaries and Alaska Native Villages on the map
+                    
+        Displaying land within the boundaries of Federally Recognized Tribes and point locations of Alaska Native Villages on the map
+      
                   </li>
                   <li>
                     <span>
@@ -2960,7 +2964,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Available for: 
                     </span>
-                    Federally-Recognized Tribes, including Alaskan Native villages 
+                    Federally Recognized Tribes, including Alaskan Native villages 
                   </li>
                 </ul>
               </div>
diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss
index fdf430ba9..2a68e53ae 100644
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@@ -33,6 +33,7 @@ There are 3 things that should be included in this file:
   - ABOUT CARD STYLES
   - SUMMARY BOX STYLES
   - PREVIOUS VERSIONS STYLES
+  - FAQs PAGE STYLES
 */
 
 
@@ -525,4 +526,15 @@ button.usa-accordion__button[aria-expanded=true]:has(div[class*="disCategoryCont
 
 .previous-versions-container .usa-card__header, .usa-card__heading, .usa-card__body, .usa-card__footer {
   font-family: "Source Sans Pro Web", "Helvetica Neue", "Helvetica", "Roboto", "Arial", "sans-serif" !important;
+}
+
+/* 
+******************************
+*      FAQs PAGE STYLES
+****************************** 
+*/
+
+.faqs-dot-alignment{
+  align-self: flex-start;
+  padding-top: 5px;
 }
\ No newline at end of file

From 5e0ee755d1e8d3eb8559f276bccc7b7415309188 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 7 Nov 2022 15:48:58 -0800
Subject: [PATCH 096/130] Update sign up link

- closes #1640
- update snapshots
---
 .../J40Footer/__snapshots__/J40Footer.spec.tsx.snap           | 2 +-
 client/src/data/copy/about.tsx                                | 2 +-
 client/src/data/copy/common.tsx                               | 4 ++--
 client/src/data/copy/publicEngage.tsx                         | 2 +-
 client/src/intl/en.json                                       | 2 +-
 client/src/pages/tests/__snapshots__/about.test.tsx.snap      | 4 ++--
 client/src/pages/tests/__snapshots__/contact.test.tsx.snap    | 2 +-
 client/src/pages/tests/__snapshots__/downloads.test.tsx.snap  | 2 +-
 .../tests/__snapshots__/freqAskedQuestions.test.tsx.snap      | 2 +-
 .../src/pages/tests/__snapshots__/methodology.test.tsx.snap   | 2 +-
 client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap  | 4 ++--
 .../pages/tests/__snapshots__/techSupportDoc.test.tsx.snap    | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap b/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap
index 87e54326a..9e8df8361 100644
--- a/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap
+++ b/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap
@@ -66,7 +66,7 @@ exports[`J40Footer renders correctly 1`] = `
                   <a
                     class="usa-link usa-link--external"
                     data-cy="sign-up-for-updates"
-                    href="https://www.surveymonkey.com/r/whceqej"
+                    href="https://lp.constantcontactpages.com/su/Vm8pCFj/spring"
                     rel="noreferrer"
                     target="_blank"
                   >
diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx
index 04cd0895b..e92b1631b 100644
--- a/client/src/data/copy/about.tsx
+++ b/client/src/data/copy/about.tsx
@@ -79,7 +79,7 @@ export const CONTENT = {
     description={'Navigate to the About page. This is the paragraph 4'}
     values={{
       version: VERSION_NUMBER,
-      link1: linkFn('https://www.surveymonkey.com/r/whceqej', false, true),
+      link1: linkFn('https://lp.constantcontactpages.com/su/Vm8pCFj/spring', false, true),
     }}
   />,
   USE_DATA_PARA:
diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx
index 05ee9fb6d..a27222fb3 100644
--- a/client/src/data/copy/common.tsx
+++ b/client/src/data/copy/common.tsx
@@ -174,7 +174,7 @@ export const FOOTER = defineMessages({
   },
   SIGN_UP_LINK: {
     id: 'common.pages.footer.sign.up.link',
-    defaultMessage: 'https://www.surveymonkey.com/r/whceqej',
+    defaultMessage: 'https://lp.constantcontactpages.com/su/Vm8pCFj/spring',
     description: 'Navigate to the about page. This is Footer link under Sign-up for updates',
   },
   MORE_INFO: {
@@ -254,7 +254,7 @@ export const FOOTER_CEQ_ADDRESS = {
   //   defaultMessage={`<link1>Sign-up</link1> for updates`}
   //   description={`Alert title that appears at the top of pages.`}
   //   values={{
-  //     link1: linkFn('https://www.surveymonkey.com/r/whceqej', false, true),
+  //     link1: linkFn('https://lp.constantcontactpages.com/su/Vm8pCFj/spring', false, true),
   //   }}
   // />,
 }
diff --git a/client/src/data/copy/publicEngage.tsx b/client/src/data/copy/publicEngage.tsx
index f441acc08..247a16fa3 100644
--- a/client/src/data/copy/publicEngage.tsx
+++ b/client/src/data/copy/publicEngage.tsx
@@ -75,7 +75,7 @@ export const RICH_COPY = {
   `}
     description={`Navigate to the public engagement page, this will be the publiceng page description 3 text`}
     values={{
-      link1: linkFn('https://www.surveymonkey.com/r/whceqej', false, true),
+      link1: linkFn('https://lp.constantcontactpages.com/su/Vm8pCFj/spring', false, true),
     }}
   />,
   PAGE_HEADING2: <FormattedMessage
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 5246447e4..834855988 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -184,7 +184,7 @@
     "description": "Navigate to the about page. This is Footer under Sign-up for updates"
   },
   "common.pages.footer.sign.up.link": {
-    "defaultMessage": "https://www.surveymonkey.com/r/whceqej",
+    "defaultMessage": "https://lp.constantcontactpages.com/su/Vm8pCFj/spring",
     "description": "Navigate to the about page. This is Footer link under Sign-up for updates"
   },
   "common.pages.footer.whitehouse.link": {
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index d3997c932..57ed2f842 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -487,7 +487,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <a
                 class="usa-link usa-link--external"
                 data-cy=""
-                href="https://www.surveymonkey.com/r/whceqej"
+                href="https://lp.constantcontactpages.com/su/Vm8pCFj/spring"
                 rel="noreferrer"
                 target="_blank"
               >
@@ -895,7 +895,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy="sign-up-for-updates"
-                    href="https://www.surveymonkey.com/r/whceqej"
+                    href="https://lp.constantcontactpages.com/su/Vm8pCFj/spring"
                     rel="noreferrer"
                     target="_blank"
                   >
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index c5b59d401..85ae11b57 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -531,7 +531,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy="sign-up-for-updates"
-                    href="https://www.surveymonkey.com/r/whceqej"
+                    href="https://lp.constantcontactpages.com/su/Vm8pCFj/spring"
                     rel="noreferrer"
                     target="_blank"
                   >
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index f79c60608..5fee0558e 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -956,7 +956,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy="sign-up-for-updates"
-                    href="https://www.surveymonkey.com/r/whceqej"
+                    href="https://lp.constantcontactpages.com/su/Vm8pCFj/spring"
                     rel="noreferrer"
                     target="_blank"
                   >
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 8e6303103..79867f6d7 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -1250,7 +1250,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy="sign-up-for-updates"
-                    href="https://www.surveymonkey.com/r/whceqej"
+                    href="https://lp.constantcontactpages.com/su/Vm8pCFj/spring"
                     rel="noreferrer"
                     target="_blank"
                   >
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 14fd2c025..24198c767 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -3046,7 +3046,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy="sign-up-for-updates"
-                    href="https://www.surveymonkey.com/r/whceqej"
+                    href="https://lp.constantcontactpages.com/su/Vm8pCFj/spring"
                     rel="noreferrer"
                     target="_blank"
                   >
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index a1ea5c4bb..c93ae905b 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -419,7 +419,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             <a
               class="usa-link usa-link--external"
               data-cy=""
-              href="https://www.surveymonkey.com/r/whceqej"
+              href="https://lp.constantcontactpages.com/su/Vm8pCFj/spring"
               rel="noreferrer"
               target="_blank"
             >
@@ -1225,7 +1225,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy="sign-up-for-updates"
-                    href="https://www.surveymonkey.com/r/whceqej"
+                    href="https://lp.constantcontactpages.com/su/Vm8pCFj/spring"
                     rel="noreferrer"
                     target="_blank"
                   >
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index f8dbe5ebe..edb221791 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -467,7 +467,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy="sign-up-for-updates"
-                    href="https://www.surveymonkey.com/r/whceqej"
+                    href="https://lp.constantcontactpages.com/su/Vm8pCFj/spring"
                     rel="noreferrer"
                     target="_blank"
                   >

From 0f20320aff16da973ef91df4fd599d2cde0e37dc Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 7 Nov 2022 18:31:47 -0800
Subject: [PATCH 097/130] Update tract feedback button to include tractid

- this is dependent on SM enabling multiple responses
- closes #1969
---
 client/src/components/AreaDetail/AreaDetail.tsx | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index ff8b31279..b0f0455e6 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -18,7 +18,6 @@ import TractPrioritization from '../TractPrioritization';
 import * as styles from './areaDetail.module.scss';
 import * as constants from '../../data/constants';
 import * as EXPLORE_COPY from '../../data/copy/explore';
-import * as COMMON_COPY from '../../data/copy/common';
 
 // @ts-ignore
 import mailIcon from '/node_modules/uswds/dist/img/usa-icons/mail_outline.svg';
@@ -158,13 +157,6 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
   const percentTractTribal = properties[constants.TRIBAL_AREAS_PERCENTAGE] >= 0 ?
     parseFloat((properties[constants.TRIBAL_AREAS_PERCENTAGE]*100).toFixed()) : null;
 
-  const feedbackEmailSubject = hash ? `
-    Census tract ID ${blockGroup}, ${countyName}, ${stateName}, ( z/lat/lon: #${hash.join('/')} )
-  ` : `Census tract ID ${blockGroup}, ${countyName}, ${stateName}`;
-
-  const feedbackEmailBody = intl.formatMessage(EXPLORE_COPY.SEND_FEEDBACK.EMAIL_BODY);
-
-
   /**
    * The workforce development category has some indicators who's source will vary depending on which
    * territory is selected. This function allows us to change the source of workforce development indicators
@@ -861,10 +853,7 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
       {/* Send Feedback button */}
       <a
         className={styles.sendFeedbackLink}
-        // The mailto string must be on a single line otherwise the email does not display subject and body
-        href={`
-          mailto:${COMMON_COPY.FEEDBACK_EMAIL}?subject=${feedbackEmailSubject}&body=${feedbackEmailBody}
-          `}
+        href={`https://www.surveymonkey.com/r/6GKVCMF?tractid=${blockGroup}`}
         target={"_blank"}
         rel="noreferrer"
       >

From b050f5a1fac58068c417aeaab124e966c8ff8f81 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 7 Nov 2022 18:43:15 -0800
Subject: [PATCH 098/130] Update HOLC long description note

- closes #2066
---
 .../tests/__snapshots__/datasetContainer.test.tsx.snap    | 8 ++++----
 client/src/data/copy/methodology.tsx                      | 2 +-
 client/src/intl/en.json                                   | 2 +-
 .../pages/tests/__snapshots__/methodology.test.tsx.snap   | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
index fe70e8820..acc69f345 100644
--- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
+++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
@@ -747,13 +747,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   
         
                   <strong>
-                    Note: 
+                    Note:
                   </strong>
-                  The historic underinvestment indicator 
+                   The historic underinvestment burden is 
                   <strong>
-                    is not shown
+                    not available
                   </strong>
-                   on the map for tracts that were not included in the original HOLC maps because there is no data available.
+                   for tracts that were not included in the original HOLC maps because there is no underlying data.
       
                 </p>
               </div>
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index 25bdc7114..3bbd868a2 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -1071,7 +1071,7 @@ export const INDICATORS = [
     note: <FormattedMessage
       id={'methodology.page.category.low.hist.underinvestectancy.note.text'}
       defaultMessage={`
-        <boldtag>Note: </boldtag>The historic underinvestment indicator <boldtag>is not shown</boldtag> on the map for tracts that were not included in the original HOLC maps because there is no data available.
+        <boldtag>Note:</boldtag> The historic underinvestment burden is <boldtag>not available</boldtag> for tracts that were not included in the original HOLC maps because there is no underlying data.
       `}
       description={'Navigate to the Methodology page. This is the note text for Historic Underinvestment'}
       values={{
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 834855988..f9cb4cd62 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1892,7 +1892,7 @@
     "description": "Navigate to the Methodology page. This is the description text for Historic Underinvestment"
   },
   "methodology.page.category.low.hist.underinvestectancy.note.text": {
-    "defaultMessage": "<boldtag>Note: </boldtag>The historic underinvestment indicator <boldtag>is not shown</boldtag> on the map for tracts that were not included in the original HOLC maps because there is no data available.",
+    "defaultMessage": "<boldtag>Note:</boldtag> The historic underinvestment burden is <boldtag>not available</boldtag> for tracts that were not included in the original HOLC maps because there is no underlying data.",
     "description": "Navigate to the Methodology page. This is the note text for Historic Underinvestment"
   },
   "methodology.page.category.low.income.description.text": {
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 24198c767..91a2eae4a 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -1762,13 +1762,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     
         
                     <strong>
-                      Note: 
+                      Note:
                     </strong>
-                    The historic underinvestment indicator 
+                     The historic underinvestment burden is 
                     <strong>
-                      is not shown
+                      not available
                     </strong>
-                     on the map for tracts that were not included in the original HOLC maps because there is no data available.
+                     for tracts that were not included in the original HOLC maps because there is no underlying data.
       
                   </p>
                 </div>

From b6b2f6299ea8ef9cf772362a64d8096854a309a7 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 8 Nov 2022 10:37:38 -0800
Subject: [PATCH 099/130] Add content to question 2 of FAQs

- closes #2067
- update snapshots
---
 client/src/data/copy/faqs.tsx                    |  9 +++++++++
 client/src/intl/en.json                          |  4 ++++
 client/src/pages/frequently-asked-questions.tsx  |  1 +
 .../freqAskedQuestions.test.tsx.snap             | 16 ++++++++++++++++
 4 files changed, 30 insertions(+)

diff --git a/client/src/data/copy/faqs.tsx b/client/src/data/copy/faqs.tsx
index 967b2dc62..c578bda8e 100644
--- a/client/src/data/copy/faqs.tsx
+++ b/client/src/data/copy/faqs.tsx
@@ -310,6 +310,15 @@ export const FAQ_ANSWERS = {
     defaultMessage={ 'Not all disadvantaged communities can be shown on the map. Some communities, such as migrant workers, do not live in just one place. The Interim Implementation Guidance on the Justice40 Initiative also directs Federal agencies to consider geographically dispersed communities when implementing programs included in the Justice40 Initiative.'}
     description={ 'Navigate to the FAQs page, this will be an answer, Q2_P3'}
   />,
+  Q2_P4: <FormattedMessage
+    id={ 'faqs.page.answers.Q2_P4'}
+    defaultMessage={ '<boldtag>The tool uses census tracts.</boldtag> Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q2_P4'}
+    values={{
+      boldtag: boldFn,
+      link1: linkFn(`https://www.census.gov/programs-surveys/acs/geography-acs/geography-boundaries-by-year.html`, false, true),
+    }}
+  />,
   Q3_P1: <FormattedMessage
     id={ 'faqs.page.answers.Q3_P1'}
     defaultMessage={ 'No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a specific census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.'}
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index f9cb4cd62..3ee801de1 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1667,6 +1667,10 @@
     "defaultMessage": "Not all disadvantaged communities can be shown on the map. Some communities, such as migrant workers, do not live in just one place. The Interim Implementation Guidance on the Justice40 Initiative also directs Federal agencies to consider geographically dispersed communities when implementing programs included in the Justice40 Initiative.",
     "description": "Navigate to the FAQs page, this will be an answer, Q2_P3"
   },
+  "faqs.page.answers.Q2_P4": {
+    "defaultMessage": "<boldtag>The tool uses census tracts.</boldtag> Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q2_P4"
+  },
   "faqs.page.answers.Q3_P1": {
     "defaultMessage": "No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a specific census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.",
     "description": "Navigate to the FAQs page, this will be an answer, Q3_P1"
diff --git a/client/src/pages/frequently-asked-questions.tsx b/client/src/pages/frequently-asked-questions.tsx
index 800d7e1f7..3837084a0 100644
--- a/client/src/pages/frequently-asked-questions.tsx
+++ b/client/src/pages/frequently-asked-questions.tsx
@@ -59,6 +59,7 @@ const FAQPage = ({location}: IFAQPageProps) => {
           <li>{FAQS_COPY.FAQ_ANSWERS.Q2_P2_2}</li>
         </ul>
         <p>{FAQS_COPY.FAQ_ANSWERS.Q2_P3}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q2_P4}</p>
       </>
     ),
     (
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 79867f6d7..b2b9fe1fb 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -530,6 +530,22 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 <p>
                   Not all disadvantaged communities can be shown on the map. Some communities, such as migrant workers, do not live in just one place. The Interim Implementation Guidance on the Justice40 Initiative also directs Federal agencies to consider geographically dispersed communities when implementing programs included in the Justice40 Initiative.
                 </p>
+                <p>
+                  <strong>
+                    The tool uses census tracts.
+                  </strong>
+                   Census tracts are small units of geography. Census tract boundaries for 
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.census.gov/programs-surveys/acs/geography-acs/geography-boundaries-by-year.html"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    statistical areas
+                  </a>
+                   are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.
+                </p>
               </div>
               <h2
                 class="usa-accordion__heading"

From c26aef9d1976cb23afe985fbe1b24c6da87b2964 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 8 Nov 2022 10:45:41 -0800
Subject: [PATCH 100/130] Update copy - closes #2059 - updates release date to
 11.21 - updates snapshots

---
 .../BetaBanner/__snapshots__/BetaBanner.test.tsx.snap         | 2 +-
 .../ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap | 2 +-
 .../J40Header/__snapshots__/J40Header.test.tsx.snap           | 2 +-
 .../ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap   | 2 +-
 client/src/data/copy/common.tsx                               | 2 +-
 client/src/data/copy/explore.tsx                              | 2 +-
 client/src/data/copy/previousVer.tsx                          | 2 +-
 client/src/intl/en.json                                       | 4 ++--
 client/src/pages/tests/__snapshots__/about.test.tsx.snap      | 2 +-
 client/src/pages/tests/__snapshots__/contact.test.tsx.snap    | 2 +-
 client/src/pages/tests/__snapshots__/downloads.test.tsx.snap  | 4 ++--
 .../tests/__snapshots__/freqAskedQuestions.test.tsx.snap      | 2 +-
 .../src/pages/tests/__snapshots__/methodology.test.tsx.snap   | 2 +-
 client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap  | 2 +-
 .../pages/tests/__snapshots__/techSupportDoc.test.tsx.snap    | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap b/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
index 2db53c031..d34600f1b 100644
--- a/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
+++ b/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`rendering of the BetaBanner checks if component renders 1`] = `
       <strong>
         This site has been updated.
       </strong>
-       The current version of the site is 1.0 that was released on Oct 25, 2022
+       The current version of the site is 1.0 that was released on Nov 21, 2022
     </div>
   </div>
 </DocumentFragment>
diff --git a/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap b/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap
index 7a497881b..1018db433 100644
--- a/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap
+++ b/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap
@@ -25,7 +25,7 @@ exports[`rendering of ExploreDataBox Component checks if component renders 1`] =
         class="usa-summary-box__text"
       >
         
-    Download the data with documentation and shapefiles, from the 
+    Download the data with documentation and shapefile from the 
         <a
           class="usa-link"
           href="/en/downloads"
diff --git a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
index d0de8ae95..f3ae9190d 100644
--- a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
+++ b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
@@ -165,7 +165,7 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 21, 2022
       </div>
     </div>
     <div
diff --git a/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
index 85d6d0391..cabbe44a7 100644
--- a/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
+++ b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
@@ -26,7 +26,7 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
     >
       <div>
         <div>
-          Release update - Oct 25, 2022
+          Release update - Nov 21, 2022
         </div>
         <div>
           New & improved
diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx
index a27222fb3..67a7d5fea 100644
--- a/client/src/data/copy/common.tsx
+++ b/client/src/data/copy/common.tsx
@@ -28,7 +28,7 @@ export const linkFn = (to:string | IDefineMessage, isInternal:boolean, isOpenNew
 
 export const FEEDBACK_EMAIL = 'Screeningtool-Support@omb.eop.gov';
 
-export const METH_1_0_RELEASE_DATE = new Date(2022, 9, 25, 11, 59, 59); // Oct 25 2022
+export const METH_1_0_RELEASE_DATE = new Date(2022, 10, 21, 11, 59, 59); // Nov 21 2022
 export const METH_BETA_RELEASE_DATE = new Date(2022, 1, 18, 11, 59, 59); // Feb 18 2022
 
 
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index f5d655e4d..d5287e724 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -75,7 +75,7 @@ export const EXPLORE_DATA_BOX = defineMessages({
 export const EXPLORE_DATA_BOX_BODY = <FormattedMessage
   id={'explore.map.page.explore.data.box.body'}
   defaultMessage={ `
-    Download the data with documentation and shapefiles, from the <link1>downloads</link1> page.
+    Download the data with documentation and shapefile from the <link1>downloads</link1> page.
   `}
   description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the fifth paragraph of this side pane`}
   values={{
diff --git a/client/src/data/copy/previousVer.tsx b/client/src/data/copy/previousVer.tsx
index b85b77563..179828914 100644
--- a/client/src/data/copy/previousVer.tsx
+++ b/client/src/data/copy/previousVer.tsx
@@ -19,7 +19,7 @@ export const CARD = {
   BODY: <FormattedMessage
     id={'previous.versions.page.body.text'}
     defaultMessage={`The beta version of the methodology and data was used during the public 
-    beta period to get feedback on the tool from {betaDate} - {releaseDate}`}
+    beta period to get feedback on the tool from {betaDate} - {releaseDate}.`}
     description={'Navigate to the previous version page. This is the Cards body text'}
     values={{
       betaDate: <FormattedDate
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 3ee801de1..b0c338746 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -616,7 +616,7 @@
     "description": "On the explore the map page, the fifth description of the page"
   },
   "explore.map.page.explore.data.box.body": {
-    "defaultMessage": "Download the data with documentation and shapefiles, from the <link1>downloads</link1> page.",
+    "defaultMessage": "Download the data with documentation and shapefile from the <link1>downloads</link1> page.",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the fifth paragraph of this side pane"
   },
   "explore.map.page.explore.data.box.title": {
@@ -2416,7 +2416,7 @@
     "description": "page not found title text"
   },
   "previous.versions.page.body.text": {
-    "defaultMessage": "The beta version of the methodology and data was used during the public beta period to get feedback on the tool from {betaDate} - {releaseDate}",
+    "defaultMessage": "The beta version of the methodology and data was used during the public beta period to get feedback on the tool from {betaDate} - {releaseDate}.",
     "description": "Navigate to the previous version page. This is the Cards body text"
   },
   "previous.versions.page.button1.alt.tag.text": {
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index 57ed2f842..942d9aec3 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -165,7 +165,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 21, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index 85ae11b57..d5ddf1ef8 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -165,7 +165,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 21, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index 5fee0558e..53d6b211d 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -165,7 +165,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 21, 2022
       </div>
     </div>
     <div
@@ -453,7 +453,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 <div>
                   <div>
-                    Release update - Oct 25, 2022
+                    Release update - Nov 21, 2022
                   </div>
                   <div>
                     New & improved
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index b2b9fe1fb..acff6ff90 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -165,7 +165,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 21, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 91a2eae4a..ccc4deb8d 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -165,7 +165,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 21, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index c93ae905b..4b79707b3 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -165,7 +165,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 21, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index edb221791..0d7e26b0b 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -165,7 +165,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 21, 2022
       </div>
     </div>
     <div

From 385242f4fd89f900c9dfd56e00cc305e8ee72de3 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 8 Nov 2022 10:53:13 -0800
Subject: [PATCH 101/130] Remove language links

- closes #2055
- updates snapshots
---
 .../GovernmentBanner/GovernmentBanner.tsx     |  5 ++-
 .../GovernmentBanner.test.tsx.snap            | 18 --------
 client/src/components/J40Header/J40Header.tsx |  9 ++--
 .../__snapshots__/J40Header.test.tsx.snap     | 42 -------------------
 .../tests/__snapshots__/about.test.tsx.snap   | 42 -------------------
 .../tests/__snapshots__/contact.test.tsx.snap | 42 -------------------
 .../__snapshots__/downloads.test.tsx.snap     | 42 -------------------
 .../freqAskedQuestions.test.tsx.snap          | 42 -------------------
 .../__snapshots__/methodology.test.tsx.snap   | 42 -------------------
 .../__snapshots__/publicEng.test.tsx.snap     | 42 -------------------
 .../techSupportDoc.test.tsx.snap              | 42 -------------------
 11 files changed, 8 insertions(+), 360 deletions(-)

diff --git a/client/src/components/GovernmentBanner/GovernmentBanner.tsx b/client/src/components/GovernmentBanner/GovernmentBanner.tsx
index f00536d90..53d1df901 100644
--- a/client/src/components/GovernmentBanner/GovernmentBanner.tsx
+++ b/client/src/components/GovernmentBanner/GovernmentBanner.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {GovBanner} from '@trussworks/react-uswds';
 import {useIntl} from 'gatsby-plugin-intl';
 
-import Language from '../Language';
+// import Language from '../Language';
 
 import * as styles from './GovernmentBanner.module.scss';
 
@@ -14,7 +14,8 @@ const GovernmentBanner = () => {
       <div className={styles.bannerContainer}>
 
         <GovBanner language={intl.locale === 'es' ? 'spanish' : 'english'}/>
-        <Language isDesktop={true}/>
+        {/* Temporarily removing while language is translated */}
+        {/* <Language isDesktop={true}/> */}
 
       </div>
     </div>
diff --git a/client/src/components/GovernmentBanner/__snapshots__/GovernmentBanner.test.tsx.snap b/client/src/components/GovernmentBanner/__snapshots__/GovernmentBanner.test.tsx.snap
index 0265cbf85..d059c99a0 100644
--- a/client/src/components/GovernmentBanner/__snapshots__/GovernmentBanner.test.tsx.snap
+++ b/client/src/components/GovernmentBanner/__snapshots__/GovernmentBanner.test.tsx.snap
@@ -135,24 +135,6 @@ exports[`rendering of the GovernmentBanner checks if component renders 1`] = `
           </div>
         </div>
       </section>
-      <div>
-        <img
-          alt="language icon for selecting language"
-          src="test-file-stub"
-        />
-        <a
-          class="usa-link"
-          href="#"
-        >
-          English
-        </a>
-        <a
-          class="usa-link"
-          href="#"
-        >
-          Español
-        </a>
-      </div>
     </div>
   </div>
 </DocumentFragment>
diff --git a/client/src/components/J40Header/J40Header.tsx b/client/src/components/J40Header/J40Header.tsx
index 847ec48be..4c356e24a 100644
--- a/client/src/components/J40Header/J40Header.tsx
+++ b/client/src/components/J40Header/J40Header.tsx
@@ -11,7 +11,7 @@ import {
 import BetaBanner from '../BetaBanner';
 import J40MainGridContainer from '../J40MainGridContainer';
 import GovernmentBanner from '../GovernmentBanner';
-import Language from '../Language';
+// import Language from '../Language';
 import {useWindowSize} from 'react-use';
 
 // @ts-ignore
@@ -235,9 +235,10 @@ const J40Header = ({location}:IJ40Header) => {
       data-cy={'nav-link-contact'}>
       {intl.formatMessage(COMMON_COPY.HEADER.CONTACT)}
     </Link>,
-    <div key={'language'}>
-      <Language isDesktop={false}/>
-    </div>,
+    // Temporarily removing language link until translation is completed
+    // <div key={'language'}>
+    //   <Language isDesktop={false}/>
+    // </div>,
   ];
 
   return (
diff --git a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
index f3ae9190d..0b7f6d597 100644
--- a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
+++ b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
@@ -140,24 +140,6 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
             </div>
           </div>
         </section>
-        <div>
-          <img
-            alt="language icon for selecting language"
-            src="test-file-stub"
-          />
-          <a
-            class="usa-link"
-            href="#"
-          >
-            English
-          </a>
-          <a
-            class="usa-link"
-            href="#"
-          >
-            Español
-          </a>
-        </div>
       </div>
     </div>
     <div>
@@ -355,30 +337,6 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
                   Contact
                 </a>
               </li>
-              <li
-                class="usa-nav__primary-item"
-              >
-                <div>
-                  <div>
-                    <img
-                      alt="language icon for selecting language"
-                      src="test-file-stub"
-                    />
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      English
-                    </a>
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      Español
-                    </a>
-                  </div>
-                </div>
-              </li>
             </ul>
           </nav>
         </div>
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index 942d9aec3..c59b95a07 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -140,24 +140,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             </div>
           </div>
         </section>
-        <div>
-          <img
-            alt="language icon for selecting language"
-            src="test-file-stub"
-          />
-          <a
-            class="usa-link"
-            href="#"
-          >
-            English
-          </a>
-          <a
-            class="usa-link"
-            href="#"
-          >
-            Español
-          </a>
-        </div>
       </div>
     </div>
     <div>
@@ -355,30 +337,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   Contact
                 </a>
               </li>
-              <li
-                class="usa-nav__primary-item"
-              >
-                <div>
-                  <div>
-                    <img
-                      alt="language icon for selecting language"
-                      src="test-file-stub"
-                    />
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      English
-                    </a>
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      Español
-                    </a>
-                  </div>
-                </div>
-              </li>
             </ul>
           </nav>
         </div>
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index d5ddf1ef8..dbcb3ffcf 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -140,24 +140,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             </div>
           </div>
         </section>
-        <div>
-          <img
-            alt="language icon for selecting language"
-            src="test-file-stub"
-          />
-          <a
-            class="usa-link"
-            href="#"
-          >
-            English
-          </a>
-          <a
-            class="usa-link"
-            href="#"
-          >
-            Español
-          </a>
-        </div>
       </div>
     </div>
     <div>
@@ -355,30 +337,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   Contact
                 </a>
               </li>
-              <li
-                class="usa-nav__primary-item"
-              >
-                <div>
-                  <div>
-                    <img
-                      alt="language icon for selecting language"
-                      src="test-file-stub"
-                    />
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      English
-                    </a>
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      Español
-                    </a>
-                  </div>
-                </div>
-              </li>
             </ul>
           </nav>
         </div>
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index 53d6b211d..bb62e791c 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -140,24 +140,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             </div>
           </div>
         </section>
-        <div>
-          <img
-            alt="language icon for selecting language"
-            src="test-file-stub"
-          />
-          <a
-            class="usa-link"
-            href="#"
-          >
-            English
-          </a>
-          <a
-            class="usa-link"
-            href="#"
-          >
-            Español
-          </a>
-        </div>
       </div>
     </div>
     <div>
@@ -355,30 +337,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   Contact
                 </a>
               </li>
-              <li
-                class="usa-nav__primary-item"
-              >
-                <div>
-                  <div>
-                    <img
-                      alt="language icon for selecting language"
-                      src="test-file-stub"
-                    />
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      English
-                    </a>
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      Español
-                    </a>
-                  </div>
-                </div>
-              </li>
             </ul>
           </nav>
         </div>
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index acff6ff90..90bcb665b 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -140,24 +140,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             </div>
           </div>
         </section>
-        <div>
-          <img
-            alt="language icon for selecting language"
-            src="test-file-stub"
-          />
-          <a
-            class="usa-link"
-            href="#"
-          >
-            English
-          </a>
-          <a
-            class="usa-link"
-            href="#"
-          >
-            Español
-          </a>
-        </div>
       </div>
     </div>
     <div>
@@ -355,30 +337,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   Contact
                 </a>
               </li>
-              <li
-                class="usa-nav__primary-item"
-              >
-                <div>
-                  <div>
-                    <img
-                      alt="language icon for selecting language"
-                      src="test-file-stub"
-                    />
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      English
-                    </a>
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      Español
-                    </a>
-                  </div>
-                </div>
-              </li>
             </ul>
           </nav>
         </div>
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index ccc4deb8d..e356f4c2c 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -140,24 +140,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             </div>
           </div>
         </section>
-        <div>
-          <img
-            alt="language icon for selecting language"
-            src="test-file-stub"
-          />
-          <a
-            class="usa-link"
-            href="#"
-          >
-            English
-          </a>
-          <a
-            class="usa-link"
-            href="#"
-          >
-            Español
-          </a>
-        </div>
       </div>
     </div>
     <div>
@@ -355,30 +337,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   Contact
                 </a>
               </li>
-              <li
-                class="usa-nav__primary-item"
-              >
-                <div>
-                  <div>
-                    <img
-                      alt="language icon for selecting language"
-                      src="test-file-stub"
-                    />
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      English
-                    </a>
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      Español
-                    </a>
-                  </div>
-                </div>
-              </li>
             </ul>
           </nav>
         </div>
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index 4b79707b3..23b13538c 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -140,24 +140,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             </div>
           </div>
         </section>
-        <div>
-          <img
-            alt="language icon for selecting language"
-            src="test-file-stub"
-          />
-          <a
-            class="usa-link"
-            href="#"
-          >
-            English
-          </a>
-          <a
-            class="usa-link"
-            href="#"
-          >
-            Español
-          </a>
-        </div>
       </div>
     </div>
     <div>
@@ -355,30 +337,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   Contact
                 </a>
               </li>
-              <li
-                class="usa-nav__primary-item"
-              >
-                <div>
-                  <div>
-                    <img
-                      alt="language icon for selecting language"
-                      src="test-file-stub"
-                    />
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      English
-                    </a>
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      Español
-                    </a>
-                  </div>
-                </div>
-              </li>
             </ul>
           </nav>
         </div>
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index 0d7e26b0b..2b160cae4 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -140,24 +140,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             </div>
           </div>
         </section>
-        <div>
-          <img
-            alt="language icon for selecting language"
-            src="test-file-stub"
-          />
-          <a
-            class="usa-link"
-            href="#"
-          >
-            English
-          </a>
-          <a
-            class="usa-link"
-            href="#"
-          >
-            Español
-          </a>
-        </div>
       </div>
     </div>
     <div>
@@ -355,30 +337,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   Contact
                 </a>
               </li>
-              <li
-                class="usa-nav__primary-item"
-              >
-                <div>
-                  <div>
-                    <img
-                      alt="language icon for selecting language"
-                      src="test-file-stub"
-                    />
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      English
-                    </a>
-                    <a
-                      class="usa-link"
-                      href="#"
-                    >
-                      Español
-                    </a>
-                  </div>
-                </div>
-              </li>
             </ul>
           </nav>
         </div>

From 34eab228dc54c7be19d3015c2594ff9545d2d9e7 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 8 Nov 2022 17:52:13 -0800
Subject: [PATCH 102/130] Update Two tribal strings

- fix if we have TA_COUNT_AK and TA_PERC
- Add "Partially surrounded" copy
- Add comment on how to find the logic truth table for paragraph1 and 2
---
 .../PrioritizationCopy/PrioritizationCopy.tsx | 34 ++++++++++++--
 .../PrioritizationCopy2.tsx                   | 45 ++++++++++++++++++-
 client/src/data/copy/explore.tsx              | 14 ++++--
 client/src/intl/en.json                       | 16 +++++--
 4 files changed, 97 insertions(+), 12 deletions(-)

diff --git a/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
index 471ec7fde..9caccab63 100644
--- a/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
+++ b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
@@ -15,7 +15,12 @@ interface IPrioritizationCopy {
 };
 
 /**
- * This component returns the prioritzation copy
+ * This component returns the prioritzation copy.
+ *
+ * The truth table that tracks all the states for this logic is captured in the shared doc
+ * called "Indicators for UI and BE Signals". The Sheet is called "Disadv Copy v4 p1". This
+ * spreadsheet is a giant truth table with all possible BE signal combinations and what the
+ * approppriate copy should be.
  *
  * @param {number} totalCategoriesPrioritized
  * @param {number} totalBurdensPrioritized
@@ -37,41 +42,60 @@ const PrioritizationCopy =
    }:IPrioritizationCopy) => {
      let prioCopyRendered;
 
+     // if 1
      if (totalCategoriesPrioritized === 0) {
+       // if 1-1
        if (isAdjacencyThreshMet && isAdjacencyLowIncome) {
          prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.PRIO_SURR_LI;
+         // if 1-2
        } else if (
          isAdjacencyThreshMet &&
           !isAdjacencyLowIncome &&
           tribalCountAK === null &&
-          tribalCountUS === null &&
-          percentTractTribal === null
+          tribalCountUS === null
        ) {
-         prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO_SURR_LI;
+         // if 1-2-1
+         if (percentTractTribal === null) {
+           prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO_SURR_LI;
+           // if 1-2-2
+         } else if (percentTractTribal === 0) {
+           prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.PAR_PRIO_SURR_NO_LI;
+           // if 1-2-3
+         } else if (percentTractTribal >= 1) {
+           prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.PAR_PRIO_SURR_NO_LI;
+         }
+         // if 1-3
        } else if (
          !(isAdjacencyThreshMet && isAdjacencyLowIncome) &&
           tribalCountAK === null &&
           tribalCountUS === null &&
           percentTractTribal === null
        ) {
+         // if 1-3-1
          if (totalBurdensPrioritized === 0) {
            prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO;
+           // if 1-3-2
          } else if (totalBurdensPrioritized === 1) {
            prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO_1BUR;
+           // if 1-3-3
          } else if (totalBurdensPrioritized > 1) {
            prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO_NBUR;
          }
+         // if 1-4
        } else if (!(isAdjacencyThreshMet && isAdjacencyLowIncome)) {
+         // if 1-4-1
          if (
            (tribalCountAK !== null && tribalCountAK >= 1) &&
         (tribalCountUS !== null && tribalCountUS >= 1)
          ) {
            prioCopyRendered = EXPLORE_COPY.getPrioAKUSCopy(tribalCountAK, tribalCountUS);
+           // if 1-4-2
          } else if (
            (tribalCountAK !== null && tribalCountAK >= 1) &&
         tribalCountUS === null
          ) {
            prioCopyRendered = EXPLORE_COPY.getPrioANVCopy(tribalCountAK);
+           // if 1-4-3
          } else if (
            (tribalCountUS !== null && tribalCountUS >= 1) &&
         tribalCountAK === null
@@ -83,6 +107,7 @@ const PrioritizationCopy =
            } else if (percentTractTribal >= 1) {
              prioCopyRendered = EXPLORE_COPY.getPrioFRTCopy(`${percentTractTribal}%`);
            }
+         // 1-4-4
          } else if (tribalCountUS === null && tribalCountAK === null) {
            if (percentTractTribal === 0) {
              prioCopyRendered = EXPLORE_COPY.getPrioFRTCopy(`less than 1%`);
@@ -91,6 +116,7 @@ const PrioritizationCopy =
            }
          }
        }
+       // if 2
      } else if (totalCategoriesPrioritized > 0) {
        if (totalBurdensPrioritized === 0) {
          prioCopyRendered = <></>;
diff --git a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx
index 435bab182..0211c5931 100644
--- a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx
+++ b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx
@@ -15,7 +15,13 @@ interface IPrioritizationCopy2 {
 };
 
 /**
- * This component returns the prioritzation copy
+ * This component returns the prioritzation copy.
+ *
+ * The truth table for this logic is captured in the shared doc called "Indicators for
+ * UI and BE Signals". The Sheet name is "Disadv Copy p2 v5". This sheet is a copy of the
+ * the full table in Sheet "Disadv Copy v4 p1", which is the full truth table in logical order.
+ * The p2 v4 sheet copies the full truth table and sorts by the column 'second paragraph' to
+ * find the appropriate logical grouping for the second paragraph.
  *
  * @param {number} totalCategoriesPrioritized
  * @param {number} totalBurdensPrioritized
@@ -37,49 +43,71 @@ const PrioritizationCopy2 =
      let noStyles = false;
      let prioCopy2Rendered;
 
+     // if 1
      if (
        (totalCategoriesPrioritized === 0 && (isAdjacencyThreshMet && isAdjacencyLowIncome)) ||
       (totalCategoriesPrioritized >= 1)
      ) {
+       // if 1-1
        if (
          tribalCountAK === null &&
         (tribalCountUS !== null && tribalCountUS >= 1) &&
         (percentTractTribal !== null && percentTractTribal >= 1)
        ) {
          prioCopy2Rendered = EXPLORE_COPY.getPrioPercAndNumPointsAlsoCopy(`${percentTractTribal}%`, tribalCountUS);
+       // if 1-2
        } else if (
          tribalCountAK === null &&
         tribalCountUS === null &&
         (percentTractTribal !== null && percentTractTribal >= 1)
        ) {
          prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`${percentTractTribal}%`, true);
+       // if 1-3
        } else if (
          tribalCountAK === null &&
         (tribalCountUS !== null && tribalCountUS >= 1) &&
         (percentTractTribal !== null && percentTractTribal == 0)
        ) {
          prioCopy2Rendered = EXPLORE_COPY.getPrioPercAndNumPointsAlsoCopy(`less than 1%`, tribalCountUS);
+       // if 1-4
        } else if (
          tribalCountAK === null &&
         tribalCountUS === null &&
         (percentTractTribal !== null && percentTractTribal == 0)
        ) {
          prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`less than 1%`, true);
+       // if 1-5
        } else if (
          (tribalCountAK !== null && tribalCountAK >= 1) &&
         tribalCountUS === null &&
         percentTractTribal === null
        ) {
          prioCopy2Rendered = EXPLORE_COPY.getPrioANVCopy(tribalCountAK, true);
+       // if 1-6
        } else if (
          (tribalCountAK !== null && tribalCountAK >= 1) &&
         (tribalCountUS !== null && tribalCountUS >= 1)
        ) {
          prioCopy2Rendered = EXPLORE_COPY.getPrioAKUSCopy(tribalCountAK, tribalCountUS, true);
+       // if 1-7
        } else {
          prioCopy2Rendered = <></>;
          noStyles = true;
        }
+       // if 2
+     } else if (
+       totalCategoriesPrioritized === 0 &&
+      isAdjacencyThreshMet && !isAdjacencyLowIncome &&
+      tribalCountAK === null && tribalCountUS === null
+     ) {
+       // if 2-1
+       if (percentTractTribal !== null && percentTractTribal == 0) {
+         prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`less than 1%`, true);
+         // if 2-2
+       } else if (percentTractTribal !== null && percentTractTribal >= 0) {
+         prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`${percentTractTribal}%`, true);
+       }
+       // if 3
      } else if (
        (totalCategoriesPrioritized === 0 && !(isAdjacencyThreshMet && isAdjacencyLowIncome)) &&
       tribalCountAK === null &&
@@ -87,6 +115,7 @@ const PrioritizationCopy2 =
       (percentTractTribal !== null && percentTractTribal >= 0)
      ) {
        prioCopy2Rendered = EXPLORE_COPY.getPrioFRTPointsCopy(tribalCountUS, true);
+       // if 4
      } else if (
        (totalCategoriesPrioritized >= 1) &&
         tribalCountAK == null &&
@@ -94,6 +123,20 @@ const PrioritizationCopy2 =
         percentTractTribal == null
      ) {
        prioCopy2Rendered = EXPLORE_COPY.getPrioFRTPointsCopy(tribalCountUS, true);
+       // if 5
+     } else if (
+       totalCategoriesPrioritized >= 1 &&
+      (tribalCountAK !== null && tribalCountAK >= 1) &&
+      (percentTractTribal !== null && percentTractTribal == 0)
+     ) {
+       prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`less than 1%`, true);
+       // if 6
+     } else if (
+       totalCategoriesPrioritized >= 1 &&
+      (tribalCountAK !== null && tribalCountAK >= 1) &&
+      (percentTractTribal !== null && percentTractTribal >= 1)
+     ) {
+       prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`${percentTractTribal}%`, true);
      } else {
        prioCopy2Rendered = <></>;
        noStyles = true;
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index d5287e724..eaecb791e 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -611,7 +611,7 @@ export const PRIORITIZATION_COPY = {
     }}
   />,
   NOT_PRIO_NBUR: <FormattedMessage
-    id={'explore.map.page.side.panel.prio.copy.prio.one.burden'}
+    id={'explore.map.page.side.panel.prio.copy.not.prio.n.burden'}
     defaultMessage={'This tract is not considered disadvantaged. It meets more than 1 burden threshold <bold>BUT</bold> no associated socioeconomic thresholds.'}
     description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets more than 1 burden threshold <bold>BUT</bold> no associated socioeconomic thresholds.`}
     values= {{
@@ -619,8 +619,16 @@ export const PRIORITIZATION_COPY = {
     }}
   />,
   NOT_PRIO_SURR_LI: <FormattedMessage
-    id={'explore.map.page.side.panel.prio.copy.prio.donut'}
-    defaultMessage={'This tract is not considered disadvantaged. It is surrounded by tracts that are disadvantaged <bold>BUT</bold> does not meet the adjusted low income threshold.'}
+    id={'explore.map.page.side.panel.prio.copy.not.prio.surr.li'}
+    defaultMessage={'This tract is not considered disadvantaged. It is surrounded by tracts that are disadvantaged <bold>BUT</bold> does not meet the adjusted low income threshold. The adjustment does not apply to any of the categories.'}
+    description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It is surrounded by tracts that are disadvantaged <bold>BUT</bold> does not meet the adjusted low income threshold.`}
+    values={{
+      bold: boldFn,
+    }}
+  />,
+  PAR_PRIO_SURR_NO_LI: <FormattedMessage
+    id={'explore.map.page.side.panel.prio.copy.par.prio.surr.no.li'}
+    defaultMessage={'This tract is partially disadvantaged. It is surrounded by tracts that are disadvantaged <bold>BUT</bold> does not meet the adjusted low income threshold. The adjustment does not apply to any of the categories.'}
     description={`Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It is surrounded by tracts that are disadvantaged <bold>BUT</bold> does not meet the adjusted low income threshold.`}
     values={{
       bold: boldFn,
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index b0c338746..38f985dbd 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1347,10 +1347,22 @@
     "defaultMessage": "This tract is not considered disadvantaged. It does not meet any burden thresholds <bold>OR</bold> at least one associated socioeconomic threshold.",
     "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It does not meet any burden thresholds OR at least one associated socioeconomic threshold."
   },
+  "explore.map.page.side.panel.prio.copy.not.prio.n.burden": {
+    "defaultMessage": "This tract is not considered disadvantaged. It meets more than 1 burden threshold <bold>BUT</bold> no associated socioeconomic thresholds.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets more than 1 burden threshold <bold>BUT</bold> no associated socioeconomic thresholds."
+  },
   "explore.map.page.side.panel.prio.copy.not.prio.one.burden": {
     "defaultMessage": "This tract is not considered disadvantaged. It meets 1 burden threshold <bold>BUT</bold> no associated socioeconomic thresholds.",
     "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets [1] burden threshold <bold>BUT</bold> no associated socioeconomic thresholds."
   },
+  "explore.map.page.side.panel.prio.copy.not.prio.surr.li": {
+    "defaultMessage": "This tract is not considered disadvantaged. It is surrounded by tracts that are disadvantaged <bold>BUT</bold> does not meet the adjusted low income threshold. The adjustment does not apply to any of the categories.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It is surrounded by tracts that are disadvantaged <bold>BUT</bold> does not meet the adjusted low income threshold."
+  },
+  "explore.map.page.side.panel.prio.copy.par.prio.surr.no.li": {
+    "defaultMessage": "This tract is partially disadvantaged. It is surrounded by tracts that are disadvantaged <bold>BUT</bold> does not meet the adjusted low income threshold. The adjustment does not apply to any of the categories.",
+    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It is surrounded by tracts that are disadvantaged <bold>BUT</bold> does not meet the adjusted low income threshold."
+  },
   "explore.map.page.side.panel.prio.copy.prio.donut": {
     "defaultMessage": "This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged <bold>AND</bold> meets an adjusted low income threshold. The adjustment does not apply to any of the categories.",
     "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is considered disadvantaged. It is completely surrounded by tracts that are disadvantaged <bold>AND</bold> meets an adjusted low income threshold. The adjustment does not apply to any of the categories."
@@ -1363,10 +1375,6 @@
     "defaultMessage": "This tract is considered disadvantaged because it meets {burdens} burden threshold <bold>AND</bold> the associated socioeconomic threshold.",
     "description": "Navigate to the explore the map page. Click on tract, This tract is considered disadvantaged because it meets {burdens} burden thresholds <bold>AND</bold> the associated socioeconomic threshold."
   },
-  "explore.map.page.side.panel.prio.copy.prio.one.burden": {
-    "defaultMessage": "This tract is not considered disadvantaged. It meets more than 1 burden threshold <bold>BUT</bold> no associated socioeconomic thresholds.",
-    "description": "Navigate to the explore the map page. Click on tract, The side panel will show This tract is not considered disadvantaged. It meets more than 1 burden threshold <bold>BUT</bold> no associated socioeconomic thresholds."
-  },
   "explore.map.page.side.panel.send.feedback.alt.img": {
     "defaultMessage": "Send feedback",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a send feedback icon, this is the images alt tag"

From 652af7f57c9ce541482cf1adee00a43f3b56c0c1 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 9 Nov 2022 12:12:42 -0800
Subject: [PATCH 103/130] Revert date

---
 .../BetaBanner/__snapshots__/BetaBanner.test.tsx.snap         | 2 +-
 .../J40Header/__snapshots__/J40Header.test.tsx.snap           | 2 +-
 .../ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap   | 2 +-
 client/src/data/copy/common.tsx                               | 2 +-
 client/src/pages/tests/__snapshots__/about.test.tsx.snap      | 2 +-
 client/src/pages/tests/__snapshots__/contact.test.tsx.snap    | 2 +-
 client/src/pages/tests/__snapshots__/downloads.test.tsx.snap  | 4 ++--
 .../tests/__snapshots__/freqAskedQuestions.test.tsx.snap      | 2 +-
 .../src/pages/tests/__snapshots__/methodology.test.tsx.snap   | 2 +-
 client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap  | 2 +-
 .../pages/tests/__snapshots__/techSupportDoc.test.tsx.snap    | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap b/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
index d34600f1b..2db53c031 100644
--- a/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
+++ b/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`rendering of the BetaBanner checks if component renders 1`] = `
       <strong>
         This site has been updated.
       </strong>
-       The current version of the site is 1.0 that was released on Nov 21, 2022
+       The current version of the site is 1.0 that was released on Oct 25, 2022
     </div>
   </div>
 </DocumentFragment>
diff --git a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
index 0b7f6d597..19b6812de 100644
--- a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
+++ b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 21, 2022
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
diff --git a/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
index cabbe44a7..85d6d0391 100644
--- a/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
+++ b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
@@ -26,7 +26,7 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
     >
       <div>
         <div>
-          Release update - Nov 21, 2022
+          Release update - Oct 25, 2022
         </div>
         <div>
           New & improved
diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx
index 67a7d5fea..a27222fb3 100644
--- a/client/src/data/copy/common.tsx
+++ b/client/src/data/copy/common.tsx
@@ -28,7 +28,7 @@ export const linkFn = (to:string | IDefineMessage, isInternal:boolean, isOpenNew
 
 export const FEEDBACK_EMAIL = 'Screeningtool-Support@omb.eop.gov';
 
-export const METH_1_0_RELEASE_DATE = new Date(2022, 10, 21, 11, 59, 59); // Nov 21 2022
+export const METH_1_0_RELEASE_DATE = new Date(2022, 9, 25, 11, 59, 59); // Oct 25 2022
 export const METH_BETA_RELEASE_DATE = new Date(2022, 1, 18, 11, 59, 59); // Feb 18 2022
 
 
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index c59b95a07..a79e44d25 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 21, 2022
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index dbcb3ffcf..de3f4882b 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 21, 2022
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index bb62e791c..7579e4c22 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 21, 2022
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
@@ -411,7 +411,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 <div>
                   <div>
-                    Release update - Nov 21, 2022
+                    Release update - Oct 25, 2022
                   </div>
                   <div>
                     New & improved
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 90bcb665b..db8a9e611 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 21, 2022
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index e356f4c2c..0bc275fb6 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 21, 2022
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index 23b13538c..3ec17e765 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 21, 2022
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index 2b160cae4..9dd5f105e 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 21, 2022
+         The current version of the site is 1.0 that was released on Oct 25, 2022
       </div>
     </div>
     <div

From 4cb6167deb7b037ee69c0b44522ae7bd5cd0d9a2 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 9 Nov 2022 15:06:45 -0800
Subject: [PATCH 104/130] Update low income tooltip

- take into account pop = null
- update comments
---
 .../src/components/AreaDetail/AreaDetail.tsx  |  7 +--
 client/src/components/Indicator/Indicator.tsx | 43 +++++++++++--------
 client/src/data/copy/explore.tsx              | 19 +++-----
 client/src/intl/en.json                       | 10 ++---
 4 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index b0f0455e6..9789c016b 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -80,14 +80,14 @@ export interface ICategory {
 
 /**
  * This filter will remove indicators from appearing in the side panel by returning
- * the filter function (curring). There is 1 use case. It can accept any indicator name
+ * the filter function (currying). There is 1 use case. It can accept any indicator name
  * as an input.
  *
  * 1. For Historic underinvestment if the value is null
  *
  * Recommendation is to use a separate filter for each indicator that needs filtering.
  *
- * @param {MessageDescriptor} label - allows to re-use this filter for all 3 indicators above
+ * @param {MessageDescriptor} label - allows to re-use this filter for any number of indicators
  * @return {indicatorInfo}
  */
 export const indicatorFilter = (label:MessageDescriptor) => {
@@ -127,7 +127,7 @@ export const getTribalPercentValue = (tribalPercentRaw: number) => {
  * @param {IAreaDetailProps} {}
  * @return {void}
  */
-const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
+const AreaDetail = ({properties}: IAreaDetailProps) => {
   const intl = useIntl();
 
   // console.log the properties of the census that is selected:
@@ -769,6 +769,7 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
             key={`ind${index}`}
             indicator={indicator}
             isImpute={properties[constants.IMPUTE_FLAG] === "0" ? false : true}
+            population={population}
           />;
         })}
 
diff --git a/client/src/components/Indicator/Indicator.tsx b/client/src/components/Indicator/Indicator.tsx
index 1bec3653c..b1396721a 100644
--- a/client/src/components/Indicator/Indicator.tsx
+++ b/client/src/components/Indicator/Indicator.tsx
@@ -14,6 +14,7 @@ import infoIcon from '/node_modules/uswds/dist/img/usa-icons/info.svg';
 interface IIndicator {
   indicator: indicatorInfo,
   isImpute?: boolean,
+  population?: number | string,
 }
 interface IIndicatorValueSubText {
   type: indicatorType,
@@ -32,20 +33,20 @@ interface IIndicatorValue {
  *
  * @return {JSX.Element}
  */
-export const IndicatorInfoIcon = () => {
+export const IndicatorInfoIcon = ({isImpute, population}: Omit<IIndicator, 'indicator'>) => {
   const intl = useIntl();
+  let showTilde = false;
 
-  // const getToolTipCopy = () => {
-  //   if (!isImpute && isAdjacent) {
-  //     return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_NO_ADJ_YES);
-  //   } else if (isImpute && !isAdjacent) {
-  //     return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_YES_ADJ_NO);
-  //   } else if (isImpute && isAdjacent) {
-  //     return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_YES_ADJ_YES);
-  //   } else {
-  //     return null;
-  //   }
-  // };
+  const getToolTipCopy = () => {
+    if (population === constants.MISSING_DATA_STRING) {
+      return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_YES_POP_NULL);
+    } else if (population !== constants.MISSING_DATA_STRING && isImpute) {
+      showTilde = true;
+      return intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_YES_POP_NOT_NULL);
+    } else {
+      return null;
+    }
+  };
 
   /**
    * This library react-tooltip creates random DOM ID which will not allow for snapshot testing as
@@ -66,13 +67,13 @@ export const IndicatorInfoIcon = () => {
       />
       <img
         data-for="lowIncomeIcon"
-        data-tip={intl.formatMessage(EXPLORE_COPY.LOW_INCOME_TOOLTIP.IMP_YES_ADJ_NO)}
+        data-tip={getToolTipCopy()}
         data-iscapture="true"
         className={styles.info}
         src={infoIcon}
         alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_VALUES.IMG_ALT_TEXT.INFO)}
       />
-      <span className={styles.infoTilde}>{ ` ~ ` }</span>
+      {showTilde && <span className={styles.infoTilde}>{ ` ~ ` }</span>}
     </>
   );
 };
@@ -223,7 +224,7 @@ export const IndicatorValue = ({type, displayStat}:IIndicatorValue) => {
  * @param {IIndicator} indicator
  * @return {JSX.Element}
  */
-const Indicator = ({indicator, isImpute}:IIndicator) => {
+const Indicator = ({indicator, isImpute, population}:IIndicator) => {
   /**
    * The indicator value could be a number | boolean | null. In all cases we coerce to number
    * before flooring.
@@ -239,8 +240,11 @@ const Indicator = ({indicator, isImpute}:IIndicator) => {
   // A boolean to represent if the indicator is above or below the threshold
   const isAboveThresh = displayStat !== null && displayStat >= threshold ? true : false;
 
-  // Show an info icon on the low icome indicator if the impute true:
-  const showLowIncomeInfoIcon = (indicator.label === 'Low income' && (isImpute));
+  // Show an info icon on the low icome indicator if:
+  const showLowIncomeInfoIcon = (
+    (indicator.label === 'Low income' && (isImpute)) ||
+    (indicator.label === 'Low income' && population === constants.MISSING_DATA_STRING && !isImpute)
+  );
 
   return (
     <li
@@ -264,7 +268,10 @@ const Indicator = ({indicator, isImpute}:IIndicator) => {
             {/* Indicator info icon */}
             { showLowIncomeInfoIcon &&
               <div className={styles.indicatorInfo}>
-                <IndicatorInfoIcon/>
+                <IndicatorInfoIcon
+                  isImpute={isImpute}
+                  population={population}
+                />
               </div>
             }
 
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index eaecb791e..aeefca7fa 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -1384,18 +1384,13 @@ export const SIDE_PANEL_SPACERS = {
 };
 
 export const LOW_INCOME_TOOLTIP = defineMessages({
-  IMP_NO_ADJ_YES: {
-    id: 'explore.map.page.side.panel.indicator.low.income.tooltip.imp.no.adj.yes',
-    defaultMessage: `Tracts that are surrounded by tracts<br />that are considered disadvantaged<br />have an adjusted low income threshold.`,
-    description: 'Hover over the low income icon and it will show Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold.',
-  },
-  IMP_YES_ADJ_NO: {
-    id: 'explore.map.page.side.panel.indicator.low.income.tooltip.imp.yes.adj.no',
-    defaultMessage: `Tracts with missing income data<br />are given estimated incomes based<br />on an average of the incomes<br />of the surrounding tracts.`,
-    description: 'Hover over the low income icon and it will show Tracts with missing income data are given estimated incomes based on an average of the incomes of the surrounding tracts.',
-  },
-  IMP_YES_ADJ_YES: {
-    id: 'explore.map.page.side.panel.indicator.low.income.tooltip.imp.yes.adj.no',
+  IMP_YES_POP_NULL: {
+    id: 'explore.map.page.side.panel.indicator.low.income.tooltip.IMP_YES_POP_NULL',
+    defaultMessage: `Income is not estimated for<br /> tracts with unknown populations.`,
+    description: 'Hover over the low income icon and it will show Income is not estimated for<br /> tracts with unknown populations.',
+  },
+  IMP_YES_POP_NOT_NULL: {
+    id: 'explore.map.page.side.panel.indicator.low.income.tooltip.IMP_YES_POP_NOT_NULL',
     defaultMessage: `Tracts with missing income data<br />are given estimated incomes<br />based on an average of the<br />incomes of the surrounding tracts.<br /> Tracts that are surrounded by<br />tracts that are considered<br />disadvantaged have a<br />low income threshold.`,
     description: 'Hover over the low income icon and it will show Tracts with missing income data are given estimated incomes based on an average of the incomes of the surrounding tracts. Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold.',
   },
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 38f985dbd..d4310df23 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1087,14 +1087,14 @@
     "defaultMessage": "Low income",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show low income"
   },
-  "explore.map.page.side.panel.indicator.low.income.tooltip.imp.no.adj.yes": {
-    "defaultMessage": "Tracts that are surrounded by tracts<br />that are considered disadvantaged<br />have an adjusted low income threshold.",
-    "description": "Hover over the low income icon and it will show Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold."
-  },
-  "explore.map.page.side.panel.indicator.low.income.tooltip.imp.yes.adj.no": {
+  "explore.map.page.side.panel.indicator.low.income.tooltip.IMP_YES_POP_NOT_NULL": {
     "defaultMessage": "Tracts with missing income data<br />are given estimated incomes<br />based on an average of the<br />incomes of the surrounding tracts.<br /> Tracts that are surrounded by<br />tracts that are considered<br />disadvantaged have a<br />low income threshold.",
     "description": "Hover over the low income icon and it will show Tracts with missing income data are given estimated incomes based on an average of the incomes of the surrounding tracts. Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold."
   },
+  "explore.map.page.side.panel.indicator.low.income.tooltip.IMP_YES_POP_NULL": {
+    "defaultMessage": "Income is not estimated for<br /> tracts with unknown populations.",
+    "description": "Hover over the low income icon and it will show Income is not estimated for<br /> tracts with unknown populations."
+  },
   "explore.map.page.side.panel.indicator.low.med.income": {
     "defaultMessage": "Low median income",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Low median income"

From 4ab3fe664c32b36e782817e5cb5731d86bcacaa7 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 14 Nov 2022 11:08:24 -0800
Subject: [PATCH 105/130] Update side panel copy

---
 client/src/data/copy/explore.tsx | 18 +++++++++---------
 client/src/intl/en.json          | 16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index aeefca7fa..26084952f 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -987,7 +987,7 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
   // Legacy Pollution
   ABANDON_MINES: {
     id: 'explore.map.page.side.panel.indicator.abandon.mines',
-    defaultMessage: 'Abandoned mine lands',
+    defaultMessage: 'Abandoned mine land',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Abandoned land mines`,
   },
   FORMER_DEF_SITES: {
@@ -1229,7 +1229,7 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   },
   LACK_GREEN_SPACE: {
     id: 'explore.map.page.side.panel.indicator.description.lack.green.space',
-    defaultMessage: 'Amount of non-crop land covered with artificial materials like concrete or pavement',
+    defaultMessage: 'Amount of land, not including crop land, that is covered with artificial materials like concrete or pavement',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Share of non-crop land covered with artificial materials like concrete or pavement`,
   },
   LACK_PLUMBING: {
@@ -1249,12 +1249,12 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   // Legacy Pollution
   ABANDON_MINES: {
     id: 'explore.map.page.side.panel.indicator.description.abandon.mines',
-    defaultMessage: 'Presence of an abandoned mine land within the tract',
+    defaultMessage: 'Presence of one or more abandoned mine land within the tract',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned mine lands within the tract`,
   },
   FORMER_DEF_SITES: {
     id: 'explore.map.page.side.panel.indicator.description.former.def.sites',
-    defaultMessage: 'Presence of a Formerly Used Defense Site within the tract',
+    defaultMessage: 'Presence of one or more Formerly Used Defense Site within the tract',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of a Formerly Used Defense Site within the tract`,
   },
   PROX_HAZ: {
@@ -1264,12 +1264,12 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   },
   PROX_RMP: {
     id: 'explore.map.page.side.panel.indicator.description.prox.rmp',
-    defaultMessage: 'Count of Risk Management Plan facilities within 5 kilometers',
+    defaultMessage: 'Count of Risk Management Plan (RMP) facilities within 5 kilometers',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of Risk Management Plan facilities within 5 kilometers`,
   },
   PROX_NPL: {
     id: 'explore.map.page.side.panel.indicator.description.prox.npl',
-    defaultMessage: `Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers`,
+    defaultMessage: `Count of proposed or listed Superfund (or National Priorities List (NPL)) sites within 5 kilometers`,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers`,
   },
 
@@ -1308,14 +1308,14 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   LING_ISO: {
     id: 'explore.map.page.side.panel.indicator.description.ling.iso',
     defaultMessage: `
-    Share of households where no one over the age 14 speaks English well
+    Share of households where no one over age 14 speaks English well
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of households where no one over the age 14 speaks English well`,
   },
   LOW_MED_INCOME: {
     id: 'explore.map.page.side.panel.indicator.description.low.med.income',
-    defaultMessage: 'Comparison of income in the tract to incomes in the area',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Comparison of income in the tract to incomes in the area`,
+    defaultMessage: 'Comparison of median income in the tract to median incomes in the area',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Comparison of median income in the tract to median incomes in the area`,
   },
   POVERTY: {
     id: 'explore.map.page.side.panel.indicator.description.poverty',
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index d4310df23..93e0cd982 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -856,7 +856,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the census tract info title"
   },
   "explore.map.page.side.panel.indicator.abandon.mines": {
-    "defaultMessage": "Abandoned mine lands",
+    "defaultMessage": "Abandoned mine land",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Abandoned land mines"
   },
   "explore.map.page.side.panel.indicator.adjacency": {
@@ -872,7 +872,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show transportation barriers"
   },
   "explore.map.page.side.panel.indicator.description.abandon.mines": {
-    "defaultMessage": "Presence of an abandoned mine land within the tract",
+    "defaultMessage": "Presence of one or more abandoned mine land within the tract",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of an abandoned mine lands within the tract"
   },
   "explore.map.page.side.panel.indicator.description.asthma": {
@@ -912,7 +912,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of flooding risk"
   },
   "explore.map.page.side.panel.indicator.description.former.def.sites": {
-    "defaultMessage": "Presence of a Formerly Used Defense Site within the tract",
+    "defaultMessage": "Presence of one or more Formerly Used Defense Site within the tract",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Presence of a Formerly Used Defense Site within the tract"
   },
   "explore.map.page.side.panel.indicator.description.heartDisease": {
@@ -936,7 +936,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of households making less than 80% of the area median family income and spending more than 30% of income on housing"
   },
   "explore.map.page.side.panel.indicator.description.lack.green.space": {
-    "defaultMessage": "Amount of non-crop land covered with artificial materials like concrete or pavement",
+    "defaultMessage": "Amount of land, not including crop land, that is covered with artificial materials like concrete or pavement",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description Share of non-crop land covered with artificial materials like concrete or pavement"
   },
   "explore.map.page.side.panel.indicator.description.lack.plumbing": {
@@ -964,8 +964,8 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description ofPeople in households where income is less than or equal to twice the federal poverty level, not including students enrolled in higher ed"
   },
   "explore.map.page.side.panel.indicator.description.low.med.income": {
-    "defaultMessage": "Comparison of income in the tract to incomes in the area",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Comparison of income in the tract to incomes in the area"
+    "defaultMessage": "Comparison of median income in the tract to median incomes in the area",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Comparison of median income in the tract to median incomes in the area"
   },
   "explore.map.page.side.panel.indicator.description.pm25": {
     "defaultMessage": "Level of inhalable particles, 2.5 micrometers or smaller",
@@ -980,11 +980,11 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of hazardous waste facilities within 5 kilometers"
   },
   "explore.map.page.side.panel.indicator.description.prox.npl": {
-    "defaultMessage": "Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers",
+    "defaultMessage": "Count of proposed or listed Superfund (or National Priorities List (NPL)) sites within 5 kilometers",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of proposed or listed Superfund (or National Priorities List) sites within 5 kilometers"
   },
   "explore.map.page.side.panel.indicator.description.prox.rmp": {
-    "defaultMessage": "Count of Risk Management Plan facilities within 5 kilometers",
+    "defaultMessage": "Count of Risk Management Plan (RMP) facilities within 5 kilometers",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Count of Risk Management Plan facilities within 5 kilometers"
   },
   "explore.map.page.side.panel.indicator.description.trafficVolume": {

From d6240dc37a1eb69539f9a7300e60ed728c91acb9 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 14 Nov 2022 19:13:58 -0800
Subject: [PATCH 106/130] Update copy on Methodology page

---
 .../src/components/Categories/Categories.tsx  |  1 +
 .../__snapshots__/Categories.test.tsx.snap    | 20 +++--
 .../datasetContainer.test.tsx.snap            | 55 +++++++++++---
 client/src/data/copy/methodology.tsx          | 54 ++++++++-----
 client/src/intl/en.json                       | 32 ++++----
 .../__snapshots__/methodology.test.tsx.snap   | 75 ++++++++++++++-----
 6 files changed, 168 insertions(+), 69 deletions(-)

diff --git a/client/src/components/Categories/Categories.tsx b/client/src/components/Categories/Categories.tsx
index fb4926c7a..570ff5c0f 100644
--- a/client/src/components/Categories/Categories.tsx
+++ b/client/src/components/Categories/Categories.tsx
@@ -30,6 +30,7 @@ const Categories = () => {
           <Grid col={8}>
             <h2>{METHODOLOGY_COPY.CATEGORY.HEADING}</h2>
             <p>{intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA3)}</p>
+            <p>{intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA4)}</p>
             <p>{METHODOLOGY_COPY.FORMULA.PARA4}</p>
           </Grid>
         </Grid>
diff --git a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
index 26790c79b..dfdf9c799 100644
--- a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
+++ b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
@@ -20,13 +20,17 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <p>
           
       The tool uses datasets as indicators of burdens. The burdens are organized into categories. A community is highlighted as disadvantaged on the CEJST map if it is in a census tract that is (1) at or above the threshold for one or more environmental, climate, or other burdens, and (2) at or
-      above the threshold for an associated socioeconomic burden. In addition, a census tract that is completely surrounded by disadvantaged communities that meet the burden thresholds, and is at or above 
-      the 50% percentile for low income, is also considered disadvantaged. 
+      above the threshold for an associated socioeconomic burden.
     
         </p>
         <p>
           
-      Census tracts are small units of geography. Census tract 
+      In addition, a census tract that is completely surrounded by disadvantaged communities and is at or above the 50% percentile for low income is also considered disadvantaged.
+    
+        </p>
+        <p>
+          
+      Census tracts are small units of geography. Census tract boundaries for 
           <a
             class="usa-link usa-link--external"
             data-cy=""
@@ -34,7 +38,7 @@ exports[`rendering of the Categories checks if component renders 1`] = `
             rel="noreferrer"
             target="_blank"
           >
-            boundaries
+            statistical areas
           </a>
            are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
       census boundaries.    
@@ -336,14 +340,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
           class="usa-link"
           href="#prox-npl"
         >
-          proximity to Superfind sites
+          proximity to Superfind sites (National Priorities List (NPL))
         </a>
          OR 
         <a
           class="usa-link"
           href="#prox-rmp"
         >
-          proximity to Risk Management Plan facilities
+          proximity to Risk Management Plan (RMP) facilities
         </a>
       </p>
       <p>
@@ -474,7 +478,7 @@ exports[`rendering of the Categories checks if component renders 1`] = `
     </div>
     <div>
       <h3>
-        Training and workforce development
+        Workforce development
       </h3>
       <p>
         
@@ -557,7 +561,7 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         </h2>
         <p>
           
-      Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities. They are highlighted on the map.  
+      Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities.
     
         </p>
       </div>
diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
index acc69f345..829d18793 100644
--- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
+++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
@@ -239,7 +239,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate of population loss.
+        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate the population loss rate.
 
       
               </div>
@@ -297,7 +297,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not include property value.
+        A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not consider property value.
       
               </div>
               <ul>
@@ -354,7 +354,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not include property value.
+        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not consider property value.
       
               </div>
               <ul>
@@ -862,7 +862,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes. Places that lack green space are also known as nature-deprived.
+        Share of land with developed surfaces covered with artificial materials like concrete or pavement, excluding crop land used for agricultural purposes. Places that lack green space are also known as nature-deprived.
 
       
               </div>
@@ -920,7 +920,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Housing without complete kitchen facilities or complete plumbing facilities.
+        Housing without indoor kitchen facilities or complete plumbing facilities.
       
               </div>
               <ul>
@@ -971,7 +971,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are not likely to have lead paint exposure and are not included.
+        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are less likely to face health risks from lead paint exposure are not included.
       
               </div>
               <ul>
@@ -1242,7 +1242,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Count of RMP, or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
+        Count of Risk Management Plan (RMP), or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
       
               </div>
               <ul>
@@ -1373,11 +1373,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
-                    href="http://google.com"
+                    href="https://www.transportation.gov/equity-Justice40#:~:text=Transportation%20access%20disadvantage%20identifies%20communities%20and%20places%20that%20spend%20more%2C%20and%20take%20longer%2C%20to%20get%20where%20they%20need%20to%20go.%20(4)"
                     rel="noreferrer"
                     target="_blank"
                   >
-                    Transportation Burdens indicator (need link)
+                    Transportation Burdens indicator
                   </a>
                     from 2022
                 </li>
@@ -1563,7 +1563,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Share of households where no one over the age 14 speaks English well.
+        Share of households where no one over age 14 speaks English well.
       
               </div>
               <ul>
@@ -1746,6 +1746,28 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   </span>
                   All U.S. states, the District of Columbia, and Puerto Rico
                 </li>
+                <li>
+                  <span>
+                    Source: 
+                  </span>
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.census.gov/data/developers/data-sets/acs-5year/2010.html"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    American Community Survey
+                  </a>
+                   from 2010
+                </li>
+                <li>
+                  <span>
+                    Available for: 
+                  </span>
+                  American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands
+    
+                </li>
               </ul>
             </div>
             <div
@@ -1760,7 +1782,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Number of unemployed people as a share of the  labor force.
+        Number of unemployed people as a share of the labor force.
       
               </div>
               <ul>
@@ -1915,6 +1937,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       The Land Area Representation (LAR) dataset depicts American Indian land areas for Federally Recognized Tribes.
       
               </div>
+              <div>
+                <p>
+                  
+        
+                  <strong>
+                    Note: 
+                  </strong>
+                  The LAR dataset depicts the exterior extent of a Federal Indian land area.  Not all Federally Recognized Tribes have a designated land area; therefore, they may not have an associated land area represented in the land area dataset.
+      
+                </p>
+              </div>
               <ul>
                 <li>
                   <span>
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index 3bbd868a2..520d4ac2f 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -56,15 +56,21 @@ export const PAGE = defineMessages({
     id: 'methodology.page.paragraph.3',
     defaultMessage: `
       The tool uses datasets as indicators of burdens. The burdens are organized into categories. A community is highlighted as disadvantaged on the CEJST map if it is in a census tract that is (1) at or above the threshold for one or more environmental, climate, or other burdens, and (2) at or
-      above the threshold for an associated socioeconomic burden. In addition, a census tract that is completely surrounded by disadvantaged communities that meet the burden thresholds, and is at or above 
-      the 50% percentile for low income, is also considered disadvantaged. 
+      above the threshold for an associated socioeconomic burden.
+    `,
+    description: 'Navigate to the methodology page. This is the methodology paragraph 3',
+  },
+  PARA4: {
+    id: 'methodology.page.paragraph.4',
+    defaultMessage: `
+      In addition, a census tract that is completely surrounded by disadvantaged communities and is at or above the 50% percentile for low income is also considered disadvantaged.
     `,
     description: 'Navigate to the methodology page. This is the methodology paragraph 3',
   },
   PARA5: {
     id: 'methodology.page.paragraph.5',
     defaultMessage: `
-      Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities. They are highlighted on the map.  
+      Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities.
     `,
     description: 'Navigate to the methodology page. This is the methodology paragraph 5',
   },
@@ -92,7 +98,7 @@ export const FORMULA = {
   PARA4: <FormattedMessage
     id={'methodology.page.paragraph.4'}
     defaultMessage={`
-      Census tracts are small units of geography. Census tract <link1>boundaries</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
+      Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
       census boundaries.    
     `}
     description={'Navigate to the methodology page. This is the methodology paragraph 4'}
@@ -275,7 +281,7 @@ export const CATEGORIES = {
     />,
     IF: <FormattedMessage
       id={'methodology.page.indicator.categories.legacy.pollution.if'}
-      defaultMessage={`Have at least one <link0>abandoned mine land</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites</link3> OR <link4>proximity to Risk Management Plan facilities</link4>`}
+      defaultMessage={`Have at least one <link0>abandoned mine land</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites (National Priorities List (NPL))</link3> OR <link4>proximity to Risk Management Plan (RMP) facilities</link4>`}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula'}
       values={{
         link0: simpleLink('#mine-land'),
@@ -346,7 +352,7 @@ export const CATEGORIES = {
     />,
     TITLE: <FormattedMessage
       id={'indicator.categories.work.dev.title'}
-      defaultMessage={'Training and workforce development'}
+      defaultMessage={'Workforce development'}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the category title'}
 
     />,
@@ -665,10 +671,10 @@ export const SOURCE_LINKS = {
   />,
   TRANS_BUR: <FormattedMessage
     id={'methodology.page.category.source.trans.bur.link'}
-    defaultMessage={`<link1>Transportation Burdens indicator (need link)</link1>  from {date22}`}
+    defaultMessage={`<link1>Transportation Burdens indicator</link1>  from {date22}`}
     description={'Navigate to the Methodology page. This is the source link for Transportation burdens'}
     values={{
-      link1: linkFn('http://google.com', false, true),
+      link1: linkFn('https://www.transportation.gov/equity-Justice40#:~:text=Transportation%20access%20disadvantage%20identifies%20communities%20and%20places%20that%20spend%20more%2C%20and%20take%20longer%2C%20to%20get%20where%20they%20need%20to%20go.%20(4)', false, true),
       date22: DATE_RANGE.TWENTYTWO,
     }}
   />,
@@ -834,7 +840,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.exp.pop.loss.rate.description.text'}
       defaultMessage={`
-        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate of population loss.
+        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate the population loss rate.
 
       `}
       description={'Navigate to the Methodology page. This is the description text for exp pop loss rate'}
@@ -859,7 +865,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.flood.risk.rate.description.text'}
       defaultMessage={`
-        A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not include property value.
+        A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not consider property value.
       `}
       description={'Navigate to the Methodology page. This is the description text for exp bld loss rate'}
     />,
@@ -883,7 +889,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.wildfire.risk.rate.description.text'}
       defaultMessage={`
-        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not include property value.
+        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not consider property value.
       `}
       description={'Navigate to the Methodology page. This is the description text for exp bld loss rate'}
     />,
@@ -1121,7 +1127,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.green.space.description.text'}
       defaultMessage={`
-        Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes. Places that lack green space are also known as nature-deprived.
+        Share of land with developed surfaces covered with artificial materials like concrete or pavement, excluding crop land used for agricultural purposes. Places that lack green space are also known as nature-deprived.
 
       `}
       description={'Navigate to the Methodology page. This is the description text for housing burden'}
@@ -1146,7 +1152,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.indoor.plumb.description.text'}
       defaultMessage={`
-        Housing without complete kitchen facilities or complete plumbing facilities.
+        Housing without indoor kitchen facilities or complete plumbing facilities.
       `}
       description={'Navigate to the Methodology page. This is the description text for housing burden'}
     />,
@@ -1169,7 +1175,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.lead.paint.description.text'}
       defaultMessage={`
-        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are not likely to have lead paint exposure and are not included.
+        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are less likely to face health risks from lead paint exposure are not included.
       `}
       description={'Navigate to the Methodology page. This is the description text for lead paint'}
     />,
@@ -1288,7 +1294,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.prox.rmp.description.text'}
       defaultMessage={`
-        Count of RMP, or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
+        Count of Risk Management Plan (RMP), or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
       `}
       description={'Navigate to the Methodology page. This is the description text for proximity to rmp'}
     />,
@@ -1435,7 +1441,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.linguistic.iso.description.text'}
       defaultMessage={`
-        Share of households where no one over the age 14 speaks English well.
+        Share of households where no one over age 14 speaks English well.
       `}
       description={'Navigate to the Methodology page. This is the description text for linguistic isolation'}
     />,
@@ -1516,6 +1522,10 @@ export const INDICATORS = [
         source: SOURCE_LINKS.CENSUS_ACS_15_19,
         availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
       },
+      {
+        source: SOURCE_LINKS.CENSUS_ACS_10,
+        availableFor: AVAILABLE_FOR.ALL_ISLDS,
+      },
     ],
   },
   {
@@ -1528,7 +1538,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.unemploy.description.text'}
       defaultMessage={`
-        Number of unemployed people as a share of the  labor force.
+        Number of unemployed people as a share of the labor force.
       `}
       description={'Navigate to the Methodology page. This is the description text for unemployment'}
     />,
@@ -1590,6 +1600,16 @@ export const INDICATORS = [
       `}
       description={'Navigate to the Methodology page. This is the description text for Tribal lands'}
     />,
+    note: <FormattedMessage
+      id={'methodology.page.category.tribal.lands.note.text'}
+      defaultMessage={`
+        <boldtag>Note: </boldtag>The LAR dataset depicts the exterior extent of a Federal Indian land area.  Not all Federally Recognized Tribes have a designated land area; therefore, they may not have an associated land area represented in the land area dataset.
+      `}
+      description={'Navigate to the Methodology page. This is the note text for low median expectancy'}
+      values={{
+        boldtag: boldFn,
+      }}
+    />,
     usedIn: CATEGORIES.TRIBAL_LANDS.METHODOLOGY,
     responsibleParty: RESPONSIBLE_PARTIES.BIA,
     sources: [
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 93e0cd982..36213a7cd 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1808,7 +1808,7 @@
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the category title"
   },
   "indicator.categories.work.dev.title": {
-    "defaultMessage": "Training and workforce development",
+    "defaultMessage": "Workforce development",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the category title"
   },
   "map.territoryFocus.focusOn": {
@@ -1852,11 +1852,11 @@
     "description": "Navigate to the Methodology page. This is the description text for exp bld loss rate"
   },
   "methodology.page.category.exp.pop.loss.rate.description.text": {
-    "defaultMessage": "Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate of population loss.",
+    "defaultMessage": "Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate the population loss rate.",
     "description": "Navigate to the Methodology page. This is the description text for exp pop loss rate"
   },
   "methodology.page.category.flood.risk.rate.description.text": {
-    "defaultMessage": "A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not include property value.",
+    "defaultMessage": "A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not consider property value.",
     "description": "Navigate to the Methodology page. This is the description text for exp bld loss rate"
   },
   "methodology.page.category.fuds.description.text": {
@@ -1864,7 +1864,7 @@
     "description": "Navigate to the Methodology page. This is the description text for Formerly Used Defense Sites"
   },
   "methodology.page.category.green.space.description.text": {
-    "defaultMessage": "Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes. Places that lack green space are also known as nature-deprived.",
+    "defaultMessage": "Share of land with developed surfaces covered with artificial materials like concrete or pavement, excluding crop land used for agricultural purposes. Places that lack green space are also known as nature-deprived.",
     "description": "Navigate to the Methodology page. This is the description text for housing burden"
   },
   "methodology.page.category.heart.disease.description.text": {
@@ -1880,11 +1880,11 @@
     "description": "Navigate to the Methodology page. This is the description text for housing burden"
   },
   "methodology.page.category.indoor.plumb.description.text": {
-    "defaultMessage": "Housing without complete kitchen facilities or complete plumbing facilities.",
+    "defaultMessage": "Housing without indoor kitchen facilities or complete plumbing facilities.",
     "description": "Navigate to the Methodology page. This is the description text for housing burden"
   },
   "methodology.page.category.lead.paint.description.text": {
-    "defaultMessage": "Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are not likely to have lead paint exposure and are not included.",
+    "defaultMessage": "Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are less likely to face health risks from lead paint exposure are not included.",
     "description": "Navigate to the Methodology page. This is the description text for lead paint"
   },
   "methodology.page.category.leaky.uwt.description.text": {
@@ -1892,7 +1892,7 @@
     "description": "Navigate to the Methodology page. This is the description text for Leaking underground storage tanks"
   },
   "methodology.page.category.linguistic.iso.description.text": {
-    "defaultMessage": "Share of households where no one over the age 14 speaks English well.",
+    "defaultMessage": "Share of households where no one over age 14 speaks English well.",
     "description": "Navigate to the Methodology page. This is the description text for linguistic isolation"
   },
   "methodology.page.category.linguistic.iso.note.text": {
@@ -1944,7 +1944,7 @@
     "description": "Navigate to the Methodology page. This is the description text for proximity to npl"
   },
   "methodology.page.category.prox.rmp.description.text": {
-    "defaultMessage": "Count of RMP, or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.",
+    "defaultMessage": "Count of Risk Management Plan (RMP), or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.",
     "description": "Navigate to the Methodology page. This is the description text for proximity to rmp"
   },
   "methodology.page.category.source.aml.link": {
@@ -2028,7 +2028,7 @@
     "description": "Navigate to the Methodology page. This is the source link for CDC Sleep"
   },
   "methodology.page.category.source.trans.bur.link": {
-    "defaultMessage": "<link1>Transportation Burdens indicator (need link)</link1> from {date22}",
+    "defaultMessage": "<link1>Transportation Burdens indicator</link1> from {date22}",
     "description": "Navigate to the Methodology page. This is the source link for Transportation burdens"
   },
   "methodology.page.category.source.ust.find.link": {
@@ -2047,6 +2047,10 @@
     "defaultMessage": "The Land Area Representation (LAR) dataset depicts American Indian land areas for Federally Recognized Tribes.",
     "description": "Navigate to the Methodology page. This is the description text for Tribal lands"
   },
+  "methodology.page.category.tribal.lands.note.text": {
+    "defaultMessage": "<boldtag>Note: </boldtag>The LAR dataset depicts the exterior extent of a Federal Indian land area. Not all Federally Recognized Tribes have a designated land area; therefore, they may not have an associated land area represented in the land area dataset.",
+    "description": "Navigate to the Methodology page. This is the note text for low median expectancy"
+  },
   "methodology.page.category.unemploy.description.text": {
     "defaultMessage": "Number of unemployed people as a share of the labor force.",
     "description": "Navigate to the Methodology page. This is the description text for unemployment"
@@ -2056,7 +2060,7 @@
     "description": "Navigate to the Methodology page. This is the description text for waste water"
   },
   "methodology.page.category.wildfire.risk.rate.description.text": {
-    "defaultMessage": "A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not include property value.",
+    "defaultMessage": "A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not consider property value.",
     "description": "Navigate to the Methodology page. This is the description text for exp bld loss rate"
   },
   "methodology.page.category.workforce.dev.description.text": {
@@ -2352,7 +2356,7 @@
     "description": "Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Reduction and remediation of legacy pollution methodology"
   },
   "methodology.page.indicator.categories.legacy.pollution.if": {
-    "defaultMessage": "Have at least one <link0>abandoned mine land</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites</link3> OR <link4>proximity to Risk Management Plan facilities</link4>",
+    "defaultMessage": "Have at least one <link0>abandoned mine land</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites (National Priorities List (NPL))</link3> OR <link4>proximity to Risk Management Plan (RMP) facilities</link4>",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula"
   },
   "methodology.page.indicator.categories.tribal.lands.methodology": {
@@ -2380,15 +2384,15 @@
     "description": "Navigate to the methodology page. This is the methodology paragraph 1, bullet 2"
   },
   "methodology.page.paragraph.3": {
-    "defaultMessage": "The tool uses datasets as indicators of burdens. The burdens are organized into categories. A community is highlighted as disadvantaged on the CEJST map if it is in a census tract that is (1) at or above the threshold for one or more environmental, climate, or other burdens, and (2) at or above the threshold for an associated socioeconomic burden. In addition, a census tract that is completely surrounded by disadvantaged communities that meet the burden thresholds, and is at or above the 50% percentile for low income, is also considered disadvantaged.",
+    "defaultMessage": "The tool uses datasets as indicators of burdens. The burdens are organized into categories. A community is highlighted as disadvantaged on the CEJST map if it is in a census tract that is (1) at or above the threshold for one or more environmental, climate, or other burdens, and (2) at or above the threshold for an associated socioeconomic burden.",
     "description": "Navigate to the methodology page. This is the methodology paragraph 3"
   },
   "methodology.page.paragraph.4": {
-    "defaultMessage": "Census tracts are small units of geography. Census tract <link1>boundaries</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.",
+    "defaultMessage": "Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.",
     "description": "Navigate to the methodology page. This is the methodology paragraph 4"
   },
   "methodology.page.paragraph.5": {
-    "defaultMessage": "Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities. They are highlighted on the map.",
+    "defaultMessage": "Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities.",
     "description": "Navigate to the methodology page. This is the methodology paragraph 5"
   },
   "methodology.page.return.to.top.link": {
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 0bc275fb6..1d2338706 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -432,13 +432,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <p>
             
       The tool uses datasets as indicators of burdens. The burdens are organized into categories. A community is highlighted as disadvantaged on the CEJST map if it is in a census tract that is (1) at or above the threshold for one or more environmental, climate, or other burdens, and (2) at or
-      above the threshold for an associated socioeconomic burden. In addition, a census tract that is completely surrounded by disadvantaged communities that meet the burden thresholds, and is at or above 
-      the 50% percentile for low income, is also considered disadvantaged. 
+      above the threshold for an associated socioeconomic burden.
     
           </p>
           <p>
             
-      Census tracts are small units of geography. Census tract 
+      In addition, a census tract that is completely surrounded by disadvantaged communities and is at or above the 50% percentile for low income is also considered disadvantaged.
+    
+          </p>
+          <p>
+            
+      Census tracts are small units of geography. Census tract boundaries for 
             <a
               class="usa-link usa-link--external"
               data-cy=""
@@ -446,7 +450,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               rel="noreferrer"
               target="_blank"
             >
-              boundaries
+              statistical areas
             </a>
              are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
       census boundaries.    
@@ -748,14 +752,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             class="usa-link"
             href="#prox-npl"
           >
-            proximity to Superfind sites
+            proximity to Superfind sites (National Priorities List (NPL))
           </a>
            OR 
           <a
             class="usa-link"
             href="#prox-rmp"
           >
-            proximity to Risk Management Plan facilities
+            proximity to Risk Management Plan (RMP) facilities
           </a>
         </p>
         <p>
@@ -886,7 +890,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       </div>
       <div>
         <h3>
-          Training and workforce development
+          Workforce development
         </h3>
         <p>
           
@@ -969,7 +973,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           </h2>
           <p>
             
-      Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities. They are highlighted on the map.  
+      Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities.
     
           </p>
         </div>
@@ -1212,7 +1216,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate of population loss.
+        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate the population loss rate.
 
       
                 </div>
@@ -1270,7 +1274,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not include property value.
+        A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not consider property value.
       
                 </div>
                 <ul>
@@ -1327,7 +1331,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not include property value.
+        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not consider property value.
       
                 </div>
                 <ul>
@@ -1835,7 +1839,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Share of land with developed surfaces covered with artificial materials like concrete or pavement and crop land used for agricultural purposes. Places that lack green space are also known as nature-deprived.
+        Share of land with developed surfaces covered with artificial materials like concrete or pavement, excluding crop land used for agricultural purposes. Places that lack green space are also known as nature-deprived.
 
       
                 </div>
@@ -1893,7 +1897,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Housing without complete kitchen facilities or complete plumbing facilities.
+        Housing without indoor kitchen facilities or complete plumbing facilities.
       
                 </div>
                 <ul>
@@ -1944,7 +1948,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are not likely to have lead paint exposure and are not included.
+        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are less likely to face health risks from lead paint exposure are not included.
       
                 </div>
                 <ul>
@@ -2215,7 +2219,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Count of RMP, or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
+        Count of Risk Management Plan (RMP), or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
       
                 </div>
                 <ul>
@@ -2346,11 +2350,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
-                      href="http://google.com"
+                      href="https://www.transportation.gov/equity-Justice40#:~:text=Transportation%20access%20disadvantage%20identifies%20communities%20and%20places%20that%20spend%20more%2C%20and%20take%20longer%2C%20to%20get%20where%20they%20need%20to%20go.%20(4)"
                       rel="noreferrer"
                       target="_blank"
                     >
-                      Transportation Burdens indicator (need link)
+                      Transportation Burdens indicator
                     </a>
                       from 2022
                   </li>
@@ -2536,7 +2540,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Share of households where no one over the age 14 speaks English well.
+        Share of households where no one over age 14 speaks English well.
       
                 </div>
                 <ul>
@@ -2719,6 +2723,28 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     </span>
                     All U.S. states, the District of Columbia, and Puerto Rico
                   </li>
+                  <li>
+                    <span>
+                      Source: 
+                    </span>
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.census.gov/data/developers/data-sets/acs-5year/2010.html"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      American Community Survey
+                    </a>
+                     from 2010
+                  </li>
+                  <li>
+                    <span>
+                      Available for: 
+                    </span>
+                    American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands
+    
+                  </li>
                 </ul>
               </div>
               <div
@@ -2733,7 +2759,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Number of unemployed people as a share of the  labor force.
+        Number of unemployed people as a share of the labor force.
       
                 </div>
                 <ul>
@@ -2888,6 +2914,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       The Land Area Representation (LAR) dataset depicts American Indian land areas for Federally Recognized Tribes.
       
                 </div>
+                <div>
+                  <p>
+                    
+        
+                    <strong>
+                      Note: 
+                    </strong>
+                    The LAR dataset depicts the exterior extent of a Federal Indian land area.  Not all Federally Recognized Tribes have a designated land area; therefore, they may not have an associated land area represented in the land area dataset.
+      
+                  </p>
+                </div>
                 <ul>
                   <li>
                     <span>

From 76a162797a08dad1dac5e54d1c1f531ba78c5485 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 14 Nov 2022 19:55:37 -0800
Subject: [PATCH 107/130] Updated About page copy

---
 .../__snapshots__/howYouCanHelp.test.tsx.snap |  2 +-
 client/src/data/copy/about.tsx                | 30 ++++++++++----
 client/src/intl/en.json                       | 16 ++++++--
 client/src/pages/about.tsx                    |  9 ++--
 .../tests/__snapshots__/about.test.tsx.snap   | 41 ++++++++-----------
 5 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
index 9068bb06f..c2ad280c9 100644
--- a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
+++ b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
@@ -34,7 +34,7 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl
         .
       </li>
       <li>
-        Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email CEQ at: 
+        Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email: 
         <a
           class="usa-link"
           href="/en/methodology"
diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx
index e92b1631b..90511ba84 100644
--- a/client/src/data/copy/about.tsx
+++ b/client/src/data/copy/about.tsx
@@ -82,6 +82,14 @@ export const CONTENT = {
       link1: linkFn('https://lp.constantcontactpages.com/su/Vm8pCFj/spring', false, true),
     }}
   />,
+  PARA5:
+  <FormattedMessage
+    id={'about.page.paragraph.5'}
+    defaultMessage={`
+      A Spanish version of the site will be available in the near future.
+    `}
+    description={'Navigate to the About page. This is the paragraph 5'}
+  />,
   USE_DATA_PARA:
   <FormattedMessage
     id={'about.page.use.data.paragraph'}
@@ -93,11 +101,22 @@ export const CONTENT = {
       link1: linkFn(PAGES_ENDPOINTS.DOWNLOADS, true, false),
     }}
   />,
+  HOW_TO_USE_PARA1:
+  <FormattedMessage
+    id={'about.page.how.to.use.tool.para1'}
+    defaultMessage={`
+      The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.  The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaskan Native Villages.
+    `}
+    description={'Navigate to the About page. This is the paragraph 4'}
+    values={{
+      link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
+    }}
+  />,
   HOW_TO_USE_PARA3:
   <FormattedMessage
-    id={'about.page.use.data.paragraph'}
+    id={'about.page.how.to.use.para3'}
     defaultMessage={`
-    A community is considered to be disadvantaged if it meets the tool's <link1>methodology</link1>.
+      A community is considered to be disadvantaged if they are located within a census tract that meets the tool’s <link1>methodology</link1> or are on land within the boundaries of Federally Recognized Tribes.
     `}
     description={'Navigate to the About page. This is the paragraph 4'}
     values={{
@@ -114,11 +133,6 @@ export const HOW_TO_USE_TOOL = defineMessages({
     defaultMessage: 'How to use the tool',
     description: 'Navigate to the About page. This is the sub heading of How to use the tool',
   },
-  PARA1: {
-    id: 'about.page.how.to.use.tool.para1',
-    defaultMessage: 'The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tracts match the data that is currently available. The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaskan Native Villages.',
-    description: 'Navigate to the About page. This is the sub heading of How to use the tool paragraph1',
-  },
   PARA2: {
     id: 'about.page.how.to.use.tool.para2',
     defaultMessage: 'The tool ranks most of the burdens using percentiles. Percentiles show how much burden each tract experiences compared to other tracts. Certain burdens use percentages or a simple yes/no.',
@@ -220,7 +234,7 @@ export const HOW_YOU_CAN_HELP_LIST_ITEMS = {
   />,
   LIST_ITEM_4: <FormattedMessage
     id={'about.page.how.you.can.help.list.item.4'}
-    defaultMessage={`Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email CEQ at: <link1>Screeningtool-Support@omb.eop.gov</link1>`}
+    defaultMessage={`Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email: <link1>Screeningtool-Support@omb.eop.gov</link1>`}
     description={`Navigate to the about page. You will see How you can help list item 3`}
     values={{
       link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 36213a7cd..3cfe6e22f 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -3,9 +3,13 @@
     "defaultMessage": "Get involved",
     "description": "Navigate to the About page. This is the sub heading of page"
   },
+  "about.page.how.to.use.para3": {
+    "defaultMessage": "A community is considered to be disadvantaged if they are located within a census tract that meets the tool’s <link1>methodology</link1> or are on land within the boundaries of Federally Recognized Tribes.",
+    "description": "Navigate to the About page. This is the paragraph 4"
+  },
   "about.page.how.to.use.tool.para1": {
-    "defaultMessage": "The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tracts match the data that is currently available. The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaskan Native Villages.",
-    "description": "Navigate to the About page. This is the sub heading of How to use the tool paragraph1"
+    "defaultMessage": "The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries. The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaskan Native Villages.",
+    "description": "Navigate to the About page. This is the paragraph 4"
   },
   "about.page.how.to.use.tool.para2": {
     "defaultMessage": "The tool ranks most of the burdens using percentiles. Percentiles show how much burden each tract experiences compared to other tracts. Certain burdens use percentages or a simple yes/no.",
@@ -32,7 +36,7 @@
     "description": "Navigate to the about page. You will see How you can help list item 3"
   },
   "about.page.how.you.can.help.list.item.4": {
-    "defaultMessage": "Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email CEQ at: <link1>Screeningtool-Support@omb.eop.gov</link1>",
+    "defaultMessage": "Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email: <link1>Screeningtool-Support@omb.eop.gov</link1>",
     "description": "Navigate to the about page. You will see How you can help list item 3"
   },
   "about.page.how.you.can.help.para.1": {
@@ -75,6 +79,10 @@
     "defaultMessage": "CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}. <link1>Sign-up</link1> for updates from CEQ",
     "description": "Navigate to the About page. This is the paragraph 4"
   },
+  "about.page.paragraph.5": {
+    "defaultMessage": "A Spanish version of the site will be available in the near future.",
+    "description": "Navigate to the About page. This is the paragraph 5"
+  },
   "about.page.send.feedback.email.link": {
     "defaultMessage": "Contact",
     "description": "about page sub header text"
@@ -96,7 +104,7 @@
     "description": "Navigate to the About page. This is the sub heading of Using the data"
   },
   "about.page.use.data.paragraph": {
-    "defaultMessage": "A community is considered to be disadvantaged if it meets the tool's <link1>methodology</link1>.",
+    "defaultMessage": "The tool's data is available for <link1>download</link1>. This data can be used to filter by state or county.",
     "description": "Navigate to the About page. This is the paragraph 4"
   },
   "about.page.use.map.heading": {
diff --git a/client/src/pages/about.tsx b/client/src/pages/about.tsx
index a6cdf89da..ba7bb0933 100644
--- a/client/src/pages/about.tsx
+++ b/client/src/pages/about.tsx
@@ -57,16 +57,19 @@ const AboutPage = ({location}: IAboutPageProps) => {
               <p>
                 {ABOUT_COPY.CONTENT.PARA2}
               </p>
-              <div className={'j40-p-tag'}>
+              {/* <div className={'j40-p-tag'}>
                 {ABOUT_COPY.CONTENT.PARA3}
                 <ul>
                   <li> {ABOUT_COPY.CONTENT.LI1}</li>
                   <li> {ABOUT_COPY.CONTENT.LI2}</li>
                 </ul>
-              </div>
+              </div> */}
               <p>
                 {ABOUT_COPY.CONTENT.PARA4}
               </p>
+              <p>
+                {ABOUT_COPY.CONTENT.PARA5}
+              </p>
             </section>
           </Grid>
 
@@ -100,7 +103,7 @@ const AboutPage = ({location}: IAboutPageProps) => {
               {intl.formatMessage(ABOUT_COPY.HOW_TO_USE_TOOL.TITLE)}
             </h2>
             <p>
-              {intl.formatMessage(ABOUT_COPY.HOW_TO_USE_TOOL.PARA1)}
+              {ABOUT_COPY.CONTENT.HOW_TO_USE_PARA1}
             </p>
             <p>
               {intl.formatMessage(ABOUT_COPY.HOW_TO_USE_TOOL.PARA2)}
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index a79e44d25..f8553ab70 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -420,25 +420,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               . The Justice40 Initiative seeks to deliver 40% of the overall benefits of investments in climate, clean energy, and related areas to disadvantaged communities.
     
             </p>
-            <div
-              class="j40-p-tag"
-            >
-              
-      Federal agencies should also use the following:
-    
-              <ul>
-                <li>
-                   
-      Addendum to the Justice40 Initiative Interim Guidance on Using CEJST
-    
-                </li>
-                <li>
-                   
-      Instructions to Federal Agencies on Using the CEJST
-    
-                </li>
-              </ul>
-            </div>
             <p>
               
       CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version 1.0. 
@@ -454,6 +435,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                for updates from CEQ
     
             </p>
+            <p>
+              
+      A Spanish version of the site will be available in the near future.
+    
+            </p>
           </section>
         </div>
         <div
@@ -477,21 +463,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             How to use the tool
           </h2>
           <p>
-            The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tracts match the data that is currently available. The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaskan Native Villages.
+            
+      The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tract boundaries for 
+            <a
+              class="usa-link"
+              href="/en/methodology"
+            >
+              statistical areas
+            </a>
+             are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.  The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaskan Native Villages.
+    
           </p>
           <p>
             The tool ranks most of the burdens using percentiles. Percentiles show how much burden each tract experiences compared to other tracts. Certain burdens use percentages or a simple yes/no.
           </p>
           <p>
             
-    A community is considered to be disadvantaged if it meets the tool's 
+      A community is considered to be disadvantaged if they are located within a census tract that meets the tool’s 
             <a
               class="usa-link"
               href="/en/methodology"
             >
               methodology
             </a>
-            .
+             or are on land within the boundaries of Federally Recognized Tribes.
     
           </p>
         </div>
@@ -771,7 +766,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               .
             </li>
             <li>
-              Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email CEQ at: 
+              Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email: 
               <a
                 class="usa-link"
                 href="/en/methodology"

From 94ffdac7a4dd07994d5f573e7d8a43c9a2eeefc9 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 14 Nov 2022 20:17:24 -0800
Subject: [PATCH 108/130] Update FAQs copy

---
 client/src/data/copy/faqs.tsx                 | 26 +++++++-----
 client/src/intl/en.json                       | 18 ++++-----
 .../freqAskedQuestions.test.tsx.snap          | 40 ++++++++++++++-----
 3 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/client/src/data/copy/faqs.tsx b/client/src/data/copy/faqs.tsx
index c578bda8e..4c7d62827 100644
--- a/client/src/data/copy/faqs.tsx
+++ b/client/src/data/copy/faqs.tsx
@@ -321,12 +321,12 @@ export const FAQ_ANSWERS = {
   />,
   Q3_P1: <FormattedMessage
     id={ 'faqs.page.answers.Q3_P1'}
-    defaultMessage={ 'No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a specific census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.'}
+    defaultMessage={ 'No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.'}
     description={ 'Navigate to the FAQs page, this will be an answer, Q3_P1'}
   />,
   Q3_P2: <FormattedMessage
     id={ 'faqs.page.answers.Q3_P2'}
-    defaultMessage={ 'Although the CEJST does not use race in the methodology, it seeks to create a map that reflects the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.'}
+    defaultMessage={ 'Although the CEJST does not use race in its methodology, the tool creates a map that seeks to reflect the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.'}
     description={ 'Navigate to the FAQs page, this will be an answer, Q3_P2'}
   />,
   Q4_P1: <FormattedMessage
@@ -353,7 +353,7 @@ export const FAQ_ANSWERS = {
   Q5_P1: <FormattedMessage
     id={ 'faqs.page.answers.Q5_P1'}
     defaultMessage={`
-      To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, land within the boundaries of Federally Recognized tribes  are highlighted as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than census tracts. The boundaries of census tracts and the lands of Federally Recognized Tribes are different.
+      To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, land within the boundaries of Federally Recognized tribes are highlighted as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than census tracts. The boundaries of census tracts and the lands of Federally Recognized Tribes are different.
     `}
     description={ 'Navigate to the FAQs page, this will be an answer, Q5_P1'}
   />,
@@ -397,7 +397,7 @@ export const FAQ_ANSWERS = {
   />,
   Q7: <FormattedMessage
     id={ 'faqs.page.answers.Q7'}
-    defaultMessage={ `A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains land within the boundaries of Federally Recognized Tribes, then the parts of the tract that are within the land of Tribes are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”`}
+    defaultMessage={ `A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains land within the boundaries of Federally Recognized Tribes, then the parts of the tract that contain the land of Tribes are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q7'}
   />,
   Q8_P1: <FormattedMessage
@@ -417,7 +417,7 @@ export const FAQ_ANSWERS = {
   />,
   Q9_P2: <FormattedMessage
     id={ 'faqs.page.answers.Q9_P2'}
-    defaultMessage={ `The CEJST will play an important role in the Justice40 Initiative. It will help to provide a single definition of disadvantaged communities for programs included in the Justice40 Initiative. This definition applies to the whole government. Federal agencies will use this definition to direct Justice40 investment benefits in the following areas:`}
+    defaultMessage={ `Federal agencies will use this definition to direct Justice40 investment benefits in the following areas:`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q9_P2'}
   />,
   Q9_P2_1: <FormattedMessage
@@ -457,7 +457,7 @@ export const FAQ_ANSWERS = {
   />,
   Q10: <FormattedMessage
     id={ 'faqs.page.answers.Q10'}
-    defaultMessage={ `Recent historic legislation—such as the Bipartisan Infrastructure Law and the Inflation Reduction Act—have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the CEJST to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.`}
+    defaultMessage={ `Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q10'}
   />,
   Q11: <FormattedMessage
@@ -467,7 +467,7 @@ export const FAQ_ANSWERS = {
   />,
   Q12_P1: <FormattedMessage
     id={ 'faqs.page.answers.Q12_P1'}
-    defaultMessage={ `The CEJST uses lessons learned from the EPA's EJScreen. EJScreen is an environmental justice mapping and screening tool. EJScreen shows environmental and demographic information and combines that information together into indices. The EPA, Federal agencies, and state and local governments will continue to use EJScreen to understand and analyze for environmental and EJ issues. For example, EPA uses <link1>EJScreen</link1> to:`}
+    defaultMessage={ `The CEJST uses lessons learned from the EPA's EJScreen. EJScreen is an environmental justice mapping and screening tool. EJScreen shows environmental and demographic information and combines that information together into indices. The EPA, Federal agencies, and state and local governments will continue to use EJScreen to understand and analyze for environmental and EJ issues. For example, EPA uses <link1> EJScreen </link1> to:`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q12_P1'}
     values={{
       link1: linkFn(EJSCREEN, false, true),
@@ -550,13 +550,19 @@ export const FAQ_ANSWERS = {
   />,
   Q15_P1_2: <FormattedMessage
     id={ 'faqs.page.answers.Q15_P1_2'}
-    defaultMessage={ `The public can also submit data sources or ideas for consideration.`}
+    defaultMessage={ `The public can also submit <link1>data sources</link1> or ideas for consideration.`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q15_P1_2'}
+    values={{
+      link1: linkFn('https://www.surveymonkey.com/r/6G9TQJ8', false, true),
+    }}
   />,
   Q15_P1_3: <FormattedMessage
     id={ 'faqs.page.answers.Q15_P1_3'}
-    defaultMessage={ `The public may also take a short survey to help improve the experience of using the tool.`}
+    defaultMessage={ `The public may also take a <link1>short survey</link1> to help improve the experience of using the tool.`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q15_P1_3'}
+    values={{
+      link1: linkFn('https://www.surveymonkey.com/r/5LZ7MNB', false, true),
+    }}
   />,
   Q15_P1_4: <FormattedMessage
     id={ 'faqs.page.answers.Q15_P1_4'}
@@ -579,7 +585,7 @@ export const FAQ_ANSWERS = {
   />,
   Q17_P1: <FormattedMessage
     id={ 'faqs.page.answers.Q17_P1'}
-    defaultMessage={ `The tool is now considered official because Federal agencies can now use version 1.0 of the Climate and Economic Justice Screening Tool (CEJST) to help identify disadvantaged communities. The 1.0 version was released in MM, YYYY. The tool is no longer in beta.`}
+    defaultMessage={ `The tool is now considered official because Federal agencies can now use version 1.0 of the Climate and Economic Justice Screening Tool (CEJST) to help identify disadvantaged communities. The 1.0 version was released in November, 2022. The tool is no longer in beta.`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q17_P1'}
   />,
   Q17_P2: <FormattedMessage
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 3cfe6e22f..ae1c3149c 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1528,7 +1528,7 @@
     "description": "Navigate to the FAQs page, this will be Q9"
   },
   "faqs.page.answers.Q10": {
-    "defaultMessage": "Recent historic legislation—such as the Bipartisan Infrastructure Law and the Inflation Reduction Act—have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the CEJST to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.",
+    "defaultMessage": "Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.",
     "description": "Navigate to the FAQs page, this will be an answer, Q10"
   },
   "faqs.page.answers.Q11": {
@@ -1536,7 +1536,7 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q11"
   },
   "faqs.page.answers.Q12_P1": {
-    "defaultMessage": "The CEJST uses lessons learned from the EPA's EJScreen. EJScreen is an environmental justice mapping and screening tool. EJScreen shows environmental and demographic information and combines that information together into indices. The EPA, Federal agencies, and state and local governments will continue to use EJScreen to understand and analyze for environmental and EJ issues. For example, EPA uses <link1>EJScreen</link1> to:",
+    "defaultMessage": "The CEJST uses lessons learned from the EPA's EJScreen. EJScreen is an environmental justice mapping and screening tool. EJScreen shows environmental and demographic information and combines that information together into indices. The EPA, Federal agencies, and state and local governments will continue to use EJScreen to understand and analyze for environmental and EJ issues. For example, EPA uses <link1> EJScreen </link1> to:",
     "description": "Navigate to the FAQs page, this will be an answer, Q12_P1"
   },
   "faqs.page.answers.Q12_P1_1": {
@@ -1600,11 +1600,11 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q15_P1_1"
   },
   "faqs.page.answers.Q15_P1_2": {
-    "defaultMessage": "The public can also submit data sources or ideas for consideration.",
+    "defaultMessage": "The public can also submit <link1>data sources</link1> or ideas for consideration.",
     "description": "Navigate to the FAQs page, this will be an answer, Q15_P1_2"
   },
   "faqs.page.answers.Q15_P1_3": {
-    "defaultMessage": "The public may also take a short survey to help improve the experience of using the tool.",
+    "defaultMessage": "The public may also take a <link1>short survey</link1> to help improve the experience of using the tool.",
     "description": "Navigate to the FAQs page, this will be an answer, Q15_P1_3"
   },
   "faqs.page.answers.Q15_P1_4": {
@@ -1616,7 +1616,7 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q16"
   },
   "faqs.page.answers.Q17_P1": {
-    "defaultMessage": "The tool is now considered official because Federal agencies can now use version 1.0 of the Climate and Economic Justice Screening Tool (CEJST) to help identify disadvantaged communities. The 1.0 version was released in MM, YYYY. The tool is no longer in beta.",
+    "defaultMessage": "The tool is now considered official because Federal agencies can now use version 1.0 of the Climate and Economic Justice Screening Tool (CEJST) to help identify disadvantaged communities. The 1.0 version was released in November, 2022. The tool is no longer in beta.",
     "description": "Navigate to the FAQs page, this will be an answer, Q17_P1"
   },
   "faqs.page.answers.Q17_P2": {
@@ -1688,11 +1688,11 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q2_P4"
   },
   "faqs.page.answers.Q3_P1": {
-    "defaultMessage": "No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a specific census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.",
+    "defaultMessage": "No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.",
     "description": "Navigate to the FAQs page, this will be an answer, Q3_P1"
   },
   "faqs.page.answers.Q3_P2": {
-    "defaultMessage": "Although the CEJST does not use race in the methodology, it seeks to create a map that reflects the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.",
+    "defaultMessage": "Although the CEJST does not use race in its methodology, the tool creates a map that seeks to reflect the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.",
     "description": "Navigate to the FAQs page, this will be an answer, Q3_P2"
   },
   "faqs.page.answers.Q4_P1": {
@@ -1736,7 +1736,7 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q6_P4"
   },
   "faqs.page.answers.Q7": {
-    "defaultMessage": "A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains land within the boundaries of Federally Recognized Tribes, then the parts of the tract that are within the land of Tribes are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”",
+    "defaultMessage": "A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains land within the boundaries of Federally Recognized Tribes, then the parts of the tract that contain the land of Tribes are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”",
     "description": "Navigate to the FAQs page, this will be an answer, Q7"
   },
   "faqs.page.answers.Q8_P1": {
@@ -1752,7 +1752,7 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q9_P1"
   },
   "faqs.page.answers.Q9_P2": {
-    "defaultMessage": "The CEJST will play an important role in the Justice40 Initiative. It will help to provide a single definition of disadvantaged communities for programs included in the Justice40 Initiative. This definition applies to the whole government. Federal agencies will use this definition to direct Justice40 investment benefits in the following areas:",
+    "defaultMessage": "Federal agencies will use this definition to direct Justice40 investment benefits in the following areas:",
     "description": "Navigate to the FAQs page, this will be an answer, Q9_P2"
   },
   "faqs.page.answers.Q9_P2_1": {
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index db8a9e611..0d90fb697 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -525,10 +525,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-2"
               >
                 <p>
-                  No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a specific census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.
+                  No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.
                 </p>
                 <p>
-                  Although the CEJST does not use race in the methodology, it seeks to create a map that reflects the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.
+                  Although the CEJST does not use race in its methodology, the tool creates a map that seeks to reflect the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.
                 </p>
               </div>
               <h2
@@ -587,7 +587,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 <p>
                   
-      To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, land within the boundaries of Federally Recognized tribes  are highlighted as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than census tracts. The boundaries of census tracts and the lands of Federally Recognized Tribes are different.
+      To respect Tribal sovereignty and self-government and to fulfill Federal trust and treaty responsibilities to Tribal Nations, land within the boundaries of Federally Recognized tribes are highlighted as disadvantaged on the map. Alaska Native Villages are included as point locations that are smaller than census tracts. The boundaries of census tracts and the lands of Federally Recognized Tribes are different.
     
                 </p>
                 <p>
@@ -716,7 +716,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-6"
               >
                 <p>
-                  A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains land within the boundaries of Federally Recognized Tribes, then the parts of the tract that are within the land of Tribes are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”
+                  A census tract that does not meet any of the burden thresholds in the tool is usually not considered to be a disadvantaged community. However, if such a census tract contains land within the boundaries of Federally Recognized Tribes, then the parts of the tract that contain the land of Tribes are considered disadvantaged. The tool will display this type of census tract as “partially disadvantaged.”
                 </p>
               </div>
               <h2
@@ -768,7 +768,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   Federal agencies will use the tool to help identify disadvantaged communities that will benefit from programs included in the Justice40 Initiative. The Justice40 Initiative seeks to deliver 40% of the overall benefits of certain investments to disadvantaged communities.
                 </p>
                 <p>
-                  The CEJST will play an important role in the Justice40 Initiative. It will help to provide a single definition of disadvantaged communities for programs included in the Justice40 Initiative. This definition applies to the whole government. Federal agencies will use this definition to direct Justice40 investment benefits in the following areas:
+                  Federal agencies will use this definition to direct Justice40 investment benefits in the following areas:
                 </p>
                 <ul>
                   <li>
@@ -814,7 +814,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-9"
               >
                 <p>
-                  Recent historic legislation—such as the Bipartisan Infrastructure Law and the Inflation Reduction Act—have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the CEJST to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.
+                  Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.
                 </p>
               </div>
               <h2
@@ -868,7 +868,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     rel="noreferrer"
                     target="_blank"
                   >
-                    EJScreen
+                     EJScreen 
                   </a>
                    to:
                 </p>
@@ -983,10 +983,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     The public can find census tracts that they are familiar with and send feedback about those tracts. That feedback is used to “ground truth” the tool. This helps the tool to better reflect the realities for communities.
                   </li>
                   <li>
-                    The public can also submit data sources or ideas for consideration.
+                    The public can also submit 
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.surveymonkey.com/r/6G9TQJ8"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      data sources
+                    </a>
+                     or ideas for consideration.
                   </li>
                   <li>
-                    The public may also take a short survey to help improve the experience of using the tool.
+                    The public may also take a 
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.surveymonkey.com/r/5LZ7MNB"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      short survey
+                    </a>
+                     to help improve the experience of using the tool.
                   </li>
                   <li>
                     The public can also email 
@@ -1045,7 +1065,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-16"
               >
                 <p>
-                  The tool is now considered official because Federal agencies can now use version 1.0 of the Climate and Economic Justice Screening Tool (CEJST) to help identify disadvantaged communities. The 1.0 version was released in MM, YYYY. The tool is no longer in beta.
+                  The tool is now considered official because Federal agencies can now use version 1.0 of the Climate and Economic Justice Screening Tool (CEJST) to help identify disadvantaged communities. The 1.0 version was released in November, 2022. The tool is no longer in beta.
                 </p>
                 <p>
                   The tool will be improved over time. The Council on Environmental Quality (CEQ) will update the tool each year based on public feedback, research, and the availability of new data.

From 509c7efa339da93ff41c86f63f40f068ca7c427f Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 14 Nov 2022 20:26:40 -0800
Subject: [PATCH 109/130] Update New tags to bold

- closes
---
 client/src/components/DatasetCard/datasetCard.module.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/DatasetCard/datasetCard.module.scss b/client/src/components/DatasetCard/datasetCard.module.scss
index 0b96f5493..292c4e7e0 100644
--- a/client/src/components/DatasetCard/datasetCard.module.scss
+++ b/client/src/components/DatasetCard/datasetCard.module.scss
@@ -70,4 +70,5 @@
 .newTag {
   @include u-bg('yellow-20v');
   @include u-text('blue-70v');
+  font-weight: bolder;
 }
\ No newline at end of file

From 191dd0b3aa1866ef04741dc4e646b8ea047ee48d Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 14 Nov 2022 20:43:26 -0800
Subject: [PATCH 110/130] Add banner

- closes #2019
---
 client/src/components/J40Header/J40Header.tsx | 16 ++++++++-----
 .../__snapshots__/J40Header.test.tsx.snap     | 24 +++++++++++++++++++
 client/src/data/copy/common.tsx               |  7 +++---
 client/src/intl/en.json                       |  6 ++---
 .../tests/__snapshots__/about.test.tsx.snap   | 24 +++++++++++++++++++
 .../tests/__snapshots__/contact.test.tsx.snap | 24 +++++++++++++++++++
 .../__snapshots__/downloads.test.tsx.snap     | 24 +++++++++++++++++++
 .../freqAskedQuestions.test.tsx.snap          | 24 +++++++++++++++++++
 .../__snapshots__/methodology.test.tsx.snap   | 24 +++++++++++++++++++
 .../__snapshots__/publicEng.test.tsx.snap     | 24 +++++++++++++++++++
 .../techSupportDoc.test.tsx.snap              | 24 +++++++++++++++++++
 11 files changed, 208 insertions(+), 13 deletions(-)

diff --git a/client/src/components/J40Header/J40Header.tsx b/client/src/components/J40Header/J40Header.tsx
index 4c356e24a..9399eeb3f 100644
--- a/client/src/components/J40Header/J40Header.tsx
+++ b/client/src/components/J40Header/J40Header.tsx
@@ -1,6 +1,7 @@
 import React, {useEffect, useState} from 'react';
 import {Link, useIntl} from 'gatsby-plugin-intl';
 import {
+  Alert,
   Header,
   NavMenuButton,
   PrimaryNav,
@@ -24,6 +25,7 @@ import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../../data/constants';
 interface IJ40Header {
   location: Location
 }
+
 /**
  * The J40Header component will control how the header looks for both mobile and desktop
  *
@@ -298,22 +300,24 @@ const J40Header = ({location}:IJ40Header) => {
       </J40MainGridContainer>
 
       {/* Alert */}
-      {/* {<J40MainGridContainer>
-        <Alert
+      {<J40MainGridContainer>
+        {/* <Alert
           className={styles.alert}
           type="info"
-          heading={intl.formatMessage(COMMON_COPY.ALERTS.ALERT_2_TITLE.TITLE)}>
+          heading={intl.formatMessage(COMMON_COPY.ALERTS.ALERT_2_TITLE.TITLE)}
+          headingLevel={'h1'}>
           {COMMON_COPY.ALERTS.ALERT_2_DESCRIPTION}
-        </Alert>
+        </Alert> */}
 
         <Alert
           className={styles.alert}
           type="info"
-          heading={intl.formatMessage(COMMON_COPY.ALERTS.ALERT_1_TITLE.TITLE)}>
+          heading={intl.formatMessage(COMMON_COPY.ALERTS.ALERT_1_TITLE.TITLE)}
+          headingLevel={'h1'}>
           {COMMON_COPY.ALERTS.ALERT_1_DESCRIPTION}
         </Alert>
       </J40MainGridContainer>
-      } */}
+      }
     </Header>
   );
 };
diff --git a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
index 19b6812de..cb40b078d 100644
--- a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
+++ b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
@@ -342,6 +342,30 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="grid-container-desktop-lg"
+      data-testid="gridContainer"
+    >
+      <div
+        class="usa-alert usa-alert--info"
+        data-testid="alert"
+      >
+        <div
+          class="usa-alert__body"
+        >
+          <h1
+            class="usa-alert__heading"
+          >
+            Version 1.0 of the tool is now available
+          </h1>
+          <p
+            class="usa-alert__text"
+          >
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+          </p>
+        </div>
+      </div>
+    </div>
   </header>
 </DocumentFragment>
 `;
diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx
index a27222fb3..3c61522dc 100644
--- a/client/src/data/copy/common.tsx
+++ b/client/src/data/copy/common.tsx
@@ -62,18 +62,17 @@ export const RFI_EXPIRATION_DATE= new Date(2022, 4, 25, 11, 59, 59); // May 25
 export const ALERTS = {
   ALERT_1_TITLE: defineMessages({
     TITLE: {
-      id: 'common.pages.alerts.public_comment_period.title',
-      defaultMessage: 'Public comment period extended',
+      id: 'common.pages.alerts.version.1.release..title',
+      defaultMessage: 'Version 1.0 of the tool is now available',
       description: 'Alert title that appears on landing page.',
     },
   }),
   EXPIRATION_DATE: RFI_EXPIRATION_DATE,
   ALERT_1_DESCRIPTION: <FormattedMessage
     id={'common.pages.alerts.public_comment_period.description'}
-    defaultMessage={`The public comment period for <link1>sending feedback</link1> via the Request for Information has been extended to {expDate1}.`}
+    defaultMessage={`The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.`}
     description={`Alert body that appears on landing page.`}
     values={{
-      link1: linkFn('https://www.federalregister.gov/documents/2022/04/25/2022-08774/climate-and-economic-justice-screening-tool-beta-version', false, true),
       expDate1: <FormattedDate
         value={RFI_EXPIRATION_DATE}
         year="numeric"
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index ae1c3149c..02d4b53a1 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -128,11 +128,11 @@
     "description": "Navigate to any page. This the title of the alert that informs the user that new census tract information is available"
   },
   "common.pages.alerts.public_comment_period.description": {
-    "defaultMessage": "The public comment period for <link1>sending feedback</link1> via the Request for Information has been extended to {expDate1}.",
+    "defaultMessage": "The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.",
     "description": "Alert body that appears on landing page."
   },
-  "common.pages.alerts.public_comment_period.title": {
-    "defaultMessage": "Public comment period extended",
+  "common.pages.alerts.version.1.release..title": {
+    "defaultMessage": "Version 1.0 of the tool is now available",
     "description": "Alert title that appears on landing page."
   },
   "common.pages.console.error.stage.url": {
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index f8553ab70..8a597039e 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -342,6 +342,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         </div>
       </div>
     </div>
+    <div
+      class="grid-container-desktop-lg"
+      data-testid="gridContainer"
+    >
+      <div
+        class="usa-alert usa-alert--info"
+        data-testid="alert"
+      >
+        <div
+          class="usa-alert__body"
+        >
+          <h1
+            class="usa-alert__heading"
+          >
+            Version 1.0 of the tool is now available
+          </h1>
+          <p
+            class="usa-alert__text"
+          >
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+          </p>
+        </div>
+      </div>
+    </div>
   </header>
   <main
     id="main-content"
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index de3f4882b..2149475cd 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -342,6 +342,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         </div>
       </div>
     </div>
+    <div
+      class="grid-container-desktop-lg"
+      data-testid="gridContainer"
+    >
+      <div
+        class="usa-alert usa-alert--info"
+        data-testid="alert"
+      >
+        <div
+          class="usa-alert__body"
+        >
+          <h1
+            class="usa-alert__heading"
+          >
+            Version 1.0 of the tool is now available
+          </h1>
+          <p
+            class="usa-alert__text"
+          >
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+          </p>
+        </div>
+      </div>
+    </div>
   </header>
   <main
     id="main-content"
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index 7579e4c22..db0f0fb5a 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -342,6 +342,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         </div>
       </div>
     </div>
+    <div
+      class="grid-container-desktop-lg"
+      data-testid="gridContainer"
+    >
+      <div
+        class="usa-alert usa-alert--info"
+        data-testid="alert"
+      >
+        <div
+          class="usa-alert__body"
+        >
+          <h1
+            class="usa-alert__heading"
+          >
+            Version 1.0 of the tool is now available
+          </h1>
+          <p
+            class="usa-alert__text"
+          >
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+          </p>
+        </div>
+      </div>
+    </div>
   </header>
   <main
     id="main-content"
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 0d90fb697..094d99c0a 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -342,6 +342,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         </div>
       </div>
     </div>
+    <div
+      class="grid-container-desktop-lg"
+      data-testid="gridContainer"
+    >
+      <div
+        class="usa-alert usa-alert--info"
+        data-testid="alert"
+      >
+        <div
+          class="usa-alert__body"
+        >
+          <h1
+            class="usa-alert__heading"
+          >
+            Version 1.0 of the tool is now available
+          </h1>
+          <p
+            class="usa-alert__text"
+          >
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+          </p>
+        </div>
+      </div>
+    </div>
   </header>
   <main
     id="main-content"
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 1d2338706..c336fd188 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -342,6 +342,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         </div>
       </div>
     </div>
+    <div
+      class="grid-container-desktop-lg"
+      data-testid="gridContainer"
+    >
+      <div
+        class="usa-alert usa-alert--info"
+        data-testid="alert"
+      >
+        <div
+          class="usa-alert__body"
+        >
+          <h1
+            class="usa-alert__heading"
+          >
+            Version 1.0 of the tool is now available
+          </h1>
+          <p
+            class="usa-alert__text"
+          >
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+          </p>
+        </div>
+      </div>
+    </div>
   </header>
   <main
     id="main-content"
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index 3ec17e765..b2f45a5ac 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -342,6 +342,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         </div>
       </div>
     </div>
+    <div
+      class="grid-container-desktop-lg"
+      data-testid="gridContainer"
+    >
+      <div
+        class="usa-alert usa-alert--info"
+        data-testid="alert"
+      >
+        <div
+          class="usa-alert__body"
+        >
+          <h1
+            class="usa-alert__heading"
+          >
+            Version 1.0 of the tool is now available
+          </h1>
+          <p
+            class="usa-alert__text"
+          >
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+          </p>
+        </div>
+      </div>
+    </div>
   </header>
   <main
     id="main-content"
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index 9dd5f105e..b4cd17445 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -342,6 +342,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         </div>
       </div>
     </div>
+    <div
+      class="grid-container-desktop-lg"
+      data-testid="gridContainer"
+    >
+      <div
+        class="usa-alert usa-alert--info"
+        data-testid="alert"
+      >
+        <div
+          class="usa-alert__body"
+        >
+          <h1
+            class="usa-alert__heading"
+          >
+            Version 1.0 of the tool is now available
+          </h1>
+          <p
+            class="usa-alert__text"
+          >
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+          </p>
+        </div>
+      </div>
+    </div>
   </header>
   <main
     id="main-content"

From c8df381f66522ece2d000fa38ac4884af1bd4515 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 15 Nov 2022 17:33:23 -0800
Subject: [PATCH 111/130] Updated top of downloads page

- update change log copy
---
 .../__snapshots__/BetaBanner.test.tsx.snap    |   2 +-
 .../__snapshots__/J40Header.test.tsx.snap     |   4 +-
 .../ReleaseUpdate/ReleaseUpdate.tsx           |  19 +-
 .../__snapshots__/ReleaseUpdate.test.tsx.snap | 183 +++--------------
 client/src/data/copy/common.tsx               |  12 +-
 client/src/data/copy/downloads.tsx            |  36 ++--
 client/src/intl/en.json                       |  30 +--
 .../tests/__snapshots__/about.test.tsx.snap   |   4 +-
 .../tests/__snapshots__/contact.test.tsx.snap |   4 +-
 .../__snapshots__/downloads.test.tsx.snap     | 187 +++---------------
 .../freqAskedQuestions.test.tsx.snap          |   4 +-
 .../__snapshots__/methodology.test.tsx.snap   |   4 +-
 .../__snapshots__/publicEng.test.tsx.snap     |   4 +-
 .../techSupportDoc.test.tsx.snap              |   4 +-
 14 files changed, 119 insertions(+), 378 deletions(-)

diff --git a/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap b/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
index 2db53c031..bad30ff84 100644
--- a/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
+++ b/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`rendering of the BetaBanner checks if component renders 1`] = `
       <strong>
         This site has been updated.
       </strong>
-       The current version of the site is 1.0 that was released on Oct 25, 2022
+       The current version of the site is 1.0 that was released on Nov 22, 2022.
     </div>
   </div>
 </DocumentFragment>
diff --git a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
index cb40b078d..539fa053f 100644
--- a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
+++ b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 22, 2022.
       </div>
     </div>
     <div
@@ -361,7 +361,7 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
           <p
             class="usa-alert__text"
           >
-            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on 11/22/2022. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
           </p>
         </div>
       </div>
diff --git a/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx b/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx
index b93d8370c..5c465bf6b 100644
--- a/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx
+++ b/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx
@@ -97,8 +97,9 @@ const ReleaseUpdate = ({}: IReleaseUpdateProps) => {
                 </ul>
                 <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_2}</li>
                 <ul>
-                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_2_1}</li>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_1_3}</li>
                   <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_2_2}</li>
+                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_2_1}</li>
                 </ul>
                 <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B2_3}</li>
                 <ul>
@@ -133,7 +134,7 @@ const ReleaseUpdate = ({}: IReleaseUpdateProps) => {
                 <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1}</li>
                 <ul>
                   <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_1}</li>
-                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2}</li>
+                  {/* <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2}</li>
                   <ul>
                     <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_1}</li>
                     <ul>
@@ -146,13 +147,13 @@ const ReleaseUpdate = ({}: IReleaseUpdateProps) => {
                       <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_3}</li>
                       <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_4}</li>
                     </ul>
-                  </ul>
+                  </ul> */}
                 </ul>
 
                 <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_2}</li>
                 <ul>
                   <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_2_1}</li>
-                  <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2}</li>
+                  {/* <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2}</li>
                   <ul>
                     <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_1}</li>
                     <ul>
@@ -165,10 +166,10 @@ const ReleaseUpdate = ({}: IReleaseUpdateProps) => {
                       <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_3}</li>
                       <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_4}</li>
                     </ul>
-                  </ul>
+                  </ul> */}
                 </ul>
 
-                <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_3}</li>
+                {/* <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_3}</li>
                 <ul>
                   <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2}</li>
                   <ul>
@@ -197,7 +198,7 @@ const ReleaseUpdate = ({}: IReleaseUpdateProps) => {
                       <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_2_4}</li>
                     </ul>
                   </ul>
-                </ul>
+                </ul> */}
 
                 <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_5}</li>
                 <ul>
@@ -214,7 +215,7 @@ const ReleaseUpdate = ({}: IReleaseUpdateProps) => {
                 </ul>
               </ul>
 
-              <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B7}</li>
+              {/* <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B7}</li>
               <ul>
                 <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B6_1_2_1}</li>
                 <ul>
@@ -230,7 +231,7 @@ const ReleaseUpdate = ({}: IReleaseUpdateProps) => {
                 <ul>
                   <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B7_3_1}</li>
                 </ul>
-              </ul>
+              </ul> */}
 
               <li>{DOWNLOAD_COPY.RELEASE_1_0.SECTION1_B8}</li>
               <ul>
diff --git a/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
index 85d6d0391..d84d4ec7f 100644
--- a/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
+++ b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap
@@ -12,7 +12,7 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
         id="releaseUpdate-header"
         tabindex="0"
       >
-        change log
+        release notes
       </a>
       <img
         alt="expand icon"
@@ -26,7 +26,7 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
     >
       <div>
         <div>
-          Release update - Oct 25, 2022
+          Version 1.0 Release update - Nov 22, 2022
         </div>
         <div>
           New & improved
@@ -34,7 +34,9 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
         <div>
           <ul>
             <li>
-              Added Federally Recognized Tribal Lands and Alaska Native Villages data from the Bureau of Indian Affairs at the Department of the Interior to the tool and map
+              Added lands within the boundaries of Federally Recognized Tribes and 
+    locations of Alaska Native Villages using data from the Bureau of Indian
+    Affairs at the U.S. Department of the Interior
             </li>
             <ul>
               <li>
@@ -56,11 +58,14 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
               </li>
               <ul>
                 <li>
-                  Lack of plumbing
+                  Historic underinvestment due to redlining
                 </li>
                 <li>
                   Lack of green space
                 </li>
+                <li>
+                  Lack of plumbing
+                </li>
               </ul>
               <li>
                 Legacy pollution
@@ -91,7 +96,9 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
               </ul>
             </ul>
             <li>
-              Added an adjacency indicator to methodology to include low income communities that had been completely surrounded by other disadvantaged communities, but which had just missed the thresholds in the beta version.
+              Included communities that are completely surrounded by other 
+    disadvantaged communities and that meet an adjusted low income 
+    threshold
             </li>
             <li>
               Made technical changes to enhance accuracy of the tool
@@ -101,10 +108,12 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
                 Removed income data for students enrolled in higher education in the low income indicator
               </li>
               <li>
-                Imputed income for census tracts missing that data that have a population greater than zero
+                Imputed income for census tracts missing income data
               </li>
               <li>
-                Used transportation barriers and population loss data indicators only for census tracts with populations of 20 or more
+                Used transportation barriers and expected population loss rate 
+    data burdens only for census tracts with populations of 20 or 
+    more to exclude areas such as airports
               </li>
             </ul>
             <li>
@@ -118,7 +127,7 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
                 Improved the design of the map side panel
               </li>
               <li>
-                Updated the site copy of the website and associated Spanish translations
+                Updated the site copy of the website
               </li>
             </ul>
             <li>
@@ -132,36 +141,6 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
                 <li>
                   Included data from 2010 decennial census for US Virgin Islands
                 </li>
-                <li>
-                  New data from EJScreen 2.1
-                </li>
-                <ul>
-                  <li>
-                    Sustainable Housing:
-                  </li>
-                  <ul>
-                    <li>
-                      Lead paint
-                    </li>
-                  </ul>
-                  <li>
-                    Legacy pollution:
-                  </li>
-                  <ul>
-                    <li>
-                      Proximity to Superfund (National Priorities List (NPL)) sites
-                    </li>
-                    <li>
-                      Proximity to Risk Management Plan (RMP) facilities
-                    </li>
-                    <li>
-                      Proximity to hazardous waste facilities
-                    </li>
-                    <li>
-                      Leaking underground storage tanks
-                    </li>
-                  </ul>
-                </ul>
               </ul>
               <li>
                 Guam
@@ -170,91 +149,6 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
                 <li>
                   Included data from 2010 decennial census for Guam
                 </li>
-                <li>
-                  New data from EJScreen 2.1
-                </li>
-                <ul>
-                  <li>
-                    Sustainable Housing:
-                  </li>
-                  <ul>
-                    <li>
-                      Lead paint
-                    </li>
-                  </ul>
-                  <li>
-                    Legacy pollution:
-                  </li>
-                  <ul>
-                    <li>
-                      Proximity to Superfund (National Priorities List (NPL)) sites
-                    </li>
-                    <li>
-                      Proximity to Risk Management Plan (RMP) facilities
-                    </li>
-                    <li>
-                      Proximity to hazardous waste facilities
-                    </li>
-                    <li>
-                      Leaking underground storage tanks
-                    </li>
-                  </ul>
-                </ul>
-              </ul>
-              <li>
-                Samoa
-              </li>
-              <ul>
-                <li>
-                  New data from EJScreen 2.1
-                </li>
-                <ul>
-                  <li>
-                    Sustainable Housing:
-                  </li>
-                  <ul>
-                    <li>
-                      Lead paint
-                    </li>
-                  </ul>
-                  <li>
-                    Legacy pollution:
-                  </li>
-                  <ul>
-                    <li>
-                      Proximity to Risk Management Plan (RMP) facilities
-                    </li>
-                    <li>
-                      Leaking underground storage tanks
-                    </li>
-                  </ul>
-                </ul>
-              </ul>
-              <li>
-                Marianna Islands
-              </li>
-              <ul>
-                <li>
-                  New data from EJScreen 2.1
-                </li>
-                <ul>
-                  <li>
-                    Sustainable Housing:
-                  </li>
-                  <ul>
-                    <li>
-                      Lead paint
-                    </li>
-                  </ul>
-                  <li>
-                    Legacy pollution:
-                  </li>
-                  <ul>
-                    <li>
-                      Leaking underground storage tanks
-                    </li>
-                  </ul>
-                </ul>
               </ul>
               <li>
                 Puerto Rico
@@ -283,46 +177,11 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
                     Proximity to Superfund (National Priorities List (NPL)) sites
                   </li>
                   <li>
-                    Proximity to Risk Management Plan (RMP) facilities
+                    Proximity to Risk Management Plan (RMP) sites
                   </li>
                 </ul>
               </ul>
             </ul>
-            <li>
-              Updated data from EJScreen 2.1 across the entire tool:
-            </li>
-            <ul>
-              <li>
-                Sustainable Housing:
-              </li>
-              <ul>
-                <li>
-                  Lead paint - 2016-2020
-                </li>
-              </ul>
-              <li>
-                Legacy pollution:
-              </li>
-              <ul>
-                <li>
-                  Proximity to Superfund (National Priorities List (NPL)) sites - 2022
-                </li>
-                <li>
-                  Proximity to Risk Management Plans (RMP) facilities - 2022
-                </li>
-                <li>
-                  Proximity to hazardous waste facilities - 2022
-                </li>
-              </ul>
-              <li>
-                Water and wastewater
-              </li>
-              <ul>
-                <li>
-                  Leaking underground storage tanks - 2022
-                </li>
-              </ul>
-            </ul>
             <li>
               Enhanced the technical files:
             </li>
@@ -331,7 +190,8 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
                 Added all new data indicators and demographics to .xls, .csv, and shapefiles
               </li>
               <li>
-                Added versions page to house beta version of download files
+                Added previous versions page to access the beta version’s 
+    download files
               </li>
               <li>
                 Updated codebook
@@ -371,7 +231,8 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
               Bug fix: loaded missing life expectancy data for Maine and Wisconsin
             </li>
             <li>
-              Bug fix: Census tracts that have 0 land should not be included on the map
+              Bug fix: Census tracts that are 100% water should not be 
+    included on the map
             </li>
           </ul>
         </div>
diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx
index 3c61522dc..36118a650 100644
--- a/client/src/data/copy/common.tsx
+++ b/client/src/data/copy/common.tsx
@@ -28,14 +28,14 @@ export const linkFn = (to:string | IDefineMessage, isInternal:boolean, isOpenNew
 
 export const FEEDBACK_EMAIL = 'Screeningtool-Support@omb.eop.gov';
 
-export const METH_1_0_RELEASE_DATE = new Date(2022, 9, 25, 11, 59, 59); // Oct 25 2022
+export const METH_1_0_RELEASE_DATE = new Date(2022, 10, 22, 11, 59, 59); // Nov 22 2022
 export const METH_BETA_RELEASE_DATE = new Date(2022, 1, 18, 11, 59, 59); // Feb 18 2022
 
 
 // Beta Banner
 export const BETA_BANNER_CONTENT = <FormattedMessage
   id={'common.pages.alerts.banner.beta.content'}
-  defaultMessage={`<bold1>This site has been updated.</bold1> The current version of the site is 1.0 that was released on {relDate}`}
+  defaultMessage={`<bold1>This site has been updated.</bold1> The current version of the site is 1.0 that was released on {relDate}.`}
   description={`Alert body that appears on landing page.`}
   values={{
     bold1: boldFn,
@@ -70,13 +70,13 @@ export const ALERTS = {
   EXPIRATION_DATE: RFI_EXPIRATION_DATE,
   ALERT_1_DESCRIPTION: <FormattedMessage
     id={'common.pages.alerts.public_comment_period.description'}
-    defaultMessage={`The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.`}
+    defaultMessage={`The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on {ver1RelDate}. For more information about the improvements to the tool, CEQ’s press release will be coming soon.`}
     description={`Alert body that appears on landing page.`}
     values={{
-      expDate1: <FormattedDate
-        value={RFI_EXPIRATION_DATE}
+      ver1RelDate: <FormattedDate
+        value={METH_1_0_RELEASE_DATE}
         year="numeric"
-        month="short"
+        month="numeric"
         day="numeric"
       />,
     }}
diff --git a/client/src/data/copy/downloads.tsx b/client/src/data/copy/downloads.tsx
index c549df92f..9c1bafe9a 100644
--- a/client/src/data/copy/downloads.tsx
+++ b/client/src/data/copy/downloads.tsx
@@ -23,8 +23,8 @@ export const PAGE_INTRO = defineMessages({
   },
   CHANGE_LOG: {
     id: 'downloads.page.change.log.text',
-    defaultMessage: 'change log',
-    description: 'Navigate to the Downloads page, this will be the view of change log',
+    defaultMessage: 'release notes',
+    description: 'Navigate to the Downloads page, this will be the view of release notes',
   },
 });
 
@@ -116,9 +116,10 @@ export const getDownloadIconAltTag = () => defineMessages({
 export const RELEASE_1_0 = {
   UPDATE_1: <FormattedMessage
     id={'download.page.release.update.title.1'}
-    defaultMessage={`Release update - {date}`}
+    defaultMessage={`Version {release} Release update - {date}`}
     description={'Navigate to the download page. This is first download file link'}
     values={{
+      release: VERSION_NUMBER,
       date: <FormattedDate
         value={COMMON_COPY.METH_1_0_RELEASE_DATE}
         year="numeric"
@@ -134,7 +135,9 @@ export const RELEASE_1_0 = {
   />,
   SECTION1_B1: <FormattedMessage
     id={'download.page.release.update.SECTION1_B1'}
-    defaultMessage={`Added Federally Recognized Tribal Lands and Alaska Native Villages data from the Bureau of Indian Affairs at the Department of the Interior to the tool and map`}
+    defaultMessage={`Added lands within the boundaries of Federally Recognized Tribes and 
+    locations of Alaska Native Villages using data from the Bureau of Indian
+    Affairs at the U.S. Department of the Interior`}
     description={'Navigate to the download page. This is SECTION1_B1'}
   />,
   SECTION1_B2: <FormattedMessage
@@ -157,6 +160,11 @@ export const RELEASE_1_0 = {
     defaultMessage={`Projected wildfire risk`}
     description={'Navigate to the download page. This is SECTION1_B2_1_2'}
   />,
+  SECTION1_B2_1_3: <FormattedMessage
+    id={'download.page.release.update.SECTION1_B2_1_3'}
+    defaultMessage={`Historic underinvestment due to redlining`}
+    description={'Navigate to the download page. This is SECTION1_B2_1_3'}
+  />,
   SECTION1_B2_2: <FormattedMessage
     id={'download.page.release.update.SECTION1_B2_2'}
     defaultMessage={`Housing`}
@@ -214,7 +222,9 @@ export const RELEASE_1_0 = {
   />,
   SECTION1_B3: <FormattedMessage
     id={'download.page.release.update.SECTION1_B3'}
-    defaultMessage={`Added an adjacency indicator to methodology to include low income communities that had been completely surrounded by other disadvantaged communities, but which had just missed the thresholds in the beta version.`}
+    defaultMessage={`Included communities that are completely surrounded by other 
+    disadvantaged communities and that meet an adjusted low income 
+    threshold`}
     description={'Navigate to the download page. This is SECTION1_B3'}
   />,
   SECTION1_B4: <FormattedMessage
@@ -229,12 +239,14 @@ export const RELEASE_1_0 = {
   />,
   SECTION1_B4_2: <FormattedMessage
     id={'download.page.release.update.SECTION1_B4_2'}
-    defaultMessage={`Imputed income for census tracts missing that data that have a population greater than zero`}
+    defaultMessage={`Imputed income for census tracts missing income data`}
     description={'Navigate to the download page. This is SECTION1_B4_2'}
   />,
   SECTION1_B4_3: <FormattedMessage
     id={'download.page.release.update.SECTION1_B4_3'}
-    defaultMessage={`Used transportation barriers and population loss data indicators only for census tracts with populations of 20 or more`}
+    defaultMessage={`Used transportation barriers and expected population loss rate 
+    data burdens only for census tracts with populations of 20 or 
+    more to exclude areas such as airports`}
     description={'Navigate to the download page. This is SECTION1_B4_3'}
   />,
   SECTION1_B5: <FormattedMessage
@@ -254,7 +266,7 @@ export const RELEASE_1_0 = {
   />,
   SECTION1_B5_3: <FormattedMessage
     id={'download.page.release.update.SECTION1_B5_3'}
-    defaultMessage={`Updated the site copy of the website and associated Spanish translations`}
+    defaultMessage={`Updated the site copy of the website`}
     description={'Navigate to the download page. This is SECTION1_B5_3'}
   />,
   SECTION1_B6: <FormattedMessage
@@ -299,7 +311,7 @@ export const RELEASE_1_0 = {
   />,
   SECTION1_B6_1_2_2_2: <FormattedMessage
     id={'download.page.release.update.SECTION1_B6_1_2_2_2'}
-    defaultMessage={`Proximity to Risk Management Plan (RMP) facilities`}
+    defaultMessage={`Proximity to Risk Management Plan (RMP) sites`}
     description={'Navigate to the download page. This is SECTION1_B6_1_2_2_2'}
   />,
   SECTION1_B6_1_2_2_3: <FormattedMessage
@@ -414,7 +426,8 @@ export const RELEASE_1_0 = {
   />,
   SECTION1_B8_2: <FormattedMessage
     id={'download.page.release.update.SECTION1_B8_2'}
-    defaultMessage={`Added versions page to house beta version of download files`}
+    defaultMessage={`Added previous versions page to access the beta version’s 
+    download files`}
     description={'Navigate to the download page. This is SECTION1_B8_2'}
   />,
   SECTION1_B8_3: <FormattedMessage
@@ -471,7 +484,8 @@ export const RELEASE_1_0 = {
   />,
   SECTION2_P2: <FormattedMessage
     id={'download.page.release.update.section.2.p2'}
-    defaultMessage={`Bug fix: Census tracts that have 0 land should not be included on the map`}
+    defaultMessage={`Bug fix: Census tracts that are 100% water should not be 
+    included on the map`}
     description={'Navigate to the download page. This is second section of the release update section'}
   />,
   FOOTER: <FormattedMessage
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 02d4b53a1..384a4ea34 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -120,7 +120,7 @@
     "description": "Alert title that appears at the top of pages."
   },
   "common.pages.alerts.banner.beta.content": {
-    "defaultMessage": "<bold1>This site has been updated.</bold1> The current version of the site is 1.0 that was released on {relDate}",
+    "defaultMessage": "<bold1>This site has been updated.</bold1> The current version of the site is 1.0 that was released on {relDate}.",
     "description": "Alert body that appears on landing page."
   },
   "common.pages.alerts.census.tract.title": {
@@ -128,7 +128,7 @@
     "description": "Navigate to any page. This the title of the alert that informs the user that new census tract information is available"
   },
   "common.pages.alerts.public_comment_period.description": {
-    "defaultMessage": "The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.",
+    "defaultMessage": "The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on {ver1RelDate}. For more information about the improvements to the tool, CEQ’s press release will be coming soon.",
     "description": "Alert body that appears on landing page."
   },
   "common.pages.alerts.version.1.release..title": {
@@ -312,7 +312,7 @@
     "description": "Navigate to the download page. This is first section of the release update SECTION1"
   },
   "download.page.release.update.SECTION1_B1": {
-    "defaultMessage": "Added Federally Recognized Tribal Lands and Alaska Native Villages data from the Bureau of Indian Affairs at the Department of the Interior to the tool and map",
+    "defaultMessage": "Added lands within the boundaries of Federally Recognized Tribes and locations of Alaska Native Villages using data from the Bureau of Indian Affairs at the U.S. Department of the Interior",
     "description": "Navigate to the download page. This is SECTION1_B1"
   },
   "download.page.release.update.SECTION1_B10": {
@@ -335,6 +335,10 @@
     "defaultMessage": "Projected wildfire risk",
     "description": "Navigate to the download page. This is SECTION1_B2_1_2"
   },
+  "download.page.release.update.SECTION1_B2_1_3": {
+    "defaultMessage": "Historic underinvestment due to redlining",
+    "description": "Navigate to the download page. This is SECTION1_B2_1_3"
+  },
   "download.page.release.update.SECTION1_B2_2": {
     "defaultMessage": "Housing",
     "description": "Navigate to the download page. This is SECTION1_B2_2"
@@ -380,7 +384,7 @@
     "description": "Navigate to the download page. This is SECTION1_B2_5_1"
   },
   "download.page.release.update.SECTION1_B3": {
-    "defaultMessage": "Added an adjacency indicator to methodology to include low income communities that had been completely surrounded by other disadvantaged communities, but which had just missed the thresholds in the beta version.",
+    "defaultMessage": "Included communities that are completely surrounded by other disadvantaged communities and that meet an adjusted low income threshold",
     "description": "Navigate to the download page. This is SECTION1_B3"
   },
   "download.page.release.update.SECTION1_B4": {
@@ -392,11 +396,11 @@
     "description": "Navigate to the download page. This is SECTION1_B4_1"
   },
   "download.page.release.update.SECTION1_B4_2": {
-    "defaultMessage": "Imputed income for census tracts missing that data that have a population greater than zero",
+    "defaultMessage": "Imputed income for census tracts missing income data",
     "description": "Navigate to the download page. This is SECTION1_B4_2"
   },
   "download.page.release.update.SECTION1_B4_3": {
-    "defaultMessage": "Used transportation barriers and population loss data indicators only for census tracts with populations of 20 or more",
+    "defaultMessage": "Used transportation barriers and expected population loss rate data burdens only for census tracts with populations of 20 or more to exclude areas such as airports",
     "description": "Navigate to the download page. This is SECTION1_B4_3"
   },
   "download.page.release.update.SECTION1_B5": {
@@ -412,7 +416,7 @@
     "description": "Navigate to the download page. This is SECTION1_B5_2"
   },
   "download.page.release.update.SECTION1_B5_3": {
-    "defaultMessage": "Updated the site copy of the website and associated Spanish translations",
+    "defaultMessage": "Updated the site copy of the website",
     "description": "Navigate to the download page. This is SECTION1_B5_3"
   },
   "download.page.release.update.SECTION1_B6": {
@@ -448,7 +452,7 @@
     "description": "Navigate to the download page. This is SECTION1_B6_1_2_2_1"
   },
   "download.page.release.update.SECTION1_B6_1_2_2_2": {
-    "defaultMessage": "Proximity to Risk Management Plan (RMP) facilities",
+    "defaultMessage": "Proximity to Risk Management Plan (RMP) sites",
     "description": "Navigate to the download page. This is SECTION1_B6_1_2_2_2"
   },
   "download.page.release.update.SECTION1_B6_1_2_2_3": {
@@ -540,7 +544,7 @@
     "description": "Navigate to the download page. This is SECTION1_B8_1"
   },
   "download.page.release.update.SECTION1_B8_2": {
-    "defaultMessage": "Added versions page to house beta version of download files",
+    "defaultMessage": "Added previous versions page to access the beta version’s download files",
     "description": "Navigate to the download page. This is SECTION1_B8_2"
   },
   "download.page.release.update.SECTION1_B8_3": {
@@ -584,16 +588,16 @@
     "description": "Navigate to the download page. This is second section of the release update section"
   },
   "download.page.release.update.section.2.p2": {
-    "defaultMessage": "Bug fix: Census tracts that have 0 land should not be included on the map",
+    "defaultMessage": "Bug fix: Census tracts that are 100% water should not be included on the map",
     "description": "Navigate to the download page. This is second section of the release update section"
   },
   "download.page.release.update.title.1": {
-    "defaultMessage": "Release update - {date}",
+    "defaultMessage": "Version {release} Release update - {date}",
     "description": "Navigate to the download page. This is first download file link"
   },
   "downloads.page.change.log.text": {
-    "defaultMessage": "change log",
-    "description": "Navigate to the Downloads page, this will be the view of change log"
+    "defaultMessage": "release notes",
+    "description": "Navigate to the Downloads page, this will be the view of release notes"
   },
   "downloads.page.download.icon.alt.tag": {
     "defaultMessage": "The icon used to indicate that the file is downloadable",
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index 8a597039e..87d9fa6f3 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 22, 2022.
       </div>
     </div>
     <div
@@ -361,7 +361,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <p
             class="usa-alert__text"
           >
-            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on 11/22/2022. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
           </p>
         </div>
       </div>
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index 2149475cd..1dc9ba62d 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 22, 2022.
       </div>
     </div>
     <div
@@ -361,7 +361,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <p
             class="usa-alert__text"
           >
-            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on 11/22/2022. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
           </p>
         </div>
       </div>
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index db0f0fb5a..42b1ffb20 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 22, 2022.
       </div>
     </div>
     <div
@@ -361,7 +361,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <p
             class="usa-alert__text"
           >
-            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on 11/22/2022. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
           </p>
         </div>
       </div>
@@ -421,7 +421,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   id="releaseUpdate-header"
                   tabindex="0"
                 >
-                  change log
+                  release notes
                 </a>
                 <img
                   alt="expand icon"
@@ -435,7 +435,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 <div>
                   <div>
-                    Release update - Oct 25, 2022
+                    Version 1.0 Release update - Nov 22, 2022
                   </div>
                   <div>
                     New & improved
@@ -443,7 +443,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <div>
                     <ul>
                       <li>
-                        Added Federally Recognized Tribal Lands and Alaska Native Villages data from the Bureau of Indian Affairs at the Department of the Interior to the tool and map
+                        Added lands within the boundaries of Federally Recognized Tribes and 
+    locations of Alaska Native Villages using data from the Bureau of Indian
+    Affairs at the U.S. Department of the Interior
                       </li>
                       <ul>
                         <li>
@@ -465,11 +467,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                         </li>
                         <ul>
                           <li>
-                            Lack of plumbing
+                            Historic underinvestment due to redlining
                           </li>
                           <li>
                             Lack of green space
                           </li>
+                          <li>
+                            Lack of plumbing
+                          </li>
                         </ul>
                         <li>
                           Legacy pollution
@@ -500,7 +505,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                         </ul>
                       </ul>
                       <li>
-                        Added an adjacency indicator to methodology to include low income communities that had been completely surrounded by other disadvantaged communities, but which had just missed the thresholds in the beta version.
+                        Included communities that are completely surrounded by other 
+    disadvantaged communities and that meet an adjusted low income 
+    threshold
                       </li>
                       <li>
                         Made technical changes to enhance accuracy of the tool
@@ -510,10 +517,12 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                           Removed income data for students enrolled in higher education in the low income indicator
                         </li>
                         <li>
-                          Imputed income for census tracts missing that data that have a population greater than zero
+                          Imputed income for census tracts missing income data
                         </li>
                         <li>
-                          Used transportation barriers and population loss data indicators only for census tracts with populations of 20 or more
+                          Used transportation barriers and expected population loss rate 
+    data burdens only for census tracts with populations of 20 or 
+    more to exclude areas such as airports
                         </li>
                       </ul>
                       <li>
@@ -527,7 +536,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                           Improved the design of the map side panel
                         </li>
                         <li>
-                          Updated the site copy of the website and associated Spanish translations
+                          Updated the site copy of the website
                         </li>
                       </ul>
                       <li>
@@ -541,36 +550,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                           <li>
                             Included data from 2010 decennial census for US Virgin Islands
                           </li>
-                          <li>
-                            New data from EJScreen 2.1
-                          </li>
-                          <ul>
-                            <li>
-                              Sustainable Housing:
-                            </li>
-                            <ul>
-                              <li>
-                                Lead paint
-                              </li>
-                            </ul>
-                            <li>
-                              Legacy pollution:
-                            </li>
-                            <ul>
-                              <li>
-                                Proximity to Superfund (National Priorities List (NPL)) sites
-                              </li>
-                              <li>
-                                Proximity to Risk Management Plan (RMP) facilities
-                              </li>
-                              <li>
-                                Proximity to hazardous waste facilities
-                              </li>
-                              <li>
-                                Leaking underground storage tanks
-                              </li>
-                            </ul>
-                          </ul>
                         </ul>
                         <li>
                           Guam
@@ -579,91 +558,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                           <li>
                             Included data from 2010 decennial census for Guam
                           </li>
-                          <li>
-                            New data from EJScreen 2.1
-                          </li>
-                          <ul>
-                            <li>
-                              Sustainable Housing:
-                            </li>
-                            <ul>
-                              <li>
-                                Lead paint
-                              </li>
-                            </ul>
-                            <li>
-                              Legacy pollution:
-                            </li>
-                            <ul>
-                              <li>
-                                Proximity to Superfund (National Priorities List (NPL)) sites
-                              </li>
-                              <li>
-                                Proximity to Risk Management Plan (RMP) facilities
-                              </li>
-                              <li>
-                                Proximity to hazardous waste facilities
-                              </li>
-                              <li>
-                                Leaking underground storage tanks
-                              </li>
-                            </ul>
-                          </ul>
-                        </ul>
-                        <li>
-                          Samoa
-                        </li>
-                        <ul>
-                          <li>
-                            New data from EJScreen 2.1
-                          </li>
-                          <ul>
-                            <li>
-                              Sustainable Housing:
-                            </li>
-                            <ul>
-                              <li>
-                                Lead paint
-                              </li>
-                            </ul>
-                            <li>
-                              Legacy pollution:
-                            </li>
-                            <ul>
-                              <li>
-                                Proximity to Risk Management Plan (RMP) facilities
-                              </li>
-                              <li>
-                                Leaking underground storage tanks
-                              </li>
-                            </ul>
-                          </ul>
-                        </ul>
-                        <li>
-                          Marianna Islands
-                        </li>
-                        <ul>
-                          <li>
-                            New data from EJScreen 2.1
-                          </li>
-                          <ul>
-                            <li>
-                              Sustainable Housing:
-                            </li>
-                            <ul>
-                              <li>
-                                Lead paint
-                              </li>
-                            </ul>
-                            <li>
-                              Legacy pollution:
-                            </li>
-                            <ul>
-                              <li>
-                                Leaking underground storage tanks
-                              </li>
-                            </ul>
-                          </ul>
                         </ul>
                         <li>
                           Puerto Rico
@@ -692,46 +586,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                               Proximity to Superfund (National Priorities List (NPL)) sites
                             </li>
                             <li>
-                              Proximity to Risk Management Plan (RMP) facilities
+                              Proximity to Risk Management Plan (RMP) sites
                             </li>
                           </ul>
                         </ul>
                       </ul>
-                      <li>
-                        Updated data from EJScreen 2.1 across the entire tool:
-                      </li>
-                      <ul>
-                        <li>
-                          Sustainable Housing:
-                        </li>
-                        <ul>
-                          <li>
-                            Lead paint - 2016-2020
-                          </li>
-                        </ul>
-                        <li>
-                          Legacy pollution:
-                        </li>
-                        <ul>
-                          <li>
-                            Proximity to Superfund (National Priorities List (NPL)) sites - 2022
-                          </li>
-                          <li>
-                            Proximity to Risk Management Plans (RMP) facilities - 2022
-                          </li>
-                          <li>
-                            Proximity to hazardous waste facilities - 2022
-                          </li>
-                        </ul>
-                        <li>
-                          Water and wastewater
-                        </li>
-                        <ul>
-                          <li>
-                            Leaking underground storage tanks - 2022
-                          </li>
-                        </ul>
-                      </ul>
                       <li>
                         Enhanced the technical files:
                       </li>
@@ -740,7 +599,8 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                           Added all new data indicators and demographics to .xls, .csv, and shapefiles
                         </li>
                         <li>
-                          Added versions page to house beta version of download files
+                          Added previous versions page to access the beta version’s 
+    download files
                         </li>
                         <li>
                           Updated codebook
@@ -780,7 +640,8 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                         Bug fix: loaded missing life expectancy data for Maine and Wisconsin
                       </li>
                       <li>
-                        Bug fix: Census tracts that have 0 land should not be included on the map
+                        Bug fix: Census tracts that are 100% water should not be 
+    included on the map
                       </li>
                     </ul>
                   </div>
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 094d99c0a..90c25bbe5 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 22, 2022.
       </div>
     </div>
     <div
@@ -361,7 +361,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <p
             class="usa-alert__text"
           >
-            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on 11/22/2022. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
           </p>
         </div>
       </div>
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index c336fd188..0b53e251b 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 22, 2022.
       </div>
     </div>
     <div
@@ -361,7 +361,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <p
             class="usa-alert__text"
           >
-            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on 11/22/2022. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
           </p>
         </div>
       </div>
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index b2f45a5ac..a61e38058 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 22, 2022.
       </div>
     </div>
     <div
@@ -361,7 +361,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <p
             class="usa-alert__text"
           >
-            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on 11/22/2022. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
           </p>
         </div>
       </div>
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index b4cd17445..73028a561 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         <strong>
           This site has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Oct 25, 2022
+         The current version of the site is 1.0 that was released on Nov 22, 2022.
       </div>
     </div>
     <div
@@ -361,7 +361,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <p
             class="usa-alert__text"
           >
-            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on xx/xx/xx. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
+            The Council on Environmental Quality (CEQ) made the version 1.0 of the tool available on 11/22/2022. For more information about the improvements to the tool, CEQ’s press release will be coming soon.
           </p>
         </div>
       </div>

From 603457c087ed7802e70e6be7578b3e2685d029f5 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 15 Nov 2022 20:16:19 -0800
Subject: [PATCH 112/130] Copy updates

- closes #2082
---
 .../src/components/AreaDetail/AreaDetail.tsx  |  4 ++--
 .../__snapshots__/Categories.test.tsx.snap    |  6 ++---
 .../SidePanelInfo/SidePanelInfo.module.scss   |  1 -
 .../SidePanelInfo/SidePanelInfo.tsx           |  6 ++---
 .../__snapshots__/SidePanelInfo.test.tsx.snap | 12 ++--------
 .../__snapshots__/mapInfoPanel.test.tsx.snap  | 12 ++--------
 client/src/data/copy/explore.tsx              | 16 +++++++-------
 client/src/data/copy/faqs.tsx                 |  2 +-
 client/src/data/copy/methodology.tsx          |  6 ++---
 client/src/intl/en.json                       | 22 +++++++++----------
 client/src/pages/methodology.tsx              |  2 +-
 .../freqAskedQuestions.test.tsx.snap          |  2 +-
 .../__snapshots__/methodology.test.tsx.snap   | 10 +++++----
 13 files changed, 43 insertions(+), 58 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 9789c016b..fcc82263b 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -648,7 +648,7 @@ const AreaDetail = ({properties}: IAreaDetailProps) => {
     {
       id: 'leg-pollute',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.LEG_POLLUTE),
-      indicators: [abandonMines, formerDefSites, proxHaz, proxNPL, proxRMP],
+      indicators: [abandonMines, formerDefSites, proxHaz, proxRMP, proxNPL],
       socioEcIndicators: [lowInc],
       isDisadvagtaged: properties[constants.IS_POLLUTION_FACTOR_DISADVANTAGED] ?
         properties[constants.IS_POLLUTION_FACTOR_DISADVANTAGED] : null,
@@ -684,7 +684,7 @@ const AreaDetail = ({properties}: IAreaDetailProps) => {
     {
       id: 'work-dev',
       titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.WORK_DEV),
-      indicators: [lingIso, lowMedInc, unemploy, poverty],
+      indicators: [lingIso, lowMedInc, poverty, unemploy],
       socioEcIndicators: [highSchool],
       isDisadvagtaged: properties[constants.IS_WORKFORCE_FACTOR_DISADVANTAGED] ?
         properties[constants.IS_WORKFORCE_FACTOR_DISADVANTAGED] : null,
diff --git a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
index dfdf9c799..bda6b2bb3 100644
--- a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
+++ b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
@@ -319,7 +319,7 @@ exports[`rendering of the Categories checks if component renders 1`] = `
           class="usa-link"
           href="#mine-land"
         >
-          abandoned mine land
+          abandoned mine lands
         </a>
          OR 
         <a
@@ -530,7 +530,7 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           AND
         </strong>
-         have 10% or more of adults have a 
+         more than 10% of adults have a 
         <a
           class="usa-link"
           href="#high-school"
@@ -556,7 +556,7 @@ exports[`rendering of the Categories checks if component renders 1`] = `
       >
         <h2>
           
-      Tribal lands
+      Tribes
     
         </h2>
         <p>
diff --git a/client/src/components/SidePanelInfo/SidePanelInfo.module.scss b/client/src/components/SidePanelInfo/SidePanelInfo.module.scss
index 4d9a81473..e0d082245 100644
--- a/client/src/components/SidePanelInfo/SidePanelInfo.module.scss
+++ b/client/src/components/SidePanelInfo/SidePanelInfo.module.scss
@@ -14,7 +14,6 @@
   }
   
   .sidePanelInfoHeading {
-    @include u-padding-top(2);
     font-size: large;
     font-weight: 600;
   }
diff --git a/client/src/components/SidePanelInfo/SidePanelInfo.tsx b/client/src/components/SidePanelInfo/SidePanelInfo.tsx
index 0ec772dac..f2f26003d 100644
--- a/client/src/components/SidePanelInfo/SidePanelInfo.tsx
+++ b/client/src/components/SidePanelInfo/SidePanelInfo.tsx
@@ -25,7 +25,7 @@ import tribalDotIcon from '../../images/sidePanelIcons/tribal-tract.svg';
 // @ts-ignore
 import pieChartIcon from '../../images/sidePanelIcons/pie-chart.svg';
 // @ts-ignore
-import handPointIcon from '../../images/sidePanelIcons/mouse-hand-point.svg';
+// import handPointIcon from '../../images/sidePanelIcons/mouse-hand-point.svg';
 
 import * as styles from './SidePanelInfo.module.scss';
 import * as constants from '../../data/constants';
@@ -67,12 +67,12 @@ const SidePanelInfo = () => {
           />
         }
         {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA1_PART4)}
-        {
+        {/* {
           windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
           <img tabIndex={0} className={styles.sidePanelInfoIcon} src={handPointIcon}
             alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.MOUSE)}
           />
-        }
+        } */}
         {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA1_PART5)}
       </p>
 
diff --git a/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap b/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap
index c53dfe5ff..332c2f337 100644
--- a/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap
+++ b/client/src/components/SidePanelInfo/__snapshots__/SidePanelInfo.test.tsx.snap
@@ -46,14 +46,6 @@ exports[`rendering of the component expects the render to match snapshot 1`] = `
       
       and select
     
-      <img
-        alt="
-      a mouse arrow icon informing the user can use the mouse
-    "
-        src="test-file-stub"
-        tabindex="0"
-      />
-      
       to see information about any census tract.
     
     </p>
@@ -166,7 +158,7 @@ exports[`rendering of the component expects the render to match snapshot 1`] = `
       tabindex="0"
     >
       
-      Land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages are
+      Land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages are highlighted
     
       <img
         alt="
@@ -176,7 +168,7 @@ exports[`rendering of the component expects the render to match snapshot 1`] = `
         tabindex="0"
       />
       
-      highlighted on the map. These communities are also considered disadvantaged.
+      on the map. These communities are also considered disadvantaged.
     
     </p>
   </aside>
diff --git a/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap b/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap
index 3f77f7adc..a619ebb24 100644
--- a/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap
+++ b/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap
@@ -51,14 +51,6 @@ exports[`simulate app starting up, no click on map should match the snapshot of
         
       and select
     
-        <img
-          alt="
-      a mouse arrow icon informing the user can use the mouse
-    "
-          src="test-file-stub"
-          tabindex="0"
-        />
-        
       to see information about any census tract.
     
       </p>
@@ -171,7 +163,7 @@ exports[`simulate app starting up, no click on map should match the snapshot of
         tabindex="0"
       >
         
-      Land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages are
+      Land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages are highlighted
     
         <img
           alt="
@@ -181,7 +173,7 @@ exports[`simulate app starting up, no click on map should match the snapshot of
           tabindex="0"
         />
         
-      highlighted on the map. These communities are also considered disadvantaged.
+      on the map. These communities are also considered disadvantaged.
     
       </p>
     </aside>
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 26084952f..0520b8001 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -33,7 +33,7 @@ export const PAGE_INTRO = defineMessages({
 export const PAGE_DESCRIPTION1 = <FormattedMessage
   id={'explore.map.page.description.1'}
   defaultMessage={`
-    Census tracts that are overburdened and underserved census tracts are highlighted as being disadvantaged on the map. Federally Recognized Tribes, including Alaska Native Villages are also considered disadvantaged communities. 
+    Census tracts that are overburdened and underserved are highlighted as being disadvantaged on the map. Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities. 
   `}
   description={'On the explore the map page, the first description of the page'}
 />;
@@ -361,14 +361,14 @@ export const SIDE_PANEL_INITIAL_STATE = defineMessages({
   PARA6_PART1: {
     id: 'explore.map.page.side.panel.info.para.6',
     defaultMessage: `
-      Land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages are
+      Land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages are highlighted
     `,
     description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Federally Recognized Tribal lands are also highlighted on the map. These communities are also considered disadvantaged.',
   },
   PARA6_PART2: {
     id: 'explore.map.page.side.panel.info.para.6',
     defaultMessage: `
-      highlighted on the map. These communities are also considered disadvantaged.
+      on the map. These communities are also considered disadvantaged.
     `,
     description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Federally Recognized Tribal lands are also highlighted on the map. These communities are also considered disadvantaged.',
   },
@@ -987,7 +987,7 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
   // Legacy Pollution
   ABANDON_MINES: {
     id: 'explore.map.page.side.panel.indicator.abandon.mines',
-    defaultMessage: 'Abandoned mine land',
+    defaultMessage: 'Abandoned mine lands',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Abandoned land mines`,
   },
   FORMER_DEF_SITES: {
@@ -1200,7 +1200,7 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   DIABETES: {
     id: 'explore.map.page.side.panel.indicator.description.diabetes',
     defaultMessage: `
-      Share of people ages 18 years and older who have diabetes
+      Share of people ages 18 years and older who have diabetes other than diabetes during pregnancy
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people ages 18 years and older who have diabetes`,
   },
@@ -1320,7 +1320,7 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   POVERTY: {
     id: 'explore.map.page.side.panel.indicator.description.poverty',
     defaultMessage: `
-      Share of people in households where the income is at or below 100% of the Federal poverty level 
+      Share of people in households where income is at or below 100% of the Federal poverty level 
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people in households where the income is at or below 100% of the Federal poverty level`,
   },
@@ -1434,14 +1434,14 @@ export const NOTE_ON_TERRITORIES = {
   PARA_0: <FormattedMessage
     id={'explore.map.page.under.map.note.on.territories.para.0'}
     defaultMessage={`
-      Not all the data used in CEJST are available or used for all U.S. territories.
+      Not all the data used in the tool are available or used for all U.S. territories.
     `}
     description={`Navigate to the explore the map page. Under the map, you will see territories paragraph 0`}
   />,
   PARA_1: <FormattedMessage
     id={'explore.map.page.under.map.note.on.territories.para.1'}
     defaultMessage={`
-      <bold>Puerto Rico:</bold> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period. 
+      <bold>Puerto Rico:</bold> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: low income, projected flood risk, energy cost, lack of indoor plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, low median income, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.
     `}
     description={`Navigate to the explore the map page. Under the map, you will see territories paragraph 1`}
     values={{
diff --git a/client/src/data/copy/faqs.tsx b/client/src/data/copy/faqs.tsx
index 4c7d62827..a44006345 100644
--- a/client/src/data/copy/faqs.tsx
+++ b/client/src/data/copy/faqs.tsx
@@ -195,7 +195,7 @@ export const QUESTIONS = [
   <FormattedMessage
     id={ 'faqs.page.Q12'}
     key={ 'faqs.page.Q12'}
-    defaultMessage={ 'Q: How is the Climate and Economic Justice Screening Tool (CEJST) different from the Environmental Protection Agency’s (EPA) EJScreen?'}
+    defaultMessage={ 'Q: How is the Climate and Economic Justice Screening Tool (CEJST) different from other Federal environmental screening tools, such as EJScreen?'}
     description={ 'Navigate to the FAQs page, this will be Q12'}
   />,
   <FormattedMessage
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index 520d4ac2f..acd9ef859 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -48,7 +48,7 @@ export const PAGE = defineMessages({
   SUB_HEADING_2: {
     id: 'methodology.page.sub.heading.2',
     defaultMessage: `
-      Tribal lands
+      Tribes
     `,
     description: 'Navigate to the methodology page. This is sub-heading 2',
   },
@@ -141,7 +141,7 @@ export const CATEGORY_AND_CLAUSE = {
   />,
   HS_DEG_GTE_10: <FormattedMessage
     id={'methodology.page.category.and.clause.hs.ed.higher.ed'}
-    defaultMessage={`<boldtag>AND</boldtag> have 10% or more of adults have a <link1>high school education</link1> level less than a high school degree
+    defaultMessage={`<boldtag>AND</boldtag> more than 10% of adults have a <link1>high school education</link1> level less than a high school degree
   `}
     description={'Navigate to the methodology page. Navigate to the category section. This is the portion of the formula dealing with higher ed enrollment and high school degree rate'}
     values={{
@@ -281,7 +281,7 @@ export const CATEGORIES = {
     />,
     IF: <FormattedMessage
       id={'methodology.page.indicator.categories.legacy.pollution.if'}
-      defaultMessage={`Have at least one <link0>abandoned mine land</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites (National Priorities List (NPL))</link3> OR <link4>proximity to Risk Management Plan (RMP) facilities</link4>`}
+      defaultMessage={`Have at least one <link0>abandoned mine lands</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites (National Priorities List (NPL))</link3> OR <link4>proximity to Risk Management Plan (RMP) facilities</link4>`}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula'}
       values={{
         link0: simpleLink('#mine-land'),
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 384a4ea34..a2ee5a34b 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -620,7 +620,7 @@
     "description": "Navigate to the Downloads page, this will be the view of change log"
   },
   "explore.map.page.description.1": {
-    "defaultMessage": "Census tracts that are overburdened and underserved census tracts are highlighted as being disadvantaged on the map. Federally Recognized Tribes, including Alaska Native Villages are also considered disadvantaged communities.",
+    "defaultMessage": "Census tracts that are overburdened and underserved are highlighted as being disadvantaged on the map. Federally Recognized Tribes, including Alaska Native Villages, are also considered disadvantaged communities.",
     "description": "On the explore the map page, the first description of the page"
   },
   "explore.map.page.description.2": {
@@ -868,7 +868,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the census tract info title"
   },
   "explore.map.page.side.panel.indicator.abandon.mines": {
-    "defaultMessage": "Abandoned mine land",
+    "defaultMessage": "Abandoned mine lands",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Abandoned land mines"
   },
   "explore.map.page.side.panel.indicator.adjacency": {
@@ -896,7 +896,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Cost and time spent on transportation"
   },
   "explore.map.page.side.panel.indicator.description.diabetes": {
-    "defaultMessage": "Share of people ages 18 years and older who have diabetes",
+    "defaultMessage": "Share of people ages 18 years and older who have diabetes other than diabetes during pregnancy",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people ages 18 years and older who have diabetes"
   },
   "explore.map.page.side.panel.indicator.description.dieselPartMatter": {
@@ -984,7 +984,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Fine inhalable particles, 2.5 micrometers and smaller"
   },
   "explore.map.page.side.panel.indicator.description.poverty": {
-    "defaultMessage": "Share of people in households where the income is at or below 100% of the Federal poverty level",
+    "defaultMessage": "Share of people in households where income is at or below 100% of the Federal poverty level",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of people in households where the income is at or below 100% of the Federal poverty level"
   },
   "explore.map.page.side.panel.indicator.description.prox.haz": {
@@ -1336,7 +1336,7 @@
     "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show percentages"
   },
   "explore.map.page.side.panel.info.para.6": {
-    "defaultMessage": "highlighted on the map. These communities are also considered disadvantaged.",
+    "defaultMessage": "on the map. These communities are also considered disadvantaged.",
     "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Federally Recognized Tribal lands are also highlighted on the map. These communities are also considered disadvantaged."
   },
   "explore.map.page.side.panel.is.community.of.focus": {
@@ -1424,11 +1424,11 @@
     "description": "Navigate to the explore the map page. Under the map, you will see territories intro text"
   },
   "explore.map.page.under.map.note.on.territories.para.0": {
-    "defaultMessage": "Not all the data used in CEJST are available or used for all U.S. territories.",
+    "defaultMessage": "Not all the data used in the tool are available or used for all U.S. territories.",
     "description": "Navigate to the explore the map page. Under the map, you will see territories paragraph 0"
   },
   "explore.map.page.under.map.note.on.territories.para.1": {
-    "defaultMessage": "<bold>Puerto Rico:</bold> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.",
+    "defaultMessage": "<bold>Puerto Rico:</bold> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: low income, projected flood risk, energy cost, lack of indoor plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, low median income, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.",
     "description": "Navigate to the explore the map page. Under the map, you will see territories paragraph 1"
   },
   "explore.map.page.under.map.note.on.territories.para.2": {
@@ -1464,7 +1464,7 @@
     "description": "Navigate to the FAQs page, this will be Q11"
   },
   "faqs.page.Q12": {
-    "defaultMessage": "Q: How is the Climate and Economic Justice Screening Tool (CEJST) different from the Environmental Protection Agency’s (EPA) EJScreen?",
+    "defaultMessage": "Q: How is the Climate and Economic Justice Screening Tool (CEJST) different from other Federal environmental screening tools, such as EJScreen?",
     "description": "Navigate to the FAQs page, this will be Q12"
   },
   "faqs.page.Q13": {
@@ -1828,7 +1828,7 @@
     "description": "Focus on the bounds of a specific territory"
   },
   "methodology.page.category.and.clause.hs.ed.higher.ed": {
-    "defaultMessage": "<boldtag>AND</boldtag> have 10% or more of adults have a <link1>high school education</link1> level less than a high school degree",
+    "defaultMessage": "<boldtag>AND</boldtag> more than 10% of adults have a <link1>high school education</link1> level less than a high school degree",
     "description": "Navigate to the methodology page. Navigate to the category section. This is the portion of the formula dealing with higher ed enrollment and high school degree rate"
   },
   "methodology.page.category.and.clause.low.inc": {
@@ -2368,7 +2368,7 @@
     "description": "Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Reduction and remediation of legacy pollution methodology"
   },
   "methodology.page.indicator.categories.legacy.pollution.if": {
-    "defaultMessage": "Have at least one <link0>abandoned mine land</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites (National Priorities List (NPL))</link3> OR <link4>proximity to Risk Management Plan (RMP) facilities</link4>",
+    "defaultMessage": "Have at least one <link0>abandoned mine lands</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites (National Priorities List (NPL))</link3> OR <link4>proximity to Risk Management Plan (RMP) facilities</link4>",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula"
   },
   "methodology.page.indicator.categories.tribal.lands.methodology": {
@@ -2416,7 +2416,7 @@
     "description": "Navigate to the methodology page. This is sub-heading 1"
   },
   "methodology.page.sub.heading.2": {
-    "defaultMessage": "Tribal lands",
+    "defaultMessage": "Tribes",
     "description": "Navigate to the methodology page. This is sub-heading 2"
   },
   "methodology.page.title.text": {
diff --git a/client/src/pages/methodology.tsx b/client/src/pages/methodology.tsx
index 06684c3b0..8b8ea32af 100644
--- a/client/src/pages/methodology.tsx
+++ b/client/src/pages/methodology.tsx
@@ -46,7 +46,7 @@ const IndexPage = ({location}: MethodPageProps) => {
                   <li>
                     {intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA1_BULLET1)}
                   </li>
-                  <li>
+                  <li className={'j40-mt3'}>
                     {intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA1_BULLET2)}
                   </li>
                 </ul>
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 90c25bbe5..40f81d44d 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -874,7 +874,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   data-testid="accordionButton_faq-id-11"
                   type="button"
                 >
-                  Q: How is the Climate and Economic Justice Screening Tool (CEJST) different from the Environmental Protection Agency’s (EPA) EJScreen?
+                  Q: How is the Climate and Economic Justice Screening Tool (CEJST) different from other Federal environmental screening tools, such as EJScreen?
                 </button>
               </h2>
               <div
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 0b53e251b..43a34c5a6 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -423,7 +423,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       If they are in census tracts that meet the thresholds for at least one of tool’s categories of burden, or
     
                 </li>
-                <li>
+                <li
+                  class="j40-mt3"
+                >
                   
       If they are on land within the boundaries of Federally Recognized Tribes
     
@@ -755,7 +757,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             class="usa-link"
             href="#mine-land"
           >
-            abandoned mine land
+            abandoned mine lands
           </a>
            OR 
           <a
@@ -966,7 +968,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             AND
           </strong>
-           have 10% or more of adults have a 
+           more than 10% of adults have a 
           <a
             class="usa-link"
             href="#high-school"
@@ -992,7 +994,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         >
           <h2>
             
-      Tribal lands
+      Tribes
     
           </h2>
           <p>

From 185f886b4067b79bcc04569ebe1514b89f631b31 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 15 Nov 2022 21:12:40 -0800
Subject: [PATCH 113/130] Add and remove burdens for PR:

- closes #2083
---
 .../src/components/AreaDetail/AreaDetail.tsx  | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index fcc82263b..766278374 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -703,17 +703,34 @@ const AreaDetail = ({properties}: IAreaDetailProps) => {
    * This sidePanelState has 3 values; namely, Nation, Puerto Rico and Island Areas.
    */
   if (sidePanelState === constants.SIDE_PANEL_STATE_VALUES.PUERTO_RICO) {
-    /* For Puerto Rico - only show the following indicators:
-        clean energy (index 1): show all
-        sustainable housing (index 2): only housing cost burden
-        legacy pollution (index 3): show all
-        workforce dev (index 4): remove linguistic iso
-    */
+    // Allow all categories except health burdens:
+    categories = categories.filter((category) => category.id !== 'health-burdens');
+
+    // Re-define which burdens show up for each category:
+
+    // 'climate-change'
+    categories[0].indicators = [flooding];
 
-    // eslint-disable-next-line max-len
-    categories = categories.filter((category) => category.id === 'work-dev' || category.id === 'clean-energy' || category.id === 'leg-pollute' || category.id === 'sustain-house');
+    // 'clean-energy'
     categories[1].indicators = [houseCost];
-    categories[3].indicators = [lowMedInc, unemploy, poverty];
+
+    // 'health-burdens'
+    // not showing this category
+
+    // 'sustain-house'
+    categories[2].indicators = [lowMedInc, unemploy, poverty, lackPlumbing];
+
+    // 'leg-pollute'
+    categories[3].indicators = [proxHaz, proxRMP, proxNPL];
+
+    // 'clean-transport'
+    categories[4].indicators = [dieselPartMatter, trafficVolume];
+
+    // 'clean-water'
+    // show all
+
+    // 'work-dev'
+    // show all
   }
 
   if (sidePanelState === constants.SIDE_PANEL_STATE_VALUES.ISLAND_AREAS) {

From 2ec259e4872eb3853fa181d6e24cc63e55f09525 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 16 Nov 2022 20:45:41 -0800
Subject: [PATCH 114/130] Correct burdens for Puerto Rico

---
 client/src/components/AreaDetail/AreaDetail.tsx | 6 +++---
 client/src/intl/en.json                         | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 766278374..685206a0a 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -712,13 +712,13 @@ const AreaDetail = ({properties}: IAreaDetailProps) => {
     categories[0].indicators = [flooding];
 
     // 'clean-energy'
-    categories[1].indicators = [houseCost];
+    categories[1].indicators = [energyCost];
 
     // 'health-burdens'
     // not showing this category
 
     // 'sustain-house'
-    categories[2].indicators = [lowMedInc, unemploy, poverty, lackPlumbing];
+    categories[2].indicators = [houseCost, lackPlumbing, leadPaint];
 
     // 'leg-pollute'
     categories[3].indicators = [proxHaz, proxRMP, proxNPL];
@@ -730,7 +730,7 @@ const AreaDetail = ({properties}: IAreaDetailProps) => {
     // show all
 
     // 'work-dev'
-    // show all
+    categories[6].indicators = [lowMedInc, poverty, unemploy];
   }
 
   if (sidePanelState === constants.SIDE_PANEL_STATE_VALUES.ISLAND_AREAS) {
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index a2ee5a34b..e74254292 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1583,6 +1583,10 @@
     "defaultMessage": "In contrast, the CEJST will help Federal agencies to identify disadvantaged communities that will benefit from programs included in the Justice40 Initiative.",
     "description": "Navigate to the FAQs page, this will be an answer, Q12_P3"
   },
+  "faqs.page.answers.Q12_P4": {
+    "defaultMessage": "<link1>This chart</link1> is helpful for understanding how the CEJST differs from some of the other Federal environmental screening tools.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q12_P4"
+  },
   "faqs.page.answers.Q13_P1": {
     "defaultMessage": "Several states that have environmental justice screening tools. CalEnviroScreen is an environmental justice screening tool for California. Other states, like New York and Michigan have screening tools as well. The Climate and Economic Justice Screening Tool (CEJST) incorporates lessons learned from these efforts.",
     "description": "Navigate to the FAQs page, this will be an answer, Q13_P1"

From babcc24f21fd5629235b8587102c86c588309075 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 16 Nov 2022 20:47:04 -0800
Subject: [PATCH 115/130] Add 3 download files to FE

- beta training slides to .env
- instructions to .env
- comp. chart to .env
- add comp chart to FAQ
- update snapshots
---
 client/.env.development                       |  3 +
 client/.env.production                        |  3 +
 .../PublicVideoBox/PublicVideoBox.test.tsx    | 20 ++++--
 .../PublicVideoBox/PublicVideoBox.tsx         |  3 +-
 .../PublicVideoBox.test.tsx.snap              | 71 ++++++++++++++++++-
 client/src/data/copy/downloads.tsx            | 22 ++++--
 client/src/data/copy/faqs.tsx                 |  9 +++
 .../src/pages/frequently-asked-questions.tsx  |  1 +
 .../freqAskedQuestions.test.tsx.snap          | 12 ++++
 .../__snapshots__/publicEng.test.tsx.snap     |  2 +-
 10 files changed, 130 insertions(+), 16 deletions(-)

diff --git a/client/.env.development b/client/.env.development
index b365364fc..075cbc611 100644
--- a/client/.env.development
+++ b/client/.env.development
@@ -16,11 +16,14 @@ GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_XLS=downloadable/beta-communities.xlsx
 GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_CSV=downloadable/beta-communities.csv
 GATSBY_FILE_DL_PATH_BETA_SHAPE_FILE_ZIP=downloadable/beta-shapefile-codebook.zip
 GATSBY_FILE_DL_PATH_BETA_DATA_DOC=downloadable/beta-data-documentation.zip
+GATSBY_FILE_DL_PATH_BETA_TRAINING_SLIDES_PPT=downloadable/technical-training-slides.pptx
 
 
 GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_XLS=downloadable/1.0-communities.xlsx
 GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_CSV=downloadable/1.0-communities.csv
 GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP=downloadable/1.0-shapefile-codebook.zip
+GATSBY_FILE_DL_PATH_1_0_INSTRUCT_PDF=downloadable/cejst-instructions-for-federal-agencies.pdf
+GATSBY_FILE_DL_PATH_1_0_COMP_CHART_PDF=downloadable/total-comparison-chart.pdf
 
 GATSBY_FILE_DL_PATH_TSD_PDF=downloadable/cejst-technical-support-document.pdf
 GATSBY_FILE_DL_PATH_TSD_ES_PDF=downloadable/cejst-technical-support-document-es.pdf
diff --git a/client/.env.production b/client/.env.production
index 1bddc6bcd..e748f4f1e 100644
--- a/client/.env.production
+++ b/client/.env.production
@@ -14,10 +14,13 @@ GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_XLS=downloadable/beta-communities.xlsx
 GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_CSV=downloadable/beta-communities.csv
 GATSBY_FILE_DL_PATH_BETA_SHAPE_FILE_ZIP=downloadable/beta-shapefile-codebook.zip
 GATSBY_FILE_DL_PATH_BETA_DATA_DOC=downloadable/beta-data-documentation.zip
+GATSBY_FILE_DL_PATH_BETA_TRAINING_SLIDES_PPT=downloadable/technical-training-slides.pptx
 
 GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_XLS=downloadable/1.0-communities.xlsx
 GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_CSV=downloadable/1.0-communities.csv
 GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP=downloadable/1.0-shapefile-codebook.zip
+GATSBY_FILE_DL_PATH_1_0_INSTRUCT_PDF=downloadable/cejst-instructions-for-federal-agencies.pdf
+GATSBY_FILE_DL_PATH_1_0_COMP_CHART_PDF=downloadable/total-comparison-chart.pdf
 
 GATSBY_FILE_DL_PATH_TSD_PDF=downloadable/cejst-technical-support-document.pdf
 GATSBY_FILE_DL_PATH_TSD_ES_PDF=downloadable/cejst-technical-support-document-es.pdf
diff --git a/client/src/components/PublicVideoBox/PublicVideoBox.test.tsx b/client/src/components/PublicVideoBox/PublicVideoBox.test.tsx
index 29cb944f5..8c4f14312 100644
--- a/client/src/components/PublicVideoBox/PublicVideoBox.test.tsx
+++ b/client/src/components/PublicVideoBox/PublicVideoBox.test.tsx
@@ -4,13 +4,21 @@ import {LocalizedComponent} from '../../test/testHelpers';
 import PublicVideoBox from './PublicVideoBox';
 
 describe('rendering of the PublicVideoBox', () => {
-  const {asFragment} = render(
-      <LocalizedComponent>
-        <PublicVideoBox />
-      </LocalizedComponent>,
-  );
+  it('checks if component renders when it is in beta', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <PublicVideoBox isBeta={true} />
+        </LocalizedComponent>,
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
 
-  it('checks if component renders', () => {
+  it('checks if component renders when it is NOT in beta', () => {
+    const {asFragment} = render(
+        <LocalizedComponent>
+          <PublicVideoBox isBeta={false} />
+        </LocalizedComponent>,
+    );
     expect(asFragment()).toMatchSnapshot();
   });
 });
diff --git a/client/src/components/PublicVideoBox/PublicVideoBox.tsx b/client/src/components/PublicVideoBox/PublicVideoBox.tsx
index 07b965df9..655ea90ee 100644
--- a/client/src/components/PublicVideoBox/PublicVideoBox.tsx
+++ b/client/src/components/PublicVideoBox/PublicVideoBox.tsx
@@ -6,6 +6,7 @@ import DownloadButton from '../DownloadButton';
 
 import * as styles from './PublicVideoBox.module.scss';
 import * as PUBLIC_COPY from '../../data/copy/publicEngage';
+import {getDownloadFileUrl} from '../../data/copy/downloads';
 
 // @ts-ignore
 import launchIcon from '/node_modules/uswds/dist/img/usa-icons/launch.svg';
@@ -55,7 +56,7 @@ const PublicVideoBox = ({isBeta}:IPublicVideoBox) => {
           </Button>
         </a>
         <DownloadButton
-          downloadLink={`https://static-data-screeningtool.geoplatform.gov/data-pipeline/data/score/downloadable/technical-training-slides.pptx`}
+          downloadLink={getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_BETA_TRAINING_SLIDES_PPT, true)}
           buttonText={isBeta ?
             intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON2_BETA_TEXT) :
             intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON2_TEXT)
diff --git a/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap b/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap
index d75255947..c4fbe08f1 100644
--- a/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap
+++ b/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`rendering of the PublicVideoBox checks if component renders 1`] = `
+exports[`rendering of the PublicVideoBox checks if component renders when it is NOT in beta 1`] = `
 <DocumentFragment>
   <div
     class="usa-summary-box"
@@ -43,7 +43,7 @@ exports[`rendering of the PublicVideoBox checks if component renders 1`] = `
         </a>
         <a
           download=""
-          href="https://static-data-screeningtool.geoplatform.gov/data-pipeline/data/score/downloadable/technical-training-slides.pptx"
+          href="//"
         >
           <button
             class="usa-button"
@@ -66,3 +66,70 @@ exports[`rendering of the PublicVideoBox checks if component renders 1`] = `
   </div>
 </DocumentFragment>
 `;
+
+exports[`rendering of the PublicVideoBox checks if component renders when it is in beta 1`] = `
+<DocumentFragment>
+  <div
+    class="usa-summary-box"
+    data-testid="summary-box"
+  >
+    <div
+      class="usa-summary-box__body"
+    >
+      <h2
+        class="usa-summary-box__heading"
+      >
+        Need information about the public beta?
+      </h2>
+      <div
+        class="usa-summary-box__text"
+      >
+        
+      Watch a recorded version of the beta version of the CEJST training on YouTube.
+  
+        <a
+          href="https://www.youtube.com/watch?v=QwHWcXbhw28"
+          rel="noreferrer"
+          target="_blank"
+        >
+          <button
+            class="usa-button"
+            data-testid="button"
+            type="button"
+          >
+            <div>
+              <div>
+                Watch on beta demo
+              </div>
+              <img
+                alt="the icon to show that this button will open in a new tab"
+                src="test-file-stub"
+              />
+            </div>
+          </button>
+        </a>
+        <a
+          download=""
+          href="//"
+        >
+          <button
+            class="usa-button"
+            data-testid="button"
+            type="button"
+          >
+            <div>
+              <div>
+                Download beta slide deck
+              </div>
+              <img
+                alt="the icon to show that this button will download the file"
+                src="test-file-stub"
+              />
+            </div>
+          </button>
+        </a>
+      </div>
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/client/src/data/copy/downloads.tsx b/client/src/data/copy/downloads.tsx
index 9c1bafe9a..343d5cdbb 100644
--- a/client/src/data/copy/downloads.tsx
+++ b/client/src/data/copy/downloads.tsx
@@ -42,32 +42,42 @@ export const DOWNLOAD_FILES = {
     COMMUNITIES_LIST_XLS: {
       SIZE: 35.6, // MB
       URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_XLS, false),
-      LAST_UPDATED: new Date('10/27/2022').getTime(),
+      LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
     },
     COMMUNITIES_LIST_CSV: {
       SIZE: 42, // MB
       URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_CSV, false),
-      LAST_UPDATED: new Date('10/27/2022').getTime(),
+      LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
     },
     SHAPE_FILE: {
       SIZE: 356.8, // MB
       URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP, false),
-      LAST_UPDATED: new Date('10/27/2022').getTime(),
+      LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
     },
     TSD: {
       SIZE: 2.4, // MB
       URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_PDF, false),
-      LAST_UPDATED: new Date('10/27/2022').getTime(),
+      LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
     },
     TSD_ES: {
       SIZE: 4.8, // MB
       URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_ES_PDF, false),
-      LAST_UPDATED: new Date('10/27/2022').getTime(),
+      LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
     },
     HOW_TO_COMMUNITIES: {
       SIZE: 658.3, // KB
       URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF, false),
-      LAST_UPDATED: new Date('10/27/2022').getTime(),
+      LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
+    },
+    INSTRUCTIONS: {
+      SIZE: .8, // KB // Todo: Update when actual file is uploaded
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_INSTRUCT_PDF, false),
+      LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
+    },
+    COMP_CHART: {
+      SIZE: .8, // KB // Todo: Update when actual file is uploaded
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_COMP_CHART_PDF, false),
+      LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
     },
   },
   BETA: {
diff --git a/client/src/data/copy/faqs.tsx b/client/src/data/copy/faqs.tsx
index a44006345..175850d16 100644
--- a/client/src/data/copy/faqs.tsx
+++ b/client/src/data/copy/faqs.tsx
@@ -8,6 +8,7 @@ import {EJSCREEN, EXEC_ORDER_LINK, FED_RECOGNIZED_INDIAN_ENTITIES} from './about
 import {boldFn, linkFn, FEEDBACK_EMAIL} from './common';
 import {PAGES_ENDPOINTS} from '../constants';
 import {EXPLORE_PAGE_LINKS} from './explore';
+import {DOWNLOAD_FILES} from './downloads';
 
 export const PAGE_INTRO = defineMessages({
   PAGE_TILE: {
@@ -523,6 +524,14 @@ export const FAQ_ANSWERS = {
     defaultMessage={ `In contrast, the CEJST will help Federal agencies to identify disadvantaged communities that will benefit from programs included in the Justice40 Initiative.`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q12_P3'}
   />,
+  Q12_P4: <FormattedMessage
+    id={ 'faqs.page.answers.Q12_P4'}
+    defaultMessage={ `<link1>This chart</link1> is helpful for understanding how the CEJST differs from some of the other Federal environmental screening tools.`}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q12_P4'}
+    values={{
+      link1: linkFn(DOWNLOAD_FILES.NARWAL.COMP_CHART.URL, false, true),
+    }}
+  />,
   Q13_P1: <FormattedMessage
     id={ 'faqs.page.answers.Q13_P1'}
     defaultMessage={ `Several states that have environmental justice screening tools. CalEnviroScreen is an environmental justice screening tool for California. Other states, like New York and Michigan have screening tools as well. The Climate and Economic Justice Screening Tool (CEJST)  incorporates lessons learned from these efforts.`}
diff --git a/client/src/pages/frequently-asked-questions.tsx b/client/src/pages/frequently-asked-questions.tsx
index 3837084a0..98b9c7acb 100644
--- a/client/src/pages/frequently-asked-questions.tsx
+++ b/client/src/pages/frequently-asked-questions.tsx
@@ -157,6 +157,7 @@ const FAQPage = ({location}: IFAQPageProps) => {
         </ul>
         <p>{FAQS_COPY.FAQ_ANSWERS.Q12_P2}</p>
         <p>{FAQS_COPY.FAQ_ANSWERS.Q12_P3}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q12_P4}</p>
       </>
     ),
     (
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 40f81d44d..d0760102c 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -930,6 +930,18 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 <p>
                   In contrast, the CEJST will help Federal agencies to identify disadvantaged communities that will benefit from programs included in the Justice40 Initiative.
                 </p>
+                <p>
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="//"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    This chart
+                  </a>
+                   is helpful for understanding how the CEJST differs from some of the other Federal environmental screening tools.
+                </p>
               </div>
               <h2
                 class="usa-accordion__heading"
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index a61e38058..8343b93a1 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -498,7 +498,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </a>
                 <a
                   download=""
-                  href="https://static-data-screeningtool.geoplatform.gov/data-pipeline/data/score/downloadable/technical-training-slides.pptx"
+                  href="//"
                 >
                   <button
                     class="usa-button"

From b0f48c9be8ce1a0dd572ba0f894f229b276f7ff4 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 16 Nov 2022 22:55:48 -0800
Subject: [PATCH 116/130] Update priotization copy

- closes #2086
- closes #2085
- reorders ifs, placed all ifs with dependency no CC > =1 w/i in the first if block
---
 .../PrioritizationCopy/PrioritizationCopy.tsx | 27 ++++-----
 .../PrioritizationCopy2.tsx                   | 56 +++++++++++--------
 2 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
index 9caccab63..734743cef 100644
--- a/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
+++ b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
@@ -48,21 +48,22 @@ const PrioritizationCopy =
        if (isAdjacencyThreshMet && isAdjacencyLowIncome) {
          prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.PRIO_SURR_LI;
          // if 1-2
-       } else if (
-         isAdjacencyThreshMet &&
-          !isAdjacencyLowIncome &&
-          tribalCountAK === null &&
-          tribalCountUS === null
-       ) {
+       } else if (isAdjacencyThreshMet && !isAdjacencyLowIncome) {
          // if 1-2-1
-         if (percentTractTribal === null) {
-           prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO_SURR_LI;
+         if ( tribalCountAK === null && tribalCountUS === null) {
+           // if 1-2-1-1
+           if (percentTractTribal === null) {
+             prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO_SURR_LI;
+             // if 1-2-1-2
+           } else if (percentTractTribal === 0) {
+             prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.PAR_PRIO_SURR_NO_LI;
+             // if 1-2-1-3
+           } else if (percentTractTribal >= 1) {
+             prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.PAR_PRIO_SURR_NO_LI;
+           }
            // if 1-2-2
-         } else if (percentTractTribal === 0) {
-           prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.PAR_PRIO_SURR_NO_LI;
-           // if 1-2-3
-         } else if (percentTractTribal >= 1) {
-           prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.PAR_PRIO_SURR_NO_LI;
+         } else if (tribalCountAK !== null && tribalCountAK >= 1) {
+           prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO_SURR_LI;
          }
          // if 1-3
        } else if (
diff --git a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx
index 0211c5931..6ed758e19 100644
--- a/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx
+++ b/client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx
@@ -89,10 +89,35 @@ const PrioritizationCopy2 =
         (tribalCountUS !== null && tribalCountUS >= 1)
        ) {
          prioCopy2Rendered = EXPLORE_COPY.getPrioAKUSCopy(tribalCountAK, tribalCountUS, true);
-       // if 1-7
-       } else {
-         prioCopy2Rendered = <></>;
-         noStyles = true;
+         // if 1-7
+       } else if (
+         !isAdjacencyThreshMet && isAdjacencyLowIncome &&
+       (tribalCountAK !== null && tribalCountAK >= 1) &&
+       (percentTractTribal !== null && percentTractTribal >= 1)
+       ) {
+         prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`${percentTractTribal}%`, true);
+         // if 1-8
+       } else if (
+         (totalCategoriesPrioritized >= 1) &&
+         tribalCountAK == null &&
+         (tribalCountUS !== null && tribalCountUS >= 1) &&
+         percentTractTribal == null
+       ) {
+         prioCopy2Rendered = EXPLORE_COPY.getPrioFRTPointsCopy(tribalCountUS, true);
+         // if 1-9
+       } else if (
+         totalCategoriesPrioritized >= 1 &&
+       (tribalCountAK !== null && tribalCountAK >= 1) &&
+       (percentTractTribal !== null && percentTractTribal == 0)
+       ) {
+         prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`less than 1%`, true);
+         // if 1-10
+       } else if (
+         totalCategoriesPrioritized >= 1 &&
+       (tribalCountAK !== null && tribalCountAK >= 1) &&
+       (percentTractTribal !== null && percentTractTribal >= 1)
+       ) {
+         prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`${percentTractTribal}%`, true);
        }
        // if 2
      } else if (
@@ -117,26 +142,11 @@ const PrioritizationCopy2 =
        prioCopy2Rendered = EXPLORE_COPY.getPrioFRTPointsCopy(tribalCountUS, true);
        // if 4
      } else if (
-       (totalCategoriesPrioritized >= 1) &&
-        tribalCountAK == null &&
-        (tribalCountUS !== null && tribalCountUS >= 1) &&
-        percentTractTribal == null
-     ) {
-       prioCopy2Rendered = EXPLORE_COPY.getPrioFRTPointsCopy(tribalCountUS, true);
-       // if 5
-     } else if (
-       totalCategoriesPrioritized >= 1 &&
-      (tribalCountAK !== null && tribalCountAK >= 1) &&
-      (percentTractTribal !== null && percentTractTribal == 0)
-     ) {
-       prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`less than 1%`, true);
-       // if 6
-     } else if (
-       totalCategoriesPrioritized >= 1 &&
-      (tribalCountAK !== null && tribalCountAK >= 1) &&
-      (percentTractTribal !== null && percentTractTribal >= 1)
+       totalCategoriesPrioritized === 0 &&
+      isAdjacencyThreshMet && !isAdjacencyLowIncome &&
+      (tribalCountAK !== null && tribalCountAK >= 1)
      ) {
-       prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`${percentTractTribal}%`, true);
+       prioCopy2Rendered = EXPLORE_COPY.getPrioANVCopy(tribalCountAK, true);
      } else {
        prioCopy2Rendered = <></>;
        noStyles = true;

From b7e35c290f00f2007ef25642f260bcdf4385ace9 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 16 Nov 2022 23:19:36 -0800
Subject: [PATCH 117/130] Update copy - update icon in side panel (unselected)
 - update copy in methodology cards

---
 .../__snapshots__/datasetCard.test.tsx.snap   |  2 +-
 .../datasetContainer.test.tsx.snap            | 34 +++++++++----------
 .../SidePanelInfo/SidePanelInfo.tsx           |  4 +--
 client/src/data/copy/methodology.tsx          | 26 +++++++-------
 client/src/intl/en.json                       | 20 +++++------
 .../__snapshots__/methodology.test.tsx.snap   | 34 +++++++++----------
 6 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap b/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap
index 182c2189a..3ee8cb0e7 100644
--- a/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap
+++ b/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap
@@ -50,7 +50,7 @@ exports[`rendering of indicator dataset card checks if component renders 1`] = `
         <span>
           Available for: 
         </span>
-        All U.S. states and the District of Columbia
+        All U.S. states, the District of Columbia, and Puerto Rico
       </li>
     </ul>
   </div>
diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
index 829d18793..7f1804eef 100644
--- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
+++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
@@ -121,7 +121,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states and the District of Columbia
+                  All U.S. states, the District of Columbia, and Puerto Rico
                 </li>
               </ul>
             </div>
@@ -239,7 +239,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate the population loss rate.
+        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the population loss rate.
 
       
               </div>
@@ -297,7 +297,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not consider property value.
+        A high precision, climate-adjusted model that projects flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not consider property value.
       
               </div>
               <ul>
@@ -354,7 +354,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not consider property value.
+        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous U.S., today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not consider property value.
       
               </div>
               <ul>
@@ -699,9 +699,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     rel="noreferrer"
                     target="_blank"
                   >
-                    U.S. Small-Area Life Expectancy Estimates Project (USALEEP)
+                    U.S. Small-Area Life Expectancy Estimates Project
                   </a>
-                   from 2010-2015
+                   (USALEEP) from 2010-2015
                 </li>
                 <li>
                   <span>
@@ -729,7 +729,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Census tracts that experienced historic underinvestment based on redlining maps created by the federal government’s Home Owners’ Loan Corporation (HOLC) between 1935 and 1940. The tool uses the 
+        Census tracts that experienced historic underinvestment based on redlining maps created by the federal government’s Home Owners’ Loan Corporation (HOLC) between 1935 and 1940. The tool uses the National Community Reinvestment Coalition’s 
                 <a
                   class="usa-link usa-link--external"
                   data-cy=""
@@ -737,7 +737,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   rel="noreferrer"
                   target="_blank"
                 >
-                  National Community Reinvestment Coalition’s methodology
+                  methodology
                 </a>
                  for converting boundaries in the HOLC maps to census tracts. Census tracts meet the threshold when they have a score of 3.25 or more out of 4.
       
@@ -789,7 +789,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Available for: 
                   </span>
-                  Metro areas of US that were HOLC graded 
+                  Metro areas of U.S. that were HOLC graded 
                 </li>
               </ul>
             </div>
@@ -819,7 +819,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Responsible Party: 
                   </span>
-                  Department of Housing & Urban Development (HUD)
+                  Department of Housing and Urban Development (HUD)
                 </li>
                 <li>
                   <span>
@@ -934,7 +934,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Responsible Party: 
                   </span>
-                  Department of Housing & Urban Development (HUD)
+                  Department of Housing and Urban Development (HUD)
                 </li>
                 <li>
                   <span>
@@ -971,7 +971,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are less likely to face health risks from lead paint exposure are not included.
+        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) that are less likely to face health risks from lead paint exposure are not included.
       
               </div>
               <ul>
@@ -1112,9 +1112,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     rel="noreferrer"
                     target="_blank"
                   >
-                    Formerly Used Defense Sites (FUDS) 
+                    Formerly Used Defense Sites
                   </a>
-                    from 2019
+                   (FUDS) from 2019
                 </li>
                 <li>
                   <span>
@@ -1385,7 +1385,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Available for: 
                   </span>
-                  All U.S. states, the District of Columbia, and Puerto Rico
+                  All U.S. states and the District of Columbia
                 </li>
               </ul>
             </div>
@@ -1458,7 +1458,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Weighted formula of number of leaking underground storage tanks and the number of underground storage tanks within 1,500 feet.
+        Weighted formula of number of leaking underground storage tanks and the number of all underground storage tanks within 1,500 feet.
       
               </div>
               <ul>
@@ -1608,7 +1608,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <strong>
                     Note: 
                   </strong>
-                  Linguistic isolation was removed from Puerto Rico based on feedback during the beta period.
+                  Linguistic isolation was removed for Puerto Rico based on feedback during the beta period.
       
                 </p>
               </div>
diff --git a/client/src/components/SidePanelInfo/SidePanelInfo.tsx b/client/src/components/SidePanelInfo/SidePanelInfo.tsx
index f2f26003d..cc8cd4572 100644
--- a/client/src/components/SidePanelInfo/SidePanelInfo.tsx
+++ b/client/src/components/SidePanelInfo/SidePanelInfo.tsx
@@ -21,7 +21,7 @@ import bellCurveIcon from '../../images/sidePanelIcons/bell-curve.svg';
 // @ts-ignore
 import censusDotIcon from '../../images/sidePanelIcons/census-tract.svg';
 // @ts-ignore
-import tribalDotIcon from '../../images/sidePanelIcons/tribal-tract.svg';
+// import tribalDotIcon from '../../images/sidePanelIcons/tribal-tract.svg';
 // @ts-ignore
 import pieChartIcon from '../../images/sidePanelIcons/pie-chart.svg';
 // @ts-ignore
@@ -149,7 +149,7 @@ const SidePanelInfo = () => {
         windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
         <p tabIndex={0}>
           {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA6_PART1)}
-          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={tribalDotIcon}
+          <img tabIndex={0} className={styles.sidePanelInfoIcon} src={censusDotIcon}
             alt={intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.DAC_CIRCLE)}
           />
           {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA6_PART2)}
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index acd9ef859..213b524d3 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -487,7 +487,7 @@ export const RESPONSIBLE_PARTIES = {
   EPA_OAR: `Environmental Protection Agency (EPA) Office of Air and Radiation (OAR)`,
   FIRST: `First Street Foundation`,
   FEMA: `Federal Emergency Management Agency (FEMA)`,
-  HUD: `Department of Housing & Urban Development (HUD)`,
+  HUD: `Department of Housing and Urban Development (HUD)`,
   NCRC: `Nationl Community Reinvestment Coalition (NCRC)`,
   TPL: `The Trust for Public Lands and American Forestry`,
   USACE: `U.S. Army Corps of Engineers`,
@@ -617,7 +617,7 @@ export const SOURCE_LINKS = {
   />,
   CDC_SLEEP: <FormattedMessage
     id={'methodology.page.category.source.cdc.sleep.link'}
-    defaultMessage={`<link1>U.S. Small-Area Life Expectancy Estimates Project (USALEEP)</link1> from {date10_15}`}
+    defaultMessage={`<link1>U.S. Small-Area Life Expectancy Estimates Project</link1> (USALEEP) from {date10_15}`}
     description={'Navigate to the Methodology page. This is the source link for CDC Sleep'}
     values={{
       link1: linkFn('https://www.cdc.gov/nchs/nvss/usaleep/usaleep.html#data', false, true),
@@ -662,7 +662,7 @@ export const SOURCE_LINKS = {
   />,
   FUDS: <FormattedMessage
     id={'methodology.page.category.source.fuds.link'}
-    defaultMessage={`<link1>Formerly Used Defense Sites (FUDS) </link1>  from {date19}`}
+    defaultMessage={`<link1>Formerly Used Defense Sites</link1> (FUDS) from {date19}`}
     description={'Navigate to the Methodology page. This is the source link for CDC Sleep'}
     values={{
       link1: linkFn('https://www.usace.army.mil/Missions/Environmental/Formerly-Used-Defense-Sites/', false, true),
@@ -728,7 +728,7 @@ export const AVAILABLE_FOR = defineMessages({
   },
   METRO_US_HOLC: {
     id: 'methodology.page.dataset.card.availableFor.METRO_US_HOLC',
-    defaultMessage: `Metro areas of US that were HOLC graded `,
+    defaultMessage: `Metro areas of U.S. that were HOLC graded `,
     description: 'Methodology page dataset card available for METRO_US_HOLC',
   },
   FRT: {
@@ -778,7 +778,7 @@ export const INDICATORS = [
     sources: [
       {
         source: SOURCE_LINKS.CENSUS_ACS_15_19,
-        availableFor: AVAILABLE_FOR.ALL_US_DC,
+        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
       },
     ],
   },
@@ -840,7 +840,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.exp.pop.loss.rate.description.text'}
       defaultMessage={`
-        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate the population loss rate.
+        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the population loss rate.
 
       `}
       description={'Navigate to the Methodology page. This is the description text for exp pop loss rate'}
@@ -865,7 +865,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.flood.risk.rate.description.text'}
       defaultMessage={`
-        A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not consider property value.
+        A high precision, climate-adjusted model that projects flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not consider property value.
       `}
       description={'Navigate to the Methodology page. This is the description text for exp bld loss rate'}
     />,
@@ -889,7 +889,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.wildfire.risk.rate.description.text'}
       defaultMessage={`
-        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not consider property value.
+        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous U.S., today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not consider property value.
       `}
       description={'Navigate to the Methodology page. This is the description text for exp bld loss rate'}
     />,
@@ -1067,7 +1067,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.low.hist.underinvestectancy.description.text'}
       defaultMessage={`
-        Census tracts that experienced historic underinvestment based on redlining maps created by the federal government’s Home Owners’ Loan Corporation (HOLC) between 1935 and 1940. The tool uses the <link1>National Community Reinvestment Coalition’s methodology</link1> for converting boundaries in the HOLC maps to census tracts. Census tracts meet the threshold when they have a score of 3.25 or more out of 4.
+        Census tracts that experienced historic underinvestment based on redlining maps created by the federal government’s Home Owners’ Loan Corporation (HOLC) between 1935 and 1940. The tool uses the National Community Reinvestment Coalition’s <link1>methodology</link1> for converting boundaries in the HOLC maps to census tracts. Census tracts meet the threshold when they have a score of 3.25 or more out of 4.
       `}
       description={'Navigate to the Methodology page. This is the description text for Historic Underinvestment'}
       values={{
@@ -1175,7 +1175,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.lead.paint.description.text'}
       defaultMessage={`
-        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are less likely to face health risks from lead paint exposure are not included.
+        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) that are less likely to face health risks from lead paint exposure are not included.
       `}
       description={'Navigate to the Methodology page. This is the description text for lead paint'}
     />,
@@ -1352,7 +1352,7 @@ export const INDICATORS = [
     sources: [
       {
         source: SOURCE_LINKS.TRANS_BUR,
-        availableFor: AVAILABLE_FOR.ALL_US_DC_PR,
+        availableFor: AVAILABLE_FOR.ALL_US_DC,
       },
     ],
   },
@@ -1392,7 +1392,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.leaky.uwt.description.text'}
       defaultMessage={`
-        Weighted formula of number of leaking underground storage tanks and the number of underground storage tanks within 1,500 feet.
+        Weighted formula of number of leaking underground storage tanks and the number of all underground storage tanks within 1,500 feet.
       `}
       description={'Navigate to the Methodology page. This is the description text for Leaking underground storage tanks'}
     />,
@@ -1448,7 +1448,7 @@ export const INDICATORS = [
     note: <FormattedMessage
       id={'methodology.page.category.linguistic.iso.note.text'}
       defaultMessage={`
-      <boldtag>Note: </boldtag>Linguistic isolation was removed from Puerto Rico based on feedback during the beta period.
+      <boldtag>Note: </boldtag>Linguistic isolation was removed for Puerto Rico based on feedback during the beta period.
       `}
       description={'Navigate to the Methodology page. This is the note text for linguistic.iso'}
       values={{
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index e74254292..23acea985 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1868,11 +1868,11 @@
     "description": "Navigate to the Methodology page. This is the description text for exp bld loss rate"
   },
   "methodology.page.category.exp.pop.loss.rate.description.text": {
-    "defaultMessage": "Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate the population loss rate.",
+    "defaultMessage": "Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the population loss rate.",
     "description": "Navigate to the Methodology page. This is the description text for exp pop loss rate"
   },
   "methodology.page.category.flood.risk.rate.description.text": {
-    "defaultMessage": "A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not consider property value.",
+    "defaultMessage": "A high precision, climate-adjusted model that projects flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not consider property value.",
     "description": "Navigate to the Methodology page. This is the description text for exp bld loss rate"
   },
   "methodology.page.category.fuds.description.text": {
@@ -1900,11 +1900,11 @@
     "description": "Navigate to the Methodology page. This is the description text for housing burden"
   },
   "methodology.page.category.lead.paint.description.text": {
-    "defaultMessage": "Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are less likely to face health risks from lead paint exposure are not included.",
+    "defaultMessage": "Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) that are less likely to face health risks from lead paint exposure are not included.",
     "description": "Navigate to the Methodology page. This is the description text for lead paint"
   },
   "methodology.page.category.leaky.uwt.description.text": {
-    "defaultMessage": "Weighted formula of number of leaking underground storage tanks and the number of underground storage tanks within 1,500 feet.",
+    "defaultMessage": "Weighted formula of number of leaking underground storage tanks and the number of all underground storage tanks within 1,500 feet.",
     "description": "Navigate to the Methodology page. This is the description text for Leaking underground storage tanks"
   },
   "methodology.page.category.linguistic.iso.description.text": {
@@ -1912,11 +1912,11 @@
     "description": "Navigate to the Methodology page. This is the description text for linguistic isolation"
   },
   "methodology.page.category.linguistic.iso.note.text": {
-    "defaultMessage": "<boldtag>Note: </boldtag>Linguistic isolation was removed from Puerto Rico based on feedback during the beta period.",
+    "defaultMessage": "<boldtag>Note: </boldtag>Linguistic isolation was removed for Puerto Rico based on feedback during the beta period.",
     "description": "Navigate to the Methodology page. This is the note text for linguistic.iso"
   },
   "methodology.page.category.low.hist.underinvestectancy.description.text": {
-    "defaultMessage": "Census tracts that experienced historic underinvestment based on redlining maps created by the federal government’s Home Owners’ Loan Corporation (HOLC) between 1935 and 1940. The tool uses the <link1>National Community Reinvestment Coalition’s methodology</link1> for converting boundaries in the HOLC maps to census tracts. Census tracts meet the threshold when they have a score of 3.25 or more out of 4.",
+    "defaultMessage": "Census tracts that experienced historic underinvestment based on redlining maps created by the federal government’s Home Owners’ Loan Corporation (HOLC) between 1935 and 1940. The tool uses the National Community Reinvestment Coalition’s <link1>methodology</link1> for converting boundaries in the HOLC maps to census tracts. Census tracts meet the threshold when they have a score of 3.25 or more out of 4.",
     "description": "Navigate to the Methodology page. This is the description text for Historic Underinvestment"
   },
   "methodology.page.category.low.hist.underinvestectancy.note.text": {
@@ -1976,7 +1976,7 @@
     "description": "Navigate to the Methodology page. This is the source link for CDC Places"
   },
   "methodology.page.category.source.cdc.sleep.link": {
-    "defaultMessage": "<link1>U.S. Small-Area Life Expectancy Estimates Project (USALEEP)</link1> from {date10_15}",
+    "defaultMessage": "<link1>U.S. Small-Area Life Expectancy Estimates Project</link1> (USALEEP) from {date10_15}",
     "description": "Navigate to the Methodology page. This is the source link for CDC Sleep"
   },
   "methodology.page.category.source.census.link.10": {
@@ -2028,7 +2028,7 @@
     "description": "Navigate to the Methodology page. This is the source link for CDC Sleep"
   },
   "methodology.page.category.source.fuds.link": {
-    "defaultMessage": "<link1>Formerly Used Defense Sites (FUDS) </link1> from {date19}",
+    "defaultMessage": "<link1>Formerly Used Defense Sites</link1> (FUDS) from {date19}",
     "description": "Navigate to the Methodology page. This is the source link for CDC Sleep"
   },
   "methodology.page.category.source.holc.link": {
@@ -2076,7 +2076,7 @@
     "description": "Navigate to the Methodology page. This is the description text for waste water"
   },
   "methodology.page.category.wildfire.risk.rate.description.text": {
-    "defaultMessage": "A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not consider property value.",
+    "defaultMessage": "A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous U.S., today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not consider property value.",
     "description": "Navigate to the Methodology page. This is the description text for exp bld loss rate"
   },
   "methodology.page.category.workforce.dev.description.text": {
@@ -2100,7 +2100,7 @@
     "description": "Methodology page dataset card available for FRT"
   },
   "methodology.page.dataset.card.availableFor.METRO_US_HOLC": {
-    "defaultMessage": "Metro areas of US that were HOLC graded",
+    "defaultMessage": "Metro areas of U.S. that were HOLC graded",
     "description": "Methodology page dataset card available for METRO_US_HOLC"
   },
   "methodology.page.dataset.card.availableFor.US_DC": {
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 43a34c5a6..173633396 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -1124,7 +1124,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states and the District of Columbia
+                    All U.S. states, the District of Columbia, and Puerto Rico
                   </li>
                 </ul>
               </div>
@@ -1242,7 +1242,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the rate the population loss rate.
+        Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the population loss rate.
 
       
                 </div>
@@ -1300,7 +1300,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        A high precision, climate-adjusted model that projects future flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not consider property value.
+        A high precision, climate-adjusted model that projects flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not consider property value.
       
                 </div>
                 <ul>
@@ -1357,7 +1357,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous US, today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not consider property value.
+        A 30-meter resolution model projecting the wildfire exposure for any specific location in the contiguous U.S., today and with future climate change. The risk of wildfire is calculated from inputs associated with fire fuels, weather, human influence, and fire movement. The risk does not consider property value.
       
                 </div>
                 <ul>
@@ -1702,9 +1702,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       rel="noreferrer"
                       target="_blank"
                     >
-                      U.S. Small-Area Life Expectancy Estimates Project (USALEEP)
+                      U.S. Small-Area Life Expectancy Estimates Project
                     </a>
-                     from 2010-2015
+                     (USALEEP) from 2010-2015
                   </li>
                   <li>
                     <span>
@@ -1732,7 +1732,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Census tracts that experienced historic underinvestment based on redlining maps created by the federal government’s Home Owners’ Loan Corporation (HOLC) between 1935 and 1940. The tool uses the 
+        Census tracts that experienced historic underinvestment based on redlining maps created by the federal government’s Home Owners’ Loan Corporation (HOLC) between 1935 and 1940. The tool uses the National Community Reinvestment Coalition’s 
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
@@ -1740,7 +1740,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     rel="noreferrer"
                     target="_blank"
                   >
-                    National Community Reinvestment Coalition’s methodology
+                    methodology
                   </a>
                    for converting boundaries in the HOLC maps to census tracts. Census tracts meet the threshold when they have a score of 3.25 or more out of 4.
       
@@ -1792,7 +1792,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Available for: 
                     </span>
-                    Metro areas of US that were HOLC graded 
+                    Metro areas of U.S. that were HOLC graded 
                   </li>
                 </ul>
               </div>
@@ -1822,7 +1822,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Responsible Party: 
                     </span>
-                    Department of Housing & Urban Development (HUD)
+                    Department of Housing and Urban Development (HUD)
                   </li>
                   <li>
                     <span>
@@ -1937,7 +1937,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Responsible Party: 
                     </span>
-                    Department of Housing & Urban Development (HUD)
+                    Department of Housing and Urban Development (HUD)
                   </li>
                   <li>
                     <span>
@@ -1974,7 +1974,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) are less likely to face health risks from lead paint exposure are not included.
+        Share of homes built before 1960, which indicates potential lead paint exposure. Tracts with extremely high home values (i.e. median home values above the 90th percentile) that are less likely to face health risks from lead paint exposure are not included.
       
                 </div>
                 <ul>
@@ -2115,9 +2115,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       rel="noreferrer"
                       target="_blank"
                     >
-                      Formerly Used Defense Sites (FUDS) 
+                      Formerly Used Defense Sites
                     </a>
-                      from 2019
+                     (FUDS) from 2019
                   </li>
                   <li>
                     <span>
@@ -2388,7 +2388,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Available for: 
                     </span>
-                    All U.S. states, the District of Columbia, and Puerto Rico
+                    All U.S. states and the District of Columbia
                   </li>
                 </ul>
               </div>
@@ -2461,7 +2461,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Weighted formula of number of leaking underground storage tanks and the number of underground storage tanks within 1,500 feet.
+        Weighted formula of number of leaking underground storage tanks and the number of all underground storage tanks within 1,500 feet.
       
                 </div>
                 <ul>
@@ -2611,7 +2611,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <strong>
                       Note: 
                     </strong>
-                    Linguistic isolation was removed from Puerto Rico based on feedback during the beta period.
+                    Linguistic isolation was removed for Puerto Rico based on feedback during the beta period.
       
                   </p>
                 </div>

From e04d36137018569c45a6a7b1a839f0532ec35d2d Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 16 Nov 2022 23:31:53 -0800
Subject: [PATCH 118/130] Update link in FAQs

---
 client/src/data/copy/faqs.tsx                 | 17 +++---
 client/src/intl/en.json                       |  6 +-
 .../src/pages/frequently-asked-questions.tsx  | 10 ++--
 .../freqAskedQuestions.test.tsx.snap          | 59 ++++++++-----------
 4 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/client/src/data/copy/faqs.tsx b/client/src/data/copy/faqs.tsx
index 175850d16..1c26acd61 100644
--- a/client/src/data/copy/faqs.tsx
+++ b/client/src/data/copy/faqs.tsx
@@ -217,12 +217,12 @@ export const QUESTIONS = [
     defaultMessage={ 'Q: Can the public provide feedback on this tool?'}
     description={ 'Navigate to the FAQs page, this will be Q15'}
   />,
-  <FormattedMessage
-    id={ 'faqs.page.Q16'}
-    key={ 'faqs.page.Q16'}
-    defaultMessage={ 'Q: Will CEQ issue another Request for Information about the tool?'}
-    description={ 'Navigate to the FAQs page, this will be Q16'}
-  />,
+  // <FormattedMessage
+  //   id={ 'faqs.page.Q16'}
+  //   key={ 'faqs.page.Q16'}
+  //   defaultMessage={ 'Q: Will CEQ issue another Request for Information about the tool?'}
+  //   description={ 'Navigate to the FAQs page, this will be Q16'}
+  // />,
   <FormattedMessage
     id={ 'faqs.page.Q17'}
     key={ 'faqs.page.Q17'}
@@ -458,8 +458,11 @@ export const FAQ_ANSWERS = {
   />,
   Q10: <FormattedMessage
     id={ 'faqs.page.answers.Q10'}
-    defaultMessage={ `Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.`}
+    defaultMessage={ `Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the <link1>eligibility criteria</link1>. Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q10'}
+    values={{
+      link1: linkFn(`https://www.whitehouse.gov/wp-content/uploads/2021/07/M-21-28.pdf`, false, true),
+    }}
   />,
   Q11: <FormattedMessage
     id={ 'faqs.page.answers.Q11'}
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 23acea985..fb6340bd4 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1479,10 +1479,6 @@
     "defaultMessage": "Q: Can the public provide feedback on this tool?",
     "description": "Navigate to the FAQs page, this will be Q15"
   },
-  "faqs.page.Q16": {
-    "defaultMessage": "Q: Will CEQ issue another Request for Information about the tool?",
-    "description": "Navigate to the FAQs page, this will be Q16"
-  },
   "faqs.page.Q17": {
     "defaultMessage": "Q: When did the official version of the tool come out?",
     "description": "Navigate to the FAQs page, this will be Q17"
@@ -1532,7 +1528,7 @@
     "description": "Navigate to the FAQs page, this will be Q9"
   },
   "faqs.page.answers.Q10": {
-    "defaultMessage": "Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.",
+    "defaultMessage": "Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the <link1>eligibility criteria</link1>. Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.",
     "description": "Navigate to the FAQs page, this will be an answer, Q10"
   },
   "faqs.page.answers.Q11": {
diff --git a/client/src/pages/frequently-asked-questions.tsx b/client/src/pages/frequently-asked-questions.tsx
index 98b9c7acb..65c4526e6 100644
--- a/client/src/pages/frequently-asked-questions.tsx
+++ b/client/src/pages/frequently-asked-questions.tsx
@@ -182,11 +182,11 @@ const FAQPage = ({location}: IFAQPageProps) => {
         </ul>
       </>
     ),
-    (
-      <>
-        <p key={16}>{FAQS_COPY.FAQ_ANSWERS.Q16}</p>
-      </>
-    ),
+    // (
+    //   <>
+    //     <p key={16}>{FAQS_COPY.FAQ_ANSWERS.Q16}</p>
+    //   </>
+    // ),
     (
       <>
         <p key={17}>{FAQS_COPY.FAQ_ANSWERS.Q17_P1}</p>
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index d0760102c..713271d20 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -838,7 +838,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-9"
               >
                 <p>
-                  Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.
+                  Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the 
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.whitehouse.gov/wp-content/uploads/2021/07/M-21-28.pdf"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    eligibility criteria
+                  </a>
+                  . Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.
                 </p>
               </div>
               <h2
@@ -1068,7 +1078,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   data-testid="accordionButton_faq-id-15"
                   type="button"
                 >
-                  Q: Will CEQ issue another Request for Information about the tool?
+                  Q: When did the official version of the tool come out?
                 </button>
               </h2>
               <div
@@ -1078,7 +1088,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-15"
               >
                 <p>
-                  Yes. CEQ plans to issue a Request for Information (RFI) about version 1.0 of the CEJST in 2023. The feedback received in that RFI will inform version 2.0 of the tool.
+                  The tool is now considered official because Federal agencies can now use version 1.0 of the Climate and Economic Justice Screening Tool (CEJST) to help identify disadvantaged communities. The 1.0 version was released in November, 2022. The tool is no longer in beta.
+                </p>
+                <p>
+                  The tool will be improved over time. The Council on Environmental Quality (CEQ) will update the tool each year based on public feedback, research, and the availability of new data.
                 </p>
               </div>
               <h2
@@ -1091,7 +1104,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   data-testid="accordionButton_faq-id-16"
                   type="button"
                 >
-                  Q: When did the official version of the tool come out?
+                  Q. How does the Council on Environmental Quality (CEQ) keep people informed about the tool?
                 </button>
               </h2>
               <div
@@ -1101,10 +1114,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-16"
               >
                 <p>
-                  The tool is now considered official because Federal agencies can now use version 1.0 of the Climate and Economic Justice Screening Tool (CEJST) to help identify disadvantaged communities. The 1.0 version was released in November, 2022. The tool is no longer in beta.
-                </p>
-                <p>
-                  The tool will be improved over time. The Council on Environmental Quality (CEQ) will update the tool each year based on public feedback, research, and the availability of new data.
+                  Sign-up to receive updates on the Climate and Economic Justice Screening Tool (CEJST) and other environmental justice news from CEQ.
                 </p>
               </div>
               <h2
@@ -1117,7 +1127,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   data-testid="accordionButton_faq-id-17"
                   type="button"
                 >
-                  Q. How does the Council on Environmental Quality (CEQ) keep people informed about the tool?
+                  Q: What files and documentation are available from the tool?
                 </button>
               </h2>
               <div
@@ -1125,29 +1135,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 data-testid="accordionItem_faq-id-17"
                 hidden=""
                 id="faq-id-17"
-              >
-                <p>
-                  Sign-up to receive updates on the Climate and Economic Justice Screening Tool (CEJST) and other environmental justice news from CEQ.
-                </p>
-              </div>
-              <h2
-                class="usa-accordion__heading"
-              >
-                <button
-                  aria-controls="faq-id-18"
-                  aria-expanded="false"
-                  class="usa-accordion__button"
-                  data-testid="accordionButton_faq-id-18"
-                  type="button"
-                >
-                  Q: What files and documentation are available from the tool?
-                </button>
-              </h2>
-              <div
-                class="usa-accordion__content usa-prose"
-                data-testid="accordionItem_faq-id-18"
-                hidden=""
-                id="faq-id-18"
               >
                 <p>
                   The Climate and Economic Justice Screening Tool (CEJST) has 
@@ -1164,10 +1151,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 class="usa-accordion__heading"
               >
                 <button
-                  aria-controls="faq-id-19"
+                  aria-controls="faq-id-18"
                   aria-expanded="false"
                   class="usa-accordion__button"
-                  data-testid="accordionButton_faq-id-19"
+                  data-testid="accordionButton_faq-id-18"
                   type="button"
                 >
                   Q: How does the tool’s shapefile work?
@@ -1175,9 +1162,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </h2>
               <div
                 class="usa-accordion__content usa-prose"
-                data-testid="accordionItem_faq-id-19"
+                data-testid="accordionItem_faq-id-18"
                 hidden=""
-                id="faq-id-19"
+                id="faq-id-18"
               >
                 <p>
                   The tool’s shapefile can be uploaded into other mapping programs such as Esri.

From 95ec83ff9b114f62f68d81ff157c91a091912c70 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 16 Nov 2022 23:35:57 -0800
Subject: [PATCH 119/130] Update linked text on note Tribal Nations

---
 client/src/data/copy/explore.tsx | 2 +-
 client/src/intl/en.json          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 0520b8001..203ccd668 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -1477,7 +1477,7 @@ export const NOTE_ON_TRIBAL_NATIONS = {
   PARA_2: <FormattedMessage
     id={'explore.map.page.under.map.note.on.tribal.nations.para.2'}
     defaultMessage={`
-      This decision was made after meaningful and robust consultation with Tribal Nations. This is consistent with CEQ’s <link1> Action Plan for Consultation and Coordination with Tribal Nations </link1>, President Biden’s <link3>Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation</link3>, and  <link2> Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments </link2> .
+      This decision was made after meaningful and robust consultation with Tribal Nations. This is consistent with CEQ’s <link1>Action Plan</link1> for Consultation and Coordination with Tribal Nations, President Biden’s <link3>Memorandum</link3> on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and <link2>Executive Order 13175</link2> on Consultation and Coordination With Indian Tribal Governments.
     `}
     description={`Navigate to the explore the map page. Under the map, you will see tribal nations paragraph 2`}
     values={{
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index fb6340bd4..fee396d84 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1444,7 +1444,7 @@
     "description": "Navigate to the explore the map page. Under the map, you will see tribal nations paragraph 1"
   },
   "explore.map.page.under.map.note.on.tribal.nations.para.2": {
-    "defaultMessage": "This decision was made after meaningful and robust consultation with Tribal Nations. This is consistent with CEQ’s <link1> Action Plan for Consultation and Coordination with Tribal Nations </link1>, President Biden’s <link3>Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation</link3>, and <link2> Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments </link2> .",
+    "defaultMessage": "This decision was made after meaningful and robust consultation with Tribal Nations. This is consistent with CEQ’s <link1>Action Plan</link1> for Consultation and Coordination with Tribal Nations, President Biden’s <link3>Memorandum</link3> on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and <link2>Executive Order 13175</link2> on Consultation and Coordination With Indian Tribal Governments.",
     "description": "Navigate to the explore the map page. Under the map, you will see tribal nations paragraph 2"
   },
   "fab.survey.text": {

From ce64458e1f852d23034b172afd888b3052bec97d Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Thu, 17 Nov 2022 12:43:53 -0800
Subject: [PATCH 120/130] Remove download file links from FAQs

---
 client/src/data/copy/faqs.tsx                 |  8 +++----
 client/src/intl/en.json                       |  2 +-
 .../src/pages/frequently-asked-questions.tsx  |  2 +-
 .../freqAskedQuestions.test.tsx.snap          | 24 +------------------
 4 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/client/src/data/copy/faqs.tsx b/client/src/data/copy/faqs.tsx
index 1c26acd61..ea51be6de 100644
--- a/client/src/data/copy/faqs.tsx
+++ b/client/src/data/copy/faqs.tsx
@@ -458,11 +458,11 @@ export const FAQ_ANSWERS = {
   />,
   Q10: <FormattedMessage
     id={ 'faqs.page.answers.Q10'}
-    defaultMessage={ `Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the <link1>eligibility criteria</link1>. Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.`}
+    defaultMessage={ `Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q10'}
-    values={{
-      link1: linkFn(`https://www.whitehouse.gov/wp-content/uploads/2021/07/M-21-28.pdf`, false, true),
-    }}
+    // values={{
+    //   link1: linkFn(`https://www.whitehouse.gov/wp-content/uploads/2021/07/M-21-28.pdf`, false, true),
+    // }}
   />,
   Q11: <FormattedMessage
     id={ 'faqs.page.answers.Q11'}
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index fee396d84..7c7fec41e 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1528,7 +1528,7 @@
     "description": "Navigate to the FAQs page, this will be Q9"
   },
   "faqs.page.answers.Q10": {
-    "defaultMessage": "Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the <link1>eligibility criteria</link1>. Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.",
+    "defaultMessage": "Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.",
     "description": "Navigate to the FAQs page, this will be an answer, Q10"
   },
   "faqs.page.answers.Q11": {
diff --git a/client/src/pages/frequently-asked-questions.tsx b/client/src/pages/frequently-asked-questions.tsx
index 65c4526e6..8753307ce 100644
--- a/client/src/pages/frequently-asked-questions.tsx
+++ b/client/src/pages/frequently-asked-questions.tsx
@@ -157,7 +157,7 @@ const FAQPage = ({location}: IFAQPageProps) => {
         </ul>
         <p>{FAQS_COPY.FAQ_ANSWERS.Q12_P2}</p>
         <p>{FAQS_COPY.FAQ_ANSWERS.Q12_P3}</p>
-        <p>{FAQS_COPY.FAQ_ANSWERS.Q12_P4}</p>
+        {/* <p>{FAQS_COPY.FAQ_ANSWERS.Q12_P4}</p> */}
       </>
     ),
     (
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 713271d20..dc0ebef57 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -838,17 +838,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-9"
               >
                 <p>
-                  Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the 
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy=""
-                    href="https://www.whitehouse.gov/wp-content/uploads/2021/07/M-21-28.pdf"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    eligibility criteria
-                  </a>
-                  . Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.
+                  Recent historic legislation, such as the Bipartisan Infrastructure Law and the Inflation Reduction Act, have created new programs or directed funds to existing programs. These investments are included in the Justice40 Initiative if they meet the eligibility criteria. Agencies will use the tool to help identify disadvantaged communities that will receive 40% of the overall benefits of those Justice40 programs.
                 </p>
               </div>
               <h2
@@ -940,18 +930,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 <p>
                   In contrast, the CEJST will help Federal agencies to identify disadvantaged communities that will benefit from programs included in the Justice40 Initiative.
                 </p>
-                <p>
-                  <a
-                    class="usa-link usa-link--external"
-                    data-cy=""
-                    href="//"
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    This chart
-                  </a>
-                   is helpful for understanding how the CEJST differs from some of the other Federal environmental screening tools.
-                </p>
               </div>
               <h2
                 class="usa-accordion__heading"

From 320a4ab35aa709cd1c5a5979d58c8be74612e163 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Thu, 17 Nov 2022 12:54:35 -0800
Subject: [PATCH 121/130] Update top of Download page

---
 client/src/pages/downloads.tsx                            | 4 +++-
 .../src/pages/tests/__snapshots__/downloads.test.tsx.snap | 8 +++++---
 client/src/styles/global.scss                             | 5 ++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/client/src/pages/downloads.tsx b/client/src/pages/downloads.tsx
index 790a3657b..4db85fa64 100644
--- a/client/src/pages/downloads.tsx
+++ b/client/src/pages/downloads.tsx
@@ -32,11 +32,13 @@ const DownloadsPage = ({location}: IDownloadsPageProps) => {
         <Grid row gap className={'j40-mb5-mt3'}>
 
           <Grid col={12} tablet={{col: 8}}>
+
+            <h2 className={'j40-mt-0 j40-mb-3'}>{DOWNLOADS_COPY.DOWNLOAD_LINKS.TITLE}</h2>
+
             <section>
               <ReleaseUpdate />
             </section>
 
-            <h2>{DOWNLOADS_COPY.DOWNLOAD_LINKS.TITLE}</h2>
             <p>
               {DOWNLOADS_COPY.DOWNLOAD_LINKS.TEXT}
             </p>
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index 42b1ffb20..182ae0adc 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -410,6 +410,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           class="grid-col-12 tablet:grid-col-8"
           data-testid="grid"
         >
+          <h2
+            class="j40-mt-0 j40-mb-3"
+          >
+            Version 1.0 file formats
+          </h2>
           <section>
             <div>
               <span>
@@ -652,9 +657,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </section>
             </div>
           </section>
-          <h2>
-            Version 1.0 file formats
-          </h2>
           <p>
             The dataset used in the 1.0 version of the tool, along with a codebook, and information about how to use the list of communities (.pdf) are available for download:
           </p>
diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss
index 2a68e53ae..4d942b8b3 100644
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@@ -98,9 +98,8 @@ p.flush {
   @include u-margin-bottom(3);
 }
 
-// 40 pixel margin-bottom
-.j40-mb-5 {
-  
+.j40-mt-0 {
+  @include u-margin-top(0);  
 }
 
 .j40-footer-ceq-font {

From 364f1f0aeb6094feed4f4f36fb57addf3f502dba Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Thu, 17 Nov 2022 22:13:25 -0800
Subject: [PATCH 122/130] Final copy update

-closes #2082
---
 .../__snapshots__/Categories.test.tsx.snap    |  6 ++---
 .../datasetContainer.test.tsx.snap            |  2 +-
 client/src/data/copy/explore.tsx              |  4 ++--
 client/src/data/copy/faqs.tsx                 |  5 ++++-
 client/src/data/copy/methodology.tsx          |  6 ++---
 client/src/intl/en.json                       | 12 +++++-----
 .../src/pages/frequently-asked-questions.tsx  |  4 ++--
 .../freqAskedQuestions.test.tsx.snap          | 22 +++++++++----------
 .../__snapshots__/methodology.test.tsx.snap   |  8 +++----
 9 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
index bda6b2bb3..94d1b0b4f 100644
--- a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
+++ b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
@@ -319,7 +319,7 @@ exports[`rendering of the Categories checks if component renders 1`] = `
           class="usa-link"
           href="#mine-land"
         >
-          abandoned mine lands
+          abandoned mine land
         </a>
          OR 
         <a
@@ -530,14 +530,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         <strong>
           AND
         </strong>
-         more than 10% of adults have a 
+         fewer than 10% of people ages 25 or older have a 
         <a
           class="usa-link"
           href="#high-school"
         >
           high school education
         </a>
-         level less than a high school degree
+          level less than a high school diploma
   
       </p>
     </div>
diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
index 7f1804eef..cbaced3ad 100644
--- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
+++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
@@ -1023,7 +1023,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   </span>
                 </div>
                 <h3>
-                  Abandoned mine lands
+                  Abandoned mine land
                 </h3>
               </div>
               <div>
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 203ccd668..8b748d96d 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -987,7 +987,7 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
   // Legacy Pollution
   ABANDON_MINES: {
     id: 'explore.map.page.side.panel.indicator.abandon.mines',
-    defaultMessage: 'Abandoned mine lands',
+    defaultMessage: 'Abandoned mine land',
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Abandoned land mines`,
   },
   FORMER_DEF_SITES: {
@@ -1333,7 +1333,7 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   HIGH_SKL: {
     id: 'explore.map.page.side.panel.indicator.description.high.school',
     defaultMessage: `
-      Percent of people ages 25 years or older who did not graduate high school 
+      Percent of people ages 25 years or older whose high school education is less than a high school diploma
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of people ages 25 years or older who did not graduate high school`,
   },
diff --git a/client/src/data/copy/faqs.tsx b/client/src/data/copy/faqs.tsx
index ea51be6de..d0c0edef1 100644
--- a/client/src/data/copy/faqs.tsx
+++ b/client/src/data/copy/faqs.tsx
@@ -607,8 +607,11 @@ export const FAQ_ANSWERS = {
   />,
   Q18: <FormattedMessage
     id={ 'faqs.page.answers.Q18'}
-    defaultMessage={ `Sign-up to receive updates on the Climate and Economic Justice Screening Tool (CEJST) and other environmental justice news from CEQ.`}
+    defaultMessage={ `<link1>Sign-up</link1> to receive updates on the Climate and Economic Justice Screening Tool (CEJST) and other environmental justice news from CEQ.`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q18'}
+    values={{
+      link1: linkFn(`https://lp.constantcontactpages.com/su/Vm8pCFj/spring`, false, true),
+    }}
   />,
   Q19: <FormattedMessage
     id={ 'faqs.page.answers.Q19'}
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index 213b524d3..0937d782d 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -141,7 +141,7 @@ export const CATEGORY_AND_CLAUSE = {
   />,
   HS_DEG_GTE_10: <FormattedMessage
     id={'methodology.page.category.and.clause.hs.ed.higher.ed'}
-    defaultMessage={`<boldtag>AND</boldtag> more than 10% of adults have a <link1>high school education</link1> level less than a high school degree
+    defaultMessage={`<boldtag>AND</boldtag> fewer than 10% of people ages 25 or older have a <link1>high school education</link1>  level less than a high school diploma
   `}
     description={'Navigate to the methodology page. Navigate to the category section. This is the portion of the formula dealing with higher ed enrollment and high school degree rate'}
     values={{
@@ -281,7 +281,7 @@ export const CATEGORIES = {
     />,
     IF: <FormattedMessage
       id={'methodology.page.indicator.categories.legacy.pollution.if'}
-      defaultMessage={`Have at least one <link0>abandoned mine lands</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites (National Priorities List (NPL))</link3> OR <link4>proximity to Risk Management Plan (RMP) facilities</link4>`}
+      defaultMessage={`Have at least one <link0>abandoned mine land</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites (National Priorities List (NPL))</link3> OR <link4>proximity to Risk Management Plan (RMP) facilities</link4>`}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula'}
       values={{
         link0: simpleLink('#mine-land'),
@@ -1194,7 +1194,7 @@ export const INDICATORS = [
     domID: 'mine-land',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.mine.land.title.text'}
-      defaultMessage={`Abandoned mine lands`}
+      defaultMessage={`Abandoned mine land`}
       description={'Navigate to the Methodology page. This is the title text for the Abandoned mine lands'}
     />,
     isNew: true,
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 7c7fec41e..48caf817c 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -868,7 +868,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the census tract info title"
   },
   "explore.map.page.side.panel.indicator.abandon.mines": {
-    "defaultMessage": "Abandoned mine lands",
+    "defaultMessage": "Abandoned mine land",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Abandoned land mines"
   },
   "explore.map.page.side.panel.indicator.adjacency": {
@@ -936,7 +936,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of the census tract's population 15 or older not \n      enrolled in college, university, or graduate school"
   },
   "explore.map.page.side.panel.indicator.description.high.school": {
-    "defaultMessage": "Percent of people ages 25 years or older who did not graduate high school",
+    "defaultMessage": "Percent of people ages 25 years or older whose high school education is less than a high school diploma",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Percent of people ages 25 years or older who did not graduate high school"
   },
   "explore.map.page.side.panel.indicator.description.historic.underinvestment": {
@@ -1628,7 +1628,7 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q17_P2"
   },
   "faqs.page.answers.Q18": {
-    "defaultMessage": "Sign-up to receive updates on the Climate and Economic Justice Screening Tool (CEJST) and other environmental justice news from CEQ.",
+    "defaultMessage": "<link1>Sign-up</link1> to receive updates on the Climate and Economic Justice Screening Tool (CEJST) and other environmental justice news from CEQ.",
     "description": "Navigate to the FAQs page, this will be an answer, Q18"
   },
   "faqs.page.answers.Q19": {
@@ -1828,7 +1828,7 @@
     "description": "Focus on the bounds of a specific territory"
   },
   "methodology.page.category.and.clause.hs.ed.higher.ed": {
-    "defaultMessage": "<boldtag>AND</boldtag> more than 10% of adults have a <link1>high school education</link1> level less than a high school degree",
+    "defaultMessage": "<boldtag>AND</boldtag> fewer than 10% of people ages 25 or older have a <link1>high school education</link1> level less than a high school diploma",
     "description": "Navigate to the methodology page. Navigate to the category section. This is the portion of the formula dealing with higher ed enrollment and high school degree rate"
   },
   "methodology.page.category.and.clause.low.inc": {
@@ -2192,7 +2192,7 @@
     "description": "Navigate to the Methodology page. This is the title text for the low median income dataset"
   },
   "methodology.page.dataset.indicator.mine.land.title.text": {
-    "defaultMessage": "Abandoned mine lands",
+    "defaultMessage": "Abandoned mine land",
     "description": "Navigate to the Methodology page. This is the title text for the Abandoned mine lands"
   },
   "methodology.page.dataset.indicator.pm25.title.text": {
@@ -2368,7 +2368,7 @@
     "description": "Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Reduction and remediation of legacy pollution methodology"
   },
   "methodology.page.indicator.categories.legacy.pollution.if": {
-    "defaultMessage": "Have at least one <link0>abandoned mine lands</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites (National Priorities List (NPL))</link3> OR <link4>proximity to Risk Management Plan (RMP) facilities</link4>",
+    "defaultMessage": "Have at least one <link0>abandoned mine land</link0> OR <link1>Formerly Used Defense Sites</link1> OR are at or above the 90th percentile for <link2>proximity to hazardous waste facilities</link2> OR <link3>proximity to Superfind sites (National Priorities List (NPL))</link3> OR <link4>proximity to Risk Management Plan (RMP) facilities</link4>",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula"
   },
   "methodology.page.indicator.categories.tribal.lands.methodology": {
diff --git a/client/src/pages/frequently-asked-questions.tsx b/client/src/pages/frequently-asked-questions.tsx
index 8753307ce..2fcc976e9 100644
--- a/client/src/pages/frequently-asked-questions.tsx
+++ b/client/src/pages/frequently-asked-questions.tsx
@@ -42,11 +42,11 @@ const FAQPage = ({location}: IFAQPageProps) => {
       <>
         <p key={1}>{FAQS_COPY.FAQ_ANSWERS.Q1_P1}</p>
         <p>{FAQS_COPY.FAQ_ANSWERS.Q1_P2}</p>
-        <p>{FAQS_COPY.FAQ_ANSWERS.Q1_P3}</p>
+        {/* <p>{FAQS_COPY.FAQ_ANSWERS.Q1_P3}</p>
         <ul>
           <li>{FAQS_COPY.FAQ_ANSWERS.Q1_P3_1}</li>
           <li>{FAQS_COPY.FAQ_ANSWERS.Q1_P3_2}</li>
-        </ul>
+        </ul> */}
         <p>{FAQS_COPY.FAQ_ANSWERS.Q1_P4}</p>
       </>
     ),
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index dc0ebef57..08753e8f5 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -452,17 +452,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 <p>
                   Federal agencies will use the tool for the Justice40 Initiative. It will help them identify disadvantaged communities that should receive 40% of the overall benefits of programs included in the Justice40 Initiative. The Justice40 Initiative seeks to deliver 40% of the overall benefits in climate, clean energy, and other related areas to disadvantaged communities.
                 </p>
-                <p>
-                  Other useful links for Federal agencies:
-                </p>
-                <ul>
-                  <li>
-                    Addendum to the Justice40 Interim Guidance
-                  </li>
-                  <li>
-                    Instructions to Federal Agencies on Using the CEJST
-                  </li>
-                </ul>
                 <p>
                   The public can find communities of interest and provide feedback. This feedback will be used to improve the tool.
                 </p>
@@ -1092,7 +1081,16 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-16"
               >
                 <p>
-                  Sign-up to receive updates on the Climate and Economic Justice Screening Tool (CEJST) and other environmental justice news from CEQ.
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://lp.constantcontactpages.com/su/Vm8pCFj/spring"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Sign-up
+                  </a>
+                   to receive updates on the Climate and Economic Justice Screening Tool (CEJST) and other environmental justice news from CEQ.
                 </p>
               </div>
               <h2
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 173633396..80250aff4 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -757,7 +757,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             class="usa-link"
             href="#mine-land"
           >
-            abandoned mine lands
+            abandoned mine land
           </a>
            OR 
           <a
@@ -968,14 +968,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           <strong>
             AND
           </strong>
-           more than 10% of adults have a 
+           fewer than 10% of people ages 25 or older have a 
           <a
             class="usa-link"
             href="#high-school"
           >
             high school education
           </a>
-           level less than a high school degree
+            level less than a high school diploma
   
         </p>
       </div>
@@ -2026,7 +2026,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     </span>
                   </div>
                   <h3>
-                    Abandoned mine lands
+                    Abandoned mine land
                   </h3>
                 </div>
                 <div>

From ff2be71a89f89f24da36650e8569366bd61d78b1 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Thu, 17 Nov 2022 22:21:57 -0800
Subject: [PATCH 123/130] Update space in About page copy

---
 client/src/data/copy/about.tsx                           | 2 +-
 client/src/intl/en.json                                  | 2 +-
 client/src/pages/tests/__snapshots__/about.test.tsx.snap | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx
index 90511ba84..5823137ff 100644
--- a/client/src/data/copy/about.tsx
+++ b/client/src/data/copy/about.tsx
@@ -25,7 +25,7 @@ export const CONTENT = {
   <FormattedMessage
     id={'about.page.paragraph.1'}
     defaultMessage={`
-      In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens.These are the communities that are disadvantaged because they are overburdened and underserved.
+      In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens. These are the communities that are disadvantaged because they are overburdened and underserved.
 
     `}
     description={'Navigate to the About page. This is the paragraph 1'}
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 48caf817c..82911e3f6 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -64,7 +64,7 @@
     "description": "Navigate to the About page. This is the list item 2"
   },
   "about.page.paragraph.1": {
-    "defaultMessage": "In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens.These are the communities that are disadvantaged because they are overburdened and underserved.",
+    "defaultMessage": "In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens. These are the communities that are disadvantaged because they are overburdened and underserved.",
     "description": "Navigate to the About page. This is the paragraph 1"
   },
   "about.page.paragraph.2": {
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index 87d9fa6f3..5dc79b7e0 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -425,7 +425,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 Executive Order 14008
               </a>
-              . The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens.These are the communities that are disadvantaged because they are overburdened and underserved.
+              . The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens. These are the communities that are disadvantaged because they are overburdened and underserved.
 
     
             </p>

From 5a2ed76be2d84c0fc34b4b5109a47be7788636f2 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 18 Nov 2022 17:10:44 -0800
Subject: [PATCH 124/130] Update copy based on Katherine's findings

- update snapshots
- remaining changes from Content 1.0
---
 .../__snapshots__/datasetContainer.test.tsx.snap   | 10 +++++-----
 .../__snapshots__/howYouCanHelp.test.tsx.snap      | 12 +++++++++++-
 client/src/data/copy/about.tsx                     |  5 +++--
 client/src/data/copy/explore.tsx                   | 10 +++++-----
 client/src/data/copy/methodology.tsx               | 10 +++++-----
 client/src/intl/en.json                            | 14 +++++++-------
 .../pages/tests/__snapshots__/about.test.tsx.snap  | 14 ++++++++++++--
 .../tests/__snapshots__/methodology.test.tsx.snap  | 10 +++++-----
 data/data-pipeline/.vscode/settings.json           |  7 ++++++-
 9 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
index cbaced3ad..f0c2869a1 100644
--- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
+++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
@@ -768,7 +768,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Responsible Party: 
                   </span>
-                  Nationl Community Reinvestment Coalition (NCRC)
+                  National Community Reinvestment Coalition (NCRC)
                 </li>
                 <li>
                   <span>
@@ -789,7 +789,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Available for: 
                   </span>
-                  Metro areas of U.S. that were HOLC graded 
+                  Metro areas of U.S. that were graded by the Home Owners’ Loan Corporation
                 </li>
               </ul>
             </div>
@@ -1131,7 +1131,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 class=""
               >
                 <h3>
-                  Proximity to hazardous waste sites
+                  Proximity to hazardous waste facilities
                 </h3>
               </div>
               <div>
@@ -1563,7 +1563,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Share of households where no one over age 14 speaks English well.
+        Share of households where no one over age 14 speaks English very well.
       
               </div>
               <ul>
@@ -1982,7 +1982,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Available for: 
                   </span>
-                  Federally Recognized Tribes, including Alaskan Native villages 
+                  Federally Recognized Tribes, including Alaska Native villages 
                 </li>
               </ul>
             </div>
diff --git a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
index c2ad280c9..8d1aef642 100644
--- a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
+++ b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
@@ -34,7 +34,17 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl
         .
       </li>
       <li>
-        Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email: 
+        Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this 
+        <a
+          class="usa-link usa-link--external"
+          data-cy=""
+          href="https://www.surveymonkey.com/r/5LZ7MNB"
+          rel="noreferrer"
+          target="_blank"
+        >
+          form
+        </a>
+         . Otherwise, email: 
         <a
           class="usa-link"
           href="/en/methodology"
diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx
index 5823137ff..d490d097e 100644
--- a/client/src/data/copy/about.tsx
+++ b/client/src/data/copy/about.tsx
@@ -105,7 +105,7 @@ export const CONTENT = {
   <FormattedMessage
     id={'about.page.how.to.use.tool.para1'}
     defaultMessage={`
-      The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.  The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaskan Native Villages.
+      The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.  The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages.
     `}
     description={'Navigate to the About page. This is the paragraph 4'}
     values={{
@@ -234,10 +234,11 @@ export const HOW_YOU_CAN_HELP_LIST_ITEMS = {
   />,
   LIST_ITEM_4: <FormattedMessage
     id={'about.page.how.you.can.help.list.item.4'}
-    defaultMessage={`Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email: <link1>Screeningtool-Support@omb.eop.gov</link1>`}
+    defaultMessage={`Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this <link2>form</link2> . Otherwise, email: <link1>Screeningtool-Support@omb.eop.gov</link1>`}
     description={`Navigate to the about page. You will see How you can help list item 3`}
     values={{
       link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
+      link2: linkFn('https://www.surveymonkey.com/r/5LZ7MNB', false, true),
     }}
   />,
   PARA1: <FormattedMessage
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 8b748d96d..cd0e4d5e5 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -41,7 +41,7 @@ export const PAGE_DESCRIPTION1 = <FormattedMessage
 export const PAGE_DESCRIPTION2 = <FormattedMessage
   id={'explore.map.page.description.2'}
   defaultMessage={`
-    Zooming-in and selecting shows information about each census tract. 
+    Zooming in and selecting shows information about each census tract. 
   `}
   description={'On the explore the map page, the fifth description of the page'}
 />;
@@ -693,7 +693,7 @@ export const getPrioANVCopy = (numPoints:number, isAlso:boolean = false) => {
   return (
     <FormattedMessage
       id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
-      defaultMessage={ 'The {numPoints} Alaskan Native Villages in this tract that are Federally Recognized are {also} considered disadvantaged.'}
+      defaultMessage={ 'The {numPoints} Alaska Native Villages in this tract that are Federally Recognized are {also} considered disadvantaged.'}
       description={`Navigate to the explore the map page. Click on tract, The {numPoints} of this tract that are Federally Recognized Tribal lands are {also} considered disadvantaged.`}
       values={{
         numPoints: numPoints,
@@ -708,8 +708,8 @@ export const getPrioAKUSCopy = (numAKpoints:number, numUSpoints:number, isAlso:b
   return (
     <FormattedMessage
       id={'explore.map.page.side.panel.prio.copy.prio.frt.n.perc'}
-      defaultMessage={ 'The {numAKpoints} Alaskan Native Villages and the {numUSpoints} tribes in this tract that are Federally Recognized are {also} considered disadvantaged.'}
-      description={`Navigate to the explore the map page. Click on tract, The {numAKpoints} Alaskan Native Villages and the {numUSpoints} tribes in this tract that are Federally Recognized are considered disadvantaged.`}
+      defaultMessage={ 'The {numAKpoints} Alaska Native Villages and the {numUSpoints} tribes in this tract that are Federally Recognized are {also} considered disadvantaged.'}
+      description={`Navigate to the explore the map page. Click on tract, The {numAKpoints} Alaska Native Villages and the {numUSpoints} tribes in this tract that are Federally Recognized are considered disadvantaged.`}
       values={{
         numAKpoints: numAKpoints,
         numUSpoints: numUSpoints,
@@ -1308,7 +1308,7 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   LING_ISO: {
     id: 'explore.map.page.side.panel.indicator.description.ling.iso',
     defaultMessage: `
-    Share of households where no one over age 14 speaks English well
+    Share of households where no one over age 14 speaks English very well
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of households where no one over the age 14 speaks English well`,
   },
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index 0937d782d..4e5461d26 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -488,7 +488,7 @@ export const RESPONSIBLE_PARTIES = {
   FIRST: `First Street Foundation`,
   FEMA: `Federal Emergency Management Agency (FEMA)`,
   HUD: `Department of Housing and Urban Development (HUD)`,
-  NCRC: `Nationl Community Reinvestment Coalition (NCRC)`,
+  NCRC: `National Community Reinvestment Coalition (NCRC)`,
   TPL: `The Trust for Public Lands and American Forestry`,
   USACE: `U.S. Army Corps of Engineers`,
 };
@@ -728,12 +728,12 @@ export const AVAILABLE_FOR = defineMessages({
   },
   METRO_US_HOLC: {
     id: 'methodology.page.dataset.card.availableFor.METRO_US_HOLC',
-    defaultMessage: `Metro areas of U.S. that were HOLC graded `,
+    defaultMessage: `Metro areas of U.S. that were graded by the Home Owners’ Loan Corporation`,
     description: 'Methodology page dataset card available for METRO_US_HOLC',
   },
   FRT: {
     id: 'methodology.page.dataset.card.availableFor.FRT',
-    defaultMessage: `Federally Recognized Tribes, including Alaskan Native villages `,
+    defaultMessage: `Federally Recognized Tribes, including Alaska Native villages `,
     description: 'Methodology page dataset card available for FRT',
   },
 });
@@ -1242,7 +1242,7 @@ export const INDICATORS = [
     domID: 'prox-haz',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.prox.haz.title.text'}
-      defaultMessage={`Proximity to hazardous waste sites`}
+      defaultMessage={`Proximity to hazardous waste facilities`}
       description={'Navigate to the Methodology page. This is the title text for the prox haz dataset'}
     />,
     description: <FormattedMessage
@@ -1441,7 +1441,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.linguistic.iso.description.text'}
       defaultMessage={`
-        Share of households where no one over age 14 speaks English well.
+        Share of households where no one over age 14 speaks English very well.
       `}
       description={'Navigate to the Methodology page. This is the description text for linguistic isolation'}
     />,
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 82911e3f6..5f0bcf1b1 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -8,7 +8,7 @@
     "description": "Navigate to the About page. This is the paragraph 4"
   },
   "about.page.how.to.use.tool.para1": {
-    "defaultMessage": "The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries. The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaskan Native Villages.",
+    "defaultMessage": "The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries. The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages.",
     "description": "Navigate to the About page. This is the paragraph 4"
   },
   "about.page.how.to.use.tool.para2": {
@@ -36,7 +36,7 @@
     "description": "Navigate to the about page. You will see How you can help list item 3"
   },
   "about.page.how.you.can.help.list.item.4": {
-    "defaultMessage": "Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email: <link1>Screeningtool-Support@omb.eop.gov</link1>",
+    "defaultMessage": "Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this <link2>form</link2> . Otherwise, email: <link1>Screeningtool-Support@omb.eop.gov</link1>",
     "description": "Navigate to the about page. You will see How you can help list item 3"
   },
   "about.page.how.you.can.help.para.1": {
@@ -624,7 +624,7 @@
     "description": "On the explore the map page, the first description of the page"
   },
   "explore.map.page.description.2": {
-    "defaultMessage": "Zooming-in and selecting shows information about each census tract.",
+    "defaultMessage": "Zooming in and selecting shows information about each census tract.",
     "description": "On the explore the map page, the fifth description of the page"
   },
   "explore.map.page.explore.data.box.body": {
@@ -1904,7 +1904,7 @@
     "description": "Navigate to the Methodology page. This is the description text for Leaking underground storage tanks"
   },
   "methodology.page.category.linguistic.iso.description.text": {
-    "defaultMessage": "Share of households where no one over age 14 speaks English well.",
+    "defaultMessage": "Share of households where no one over age 14 speaks English very well.",
     "description": "Navigate to the Methodology page. This is the description text for linguistic isolation"
   },
   "methodology.page.category.linguistic.iso.note.text": {
@@ -2092,11 +2092,11 @@
     "description": "Methodology page dataset card available for CONUS and DC"
   },
   "methodology.page.dataset.card.availableFor.FRT": {
-    "defaultMessage": "Federally Recognized Tribes, including Alaskan Native villages",
+    "defaultMessage": "Federally Recognized Tribes, including Alaska Native villages",
     "description": "Methodology page dataset card available for FRT"
   },
   "methodology.page.dataset.card.availableFor.METRO_US_HOLC": {
-    "defaultMessage": "Metro areas of U.S. that were HOLC graded",
+    "defaultMessage": "Metro areas of U.S. that were graded by the Home Owners’ Loan Corporation",
     "description": "Methodology page dataset card available for METRO_US_HOLC"
   },
   "methodology.page.dataset.card.availableFor.US_DC": {
@@ -2204,7 +2204,7 @@
     "description": "Navigate to the Methodology page. This is the title text for the poverty dataset"
   },
   "methodology.page.dataset.indicator.prox.haz.title.text": {
-    "defaultMessage": "Proximity to hazardous waste sites",
+    "defaultMessage": "Proximity to hazardous waste facilities",
     "description": "Navigate to the Methodology page. This is the title text for the prox haz dataset"
   },
   "methodology.page.dataset.indicator.prox.npl.title.text": {
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index 5dc79b7e0..977aa4b73 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -495,7 +495,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             >
               statistical areas
             </a>
-             are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.  The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaskan Native Villages.
+             are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.  The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages.
     
           </p>
           <p>
@@ -790,7 +790,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               .
             </li>
             <li>
-              Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form. Otherwise, email: 
+              Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this 
+              <a
+                class="usa-link usa-link--external"
+                data-cy=""
+                href="https://www.surveymonkey.com/r/5LZ7MNB"
+                rel="noreferrer"
+                target="_blank"
+              >
+                form
+              </a>
+               . Otherwise, email: 
               <a
                 class="usa-link"
                 href="/en/methodology"
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 80250aff4..5f12e612b 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -1771,7 +1771,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Responsible Party: 
                     </span>
-                    Nationl Community Reinvestment Coalition (NCRC)
+                    National Community Reinvestment Coalition (NCRC)
                   </li>
                   <li>
                     <span>
@@ -1792,7 +1792,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Available for: 
                     </span>
-                    Metro areas of U.S. that were HOLC graded 
+                    Metro areas of U.S. that were graded by the Home Owners’ Loan Corporation
                   </li>
                 </ul>
               </div>
@@ -2134,7 +2134,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   class=""
                 >
                   <h3>
-                    Proximity to hazardous waste sites
+                    Proximity to hazardous waste facilities
                   </h3>
                 </div>
                 <div>
@@ -2566,7 +2566,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Share of households where no one over age 14 speaks English well.
+        Share of households where no one over age 14 speaks English very well.
       
                 </div>
                 <ul>
@@ -2985,7 +2985,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Available for: 
                     </span>
-                    Federally Recognized Tribes, including Alaskan Native villages 
+                    Federally Recognized Tribes, including Alaska Native villages 
                   </li>
                 </ul>
               </div>
diff --git a/data/data-pipeline/.vscode/settings.json b/data/data-pipeline/.vscode/settings.json
index e5a4989fb..9a6568eef 100644
--- a/data/data-pipeline/.vscode/settings.json
+++ b/data/data-pipeline/.vscode/settings.json
@@ -12,5 +12,10 @@
     "."
   ],
   "python.testing.unittestEnabled": false,
-  "python.testing.nosetestsEnabled": false
+  "python.testing.nosetestsEnabled": false,
+  "workbench.colorCustomizations": {
+    "activityBar.background": "#2C294C",
+    "titleBar.activeBackground": "#3E3A6A",
+    "titleBar.activeForeground": "#FCFCFD"
+  }
 }

From 405dde3f7f62c90dd49b0d74c3dfec992c5d06cf Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Fri, 18 Nov 2022 17:21:12 -0800
Subject: [PATCH 125/130] Undo BE settings file

---
 data/data-pipeline/.vscode/settings.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/data/data-pipeline/.vscode/settings.json b/data/data-pipeline/.vscode/settings.json
index 9a6568eef..e5a4989fb 100644
--- a/data/data-pipeline/.vscode/settings.json
+++ b/data/data-pipeline/.vscode/settings.json
@@ -12,10 +12,5 @@
     "."
   ],
   "python.testing.unittestEnabled": false,
-  "python.testing.nosetestsEnabled": false,
-  "workbench.colorCustomizations": {
-    "activityBar.background": "#2C294C",
-    "titleBar.activeBackground": "#3E3A6A",
-    "titleBar.activeForeground": "#FCFCFD"
-  }
+  "python.testing.nosetestsEnabled": false
 }

From ec04ad0ce706e1f267d5ae8556fd9dc59d9c10d0 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 21 Nov 2022 10:41:41 -0800
Subject: [PATCH 126/130] Fix FUDS bug

- closes #2090
---
 client/src/components/AreaDetail/AreaDetail.tsx | 3 ++-
 client/src/components/Indicator/Indicator.tsx   | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 685206a0a..3d4304d66 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -465,7 +465,8 @@ const AreaDetail = ({properties}: IAreaDetailProps) => {
     description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.FORMER_DEF_SITES),
     type: 'boolean',
     value: properties.hasOwnProperty(constants.FORMER_DEF_SITES_RAW_VALUE) ?
-      (properties[constants.FORMER_DEF_SITES_RAW_VALUE] === constants.FUDS_RAW_YES ? true : false) :
+      // double equality is used in this instance as it seems that FUDS_RAW could be "1" or 1 from the BE
+      (properties[constants.FORMER_DEF_SITES_RAW_VALUE] == constants.FUDS_RAW_YES ? true : false) :
       null,
     isDisadvagtaged: properties.hasOwnProperty(constants.FORMER_DEF_SITES_EXCEEDS_THRESH) ?
     properties[constants.FORMER_DEF_SITES_EXCEEDS_THRESH] : null,
diff --git a/client/src/components/Indicator/Indicator.tsx b/client/src/components/Indicator/Indicator.tsx
index b1396721a..1d0ffeb25 100644
--- a/client/src/components/Indicator/Indicator.tsx
+++ b/client/src/components/Indicator/Indicator.tsx
@@ -231,6 +231,8 @@ const Indicator = ({indicator, isImpute, population}:IIndicator) => {
    *
    * In the case where indicator.value is a boolean, the displayStat will be either 100 or 0, depending
    * on if indicator.value is true or false respectively.
+   *
+   * Todo: The way the displayStat handles the boolean indicators should be refactored
    */
   const displayStat = indicator.value !== null ? Math.floor(Number(indicator.value) * 100) : null;
 

From 6c841486fce577486b9aa6bcd287be37f03adb5e Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 21 Nov 2022 10:46:52 -0800
Subject: [PATCH 127/130] Fix Low Income tooltip copy

---
 client/src/data/copy/explore.tsx | 4 ++--
 client/src/intl/en.json          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index cd0e4d5e5..2815774ce 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -1391,8 +1391,8 @@ export const LOW_INCOME_TOOLTIP = defineMessages({
   },
   IMP_YES_POP_NOT_NULL: {
     id: 'explore.map.page.side.panel.indicator.low.income.tooltip.IMP_YES_POP_NOT_NULL',
-    defaultMessage: `Tracts with missing income data<br />are given estimated incomes<br />based on an average of the<br />incomes of the surrounding tracts.<br /> Tracts that are surrounded by<br />tracts that are considered<br />disadvantaged have a<br />low income threshold.`,
-    description: 'Hover over the low income icon and it will show Tracts with missing income data are given estimated incomes based on an average of the incomes of the surrounding tracts. Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold.',
+    defaultMessage: `Tracts with missing income data<br />are given estimated incomes<br />based on an average of the<br />incomes of the surrounding tracts.`,
+    description: 'Hover over the low income icon and it will show Tracts with missing income data are given estimated incomes based on an average of the incomes of the surrounding tracts.',
   },
 });
 
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 5f0bcf1b1..4c53c8dca 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1100,8 +1100,8 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show low income"
   },
   "explore.map.page.side.panel.indicator.low.income.tooltip.IMP_YES_POP_NOT_NULL": {
-    "defaultMessage": "Tracts with missing income data<br />are given estimated incomes<br />based on an average of the<br />incomes of the surrounding tracts.<br /> Tracts that are surrounded by<br />tracts that are considered<br />disadvantaged have a<br />low income threshold.",
-    "description": "Hover over the low income icon and it will show Tracts with missing income data are given estimated incomes based on an average of the incomes of the surrounding tracts. Tracts that are surrounded by tracts that are considered disadvantaged have a low income threshold."
+    "defaultMessage": "Tracts with missing income data<br />are given estimated incomes<br />based on an average of the<br />incomes of the surrounding tracts.",
+    "description": "Hover over the low income icon and it will show Tracts with missing income data are given estimated incomes based on an average of the incomes of the surrounding tracts."
   },
   "explore.map.page.side.panel.indicator.low.income.tooltip.IMP_YES_POP_NULL": {
     "defaultMessage": "Income is not estimated for<br /> tracts with unknown populations.",

From a02e535998bb12dc4372856558d23dae2a0001db Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 21 Nov 2022 12:38:08 -0800
Subject: [PATCH 128/130] Final copy updates

-closes #2092
---
 .../__snapshots__/BetaBanner.test.tsx.snap    |   4 +-
 .../__snapshots__/Categories.test.tsx.snap    |   4 +-
 .../datasetContainer.test.tsx.snap            |  68 ++++++++-
 .../__snapshots__/J40Header.test.tsx.snap     |   4 +-
 client/src/data/copy/about.tsx                |   6 +-
 client/src/data/copy/common.tsx               |   2 +-
 client/src/data/copy/explore.tsx              |   6 +-
 client/src/data/copy/faqs.tsx                 |  21 ++-
 client/src/data/copy/methodology.tsx          | 137 ++++++++++++++----
 client/src/intl/en.json                       | 118 +++++++++++----
 .../src/pages/frequently-asked-questions.tsx  |   8 +-
 .../tests/__snapshots__/about.test.tsx.snap   |  10 +-
 .../tests/__snapshots__/contact.test.tsx.snap |   4 +-
 .../__snapshots__/downloads.test.tsx.snap     |   4 +-
 .../freqAskedQuestions.test.tsx.snap          |  24 +--
 .../__snapshots__/methodology.test.tsx.snap   |  78 ++++++++--
 .../__snapshots__/publicEng.test.tsx.snap     |   4 +-
 .../techSupportDoc.test.tsx.snap              |   4 +-
 18 files changed, 389 insertions(+), 117 deletions(-)

diff --git a/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap b/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
index bad30ff84..3434606d2 100644
--- a/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
+++ b/client/src/components/BetaBanner/__snapshots__/BetaBanner.test.tsx.snap
@@ -5,9 +5,9 @@ exports[`rendering of the BetaBanner checks if component renders 1`] = `
   <div>
     <div>
       <strong>
-        This site has been updated.
+        This tool has been updated.
       </strong>
-       The current version of the site is 1.0 that was released on Nov 22, 2022.
+       The 1.0 version of the tool was released on Nov 22, 2022.
     </div>
   </div>
 </DocumentFragment>
diff --git a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
index 94d1b0b4f..d260d6e63 100644
--- a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
+++ b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
@@ -40,7 +40,7 @@ exports[`rendering of the Categories checks if component renders 1`] = `
           >
             statistical areas
           </a>
-           are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
+           are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen because many of the data sources in the tool currently use the 2010 
       census boundaries.    
     
         </p>
@@ -537,7 +537,7 @@ exports[`rendering of the Categories checks if component renders 1`] = `
         >
           high school education
         </a>
-          level less than a high school diploma
+         (i.e. graduated with a high school degree)
   
       </p>
     </div>
diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
index f0c2869a1..631443977 100644
--- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
+++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
@@ -242,6 +242,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the population loss rate.
 
       
+              </div>
+              <div>
+                <p>
+                  
+        
+                  <strong>
+                    Note: 
+                  </strong>
+                  this burden only applies for census tracts with populations greater than 20 people.
+      
+                </p>
               </div>
               <ul>
                 <li>
@@ -432,7 +443,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     rel="noreferrer"
                     target="_blank"
                   >
-                    LEAD Score
+                    LEAD Tool
                   </a>
                    from 2018
                 </li>
@@ -877,7 +888,39 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <span>
                     Responsible Party: 
                   </span>
-                  The Trust for Public Lands and American Forestry
+                  
+      Data from 
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.mrlc.gov/about"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Multi-Resolution Land Characteristics (MRLC)
+                  </a>
+                   consortium; data analysis provided by 
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.tpl.org/"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    The Trust for Public Lands
+                  </a>
+                   and 
+                  <a
+                    class="usa-link usa-link--external"
+                    data-cy=""
+                    href="https://www.americanforests.org/"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    American Forests
+                  </a>
+                  
+    
                 </li>
                 <li>
                   <span>
@@ -1242,7 +1285,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               </div>
               <div>
                 
-        Count of Risk Management Plan (RMP), or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
+        Count of Risk Management Plan (RMP) facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers. These facilities are mandated by the Clean Air Act to file RMPs because they handle substances with significant environmental and public health risks.
       
               </div>
               <ul>
@@ -1353,6 +1396,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         Average relative cost and time spent on transportation relative to all other tracts.
       
               </div>
+              <div>
+                <p>
+                  
+      
+                  <strong>
+                    Note: 
+                  </strong>
+                   this burden only applies for census tracts with populations greater than 20 people
+    
+                </p>
+              </div>
               <ul>
                 <li>
                   <span>
@@ -1377,7 +1431,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     rel="noreferrer"
                     target="_blank"
                   >
-                    Transportation Burdens indicator
+                    Transportation access disadvantage 3
                   </a>
                     from 2022
                 </li>
@@ -1453,12 +1507,12 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   </span>
                 </div>
                 <h3>
-                  Leaking underground storage tanks
+                  Underground storage tanks and releases
                 </h3>
               </div>
               <div>
                 
-        Weighted formula of number of leaking underground storage tanks and the number of all underground storage tanks within 1,500 feet.
+        Weighted formula of the density of leaking underground storage tanks and the number of all active underground storage tanks within 1,500 feet of the census tract boundaries.
       
               </div>
               <ul>
@@ -1539,7 +1593,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     rel="noreferrer"
                     target="_blank"
                   >
-                    Risk-Screening Environmental Indicators (RSEI) Model
+                    Risk-Screening Environmental Indicators (RSEI) model
                   </a>
                    from 2020 as compiled by EPA’s EJScreen
                 </li>
diff --git a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
index 539fa053f..66e45c9c4 100644
--- a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
+++ b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
@@ -145,9 +145,9 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
     <div>
       <div>
         <strong>
-          This site has been updated.
+          This tool has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 22, 2022.
+         The 1.0 version of the tool was released on Nov 22, 2022.
       </div>
     </div>
     <div
diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx
index d490d097e..624520a20 100644
--- a/client/src/data/copy/about.tsx
+++ b/client/src/data/copy/about.tsx
@@ -25,7 +25,7 @@ export const CONTENT = {
   <FormattedMessage
     id={'about.page.paragraph.1'}
     defaultMessage={`
-      In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens. These are the communities that are disadvantaged because they are overburdened and underserved.
+      In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens in eight categories: climate change, energy, health, housing, legacy pollution, transportation, water and wastewater, and workforce development. The tool uses this information to identify communities that are experiencing these burdens. These are the communities that are disadvantaged because they are overburdened and underserved.
 
     `}
     description={'Navigate to the About page. This is the paragraph 1'}
@@ -105,7 +105,7 @@ export const CONTENT = {
   <FormattedMessage
     id={'about.page.how.to.use.tool.para1'}
     defaultMessage={`
-      The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.  The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages.
+      The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen because many of the data sources in the tool currently use the 2010 census boundaries.  The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages.
     `}
     description={'Navigate to the About page. This is the paragraph 4'}
     values={{
@@ -146,7 +146,7 @@ export const HOW_TO_USE_TOOL = defineMessages({
   USE_MAP_PARA: {
     id: 'about.page.use.map.para',
     defaultMessage: `
-      Zoom-in and select any census tract to see if it is considered disadvantaged.
+      Zoom in and select any census tract to see if it is considered disadvantaged.
     `,
     description: 'Navigate to the About page. This is the paragraph of Using the map',
   },
diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx
index 36118a650..67fcfc731 100644
--- a/client/src/data/copy/common.tsx
+++ b/client/src/data/copy/common.tsx
@@ -35,7 +35,7 @@ export const METH_BETA_RELEASE_DATE = new Date(2022, 1, 18, 11, 59, 59); // Feb
 // Beta Banner
 export const BETA_BANNER_CONTENT = <FormattedMessage
   id={'common.pages.alerts.banner.beta.content'}
-  defaultMessage={`<bold1>This site has been updated.</bold1> The current version of the site is 1.0 that was released on {relDate}.`}
+  defaultMessage={`<bold1>This tool has been updated.</bold1> The 1.0 version of the tool was released on {relDate}.`}
   description={`Alert body that appears on landing page.`}
   values={{
     bold1: boldFn,
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 2815774ce..5933be440 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -1031,8 +1031,8 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
   // Water
   LEAKY_TANKS: {
     id: 'explore.map.page.side.panel.indicator.leaky.tanks',
-    defaultMessage: 'Leaking underground storage tanks',
-    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Leaking underground storage tanks`,
+    defaultMessage: 'Underground storage tanks and releases',
+    description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Underground storage tanks and releases`,
   },
   WASTE_WATER: {
     id: 'explore.map.page.side.panel.indicator.wasteWater',
@@ -1293,7 +1293,7 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
   // Water
   LEAKY_TANKS: {
     id: 'explore.map.page.side.panel.indicator.description.leaky.tanks',
-    defaultMessage: `Formula that counts leaking underground storage tanks and number of all underground storage tanks within 1500 feet
+    defaultMessage: `Formula of the density of leaking underground storage tanks and number of all active underground storage tanks within 1500 feet of the census tract boundaries
     `,
     description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of leaky storage tanks`,
   },
diff --git a/client/src/data/copy/faqs.tsx b/client/src/data/copy/faqs.tsx
index d0c0edef1..c2930983d 100644
--- a/client/src/data/copy/faqs.tsx
+++ b/client/src/data/copy/faqs.tsx
@@ -308,28 +308,32 @@ export const FAQ_ANSWERS = {
   />,
   Q2_P3: <FormattedMessage
     id={ 'faqs.page.answers.Q2_P3'}
-    defaultMessage={ 'Not all disadvantaged communities can be shown on the map. Some communities, such as migrant workers, do not live in just one place. The Interim Implementation Guidance on the Justice40 Initiative also directs Federal agencies to consider geographically dispersed communities when implementing programs included in the Justice40 Initiative.'}
+    defaultMessage={ 'Not all disadvantaged communities can be shown on the map. Some communities do not live in just one place. The Interim Implementation Guidance on the Justice40 Initiative also directs Federal agencies to consider geographically dispersed communities when implementing programs included in the Justice40 Initiative.'}
     description={ 'Navigate to the FAQs page, this will be an answer, Q2_P3'}
   />,
   Q2_P4: <FormattedMessage
     id={ 'faqs.page.answers.Q2_P4'}
-    defaultMessage={ '<boldtag>The tool uses census tracts.</boldtag> Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.'}
+    defaultMessage={ 'The tool uses census tracts. Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.'}
     description={ 'Navigate to the FAQs page, this will be an answer, Q2_P4'}
     values={{
-      boldtag: boldFn,
       link1: linkFn(`https://www.census.gov/programs-surveys/acs/geography-acs/geography-boundaries-by-year.html`, false, true),
     }}
   />,
   Q3_P1: <FormattedMessage
     id={ 'faqs.page.answers.Q3_P1'}
-    defaultMessage={ 'No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.'}
+    defaultMessage={ 'No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool displays data about race and age only to provide information when a census tract is selected.'}
     description={ 'Navigate to the FAQs page, this will be an answer, Q3_P1'}
   />,
   Q3_P2: <FormattedMessage
     id={ 'faqs.page.answers.Q3_P2'}
-    defaultMessage={ 'Although the CEJST does not use race in its methodology, the tool creates a map that seeks to reflect the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.'}
+    defaultMessage={ 'It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.'}
     description={ 'Navigate to the FAQs page, this will be an answer, Q3_P2'}
   />,
+  Q3_P3: <FormattedMessage
+    id={ 'faqs.page.answers.Q3_P3'}
+    defaultMessage={ 'Although the CEJST does not use race in its methodology, the tool creates a map that seeks to reflect the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.'}
+    description={ 'Navigate to the FAQs page, this will be an answer, Q3_P3'}
+  />,
   Q4_P1: <FormattedMessage
     id={ 'faqs.page.answers.Q4_P1'}
     defaultMessage={ 'Yes, the version 1.0 of the CEJST has some data for all the territories but not all the CEJST data are available or used for all U.S. territories. '}
@@ -345,7 +349,7 @@ export const FAQ_ANSWERS = {
   />,
   Q4_P3: <FormattedMessage
     id={ 'faqs.page.answers.Q4_P3'}
-    defaultMessage={ '<boldtag>American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands:</boldtag> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period. '}
+    defaultMessage={ '<boldtag>American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands:</boldtag> For these U.S. territories, the tool uses the following data: unemployment, poverty, low median income, and high school education. These burdens are in the workforce development category. '}
     description={ 'Navigate to the FAQs page, this will be an answer, Q4_P3'}
     values={{
       boldtag: boldFn,
@@ -383,12 +387,13 @@ export const FAQ_ANSWERS = {
   />,
   Q6_P2: <FormattedMessage
     id={ 'faqs.page.answers.Q6_P2'}
-    defaultMessage={ ` : Disadvantaged census tracts`}
+    defaultMessage={ ` : Disadvantaged census tracts (meets threshold methodology OR contains lands of Tribes)`}
     description={ 'Navigate to the FAQs page, this will be an answer, Q6_P2'}
   />,
   Q6_P3: <FormattedMessage
     id={ 'faqs.page.answers.Q6_P3'}
-    defaultMessage={ ` : Disadvantaged census tracts and land within the boundaries of Federally Recognized Tribes `}
+    defaultMessage={ ` : Disadvantaged census tracts and land within the boundaries of Federally Recognized Tribes (meets threshold methodology AND contains lands of Tribes)
+    `}
     description={ 'Navigate to the FAQs page, this will be an answer, Q6_P3'}
   />,
   Q6_P4: <FormattedMessage
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index 4e5461d26..372be076c 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -27,7 +27,7 @@ export const PAGE = defineMessages({
   PARA1_BULLET1: {
     id: 'methodology.page.paragraph.1.bullet.1',
     defaultMessage: `
-      If they are in census tracts that meet the thresholds for at least one of tool’s categories of burden, or
+      If they are in census tracts that meet the thresholds for at least one of the tool’s categories of burden, or
     `,
     description: 'Navigate to the methodology page. This is the methodology paragraph 1, bullet 1',
   },
@@ -98,7 +98,7 @@ export const FORMULA = {
   PARA4: <FormattedMessage
     id={'methodology.page.paragraph.4'}
     defaultMessage={`
-      Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
+      Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen because many of the data sources in the tool currently use the 2010 
       census boundaries.    
     `}
     description={'Navigate to the methodology page. This is the methodology paragraph 4'}
@@ -141,7 +141,7 @@ export const CATEGORY_AND_CLAUSE = {
   />,
   HS_DEG_GTE_10: <FormattedMessage
     id={'methodology.page.category.and.clause.hs.ed.higher.ed'}
-    defaultMessage={`<boldtag>AND</boldtag> fewer than 10% of people ages 25 or older have a <link1>high school education</link1>  level less than a high school diploma
+    defaultMessage={`<boldtag>AND</boldtag> fewer than 10% of people ages 25 or older have a <link1>high school education</link1> (i.e. graduated with a high school degree)
   `}
     description={'Navigate to the methodology page. Navigate to the category section. This is the portion of the formula dealing with higher ed enrollment and high school degree rate'}
     values={{
@@ -477,20 +477,83 @@ export const DATE_RANGE = {
 };
 
 export const RESPONSIBLE_PARTIES = {
-  BIA: `Bureau of Indian Affairs (BIA)`,
-  CDC: `Centers for Disease Control and Prevention (CDC)`,
-  CENSUS: `U.S. Census`,
-  DOE: `Department of Energy (DOE)`,
-  DOI: `Department of the Interior (DOI)`,
-  DOT: `Department of Transportation (DOT)`,
-  EPA: `Environmental Protection Agency (EPA)`,
-  EPA_OAR: `Environmental Protection Agency (EPA) Office of Air and Radiation (OAR)`,
-  FIRST: `First Street Foundation`,
-  FEMA: `Federal Emergency Management Agency (FEMA)`,
-  HUD: `Department of Housing and Urban Development (HUD)`,
-  NCRC: `National Community Reinvestment Coalition (NCRC)`,
-  TPL: `The Trust for Public Lands and American Forestry`,
-  USACE: `U.S. Army Corps of Engineers`,
+  BIA: <FormattedMessage
+    id={'methodology.page.cat.res.part.BIA'}
+    defaultMessage={'Bureau of Indian Affairs (BIA)'}
+    description={'responsible party text'}
+  />,
+  CDC: <FormattedMessage
+    id={'methodology.page.cat.res.part.CDC'}
+    defaultMessage={'Centers for Disease Control and Prevention (CDC)'}
+    description={'responsible party text'}
+  />,
+  CENSUS: <FormattedMessage
+    id={'methodology.page.cat.res.part.CENSUS'}
+    defaultMessage={'U.S. Census'}
+    description={'responsible party text'}
+  />,
+  DOE: <FormattedMessage
+    id={'methodology.page.cat.res.part.DOE'}
+    defaultMessage={'Department of Energy (DOE)'}
+    description={'responsible party text'}
+  />,
+  DOI: <FormattedMessage
+    id={'methodology.page.cat.res.part.DOI'}
+    defaultMessage={'Department of the Interior (DOI)'}
+    description={'responsible party text'}
+  />,
+  DOT: <FormattedMessage
+    id={'methodology.page.cat.res.part.DOT'}
+    defaultMessage={'Department of Transportation (DOT)'}
+    description={'responsible party text'}
+  />,
+  EPA: <FormattedMessage
+    id={'methodology.page.cat.res.part.EPA'}
+    defaultMessage={'Environmental Protection Agency (EPA)'}
+    description={'responsible party text'}
+  />,
+  EPA_OAR: <FormattedMessage
+    id={'methodology.page.cat.res.part.EPA_OAR'}
+    defaultMessage={'Environmental Protection Agency (EPA) Office of Air and Radiation (OAR)'}
+    description={'responsible party text'}
+  />,
+  FIRST: <FormattedMessage
+    id={'methodology.page.cat.res.part.FIRST'}
+    defaultMessage={'First Street Foundation'}
+    description={'responsible party text'}
+  />,
+  FEMA: <FormattedMessage
+    id={'methodology.page.cat.res.part.FEMA'}
+    defaultMessage={'Federal Emergency Management Agency (FEMA)'}
+    description={'responsible party text'}
+  />,
+  HUD: <FormattedMessage
+    id={'methodology.page.cat.res.part.HUD'}
+    defaultMessage={'Department of Housing and Urban Development (HUD)'}
+    description={'responsible party text'}
+  />,
+  NCRC: <FormattedMessage
+    id={'methodology.page.cat.res.part.NCRC'}
+    defaultMessage={'National Community Reinvestment Coalition (NCRC)'}
+    description={'responsible party text'}
+  />,
+  GREEN_SPACE: <FormattedMessage
+    id={'methodology.page.cat.res.part.GREEN_SPACE'}
+    defaultMessage={`
+      Data from <link1>Multi-Resolution Land Characteristics (MRLC)</link1> consortium; data analysis provided by <link2>The Trust for Public Lands</link2> and <link3>American Forests</link3>
+    `}
+    description={'responsible party text'}
+    values={{
+      link1: linkFn('https://www.mrlc.gov/about', false, true),
+      link2: linkFn('https://www.tpl.org/', false, true),
+      link3: linkFn('https://www.americanforests.org/', false, true),
+    }}
+  />,
+  USACE: <FormattedMessage
+    id={'methodology.page.cat.res.part.USACE'}
+    defaultMessage={'U.S. Army Corps of Engineers'}
+    description={'responsible party text'}
+  />,
 };
 
 export const SOURCE_LINKS = {
@@ -523,7 +586,7 @@ export const SOURCE_LINKS = {
   />,
   DOE_LEAD: <FormattedMessage
     id={'methodology.page.category.source.doe.lead.link'}
-    defaultMessage={`<link1>LEAD Score</link1> from {date18}`}
+    defaultMessage={`<link1>LEAD Tool</link1> from {date18}`}
     description={'Navigate to the Methodology page. This is the source link for DOE FEMA'}
     values={{
       link1: linkFn('https://www.energy.gov/eere/slsc/low-income-energy-affordability-data-lead-tool', false, true),
@@ -599,7 +662,7 @@ export const SOURCE_LINKS = {
   />,
   EPA_RSEI: <FormattedMessage
     id={'methodology.page.category.source.epa.rsei.link'}
-    defaultMessage={`<link1>Risk-Screening Environmental Indicators (RSEI) Model</link1> from {date20} as compiled by EPA’s EJScreen`}
+    defaultMessage={`<link1>Risk-Screening Environmental Indicators (RSEI) model</link1> from {date20} as compiled by EPA’s EJScreen`}
     description={'Navigate to the Methodology page. This is the source link for EPA RSEI'}
     values={{
       link1: linkFn('https://www.epa.gov/ejscreen/technical-documentation-ejscreen', false, true),
@@ -671,7 +734,7 @@ export const SOURCE_LINKS = {
   />,
   TRANS_BUR: <FormattedMessage
     id={'methodology.page.category.source.trans.bur.link'}
-    defaultMessage={`<link1>Transportation Burdens indicator</link1>  from {date22}`}
+    defaultMessage={`<link1>Transportation access disadvantage 3</link1>  from {date22}`}
     description={'Navigate to the Methodology page. This is the source link for Transportation burdens'}
     values={{
       link1: linkFn('https://www.transportation.gov/equity-Justice40#:~:text=Transportation%20access%20disadvantage%20identifies%20communities%20and%20places%20that%20spend%20more%2C%20and%20take%20longer%2C%20to%20get%20where%20they%20need%20to%20go.%20(4)', false, true),
@@ -745,7 +808,7 @@ export interface IIndicators {
   description: JSX.Element,
   note?: JSX.Element,
   usedIn: JSX.Element,
-  responsibleParty: string,
+  responsibleParty: JSX.Element,
   sources: {
     source: JSX.Element,
     availableFor: { // Todo remove this and replace with MessageDescriptor when ticket #2000 is fixed
@@ -845,6 +908,16 @@ export const INDICATORS = [
       `}
       description={'Navigate to the Methodology page. This is the description text for exp pop loss rate'}
     />,
+    note: <FormattedMessage
+      id={'methodology.page.category.exp.pop.loss.rate.note.text'}
+      defaultMessage={`
+        <boldtag>Note: </boldtag>this burden only applies for census tracts with populations greater than 20 people.
+      `}
+      description={'Navigate to the Methodology page. This is the note text for low life expectancy'}
+      values={{
+        boldtag: boldFn,
+      }}
+    />,
     usedIn: CATEGORIES.CLIMATE_CHANGE.METHODOLOGY,
     responsibleParty: RESPONSIBLE_PARTIES.FEMA,
     sources: [
@@ -1133,7 +1206,7 @@ export const INDICATORS = [
       description={'Navigate to the Methodology page. This is the description text for housing burden'}
     />,
     usedIn: CATEGORIES.AFFORDABLE_HOUSING.METHODOLOGY,
-    responsibleParty: RESPONSIBLE_PARTIES.TPL,
+    responsibleParty: RESPONSIBLE_PARTIES.GREEN_SPACE,
     sources: [
       {
         source: SOURCE_LINKS.PDI,
@@ -1294,7 +1367,7 @@ export const INDICATORS = [
     description: <FormattedMessage
       id={'methodology.page.category.prox.rmp.description.text'}
       defaultMessage={`
-        Count of Risk Management Plan (RMP), or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
+        Count of Risk Management Plan (RMP) facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers. These facilities are mandated by the Clean Air Act to file RMPs because they handle substances with significant environmental and public health risks.
       `}
       description={'Navigate to the Methodology page. This is the description text for proximity to rmp'}
     />,
@@ -1347,6 +1420,16 @@ export const INDICATORS = [
       `}
       description={'Navigate to the Methodology page. This is the description text for Transportation barriers'}
     />,
+    note: <FormattedMessage
+      id={'methodology.page.category.trans.barrier.note.text'}
+      defaultMessage={`
+      <boldtag>Note: </boldtag> this burden only applies for census tracts with populations greater than 20 people
+    `}
+      description={'Navigate to the Methodology page. This is the note text for trans.barrier'}
+      values={{
+        boldtag: boldFn,
+      }}
+    />,
     usedIn: CATEGORIES.CLEAN_TRANSPORT.METHODOLOGY,
     responsibleParty: RESPONSIBLE_PARTIES.DOT,
     sources: [
@@ -1385,16 +1468,16 @@ export const INDICATORS = [
     domID: 'leaky-uwt',
     indicator: <FormattedMessage
       id={'methodology.page.dataset.indicator.leaky.uwt.title.text'}
-      defaultMessage={`Leaking underground storage tanks`}
-      description={'Navigate to the Methodology page. This is the title text for the Leaking underground storage tanks'}
+      defaultMessage={`Underground storage tanks and releases`}
+      description={'Navigate to the Methodology page. This is the title text for the Underground storage tanks and releases'}
     />,
     isNew: true,
     description: <FormattedMessage
       id={'methodology.page.category.leaky.uwt.description.text'}
       defaultMessage={`
-        Weighted formula of number of leaking underground storage tanks and the number of all underground storage tanks within 1,500 feet.
+        Weighted formula of the density of leaking underground storage tanks and the number of all active underground storage tanks within 1,500 feet of the census tract boundaries.
       `}
-      description={'Navigate to the Methodology page. This is the description text for Leaking underground storage tanks'}
+      description={'Navigate to the Methodology page. This is the description text for Underground storage tanks and releases'}
     />,
     usedIn: CATEGORIES.CLEAN_WATER.METHODOLOGY,
     responsibleParty: RESPONSIBLE_PARTIES.EPA,
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 4c53c8dca..ff1ab5055 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -8,7 +8,7 @@
     "description": "Navigate to the About page. This is the paragraph 4"
   },
   "about.page.how.to.use.tool.para1": {
-    "defaultMessage": "The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries. The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages.",
+    "defaultMessage": "The tool shows information about the burdens that communities experience. It uses datasets to identify indicators of burdens. The tool shows these burdens in census tracts. Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen because many of the data sources in the tool currently use the 2010 census boundaries. The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages.",
     "description": "Navigate to the About page. This is the paragraph 4"
   },
   "about.page.how.to.use.tool.para2": {
@@ -64,7 +64,7 @@
     "description": "Navigate to the About page. This is the list item 2"
   },
   "about.page.paragraph.1": {
-    "defaultMessage": "In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens. These are the communities that are disadvantaged because they are overburdened and underserved.",
+    "defaultMessage": "In January of 2020, President Biden issued <link1>Executive Order 14008</link1>. The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens in eight categories: climate change, energy, health, housing, legacy pollution, transportation, water and wastewater, and workforce development. The tool uses this information to identify communities that are experiencing these burdens. These are the communities that are disadvantaged because they are overburdened and underserved.",
     "description": "Navigate to the About page. This is the paragraph 1"
   },
   "about.page.paragraph.2": {
@@ -112,7 +112,7 @@
     "description": "Navigate to the About page. This is the sub heading of Using the map"
   },
   "about.page.use.map.para": {
-    "defaultMessage": "Zoom-in and select any census tract to see if it is considered disadvantaged.",
+    "defaultMessage": "Zoom in and select any census tract to see if it is considered disadvantaged.",
     "description": "Navigate to the About page. This is the paragraph of Using the map"
   },
   "common.pages.alerts.additional_docs_available.description": {
@@ -120,7 +120,7 @@
     "description": "Alert title that appears at the top of pages."
   },
   "common.pages.alerts.banner.beta.content": {
-    "defaultMessage": "<bold1>This site has been updated.</bold1> The current version of the site is 1.0 that was released on {relDate}.",
+    "defaultMessage": "<bold1>This tool has been updated.</bold1> The 1.0 version of the tool was released on {relDate}.",
     "description": "Alert body that appears on landing page."
   },
   "common.pages.alerts.census.tract.title": {
@@ -960,7 +960,7 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of Share of homes that are likely to have lead paint   \n    "
   },
   "explore.map.page.side.panel.indicator.description.leaky.tanks": {
-    "defaultMessage": "Formula that counts leaking underground storage tanks and number of all underground storage tanks within 1500 feet",
+    "defaultMessage": "Formula of the density of leaking underground storage tanks and number of all active underground storage tanks within 1500 feet of the census tract boundaries",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show an indicator description of leaky storage tanks"
   },
   "explore.map.page.side.panel.indicator.description.lifeExpect": {
@@ -1084,8 +1084,8 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Lead paint"
   },
   "explore.map.page.side.panel.indicator.leaky.tanks": {
-    "defaultMessage": "Leaking underground storage tanks",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Leaking underground storage tanks"
+    "defaultMessage": "Underground storage tanks and releases",
+    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Underground storage tanks and releases"
   },
   "explore.map.page.side.panel.indicator.lifeExpect": {
     "defaultMessage": "Low life expectancy",
@@ -1684,21 +1684,25 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q2_P2_2"
   },
   "faqs.page.answers.Q2_P3": {
-    "defaultMessage": "Not all disadvantaged communities can be shown on the map. Some communities, such as migrant workers, do not live in just one place. The Interim Implementation Guidance on the Justice40 Initiative also directs Federal agencies to consider geographically dispersed communities when implementing programs included in the Justice40 Initiative.",
+    "defaultMessage": "Not all disadvantaged communities can be shown on the map. Some communities do not live in just one place. The Interim Implementation Guidance on the Justice40 Initiative also directs Federal agencies to consider geographically dispersed communities when implementing programs included in the Justice40 Initiative.",
     "description": "Navigate to the FAQs page, this will be an answer, Q2_P3"
   },
   "faqs.page.answers.Q2_P4": {
-    "defaultMessage": "<boldtag>The tool uses census tracts.</boldtag> Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.",
+    "defaultMessage": "The tool uses census tracts. Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.",
     "description": "Navigate to the FAQs page, this will be an answer, Q2_P4"
   },
   "faqs.page.answers.Q3_P1": {
-    "defaultMessage": "No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.",
+    "defaultMessage": "No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool displays data about race and age only to provide information when a census tract is selected.",
     "description": "Navigate to the FAQs page, this will be an answer, Q3_P1"
   },
   "faqs.page.answers.Q3_P2": {
-    "defaultMessage": "Although the CEJST does not use race in its methodology, the tool creates a map that seeks to reflect the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.",
+    "defaultMessage": "It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.",
     "description": "Navigate to the FAQs page, this will be an answer, Q3_P2"
   },
+  "faqs.page.answers.Q3_P3": {
+    "defaultMessage": "Although the CEJST does not use race in its methodology, the tool creates a map that seeks to reflect the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.",
+    "description": "Navigate to the FAQs page, this will be an answer, Q3_P3"
+  },
   "faqs.page.answers.Q4_P1": {
     "defaultMessage": "Yes, the version 1.0 of the CEJST has some data for all the territories but not all the CEJST data are available or used for all U.S. territories.",
     "description": "Navigate to the FAQs page, this will be an answer, Q4_P1"
@@ -1708,7 +1712,7 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q4_P2"
   },
   "faqs.page.answers.Q4_P3": {
-    "defaultMessage": "<boldtag>American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands:</boldtag> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.",
+    "defaultMessage": "<boldtag>American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands:</boldtag> For these U.S. territories, the tool uses the following data: unemployment, poverty, low median income, and high school education. These burdens are in the workforce development category.",
     "description": "Navigate to the FAQs page, this will be an answer, Q4_P3"
   },
   "faqs.page.answers.Q5_P1": {
@@ -1728,11 +1732,11 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q6_P1"
   },
   "faqs.page.answers.Q6_P2": {
-    "defaultMessage": ": Disadvantaged census tracts",
+    "defaultMessage": ": Disadvantaged census tracts (meets threshold methodology OR contains lands of Tribes)",
     "description": "Navigate to the FAQs page, this will be an answer, Q6_P2"
   },
   "faqs.page.answers.Q6_P3": {
-    "defaultMessage": ": Disadvantaged census tracts and land within the boundaries of Federally Recognized Tribes",
+    "defaultMessage": ": Disadvantaged census tracts and land within the boundaries of Federally Recognized Tribes (meets threshold methodology AND contains lands of Tribes)",
     "description": "Navigate to the FAQs page, this will be an answer, Q6_P3"
   },
   "faqs.page.answers.Q6_P4": {
@@ -1827,8 +1831,64 @@
     "defaultMessage": "Focus on {territory}",
     "description": "Focus on the bounds of a specific territory"
   },
+  "methodology.page.cat.res.part.BIA": {
+    "defaultMessage": "Bureau of Indian Affairs (BIA)",
+    "description": "responsible party text"
+  },
+  "methodology.page.cat.res.part.CDC": {
+    "defaultMessage": "Centers for Disease Control and Prevention (CDC)",
+    "description": "responsible party text"
+  },
+  "methodology.page.cat.res.part.CENSUS": {
+    "defaultMessage": "U.S. Census",
+    "description": "responsible party text"
+  },
+  "methodology.page.cat.res.part.DOE": {
+    "defaultMessage": "Department of Energy (DOE)",
+    "description": "responsible party text"
+  },
+  "methodology.page.cat.res.part.DOI": {
+    "defaultMessage": "Department of the Interior (DOI)",
+    "description": "responsible party text"
+  },
+  "methodology.page.cat.res.part.DOT": {
+    "defaultMessage": "Department of Transportation (DOT)",
+    "description": "responsible party text"
+  },
+  "methodology.page.cat.res.part.EPA": {
+    "defaultMessage": "Environmental Protection Agency (EPA)",
+    "description": "responsible party text"
+  },
+  "methodology.page.cat.res.part.EPA_OAR": {
+    "defaultMessage": "Environmental Protection Agency (EPA) Office of Air and Radiation (OAR)",
+    "description": "responsible party text"
+  },
+  "methodology.page.cat.res.part.FEMA": {
+    "defaultMessage": "Federal Emergency Management Agency (FEMA)",
+    "description": "responsible party text"
+  },
+  "methodology.page.cat.res.part.FIRST": {
+    "defaultMessage": "First Street Foundation",
+    "description": "responsible party text"
+  },
+  "methodology.page.cat.res.part.GREEN_SPACE": {
+    "defaultMessage": "Data from <link1>Multi-Resolution Land Characteristics (MRLC)</link1> consortium; data analysis provided by <link2>The Trust for Public Lands</link2> and <link3>American Forests</link3>",
+    "description": "responsible party text"
+  },
+  "methodology.page.cat.res.part.HUD": {
+    "defaultMessage": "Department of Housing and Urban Development (HUD)",
+    "description": "responsible party text"
+  },
+  "methodology.page.cat.res.part.NCRC": {
+    "defaultMessage": "National Community Reinvestment Coalition (NCRC)",
+    "description": "responsible party text"
+  },
+  "methodology.page.cat.res.part.USACE": {
+    "defaultMessage": "U.S. Army Corps of Engineers",
+    "description": "responsible party text"
+  },
   "methodology.page.category.and.clause.hs.ed.higher.ed": {
-    "defaultMessage": "<boldtag>AND</boldtag> fewer than 10% of people ages 25 or older have a <link1>high school education</link1> level less than a high school diploma",
+    "defaultMessage": "<boldtag>AND</boldtag> fewer than 10% of people ages 25 or older have a <link1>high school education</link1> (i.e. graduated with a high school degree)",
     "description": "Navigate to the methodology page. Navigate to the category section. This is the portion of the formula dealing with higher ed enrollment and high school degree rate"
   },
   "methodology.page.category.and.clause.low.inc": {
@@ -1867,6 +1927,10 @@
     "defaultMessage": "Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the population loss rate.",
     "description": "Navigate to the Methodology page. This is the description text for exp pop loss rate"
   },
+  "methodology.page.category.exp.pop.loss.rate.note.text": {
+    "defaultMessage": "<boldtag>Note: </boldtag>this burden only applies for census tracts with populations greater than 20 people.",
+    "description": "Navigate to the Methodology page. This is the note text for low life expectancy"
+  },
   "methodology.page.category.flood.risk.rate.description.text": {
     "defaultMessage": "A high precision, climate-adjusted model that projects flood risk for properties in the future. The dataset calculates how many properties are at risk of floods occurring in the next thirty years from tides, rain, riverine and storm surges, or a 26% risk total over the 30-year time horizon. The risk is defined as an annualized 1% chance. The tool calculates tract-level risk as the share of properties meeting the risk threshold. The risk does not consider property value.",
     "description": "Navigate to the Methodology page. This is the description text for exp bld loss rate"
@@ -1900,8 +1964,8 @@
     "description": "Navigate to the Methodology page. This is the description text for lead paint"
   },
   "methodology.page.category.leaky.uwt.description.text": {
-    "defaultMessage": "Weighted formula of number of leaking underground storage tanks and the number of all underground storage tanks within 1,500 feet.",
-    "description": "Navigate to the Methodology page. This is the description text for Leaking underground storage tanks"
+    "defaultMessage": "Weighted formula of the density of leaking underground storage tanks and the number of all active underground storage tanks within 1,500 feet of the census tract boundaries.",
+    "description": "Navigate to the Methodology page. This is the description text for Underground storage tanks and releases"
   },
   "methodology.page.category.linguistic.iso.description.text": {
     "defaultMessage": "Share of households where no one over age 14 speaks English very well.",
@@ -1956,7 +2020,7 @@
     "description": "Navigate to the Methodology page. This is the description text for proximity to npl"
   },
   "methodology.page.category.prox.rmp.description.text": {
-    "defaultMessage": "Count of Risk Management Plan (RMP), or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.",
+    "defaultMessage": "Count of Risk Management Plan (RMP) facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers. These facilities are mandated by the Clean Air Act to file RMPs because they handle substances with significant environmental and public health risks.",
     "description": "Navigate to the Methodology page. This is the description text for proximity to rmp"
   },
   "methodology.page.category.source.aml.link": {
@@ -1984,7 +2048,7 @@
     "description": "Navigate to the Methodology page. This is the source link for Census ACS"
   },
   "methodology.page.category.source.doe.lead.link": {
-    "defaultMessage": "<link1>LEAD Score</link1> from {date18}",
+    "defaultMessage": "<link1>LEAD Tool</link1> from {date18}",
     "description": "Navigate to the Methodology page. This is the source link for DOE FEMA"
   },
   "methodology.page.category.source.dot.epa.link": {
@@ -2008,7 +2072,7 @@
     "description": "Navigate to the Methodology page. This is the source link for EPA RMP"
   },
   "methodology.page.category.source.epa.rsei.link": {
-    "defaultMessage": "<link1>Risk-Screening Environmental Indicators (RSEI) Model</link1> from {date20} as compiled by EPA’s EJScreen",
+    "defaultMessage": "<link1>Risk-Screening Environmental Indicators (RSEI) model</link1> from {date20} as compiled by EPA’s EJScreen",
     "description": "Navigate to the Methodology page. This is the source link for EPA RSEI"
   },
   "methodology.page.category.source.epa.tsdf.link": {
@@ -2040,7 +2104,7 @@
     "description": "Navigate to the Methodology page. This is the source link for CDC Sleep"
   },
   "methodology.page.category.source.trans.bur.link": {
-    "defaultMessage": "<link1>Transportation Burdens indicator</link1> from {date22}",
+    "defaultMessage": "<link1>Transportation access disadvantage 3</link1> from {date22}",
     "description": "Navigate to the Methodology page. This is the source link for Transportation burdens"
   },
   "methodology.page.category.source.ust.find.link": {
@@ -2055,6 +2119,10 @@
     "defaultMessage": "Average relative cost and time spent on transportation relative to all other tracts.",
     "description": "Navigate to the Methodology page. This is the description text for Transportation barriers"
   },
+  "methodology.page.category.trans.barrier.note.text": {
+    "defaultMessage": "<boldtag>Note: </boldtag> this burden only applies for census tracts with populations greater than 20 people",
+    "description": "Navigate to the Methodology page. This is the note text for trans.barrier"
+  },
   "methodology.page.category.tribal.lands.description.text": {
     "defaultMessage": "The Land Area Representation (LAR) dataset depicts American Indian land areas for Federally Recognized Tribes.",
     "description": "Navigate to the Methodology page. This is the description text for Tribal lands"
@@ -2172,8 +2240,8 @@
     "description": "Navigate to the Methodology page. This is the title text for the lead paint dataset"
   },
   "methodology.page.dataset.indicator.leaky.uwt.title.text": {
-    "defaultMessage": "Leaking underground storage tanks",
-    "description": "Navigate to the Methodology page. This is the title text for the Leaking underground storage tanks"
+    "defaultMessage": "Underground storage tanks and releases",
+    "description": "Navigate to the Methodology page. This is the title text for the Underground storage tanks and releases"
   },
   "methodology.page.dataset.indicator.life.exp.title.text": {
     "defaultMessage": "Low life expectancy",
@@ -2388,7 +2456,7 @@
     "description": "Navigate to the methodology page. This is the methodology paragraph 1"
   },
   "methodology.page.paragraph.1.bullet.1": {
-    "defaultMessage": "If they are in census tracts that meet the thresholds for at least one of tool’s categories of burden, or",
+    "defaultMessage": "If they are in census tracts that meet the thresholds for at least one of the tool’s categories of burden, or",
     "description": "Navigate to the methodology page. This is the methodology paragraph 1, bullet 1"
   },
   "methodology.page.paragraph.1.bullet.2": {
@@ -2400,7 +2468,7 @@
     "description": "Navigate to the methodology page. This is the methodology paragraph 3"
   },
   "methodology.page.paragraph.4": {
-    "defaultMessage": "Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.",
+    "defaultMessage": "Census tracts are small units of geography. Census tract boundaries for <link1>statistical areas</link1> are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen because many of the data sources in the tool currently use the 2010 census boundaries.",
     "description": "Navigate to the methodology page. This is the methodology paragraph 4"
   },
   "methodology.page.paragraph.5": {
diff --git a/client/src/pages/frequently-asked-questions.tsx b/client/src/pages/frequently-asked-questions.tsx
index 2fcc976e9..35acef324 100644
--- a/client/src/pages/frequently-asked-questions.tsx
+++ b/client/src/pages/frequently-asked-questions.tsx
@@ -30,6 +30,11 @@ const dotStyles = {
   },
 };
 
+const dotStylesTribal = {
+  alignSelf: 'baseline',
+  paddingTop: '5px',
+};
+
 const accordionContainerStyle = {
   marginTop: `1.2rem`,
 };
@@ -66,6 +71,7 @@ const FAQPage = ({location}: IFAQPageProps) => {
       <>
         <p key={3}>{FAQS_COPY.FAQ_ANSWERS.Q3_P1}</p>
         <p>{FAQS_COPY.FAQ_ANSWERS.Q3_P2}</p>
+        <p>{FAQS_COPY.FAQ_ANSWERS.Q3_P3}</p>
       </>
     ),
     (
@@ -96,7 +102,7 @@ const FAQPage = ({location}: IFAQPageProps) => {
           <div style={dotStyles.p}>{FAQS_COPY.FAQ_ANSWERS.Q6_P2}</div>
         </div>
         <div style={dotStyles}>
-          <img src={tribalDotIcon}
+          <img style={dotStylesTribal} src={tribalDotIcon}
             alt={intl.formatMessage(SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT.DAC_CIRCLE)}
           />
           <div style={dotStyles.p}>{FAQS_COPY.FAQ_ANSWERS.Q6_P3}</div>
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index 977aa4b73..be27a6aba 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -145,9 +145,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     <div>
       <div>
         <strong>
-          This site has been updated.
+          This tool has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 22, 2022.
+         The 1.0 version of the tool was released on Nov 22, 2022.
       </div>
     </div>
     <div
@@ -425,7 +425,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               >
                 Executive Order 14008
               </a>
-              . The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens. The tool uses this information to identify communities that are experiencing these burdens. These are the communities that are disadvantaged because they are overburdened and underserved.
+              . The order directed the Council on Environmental Quality (CEQ) to develop a new tool. This tool is called the Climate and Economic Justice Screening Tool. The tool has an interactive map and uses datasets that are indicators of burdens in eight categories: climate change, energy, health, housing, legacy pollution, transportation, water and wastewater, and workforce development. The tool uses this information to identify communities that are experiencing these burdens. These are the communities that are disadvantaged because they are overburdened and underserved.
 
     
             </p>
@@ -495,7 +495,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             >
               statistical areas
             </a>
-             are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 census boundaries.  The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages.
+             are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen because many of the data sources in the tool currently use the 2010 census boundaries.  The tool also shows land within the boundaries of Federally Recognized Tribes and point locations for Alaska Native Villages.
     
           </p>
           <p>
@@ -550,7 +550,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   </h3>
                   <p>
                     
-      Zoom-in and select any census tract to see if it is considered disadvantaged.
+      Zoom in and select any census tract to see if it is considered disadvantaged.
     
                   </p>
                   <div
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index 1dc9ba62d..4c09683ac 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -145,9 +145,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     <div>
       <div>
         <strong>
-          This site has been updated.
+          This tool has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 22, 2022.
+         The 1.0 version of the tool was released on Nov 22, 2022.
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index 182ae0adc..e63b8526f 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -145,9 +145,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     <div>
       <div>
         <strong>
-          This site has been updated.
+          This tool has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 22, 2022.
+         The 1.0 version of the tool was released on Nov 22, 2022.
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 08753e8f5..21ef28c49 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -145,9 +145,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     <div>
       <div>
         <strong>
-          This site has been updated.
+          This tool has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 22, 2022.
+         The 1.0 version of the tool was released on Nov 22, 2022.
       </div>
     </div>
     <div
@@ -499,13 +499,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   </li>
                 </ul>
                 <p>
-                  Not all disadvantaged communities can be shown on the map. Some communities, such as migrant workers, do not live in just one place. The Interim Implementation Guidance on the Justice40 Initiative also directs Federal agencies to consider geographically dispersed communities when implementing programs included in the Justice40 Initiative.
+                  Not all disadvantaged communities can be shown on the map. Some communities do not live in just one place. The Interim Implementation Guidance on the Justice40 Initiative also directs Federal agencies to consider geographically dispersed communities when implementing programs included in the Justice40 Initiative.
                 </p>
                 <p>
-                  <strong>
-                    The tool uses census tracts.
-                  </strong>
-                   Census tracts are small units of geography. Census tract boundaries for 
+                  The tool uses census tracts. Census tracts are small units of geography. Census tract boundaries for 
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
@@ -538,7 +535,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 id="faq-id-2"
               >
                 <p>
-                  No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool offers data about race and age only as information when a census tract is selected. It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.
+                  No. The Climate and Economic Justice Screening Tool (CEJST) does not use racial demographics in its methodology. The current version of the tool displays data about race and age only to provide information when a census tract is selected.
+                </p>
+                <p>
+                  It is well-documented that communities of color suffer disproportionately from environmental and health burdens. Due to decades of underinvestment, they also face greater risks from climate change.
                 </p>
                 <p>
                   Although the CEJST does not use race in its methodology, the tool creates a map that seeks to reflect the on-the-ground burdens and realities that disadvantaged communities face. The tool shows communities that have environmental burdens and face injustice.
@@ -576,7 +576,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <strong>
                     American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands:
                   </strong>
-                   The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period. 
+                   For these U.S. territories, the tool uses the following data: unemployment, poverty, low median income, and high school education. These burdens are in the workforce development category. 
                 </p>
               </div>
               <h2
@@ -687,7 +687,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <div
                     style="padding-left: 2px;"
                   >
-                     : Disadvantaged census tracts
+                     : Disadvantaged census tracts (meets threshold methodology OR contains lands of Tribes)
                   </div>
                 </div>
                 <div
@@ -698,11 +698,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
       a blue circle icon informing the user of what a disadvantaged community is depicted as
     "
                     src="test-file-stub"
+                    style="align-self: baseline; padding-top: 5px;"
                   />
                   <div
                     style="padding-left: 2px;"
                   >
-                     : Disadvantaged census tracts and land within the boundaries of Federally Recognized Tribes 
+                     : Disadvantaged census tracts and land within the boundaries of Federally Recognized Tribes (meets threshold methodology AND contains lands of Tribes)
+    
                   </div>
                 </div>
                 <p>
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 5f12e612b..6936e009c 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -145,9 +145,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     <div>
       <div>
         <strong>
-          This site has been updated.
+          This tool has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 22, 2022.
+         The 1.0 version of the tool was released on Nov 22, 2022.
       </div>
     </div>
     <div
@@ -420,7 +420,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <ul>
                 <li>
                   
-      If they are in census tracts that meet the thresholds for at least one of tool’s categories of burden, or
+      If they are in census tracts that meet the thresholds for at least one of the tool’s categories of burden, or
     
                 </li>
                 <li
@@ -478,7 +478,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             >
               statistical areas
             </a>
-             are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen primarily because many of the data sources in the tool currently use the 2010 
+             are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. This was chosen because many of the data sources in the tool currently use the 2010 
       census boundaries.    
     
           </p>
@@ -975,7 +975,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
           >
             high school education
           </a>
-            level less than a high school diploma
+           (i.e. graduated with a high school degree)
   
         </p>
       </div>
@@ -1245,6 +1245,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         Expected fatalities and injuries due to fourteen types of natural hazards each year. These hazards have some link to climate change. They are: avalanche, coastal flooding, cold wave, drought, hail, heat wave, hurricane, ice storm, landslide, riverine flooding, strong wind, tornado, wildfire, and winter weather. Population loss is defined by the Spatial Hazard Events and Losses and National Centers for Environmental Information’s (NCEI). It reports the number of fatalities and injuries caused by the hazard. An injury is counted as one-tenth (1/10) of a fatality. The NCEI Storm Events Database classifies both direct and indirect injuries. Both types are counted as population loss. The total number is divided by the population in the census tract to get the population loss rate.
 
       
+                </div>
+                <div>
+                  <p>
+                    
+        
+                    <strong>
+                      Note: 
+                    </strong>
+                    this burden only applies for census tracts with populations greater than 20 people.
+      
+                  </p>
                 </div>
                 <ul>
                   <li>
@@ -1435,7 +1446,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       rel="noreferrer"
                       target="_blank"
                     >
-                      LEAD Score
+                      LEAD Tool
                     </a>
                      from 2018
                   </li>
@@ -1880,7 +1891,39 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <span>
                       Responsible Party: 
                     </span>
-                    The Trust for Public Lands and American Forestry
+                    
+      Data from 
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.mrlc.gov/about"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      Multi-Resolution Land Characteristics (MRLC)
+                    </a>
+                     consortium; data analysis provided by 
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.tpl.org/"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      The Trust for Public Lands
+                    </a>
+                     and 
+                    <a
+                      class="usa-link usa-link--external"
+                      data-cy=""
+                      href="https://www.americanforests.org/"
+                      rel="noreferrer"
+                      target="_blank"
+                    >
+                      American Forests
+                    </a>
+                    
+    
                   </li>
                   <li>
                     <span>
@@ -2245,7 +2288,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                 </div>
                 <div>
                   
-        Count of Risk Management Plan (RMP), or potential chemical accident management plan, facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers.
+        Count of Risk Management Plan (RMP) facilities within 5 kilometers (or nearest one beyond 5 kilometers), each divided by distance in kilometers. These facilities are mandated by the Clean Air Act to file RMPs because they handle substances with significant environmental and public health risks.
       
                 </div>
                 <ul>
@@ -2356,6 +2399,17 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
         Average relative cost and time spent on transportation relative to all other tracts.
       
                 </div>
+                <div>
+                  <p>
+                    
+      
+                    <strong>
+                      Note: 
+                    </strong>
+                     this burden only applies for census tracts with populations greater than 20 people
+    
+                  </p>
+                </div>
                 <ul>
                   <li>
                     <span>
@@ -2380,7 +2434,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       rel="noreferrer"
                       target="_blank"
                     >
-                      Transportation Burdens indicator
+                      Transportation access disadvantage 3
                     </a>
                       from 2022
                   </li>
@@ -2456,12 +2510,12 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     </span>
                   </div>
                   <h3>
-                    Leaking underground storage tanks
+                    Underground storage tanks and releases
                   </h3>
                 </div>
                 <div>
                   
-        Weighted formula of number of leaking underground storage tanks and the number of all underground storage tanks within 1,500 feet.
+        Weighted formula of the density of leaking underground storage tanks and the number of all active underground storage tanks within 1,500 feet of the census tract boundaries.
       
                 </div>
                 <ul>
@@ -2542,7 +2596,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       rel="noreferrer"
                       target="_blank"
                     >
-                      Risk-Screening Environmental Indicators (RSEI) Model
+                      Risk-Screening Environmental Indicators (RSEI) model
                     </a>
                      from 2020 as compiled by EPA’s EJScreen
                   </li>
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index 8343b93a1..38c415e2e 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -145,9 +145,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     <div>
       <div>
         <strong>
-          This site has been updated.
+          This tool has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 22, 2022.
+         The 1.0 version of the tool was released on Nov 22, 2022.
       </div>
     </div>
     <div
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index 73028a561..28a28ad48 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -145,9 +145,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
     <div>
       <div>
         <strong>
-          This site has been updated.
+          This tool has been updated.
         </strong>
-         The current version of the site is 1.0 that was released on Nov 22, 2022.
+         The 1.0 version of the tool was released on Nov 22, 2022.
       </div>
     </div>
     <div

From f5a708b4bed8b8f3dad407556a70e31140e63873 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 21 Nov 2022 13:16:28 -0800
Subject: [PATCH 129/130] Final final copy changes

---
 .../__snapshots__/Categories.test.tsx.snap       |  2 +-
 .../__snapshots__/datasetContainer.test.tsx.snap | 14 +++++++-------
 .../PrioritizationCopy/PrioritizationCopy.tsx    |  2 +-
 client/src/data/copy/explore.tsx                 |  2 +-
 client/src/data/copy/faqs.tsx                    |  2 +-
 client/src/data/copy/methodology.tsx             | 10 +++++-----
 client/src/intl/en.json                          | 14 +++++++-------
 .../freqAskedQuestions.test.tsx.snap             |  2 +-
 .../__snapshots__/methodology.test.tsx.snap      | 16 ++++++++--------
 9 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
index d260d6e63..7c11380bc 100644
--- a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
+++ b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap
@@ -449,7 +449,7 @@ exports[`rendering of the Categories checks if component renders 1`] = `
           class="usa-link"
           href="#leaky-uwt"
         >
-          leaking underground storage tanks
+          underground storage tanks and releases
         </a>
          OR 
         <a
diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
index 631443977..c3f54e5b9 100644
--- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
+++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
@@ -897,9 +897,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     rel="noreferrer"
                     target="_blank"
                   >
-                    Multi-Resolution Land Characteristics (MRLC)
+                    Multi-Resolution Land Characteristics
                   </a>
-                   consortium; data analysis provided by 
+                   (MRLC) consortium; data analysis provided by 
                   <a
                     class="usa-link usa-link--external"
                     data-cy=""
@@ -933,9 +933,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     rel="noreferrer"
                     target="_blank"
                   >
-                    Percent Developed Imperviousness (CONUS) 
+                    Percent Developed Imperviousness
                   </a>
-                   from 2019
+                   (CONUS)  from 2019
                 </li>
                 <li>
                   <span>
@@ -1403,7 +1403,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <strong>
                     Note: 
                   </strong>
-                   this burden only applies for census tracts with populations greater than 20 people
+                   this burden only applies for census tracts with populations greater than 20 people.
     
                 </p>
               </div>
@@ -1431,9 +1431,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     rel="noreferrer"
                     target="_blank"
                   >
-                    Transportation access disadvantage 3
+                    Transportation access disadvantage
                   </a>
-                    from 2022
+                   from 2022
                 </li>
                 <li>
                   <span>
diff --git a/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
index 734743cef..c2b22f6ef 100644
--- a/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
+++ b/client/src/components/PrioritizationCopy/PrioritizationCopy.tsx
@@ -63,7 +63,7 @@ const PrioritizationCopy =
            }
            // if 1-2-2
          } else if (tribalCountAK !== null && tribalCountAK >= 1) {
-           prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.NOT_PRIO_SURR_LI;
+           prioCopyRendered = EXPLORE_COPY.PRIORITIZATION_COPY.PAR_PRIO_SURR_NO_LI;
          }
          // if 1-3
        } else if (
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 5933be440..2884d592f 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -1441,7 +1441,7 @@ export const NOTE_ON_TERRITORIES = {
   PARA_1: <FormattedMessage
     id={'explore.map.page.under.map.note.on.territories.para.1'}
     defaultMessage={`
-      <bold>Puerto Rico:</bold> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: low income, projected flood risk, energy cost, lack of indoor plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, low median income, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.
+      <bold>Puerto Rico:</bold> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: low income, projected flood risk, energy cost, lack of indoor plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, underground storage tanks and releases, wastewater discharge, low median income, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.
     `}
     description={`Navigate to the explore the map page. Under the map, you will see territories paragraph 1`}
     values={{
diff --git a/client/src/data/copy/faqs.tsx b/client/src/data/copy/faqs.tsx
index c2930983d..408f1707e 100644
--- a/client/src/data/copy/faqs.tsx
+++ b/client/src/data/copy/faqs.tsx
@@ -341,7 +341,7 @@ export const FAQ_ANSWERS = {
   />,
   Q4_P2: <FormattedMessage
     id={ 'faqs.page.answers.Q4_P2'}
-    defaultMessage={ `<boldtag>Puerto Rico:</boldtag> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period. `}
+    defaultMessage={ `<boldtag>Puerto Rico:</boldtag> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, underground storage tanks and releases, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period. `}
     description={ 'Navigate to the FAQs page, this will be an answer, Q4_P2'}
     values={{
       boldtag: boldFn,
diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx
index 372be076c..d95008c00 100644
--- a/client/src/data/copy/methodology.tsx
+++ b/client/src/data/copy/methodology.tsx
@@ -334,7 +334,7 @@ export const CATEGORIES = {
     />,
     IF: <FormattedMessage
       id={'methodology.page.indicator.categories.clean.water.if'}
-      defaultMessage={`<boldtag>ARE</boldtag> at or above the 90th percentile for <link0>leaking underground storage tanks</link0> OR <link1>wastewater discharge</link1>`}
+      defaultMessage={`<boldtag>ARE</boldtag> at or above the 90th percentile for <link0>underground storage tanks and releases</link0> OR <link1>wastewater discharge</link1>`}
       description={'Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula'}
       values={{
         boldtag: boldFn,
@@ -540,7 +540,7 @@ export const RESPONSIBLE_PARTIES = {
   GREEN_SPACE: <FormattedMessage
     id={'methodology.page.cat.res.part.GREEN_SPACE'}
     defaultMessage={`
-      Data from <link1>Multi-Resolution Land Characteristics (MRLC)</link1> consortium; data analysis provided by <link2>The Trust for Public Lands</link2> and <link3>American Forests</link3>
+      Data from <link1>Multi-Resolution Land Characteristics</link1> (MRLC) consortium; data analysis provided by <link2>The Trust for Public Lands</link2> and <link3>American Forests</link3>
     `}
     description={'responsible party text'}
     values={{
@@ -707,7 +707,7 @@ export const SOURCE_LINKS = {
   />,
   PDI: <FormattedMessage
     id={'methodology.page.category.source.pdi.link'}
-    defaultMessage={`<link1>Percent Developed Imperviousness (CONUS) </link1> from {date19}`}
+    defaultMessage={`<link1>Percent Developed Imperviousness</link1> (CONUS)  from {date19}`}
     description={'Navigate to the Methodology page. This is the source link for CDC Sleep'}
     values={{
       link1: linkFn('https://www.mrlc.gov/data/nlcd-2019-percent-developed-imperviousness-conus', false, true),
@@ -734,7 +734,7 @@ export const SOURCE_LINKS = {
   />,
   TRANS_BUR: <FormattedMessage
     id={'methodology.page.category.source.trans.bur.link'}
-    defaultMessage={`<link1>Transportation access disadvantage 3</link1>  from {date22}`}
+    defaultMessage={`<link1>Transportation access disadvantage</link1> from {date22}`}
     description={'Navigate to the Methodology page. This is the source link for Transportation burdens'}
     values={{
       link1: linkFn('https://www.transportation.gov/equity-Justice40#:~:text=Transportation%20access%20disadvantage%20identifies%20communities%20and%20places%20that%20spend%20more%2C%20and%20take%20longer%2C%20to%20get%20where%20they%20need%20to%20go.%20(4)', false, true),
@@ -1423,7 +1423,7 @@ export const INDICATORS = [
     note: <FormattedMessage
       id={'methodology.page.category.trans.barrier.note.text'}
       defaultMessage={`
-      <boldtag>Note: </boldtag> this burden only applies for census tracts with populations greater than 20 people
+      <boldtag>Note: </boldtag> this burden only applies for census tracts with populations greater than 20 people.
     `}
       description={'Navigate to the Methodology page. This is the note text for trans.barrier'}
       values={{
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index ff1ab5055..e3346f14b 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -1428,7 +1428,7 @@
     "description": "Navigate to the explore the map page. Under the map, you will see territories paragraph 0"
   },
   "explore.map.page.under.map.note.on.territories.para.1": {
-    "defaultMessage": "<bold>Puerto Rico:</bold> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: low income, projected flood risk, energy cost, lack of indoor plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, low median income, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.",
+    "defaultMessage": "<bold>Puerto Rico:</bold> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: low income, projected flood risk, energy cost, lack of indoor plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, underground storage tanks and releases, wastewater discharge, low median income, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.",
     "description": "Navigate to the explore the map page. Under the map, you will see territories paragraph 1"
   },
   "explore.map.page.under.map.note.on.territories.para.2": {
@@ -1708,7 +1708,7 @@
     "description": "Navigate to the FAQs page, this will be an answer, Q4_P1"
   },
   "faqs.page.answers.Q4_P2": {
-    "defaultMessage": "<boldtag>Puerto Rico:</boldtag> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.",
+    "defaultMessage": "<boldtag>Puerto Rico:</boldtag> The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, underground storage tanks and releases, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period.",
     "description": "Navigate to the FAQs page, this will be an answer, Q4_P2"
   },
   "faqs.page.answers.Q4_P3": {
@@ -1872,7 +1872,7 @@
     "description": "responsible party text"
   },
   "methodology.page.cat.res.part.GREEN_SPACE": {
-    "defaultMessage": "Data from <link1>Multi-Resolution Land Characteristics (MRLC)</link1> consortium; data analysis provided by <link2>The Trust for Public Lands</link2> and <link3>American Forests</link3>",
+    "defaultMessage": "Data from <link1>Multi-Resolution Land Characteristics</link1> (MRLC) consortium; data analysis provided by <link2>The Trust for Public Lands</link2> and <link3>American Forests</link3>",
     "description": "responsible party text"
   },
   "methodology.page.cat.res.part.HUD": {
@@ -2100,11 +2100,11 @@
     "description": "Navigate to the Methodology page. This is the source link for HUD"
   },
   "methodology.page.category.source.pdi.link": {
-    "defaultMessage": "<link1>Percent Developed Imperviousness (CONUS) </link1> from {date19}",
+    "defaultMessage": "<link1>Percent Developed Imperviousness</link1> (CONUS) from {date19}",
     "description": "Navigate to the Methodology page. This is the source link for CDC Sleep"
   },
   "methodology.page.category.source.trans.bur.link": {
-    "defaultMessage": "<link1>Transportation access disadvantage 3</link1> from {date22}",
+    "defaultMessage": "<link1>Transportation access disadvantage</link1> from {date22}",
     "description": "Navigate to the Methodology page. This is the source link for Transportation burdens"
   },
   "methodology.page.category.source.ust.find.link": {
@@ -2120,7 +2120,7 @@
     "description": "Navigate to the Methodology page. This is the description text for Transportation barriers"
   },
   "methodology.page.category.trans.barrier.note.text": {
-    "defaultMessage": "<boldtag>Note: </boldtag> this burden only applies for census tracts with populations greater than 20 people",
+    "defaultMessage": "<boldtag>Note: </boldtag> this burden only applies for census tracts with populations greater than 20 people.",
     "description": "Navigate to the Methodology page. This is the note text for trans.barrier"
   },
   "methodology.page.category.tribal.lands.description.text": {
@@ -2400,7 +2400,7 @@
     "description": "Navigate to the methodology page. Navigate to the dataset section. This is the portion of the dataset card that populates the Used in section for the Clean transportation methodology"
   },
   "methodology.page.indicator.categories.clean.water.if": {
-    "defaultMessage": "<boldtag>ARE</boldtag> at or above the 90th percentile for <link0>leaking underground storage tanks</link0> OR <link1>wastewater discharge</link1>",
+    "defaultMessage": "<boldtag>ARE</boldtag> at or above the 90th percentile for <link0>underground storage tanks and releases</link0> OR <link1>wastewater discharge</link1>",
     "description": "Navigate to the methodology page. Navigate to the category section. This will set the if portion of the formula"
   },
   "methodology.page.indicator.categories.clean.water.methodology": {
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 21ef28c49..8796cb71f 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -570,7 +570,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                   <strong>
                     Puerto Rico:
                   </strong>
-                   The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, leaking underground storage tanks, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period. 
+                   The data used for Puerto Rico are from all relevant and available fields in the energy, housing, legacy pollution, transportation, and workforce development categories. The following data are used: projected flood risk, energy cost, lack of plumbing, lead paint, housing cost, proximity to hazardous waste facilities, proximity to Superfund or National Priorities List (NPL) sites, proximity to Risk Management Plan (RMP) facilities, diesel particulate matter exposure, traffic proximity and volume, underground storage tanks and releases, wastewater discharge, poverty, unemployment, and high school education. Linguistic isolation was removed for Puerto Rico based on feedback received during the beta period. 
                 </p>
                 <p>
                   <strong>
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index 6936e009c..c8b092211 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -887,7 +887,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             class="usa-link"
             href="#leaky-uwt"
           >
-            leaking underground storage tanks
+            underground storage tanks and releases
           </a>
            OR 
           <a
@@ -1900,9 +1900,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       rel="noreferrer"
                       target="_blank"
                     >
-                      Multi-Resolution Land Characteristics (MRLC)
+                      Multi-Resolution Land Characteristics
                     </a>
-                     consortium; data analysis provided by 
+                     (MRLC) consortium; data analysis provided by 
                     <a
                       class="usa-link usa-link--external"
                       data-cy=""
@@ -1936,9 +1936,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       rel="noreferrer"
                       target="_blank"
                     >
-                      Percent Developed Imperviousness (CONUS) 
+                      Percent Developed Imperviousness
                     </a>
-                     from 2019
+                     (CONUS)  from 2019
                   </li>
                   <li>
                     <span>
@@ -2406,7 +2406,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                     <strong>
                       Note: 
                     </strong>
-                     this burden only applies for census tracts with populations greater than 20 people
+                     this burden only applies for census tracts with populations greater than 20 people.
     
                   </p>
                 </div>
@@ -2434,9 +2434,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                       rel="noreferrer"
                       target="_blank"
                     >
-                      Transportation access disadvantage 3
+                      Transportation access disadvantage
                     </a>
-                      from 2022
+                     from 2022
                   </li>
                   <li>
                     <span>

From 8106a835e6c6dbae78a328434f5e44aca74c78c9 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Mon, 21 Nov 2022 14:34:25 -0800
Subject: [PATCH 130/130] Update 1.0 communities list on download page

---
 client/.env.development                                      | 1 +
 client/.env.production                                       | 1 +
 client/src/data/copy/downloads.tsx                           | 4 ++--
 client/src/pages/tests/__snapshots__/downloads.test.tsx.snap | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/.env.development b/client/.env.development
index 075cbc611..10206ecb1 100644
--- a/client/.env.development
+++ b/client/.env.development
@@ -21,6 +21,7 @@ GATSBY_FILE_DL_PATH_BETA_TRAINING_SLIDES_PPT=downloadable/technical-training-sli
 
 GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_XLS=downloadable/1.0-communities.xlsx
 GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_CSV=downloadable/1.0-communities.csv
+GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_PDF=downloadable/1.0-communities-list.pdf
 GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP=downloadable/1.0-shapefile-codebook.zip
 GATSBY_FILE_DL_PATH_1_0_INSTRUCT_PDF=downloadable/cejst-instructions-for-federal-agencies.pdf
 GATSBY_FILE_DL_PATH_1_0_COMP_CHART_PDF=downloadable/total-comparison-chart.pdf
diff --git a/client/.env.production b/client/.env.production
index e748f4f1e..2b3f02b31 100644
--- a/client/.env.production
+++ b/client/.env.production
@@ -18,6 +18,7 @@ GATSBY_FILE_DL_PATH_BETA_TRAINING_SLIDES_PPT=downloadable/technical-training-sli
 
 GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_XLS=downloadable/1.0-communities.xlsx
 GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_CSV=downloadable/1.0-communities.csv
+GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_PDF=downloadable/1.0-communities-list.pdf
 GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP=downloadable/1.0-shapefile-codebook.zip
 GATSBY_FILE_DL_PATH_1_0_INSTRUCT_PDF=downloadable/cejst-instructions-for-federal-agencies.pdf
 GATSBY_FILE_DL_PATH_1_0_COMP_CHART_PDF=downloadable/total-comparison-chart.pdf
diff --git a/client/src/data/copy/downloads.tsx b/client/src/data/copy/downloads.tsx
index 343d5cdbb..89ecff8b1 100644
--- a/client/src/data/copy/downloads.tsx
+++ b/client/src/data/copy/downloads.tsx
@@ -65,8 +65,8 @@ export const DOWNLOAD_FILES = {
       LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
     },
     HOW_TO_COMMUNITIES: {
-      SIZE: 658.3, // KB
-      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF, false),
+      SIZE: 687.9, // KB
+      URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_PDF, false),
       LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
     },
     INSTRUCTIONS: {
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index e63b8526f..382322f07 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -727,7 +727,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
             >
               How to use the list of communities
             </a>
-             (.pdf 658.3kB)
+             (.pdf 687.9kB)
           </p>
         </div>
         <div