Attempt to merge Lighthouse Fix branch from Nat (#758)

* Add a11y tests in cypress for methodology page - update cypress to version 8.5 - add HTML lang the <head> element - change process list headings to h4 - add alt tag to download image icon - move <GovBanner> into <Header> - add documentation around a11y testing * Add cypress a11y tests for cejst page - add alt icon for mapIntro page - change legend to be a normal div - add a class that mimics the h4 styles - remove superfluous styles * Add cypress a11y tests for contact and 404 page * Update snapshots * Move static text in footer to copy folder * Add cypress a11y test to About page - add required h1 tag - updates snapshot * Add site_url.xml and modify robots.txt file - adds plugins for robots.txt and sitemap - remove env.local and will add env.production - modifiy all yml files (docker and GHA) to specify new env variables - refactor env variables to either DATA_SOURCE, SITE_URL or PATH_PREFIX - set defaults for env variables in gatsby-config - remove timeline component - will add blank index page - update README on info on env variables * Add plugin to allow custom env vars - allows system env vars, ie, DATA_SOURCE on client-side application * Update displayed URLs in GHA to new CDN (d29) - also updates the blank index.html * Correct spacing * Set SITE_URL to new CDN for robots.txt * Remove SITE_URL as this is set by GHA * Update README around docker and env vars
2025-02-22 01:31:25 -08:00 · 2021-10-04 08:43:33 -07:00 · 2021-10-04 08:43:33 -07:00 · 72d80a5803
commit 72d80a5803
parent 52aa0e3123
32 changed files with 999 additions and 748 deletions
--- a/.github/workflows/deploy_main.yml
+++ b/.github/workflows/deploy_main.yml
@ -31,8 +31,11 @@ jobs:
      - name: Build
        run: npm run build --if-present
        env:
-          DATA_SOURCE: development
-          PATH_PREFIX: ""
+          # See the client readme for more info on environment variables: 
+          # https://github.com/usds/justice40-tool/blob/main/client/README.md
+          DATA_SOURCE: cdn
+          # TODO: Update main URL when either is back up
+          SITE_URL: https://d29zfl8cj7y1zf.cloudfront.net/
      - name: Get directory contents
        run: ls -la public
      - name: Lint
@ -76,7 +79,7 @@ jobs:
      - name: Invalidate cache on AWS CDNs
        uses: chetan/invalidate-cloudfront-action@master
        env:
-          DISTRIBUTION: "ED03LPVC4OXSW" # TODO: set this as ENV var above
+          DISTRIBUTION: "E27WCOZZ03KIBX" # TODO: set this as ENV var above
          PATHS: "/*"
          AWS_REGION: "us-east-1"
          AWS_ACCESS_KEY_ID: ${{ secrets.CLIENT_DEV_AWS_ACCESS_KEY_ID }}
@ -86,13 +89,13 @@ jobs:
        with:
          message: |
            **🚢 PR Deployed! 🚢**
-            Find it here: https://d2zjid6n5ja2pt.cloudfront.net/  !
+            Find it here: https://d29zfl8cj7y1zf.cloudfront.net/  !
          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
      - name: Printing deployment URLs
        run: |
+          echo "Geoplatform official site (may or may not be up): https://screeningtool.geoplatform.gov/"
+          echo "The Cloudfront behind this official site: https://d29zfl8cj7y1zf.cloudfront.net/"
          echo "Github pages: https://usds.github.io/justice40-tool/$DESTINATION_FOLDER/en"
-          echo "Standard S3 bucket version (http only) : http://usds-geoplatform-justice40-website.s3-website-us-east-1.amazonaws.com/justice40-tool/$DESTINATION_FOLDER/en"
-          echo "Cloudfront https: https://d2zjid6n5ja2pt.cloudfront.net"
-          echo "Geoplatform official site: https://screeningtool.geoplatform.gov/en/"
+          echo "The origin S3 bucket (http only) : http://usds-geoplatform-justice40-website.s3-website-us-east-1.amazonaws.com/justice40-tool/$DESTINATION_FOLDER/en"
--- a/.github/workflows/deploy_staging.yml
+++ b/.github/workflows/deploy_staging.yml
@ -30,8 +30,10 @@ jobs:
      - name: Build
        run: npm run build --if-present
        env:
-          # Todo update this to env
-          DATA_SOURCE: development
+          # See the client readme for more info on environment variables: 
+          # https://github.com/usds/justice40-tool/blob/main/client/README.md
+          DATA_SOURCE: cdn
+          SITE_URL: "http://usds-geoplatform-justice40-website.s3-website-us-east-1.amazonaws.com/"
          PATH_PREFIX: "/justice40-tool/${{env.DESTINATION_FOLDER}}"
      - name: Get directory contents
        run: ls -la public
@ -93,5 +95,3 @@ jobs:
      - name: Printing deployment URLs
        run: |
          echo "Github pages: https://usds.github.io/justice40-tool/$DESTINATION_FOLDER/en"
-          echo "Standard S3 bucket version (http only) : http://usds-geoplatform-justice40-website.s3-website-us-east-1.amazonaws.com/justice40-tool/$DESTINATION_FOLDER/en"
-          echo "Cloudfront https: https://d2zjid6n5ja2pt.cloudfront.net/justice40-tool/$DESTINATION_FOLDER/en"
--- a/client/.env.development
+++ b/client/.env.development
@ -1,11 +1,12 @@
 # WARNING:
 # THIS FILE IS CHECKED INTO VERSION CONTROL! DO NOT ADD ANY SECRET INFO. IF SECRETS ARE ADDED, PLEASE ADD TO # GIT IGNORE FILE

-GATSBY_DATA_ROOT_PATH=https://d3jqyw10j8e7p9.cloudfront.net
+# Feature Tiles env variables:
+# The TILES_BASE_URL will be determined by the DATA_SOURCE env variable
+GATSBY_CDN_TILES_BASE_URL=https://d3jqyw10j8e7p9.cloudfront.net
+GATSBY_LOCAL_TILES_BASE_URL=http://localhost:5000/data/data-pipeline
+
 GATSBY_DATA_PIPELINE_SCORE_PATH=data-pipeline/data/score
 GATSBY_SCORE_DOWNLOAD_FILE_PATH=downloadable/Screening_Tool_Data.zip
 GATSBY_MAP_TILES_PATH=tiles

-# These may be used in the future:
-# WEB_APP_CDN_BASE_URL=https://d2zjid6n5ja2pt.cloudfront.net
-# S3_BASE_URL=https://justice40-data.s3.amazonaws.com
--- a/client/.env.local
+++ b/client/.env.local
@ -1,11 +0,0 @@
-# WARNING:
-# THIS FILE IS CHECKED INTO VERSION CONTROL! DO NOT ADD ANY SECRET INFO. IF SECRETS ARE ADDED, PLEASE ADD TO # GIT IGNORE FILE
-
-GATSBY_DATA_ROOT_PATH=http://localhost:5000/data/data-pipeline
-GATSBY_DATA_PIPELINE_SCORE_PATH=data_pipeline/data/score
-GATSBY_SCORE_DOWNLOAD_FILE_PATH=downloadable/Screening_Tool_Data.zip
-GATSBY_MAP_TILES_PATH=tiles
-
-# These may be used in the future:
-# WEB_APP_CDN_BASE_URL=https://d2zjid6n5ja2pt.cloudfront.net
-# S3_BASE_URL=https://justice40-data.s3.amazonaws.com
--- a/client/.env.production
+++ b/client/.env.production
@ -0,0 +1,10 @@
+# WARNING:
+# THIS FILE IS CHECKED INTO VERSION CONTROL! DO NOT ADD ANY SECRET INFO. IF SECRETS ARE ADDED, PLEASE ADD TO # GIT IGNORE FILE
+
+# Feature Tiles env variables:
+# The TILES_BASE_URL will always point to the CDN
+GATSBY_CDN_TILES_BASE_URL=https://d3jqyw10j8e7p9.cloudfront.net
+
+GATSBY_DATA_PIPELINE_SCORE_PATH=data-pipeline/data/score
+GATSBY_SCORE_DOWNLOAD_FILE_PATH=downloadable/Screening_Tool_Data.zip
+GATSBY_MAP_TILES_PATH=tiles
--- a/client/README.md
+++ b/client/README.md
@ -7,6 +7,7 @@ This README contains the following content:
 - [Testing](#testing)
 - [Localization](#localization)
 - [Feature toggling](#feature-toggling)
+- [Environment variables](#environment-variables)
 - [Debugging](#debugging)

 ## Installing and running the client site
@ -24,13 +25,32 @@ _Note that while this app uses npm as the package manager, yarn is required to b
 ### Via docker
 - Launch VS code in the top level directory (above client)
 - Install the Microsoft docker VS code extension
+- make sure you are in the main repo's directory
 - Type `docker-compose up`
 - Running this on MacBook Pro with a 2.6GHz 6-core i7 with 16 GB of memory can take upto 20 minutes to complete.
+- This will create three images, j4_website, j40_score_server and j40_data_pipeline. It will take up ~ 30 to 35 GB of image disk space
+
+By navigating to the client folder, the Dockerfile runs `npm start`. This will create a development version of the app.
+
+#### Re-building j4_website
+If you've made changes to the docker-compose file and want to re-build the j40_website:
+
+`docker-compose build --no-cache j40_website`
+
+This will not use the cache and re-build the image. Then do 
+
+`docker-compoe up`
+
+#### docker hangs
+- Ensure that there's enough disk image space in docker. The Docker Desktop app will show the total disk image used (gear cog -> Resources -> Disk image size). This application will require ~ 30 - 35 GB. Allocating 50-60 GB should be sufficient. If the amount used is significantly greater than 35 GB you may need to prune the docker images:
+
+`docker image system`
+
+This should reduce the total used space. 

 #### Changing the source of tile / map layer
 If you don't want to use the local data-pipeline location for getting the tile / map layers, you can change the 
-DATA_SOURCE env variable in the docker-compose.yml file to development and it will point to the CDN for the tile / 
-map layer.
+DATA_SOURCE env variable in the docker-compose.yml. See [environment variables](#environment-variables) for more info.

 #### Troubleshooting docker

@ -107,6 +127,16 @@ To access a translated version of a page, e.g. `pages/index.js`, add the locale

 - English: `localhost:8000/en/`, or `localhost:8000/` (the default fallback is English)

+## Environment Variables
+
+There are 3 environment variables that can be set:
+
+1. DATA_SOURCE (required) = can be set to 'cdn' or 'local'. This is used to change where the tiles are sourced from. It is used in the [constants](https://github.com/usds/justice40-tool/blob/main/client/src/data/constants.tsx) file to determine which TILE_BASE_URL to use.
+2. SITE_URL = set this to change the base URL for the website's public html folder. If none is provided, then localhost:8000 is used. This is used for the site_map.xml file and robots.txt file. This is only used during production build aka `npm build`.
+3. PATH_PREFIX = set this to add an additional path(s) to SITE_URL. If none is provided then no additional paths are added to the SITE_URL. This is only used during production build aka `npm build`.
+
+Note when setting environment variables in docker-compose, DATA_SOURCE is the only one that is applicable. 
+
 ## Feature Toggling

 We have implemented very simple feature flagging for this app, accessible via URL parameters.
--- a/client/cypress/integration/LegacyTests/accessibility.test.js
+++ b/client/cypress/integration/LegacyTests/accessibility.test.js
@ -1,7 +1,26 @@
 // / <reference types="Cypress" />

-// Define at the top of the spec file or just import it
+/**
+ * The a11y check will use a cypress-axe library:
+ *  - https://www.npmjs.com/package/cypress-axe
+ *
+ * This implements Deque's axe.run:
+ *  - https://www.deque.com/axe/core-documentation/api-documentation/#api-name-axerun
+ *
+ * The table of rule descriptions that are seen in the terminal can be seen in totality here:
+ *  - https://github.com/dequelabs/axe-core/blob/master/doc/rule-descriptions.md
+ *
+ */

+const endpoints = [
+  'en/',
+  'en/cejst',
+  'en/methodology',
+  'en/contact',
+  'en/404',
+];
+
+// The violation callback will post the violations into the terminal
 // eslint-disable-next-line require-jsdoc
 function terminalLog(violations) {
  cy.task(
@ -10,13 +29,17 @@ function terminalLog(violations) {
        violations.length === 1 ? '' : 's'
      } ${violations.length === 1 ? 'was' : 'were'} detected`,
  );
+
  // pluck specific keys to keep the table readable
  const violationData = violations.map(
-      ({id, impact, description, nodes}) => ({
+      // The results array is described here:
+      // - https://www.deque.com/axe/core-documentation/api-documentation/#result-arrays
+      // Unable to figure out how add the HTML element that the violation is occuring on. Using
+      // Axe chrome plugin instead.
+      ({id, impact, description}) => ({
        id,
        impact,
        description,
-        nodes: nodes.length,
      }),
  );

@ -24,11 +47,13 @@ function terminalLog(violations) {
 }


-describe('Accessibility tests', () => {
-  beforeEach(() => {
-    cy.visit('/').get('main').injectAxe();
-  });
-  it('Has no detectable accessibility violations on load', () => {
-    cy.checkA11y(null, {includedImpacts: ['critical']}, terminalLog);
+describe('Accessibility checks', () => {
+  endpoints.forEach((endpoint) => {
+    it(`Check Accessibility on ${endpoint} page`, () => {
+      cy.visit(endpoint).get('main').then(() => {
+        cy.injectAxe();
+        cy.checkA11y(null, null, terminalLog);
+      });
+    });
  });
 });
--- a/client/gatsby-config.js
+++ b/client/gatsby-config.js
@ -1,13 +1,21 @@
 require('dotenv').config({
-  path: `.env.${process.env.DATA_SOURCE}`,
+  // NODE_ENV is automatically set to
+  //   'development' when the app is launched via 'npm start' or 'npm develop'
+  //   'production' when the app is launched via 'npm build'
+
+  // Depending on the node environment, the app will then use
+  // .env.production or .env.development for application
+  // env variables.
+  path: `.env.${process.env.NODE_ENV}`,
 });

 module.exports = {
  siteMetadata: {
    title: 'Justice40',
    image: '/static/favicon.ico',
+    siteUrl: process.env.SITE_URL || 'http://localhost:8000',
  },
-  pathPrefix: `${process.env.PATH_PREFIX}`,
+  pathPrefix: process.env.PATH_PREFIX || '',
  plugins: [
    {
      resolve: 'gatsby-plugin-sass',
@ -64,5 +72,29 @@ module.exports = {
      },
    },
    'gatsby-plugin-react-helmet',
+    {
+      resolve: 'gatsby-plugin-robots-txt',
+      options: {
+        policy: [{userAgent: '*', allow: '/'}],
+      },
+    },
+    {
+      resolve: `gatsby-plugin-sitemap`,
+      options: {
+        excludes: [
+          '/',
+          '/cejst',
+          '/contact',
+          '/methodology',
+          '/404',
+        ],
+      },
+    },
+    {
+      resolve: `gatsby-plugin-env-variables`,
+      options: {
+        allowList: ['DATA_SOURCE'],
+      },
+    },
  ],
 };
--- a/client/package-lock.json
+++ b/client/package-lock.json
@ -25,7 +25,6 @@
      "version": "7.14.5",
      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
-      "dev": true,
      "requires": {
        "@babel/highlight": "^7.14.5"
      }
@ -347,8 +346,7 @@
    "@babel/helper-validator-identifier": {
      "version": "7.14.5",
      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz",
-      "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==",
-      "dev": true
+      "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg=="
    },
    "@babel/helper-validator-option": {
      "version": "7.14.5",
@ -383,7 +381,6 @@
      "version": "7.14.5",
      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-      "dev": true,
      "requires": {
        "@babel/helper-validator-identifier": "^7.14.5",
        "chalk": "^2.0.0",
@ -394,7 +391,6 @@
          "version": "3.2.1",
          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
          "requires": {
            "color-convert": "^1.9.0"
          }
@ -403,7 +399,6 @@
          "version": "2.4.2",
          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
          "requires": {
            "ansi-styles": "^3.2.1",
            "escape-string-regexp": "^1.0.5",
@ -414,7 +409,6 @@
          "version": "1.9.3",
          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
          "requires": {
            "color-name": "1.1.3"
          }
@ -422,20 +416,17 @@
        "color-name": {
          "version": "1.1.3",
          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
        },
        "has-flag": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
        },
        "supports-color": {
          "version": "5.5.0",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
          "requires": {
            "has-flag": "^3.0.0"
          }
@ -1918,9 +1909,9 @@
      }
    },
    "@cypress/request": {
-      "version": "2.88.5",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.5.tgz",
-      "integrity": "sha512-TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA==",
+      "version": "2.88.6",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.6.tgz",
+      "integrity": "sha512-z0UxBE/+qaESAHY9p9sM2h8Y4XqtsbDCt0/DPOrqA/RZgKi4PkxdpXyK4wCCnSk1xHqWHZZAE+gV6aDAR6+caQ==",
      "dev": true,
      "requires": {
        "aws-sign2": "~0.7.0",
@ -1936,13 +1927,20 @@
        "isstream": "~0.1.2",
        "json-stringify-safe": "~5.0.1",
        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
        "performance-now": "^2.1.0",
        "qs": "~6.5.2",
        "safe-buffer": "^5.1.2",
        "tough-cookie": "~2.5.0",
        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
+        "uuid": "^8.3.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "dev": true
+        }
      }
    },
    "@cypress/xvfb": {
@ -3523,6 +3521,11 @@
      "integrity": "sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==",
      "dev": true
    },
+    "@types/minimist": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="
+    },
    "@types/mkdirp": {
      "version": "0.5.2",
      "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz",
@ -3535,8 +3538,7 @@
    "@types/node": {
      "version": "15.12.5",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.5.tgz",
-      "integrity": "sha512-se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg==",
-      "dev": true
+      "integrity": "sha512-se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="
    },
    "@types/node-fetch": {
      "version": "2.5.10",
@ -3561,11 +3563,15 @@
        }
      }
    },
+    "@types/normalize-package-data": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="
+    },
    "@types/parse-json": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
    },
    "@types/prettier": {
      "version": "2.3.0",
@ -3644,15 +3650,23 @@
        "@types/node": "*"
      }
    },
+    "@types/sax": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@types/sax/-/sax-1.2.3.tgz",
+      "integrity": "sha512-+QSw6Tqvs/KQpZX8DvIl3hZSjNFLW/OqE5nlyHXtTwODaJvioN2rOWpBNEWZp2HZUFhOh+VohmJku/WxEXU2XA==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
    "@types/scheduler": {
      "version": "0.16.1",
      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.1.tgz",
      "integrity": "sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA=="
    },
    "@types/sinonjs__fake-timers": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz",
-      "integrity": "sha512-dIPoZ3g5gcx9zZEszaxLSVTvMReD3xxyyDnQUjA6IYDG9Ba2AV0otMPs+77sG9ojB4Qr2N2Vk5RnKeuA0X/0bg==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz",
+      "integrity": "sha512-IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A==",
      "dev": true
    },
    "@types/sizzle": {
@ -3713,9 +3727,9 @@
      "dev": true
    },
    "@types/yauzl": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
-      "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
+      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
      "dev": true,
      "optional": true,
      "requires": {
@ -4560,9 +4574,9 @@
      "dev": true
    },
    "async": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
-      "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz",
+      "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==",
      "dev": true
    },
    "async-cache": {
@ -4619,8 +4633,7 @@
    "at-least-node": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
    },
    "atob": {
      "version": "2.1.2",
@ -5686,8 +5699,7 @@
    "callsites": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
    },
    "camel-case": {
      "version": "4.1.2",
@ -5702,8 +5714,17 @@
    "camelcase": {
      "version": "5.3.1",
      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+    },
+    "camelcase-keys": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "requires": {
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
+      }
    },
    "caniuse-api": {
      "version": "3.0.0",
@ -6216,8 +6237,7 @@
    "common-tags": {
      "version": "1.8.0",
      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz",
-      "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==",
-      "dev": true
+      "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="
    },
    "commondir": {
      "version": "1.0.1",
@ -6555,7 +6575,6 @@
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-      "dev": true,
      "requires": {
        "@types/parse-json": "^4.0.0",
        "import-fresh": "^3.1.0",
@ -7072,12 +7091,12 @@
      }
    },
    "cypress": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-7.6.0.tgz",
-      "integrity": "sha512-tTwQExY28CKt6cY85/2V1uLExcMfpBEBWXt/EcE2ht/Onl9k4lxUS7ul1UnUO5MrYwMIHMdGVh13DxdzXj4Z5w==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.5.0.tgz",
+      "integrity": "sha512-MMkXIS+Ro2KETn4gAlG3tIc/7FiljuuCZP0zpd9QsRG6MZSyZW/l1J3D4iQM6WHsVxuX4rFChn5jPFlC2tNSvQ==",
      "dev": true,
      "requires": {
-        "@cypress/request": "^2.88.5",
+        "@cypress/request": "^2.88.6",
        "@cypress/xvfb": "^1.2.4",
        "@types/node": "^14.14.31",
        "@types/sinonjs__fake-timers": "^6.0.2",
@ -7111,6 +7130,7 @@
        "minimist": "^1.2.5",
        "ospath": "^1.2.2",
        "pretty-bytes": "^5.6.0",
+        "proxy-from-env": "1.0.0",
        "ramda": "~0.27.1",
        "request-progress": "^3.0.0",
        "supports-color": "^8.1.1",
@ -7121,9 +7141,9 @@
      },
      "dependencies": {
        "@types/node": {
-          "version": "14.17.4",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz",
-          "integrity": "sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A==",
+          "version": "14.17.19",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.19.tgz",
+          "integrity": "sha512-jjYI6NkyfXykucU6ELEoT64QyKOdvaA6enOqKtP4xUsGY0X0ZUZz29fUmrTRo+7v7c6TgDu82q3GHHaCEkqZwA==",
          "dev": true
        },
        "commander": {
@ -7279,9 +7299,9 @@
      "dev": true
    },
    "dayjs": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.5.tgz",
-      "integrity": "sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g==",
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz",
+      "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==",
      "dev": true
    },
    "debug": {
@ -7302,8 +7322,23 @@
    "decamelize": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+    },
+    "decamelize-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "requires": {
+        "decamelize": "^1.1.0",
+        "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "map-obj": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
+        }
+      }
    },
    "decimal.js": {
      "version": "10.3.1",
@ -8201,7 +8236,6 @@
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
      "requires": {
        "is-arrayish": "^0.2.1"
      }
@ -8328,8 +8362,7 @@
    "escape-string-regexp": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
    },
    "escodegen": {
      "version": "2.0.0",
@ -9779,7 +9812,6 @@
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
      "requires": {
        "locate-path": "^5.0.0",
        "path-exists": "^4.0.0"
@ -10106,7 +10138,6 @@
      "version": "9.1.0",
      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dev": true,
      "requires": {
        "at-least-node": "^1.0.0",
        "graceful-fs": "^4.2.0",
@ -10135,8 +10166,7 @@
    "function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
    },
    "functional-red-black-tree": {
      "version": "1.0.1",
@ -10815,6 +10845,11 @@
        "micromatch": "^4.0.2"
      }
    },
+    "gatsby-plugin-env-variables": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/gatsby-plugin-env-variables/-/gatsby-plugin-env-variables-2.1.0.tgz",
+      "integrity": "sha512-TNApeosvOcDxOoxZuzJ3rK4rbR2Fvzvweszn22U+z7bVtZ09G8/MtZg14l3HPXQBwqWjsWJH+PrRP+Z+7W7N/A=="
+    },
    "gatsby-plugin-intl": {
      "version": "0.3.3",
      "resolved": "https://registry.npmjs.org/gatsby-plugin-intl/-/gatsby-plugin-intl-0.3.3.tgz",
@ -10918,6 +10953,15 @@
        "@babel/runtime": "^7.14.0"
      }
    },
+    "gatsby-plugin-robots-txt": {
+      "version": "1.6.10",
+      "resolved": "https://registry.npmjs.org/gatsby-plugin-robots-txt/-/gatsby-plugin-robots-txt-1.6.10.tgz",
+      "integrity": "sha512-soQT765LF0J8/dfrZGFuA/ZB/JUyvt2nVyHEFLUMd/qxgiem9x0EOZquJPId78xDHYePMkxNCPk9UsLcTZdFZw==",
+      "requires": {
+        "@babel/runtime": "^7.14.0",
+        "generate-robotstxt": "^8.0.3"
+      }
+    },
    "gatsby-plugin-sass": {
      "version": "4.8.0",
      "resolved": "https://registry.npmjs.org/gatsby-plugin-sass/-/gatsby-plugin-sass-4.8.0.tgz",
@ -10975,6 +11019,27 @@
        }
      }
    },
+    "gatsby-plugin-sitemap": {
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/gatsby-plugin-sitemap/-/gatsby-plugin-sitemap-4.10.0.tgz",
+      "integrity": "sha512-q7WdaZLzOQnSJDZ2/ArTnSpCG26Eqgpt9jvni6wUqPxLic9irwvzIHhZxmZp8I7iq6Ue1Ii1MD5kWO2VTYb7GA==",
+      "requires": {
+        "@babel/runtime": "^7.15.4",
+        "common-tags": "^1.8.0",
+        "minimatch": "^3.0.4",
+        "sitemap": "^7.0.0"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+          "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        }
+      }
+    },
    "gatsby-plugin-typescript": {
      "version": "3.8.0",
      "resolved": "https://registry.npmjs.org/gatsby-plugin-typescript/-/gatsby-plugin-typescript-3.8.0.tgz",
@ -11220,6 +11285,26 @@
        }
      }
    },
+    "generate-robotstxt": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/generate-robotstxt/-/generate-robotstxt-8.0.3.tgz",
+      "integrity": "sha512-iD//oAVKcHOCz9M0IiT3pyUiF2uN1qvL3qaTA8RGLz7NU7l0XVwyzd3rN+tzhB657DNUgrygXt9w8+0zkTMFrg==",
+      "requires": {
+        "cosmiconfig": "^6.0.0",
+        "fs-extra": "^9.0.0",
+        "ip-regex": "^4.1.0",
+        "is-absolute-url": "^3.0.3",
+        "meow": "^7.0.1",
+        "resolve-from": "^5.0.0"
+      },
+      "dependencies": {
+        "ip-regex": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
+          "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q=="
+        }
+      }
+    },
    "generic-names": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/generic-names/-/generic-names-2.0.1.tgz",
@ -11770,6 +11855,11 @@
        "har-schema": "^2.0.0"
      }
    },
+    "hard-rejection": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA=="
+    },
    "harmony-reflect": {
      "version": "1.6.2",
      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
@ -11780,7 +11870,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
      "requires": {
        "function-bind": "^1.1.1"
      }
@ -11985,8 +12074,7 @@
    "hosted-git-info": {
      "version": "2.8.9",
      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
    },
    "hpack.js": {
      "version": "2.1.6",
@ -12363,7 +12451,6 @@
      "version": "3.3.0",
      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
      "requires": {
        "parent-module": "^1.0.0",
        "resolve-from": "^4.0.0"
@ -12372,8 +12459,7 @@
        "resolve-from": {
          "version": "4.0.0",
          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-          "dev": true
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
        }
      }
    },
@ -12663,8 +12749,7 @@
    "is-absolute-url": {
      "version": "3.0.3",
      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
-      "dev": true
+      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="
    },
    "is-accessor-descriptor": {
      "version": "0.1.6",
@ -12726,8 +12811,7 @@
    "is-arrayish": {
      "version": "0.2.1",
      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
    },
    "is-bigint": {
      "version": "1.0.2",
@ -12800,7 +12884,6 @@
      "version": "2.4.0",
      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
-      "dev": true,
      "requires": {
        "has": "^1.0.3"
      }
@ -14777,8 +14860,7 @@
    "json-parse-even-better-errors": {
      "version": "2.3.1",
      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
    },
    "json-schema": {
      "version": "0.2.3",
@ -14832,7 +14914,6 @@
      "version": "6.1.0",
      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
      "requires": {
        "graceful-fs": "^4.1.6",
        "universalify": "^2.0.0"
@ -14900,8 +14981,7 @@
    "kind-of": {
      "version": "6.0.3",
      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
    },
    "kleur": {
      "version": "3.0.3",
@ -15068,22 +15148,29 @@
    "lines-and-columns": {
      "version": "1.1.6",
      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-      "dev": true
+      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
    },
    "listr2": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.10.0.tgz",
-      "integrity": "sha512-eP40ZHihu70sSmqFNbNy2NL1YwImmlMmPh9WO5sLmPDleurMHt3n+SwEWNu2kzKScexZnkyFtc1VI0z/TGlmpw==",
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.12.2.tgz",
+      "integrity": "sha512-64xC2CJ/As/xgVI3wbhlPWVPx0wfTqbUAkpb7bjDi0thSWMqrf07UFhrfsGoo8YSXmF049Rp9C0cjLC8rZxK9A==",
      "dev": true,
      "requires": {
        "cli-truncate": "^2.1.0",
-        "colorette": "^1.2.2",
+        "colorette": "^1.4.0",
        "log-update": "^4.0.0",
        "p-map": "^4.0.0",
        "rxjs": "^6.6.7",
        "through": "^2.3.8",
        "wrap-ansi": "^7.0.0"
+      },
+      "dependencies": {
+        "colorette": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+          "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
+          "dev": true
+        }
      }
    },
    "load-json-file": {
@ -15137,7 +15224,6 @@
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
      "requires": {
        "p-locate": "^4.1.0"
      }
@ -15446,6 +15532,11 @@
      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
      "dev": true
    },
+    "map-obj": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="
+    },
    "map-stream": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
@ -15738,6 +15829,75 @@
        }
      }
    },
+    "meow": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz",
+      "integrity": "sha512-GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==",
+      "requires": {
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^2.5.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.13.1",
+        "yargs-parser": "^18.1.3"
+      },
+      "dependencies": {
+        "read-pkg": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+          "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+          "requires": {
+            "@types/normalize-package-data": "^2.4.0",
+            "normalize-package-data": "^2.5.0",
+            "parse-json": "^5.0.0",
+            "type-fest": "^0.6.0"
+          },
+          "dependencies": {
+            "type-fest": {
+              "version": "0.6.0",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+              "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
+            }
+          }
+        },
+        "read-pkg-up": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+          "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+          "requires": {
+            "find-up": "^4.1.0",
+            "read-pkg": "^5.2.0",
+            "type-fest": "^0.8.1"
+          },
+          "dependencies": {
+            "type-fest": {
+              "version": "0.8.1",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+            }
+          }
+        },
+        "type-fest": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+          "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="
+        },
+        "yargs-parser": {
+          "version": "18.1.3",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
    "merge-descriptors": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@ -15929,8 +16089,7 @@
    "min-indent": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="
    },
    "mini-css-extract-plugin": {
      "version": "1.6.0",
@ -16001,6 +16160,28 @@
      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
    },
+    "minimist-options": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "requires": {
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
+      },
+      "dependencies": {
+        "arrify": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+        },
+        "is-plain-obj": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+          "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
+        }
+      }
+    },
    "mitt": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz",
@ -16364,7 +16545,6 @@
      "version": "2.5.0",
      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
      "requires": {
        "hosted-git-info": "^2.1.4",
        "resolve": "^1.10.0",
@ -16375,8 +16555,7 @@
        "semver": {
          "version": "5.7.1",
          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
        }
      }
    },
@ -16471,12 +16650,6 @@
      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
      "dev": true
    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
-    },
    "object-assign": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@ -16793,7 +16966,6 @@
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
      "requires": {
        "p-try": "^2.0.0"
      }
@ -16802,7 +16974,6 @@
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
      "requires": {
        "p-limit": "^2.2.0"
      }
@ -16836,8 +17007,7 @@
    "p-try": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
    },
    "package-json": {
      "version": "6.5.0",
@ -16906,7 +17076,6 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
      "requires": {
        "callsites": "^3.0.0"
      }
@ -16951,7 +17120,6 @@
      "version": "5.2.0",
      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.0.0",
        "error-ex": "^1.3.1",
@ -17136,8 +17304,7 @@
    "path-exists": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
    },
    "path-is-absolute": {
      "version": "1.0.1",
@ -17158,8 +17325,7 @@
    "path-parse": {
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
    },
    "path-platform": {
      "version": "0.11.15",
@ -17891,6 +18057,12 @@
        "ipaddr.js": "1.9.1"
      }
    },
+    "proxy-from-env": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
+      "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=",
+      "dev": true
+    },
    "prr": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@ -18005,6 +18177,11 @@
      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
    },
+    "quick-lru": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="
+    },
    "quickselect": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
@ -18790,7 +18967,6 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
      "requires": {
        "indent-string": "^4.0.0",
        "strip-indent": "^3.0.0"
@ -19214,7 +19390,6 @@
      "version": "1.20.0",
      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dev": true,
      "requires": {
        "is-core-module": "^2.2.0",
        "path-parse": "^1.0.6"
@ -19232,8 +19407,7 @@
    "resolve-from": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
    },
    "resolve-id-refs": {
      "version": "0.1.0",
@ -19571,6 +19745,11 @@
        "neo-async": "^2.6.2"
      }
    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
    "saxes": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
@ -19962,6 +20141,24 @@
      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
      "dev": true
    },
+    "sitemap": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-7.0.0.tgz",
+      "integrity": "sha512-Ud0jrRQO2k7fEtPAM+cQkBKoMvxQyPKNXKDLn8tRVHxRCsdDQ2JZvw+aZ5IRYYQVAV9iGxEar6boTwZzev+x3g==",
+      "requires": {
+        "@types/node": "^15.0.1",
+        "@types/sax": "^1.2.1",
+        "arg": "^5.0.0",
+        "sax": "^1.2.4"
+      },
+      "dependencies": {
+        "arg": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz",
+          "integrity": "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA=="
+        }
+      }
+    },
    "slash": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@ -20310,7 +20507,6 @@
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
      "requires": {
        "spdx-expression-parse": "^3.0.0",
        "spdx-license-ids": "^3.0.0"
@ -20319,14 +20515,12 @@
    "spdx-exceptions": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
    },
    "spdx-expression-parse": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
      "requires": {
        "spdx-exceptions": "^2.1.0",
        "spdx-license-ids": "^3.0.0"
@ -20335,8 +20529,7 @@
    "spdx-license-ids": {
      "version": "3.0.9",
      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
-      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
-      "dev": true
+      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="
    },
    "spdx-ranges": {
      "version": "2.1.1",
@ -20933,7 +21126,6 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
      "requires": {
        "min-indent": "^1.0.0"
      }
@ -21569,6 +21761,11 @@
      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
      "dev": true
    },
+    "trim-newlines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="
+    },
    "trim-repeated": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
@ -21952,8 +22149,7 @@
    "universalify": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
    },
    "unixify": {
      "version": "1.0.0",
@ -22336,7 +22532,6 @@
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
      "requires": {
        "spdx-correct": "^3.0.0",
        "spdx-expression-parse": "^3.0.0"
@ -23719,8 +23914,7 @@
    "yaml": {
      "version": "1.10.2",
      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
    },
    "yaml-loader": {
      "version": "0.6.0",
--- a/client/package.json
+++ b/client/package.json
@ -46,7 +46,7 @@
    "axe-core": "^4.2.1",
    "babel-jest": "^27.0.1",
    "babel-preset-gatsby": "^1.6.0",
-    "cypress": "^7.4.0",
+    "cypress": "^8.5.0",
    "cypress-axe": "^0.12.2",
    "cypress-cucumber-preprocessor": "^4.2.0",
    "eslint": "^7.27.0",
@ -76,6 +76,9 @@
    "@turf/bbox": "^6.5.0",
    "chroma-js": "^2.1.2",
    "d3-ease": "^3.0.1",
+    "gatsby-plugin-env-variables": "^2.1.0",
+    "gatsby-plugin-robots-txt": "^1.6.10",
+    "gatsby-plugin-sitemap": "^4.10.0",
    "mapbox-gl": "^1.13.0",
    "maplibre-gl": ">=1.14.0",
    "query-string": "^7.0.0",
--- a/client/src/components/DownloadPacket/index.tsx
+++ b/client/src/components/DownloadPacket/index.tsx
@ -29,7 +29,7 @@ const DownloadPacket = () => {
            <div className={styles.downloadBoxButtonContainer}>
              <a data-cy={'download-link'} href={METHODOLOGY_COPY.DOWNLOAD_ZIP_URL}>
                <Button className={styles.downloadBoxButton} type="button">
-                  <div><img src={downloadIcon} /> </div>
+                  <div><img src={downloadIcon} alt={'download icon for download package'}/> </div>
                  <div className={styles.downloadPacketText}>
                    {intl.formatMessage(METHODOLOGY_COPY.DOWNLOAD_PACKAGE.BUTTON_TEXT)}
                  </div>
--- a/client/src/components/J40Footer.tsx
+++ b/client/src/components/J40Footer.tsx
@ -16,7 +16,8 @@ const J40Footer = () => {
  const intl = useIntl();

  const NAVLINKS = [
-    ['Contact',
+    [
+      intl.formatMessage(COMMON_COPY.FOOTER.CONTACT),
      <Address
        key={'footeraddress'}
        className={'j40-footer-address'}
@ -70,9 +71,9 @@ const J40Footer = () => {
    // `className="mobile-lg:grid-col-6 desktop:grid-col-3">` needs to be
    // `className="mobile-lg:grid-col-12 desktop:grid-col-4">` ugh.
    <footer className={'j40-footer'}>
-      <div className="usa-footer__primary-section pb">
+      <div className="usa-footer__primary-section pb2">
        <J40MainGridContainer>
-          <div className={'grid-row grid-gap-4 padding-bottom-6 tablet-lg:grid-col4'}>
+          <div className={'grid-row tablet-lg:grid-col4'}>
            {NAVLINKS.map((links, i) => (
              <div key={`linkSection-${i}`}
                className="mobile-lg:grid-col-12 desktop:grid-col-4">
@ -95,7 +96,11 @@ const J40Footer = () => {
                src={whitehouseIcon}
                alt={intl.formatMessage(COMMON_COPY.FOOTER.LOGO_ALT)}/>
            }
-            heading={<h5>{intl.formatMessage(COMMON_COPY.FOOTER.TITLE)}</h5>}
+            heading={
+              <div className={'j40-footer-ceq-font'}>
+                {intl.formatMessage(COMMON_COPY.FOOTER.TITLE)}
+              </div>
+            }
          />
        </J40MainGridContainer>
      </div>
@ -110,9 +115,9 @@ const NavSection = ({
 }): React.ReactElement => {
  const [primaryLinkOrHeading, ...secondaryLinks] = links;
  return (
-    <section className={'usa-footer__primary-content'}>
-      <h4 className="padding-top-1 padding-bottom-0">{primaryLinkOrHeading}</h4>
-      <NavList className={'padding-bottom-4'} type="footerSecondary" items={secondaryLinks} />
+    <section>
+      <div className="j40-h4">{primaryLinkOrHeading}</div>
+      <NavList type="footerSecondary" items={secondaryLinks} />
    </section>
  );
 };
--- a/client/src/components/J40Header.tsx
+++ b/client/src/components/J40Header.tsx
@ -74,10 +74,10 @@ const J40Header = () => {

  return (
    <>
-      <GovBanner/>
      <Header
        basic={true} role={'banner'}
        className={'usa-header j40-header'}>
+        <GovBanner/>
        <div className="usa-nav-container">
          <div className="usa-navbar">
            {/* Removing h1 from logo ease transition to USWDS tokens in headers */}
--- a/client/src/components/MapLegend/index.tsx
+++ b/client/src/components/MapLegend/index.tsx
@ -10,9 +10,9 @@ const MapLegend = () => {
    <div className={styles.legendContainer}>
      <div className={styles.colorSwatch} />
      <div>
-        <h4>
+        <div className={'j40-h4'}>
          {intl.formatMessage(EXPLORE_COPY.LEGEND.PRIORITY_LABEL)}
-        </h4>
+        </div>
        <p className={'secondary'}>
          {intl.formatMessage(EXPLORE_COPY.LEGEND.PRIORITY_DESCRIPT)}
        </p>
--- a/client/src/components/MapLegend/tests/snapshots/mapLegend.test.tsx.snap
+++ b/client/src/components/MapLegend/tests/snapshots/mapLegend.test.tsx.snap
@ -5,9 +5,11 @@ exports[`rendering of the MapLegend checks if snapshots have changed 1`] = `
  <div>
    <div />
    <div>
-      <h4>
+      <div
+        class="j40-h4"
+      >
        Draft community of focus
-      </h4>
+      </div>
      <p
        class="secondary"
      >
--- a/client/src/components/snapshots/J40Footer.spec.tsx.snap
+++ b/client/src/components/snapshots/J40Footer.spec.tsx.snap
@ -6,28 +6,26 @@ exports[`J40Footer renders correctly 1`] = `
    class="j40-footer"
  >
    <div
-      class="usa-footer__primary-section pb"
+      class="usa-footer__primary-section pb2"
    >
      <div
        class="grid-container-desktop-lg"
        data-testid="gridContainer"
      >
        <div
-          class="grid-row grid-gap-4 padding-bottom-6 tablet-lg:grid-col4"
+          class="grid-row tablet-lg:grid-col4"
        >
          <div
            class="mobile-lg:grid-col-12 desktop:grid-col-4"
          >
-            <section
-              class="usa-footer__primary-content"
-            >
-              <h4
-                class="padding-top-1 padding-bottom-0"
+            <section>
+              <div
+                class="j40-h4"
              >
                Contact
-              </h4>
+              </div>
              <ul
-                class="usa-list usa-list--unstyled padding-bottom-4"
+                class="usa-list usa-list--unstyled"
              >
                <li
                  class="usa-footer__secondary-link"
@ -67,16 +65,14 @@ exports[`J40Footer renders correctly 1`] = `
          <div
            class="mobile-lg:grid-col-12 desktop:grid-col-4"
          >
-            <section
-              class="usa-footer__primary-content"
-            >
-              <h4
-                class="padding-top-1 padding-bottom-0"
+            <section>
+              <div
+                class="j40-h4"
              >
                More information
-              </h4>
+              </div>
              <ul
-                class="usa-list usa-list--unstyled padding-bottom-4"
+                class="usa-list usa-list--unstyled"
              >
                <li
                  class="usa-footer__secondary-link"
@ -118,16 +114,14 @@ exports[`J40Footer renders correctly 1`] = `
          <div
            class="mobile-lg:grid-col-12 desktop:grid-col-4"
          >
-            <section
-              class="usa-footer__primary-content"
-            >
-              <h4
-                class="padding-top-1 padding-bottom-0"
+            <section>
+              <div
+                class="j40-h4"
              >
                Have a question about government services?
-              </h4>
+              </div>
              <ul
-                class="usa-list usa-list--unstyled padding-bottom-4"
+                class="usa-list usa-list--unstyled"
              >
                <li
                  class="usa-footer__secondary-link"
@ -168,9 +162,11 @@ exports[`J40Footer renders correctly 1`] = `
          <div
            class="mobile-lg:grid-col-auto"
          >
-            <h5>
+            <div
+              class="j40-footer-ceq-font"
+            >
              Council on Environmental Quality
-            </h5>
+            </div>
          </div>
        </div>
      </div>
--- a/client/src/components/snapshots/mapInfoPanel.test.tsx.snap
+++ b/client/src/components/snapshots/mapInfoPanel.test.tsx.snap
@ -13,6 +13,7 @@ exports[`simulate app starting up, no click on map should match the snapshot of
      </header>
      <div>
        <img
+          alt="icon showing a lightbulb"
          src="test-file-stub"
        />
        <div>
--- a/client/src/components/snapshots/scoreStepsList.test.tsx.snap
+++ b/client/src/components/snapshots/scoreStepsList.test.tsx.snap
@ -27,12 +27,12 @@ exports[`rendering of the component should match the snapshot of the MapIntroduc
    <li
      class="usa-process-list__item"
    >
-      <h4
+      <h3
        class="usa-process-list__heading"
        data-testid="processListHeading"
      >
        Gather datasets
-      </h4>
+      </h3>
      <p>
         
      </p>
@ -78,12 +78,12 @@ exports[`rendering of the component should match the snapshot of the MapIntroduc
    <li
      class="usa-process-list__item"
    >
-      <h4
+      <h3
        class="usa-process-list__heading"
        data-testid="processListHeading"
      >
        Determine communites of focus
-      </h4>
+      </h3>
      <p>
         
      </p>
--- a/client/src/components/layout.tsx
+++ b/client/src/components/layout.tsx
@ -14,7 +14,9 @@ const Layout = ({children, location, title}: ILayoutProps) => {
  // @ts-ignore
  return (
    <>
-      <Helmet title={title} defer={false}>
+      <Helmet defer={false}>
+        <html lang="en"/>
+        <title>{title}</title>
        <script async
          type="text/javascript"
          id="_fed_an_ua_tag"
--- a/client/src/components/mapIntroduction.tsx
+++ b/client/src/components/mapIntroduction.tsx
@ -15,7 +15,7 @@ const MapIntroduction = () => {
        {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.TITLE)}
      </header>
      <div className={styles.mapIntroText}>
-        <img className={styles.mapIntroLightbulb} src={lightbulbIcon} />
+        <img className={styles.mapIntroLightbulb} src={lightbulbIcon} alt={'icon showing a lightbulb'}/>
        <div className={styles.didYouKnowBox}>
          <div className={styles.didYouKnow}>
            {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.DID_YOU_KNOW)}
--- a/client/src/components/scoreStepsList.tsx
+++ b/client/src/components/scoreStepsList.tsx
@ -33,7 +33,7 @@ const ScoreStepsList = () => {
        {/* Step 1 */}
        <ProcessListItem>

-          <ProcessListHeading type="h4">
+          <ProcessListHeading type="h3">
            {intl.formatMessage(METHODOLOGY_COPY.METHODOLOGY_STEPS.STEP_1_HEADING)}
          </ProcessListHeading>
          <p>{' '}</p>
@ -70,7 +70,7 @@ const ScoreStepsList = () => {
        {/* Step 2 */}
        <ProcessListItem>

-          <ProcessListHeading type="h4">
+          <ProcessListHeading type="h3">
            {intl.formatMessage(METHODOLOGY_COPY.METHODOLOGY_STEPS.STEP_2_HEADING)}
          </ProcessListHeading>

--- a/client/src/data/blankCEJST/index.html
+++ b/client/src/data/blankCEJST/index.html
@ -0,0 +1,12 @@
+<!doctype html>
+
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+
+<body>
+  <!-- your content here... -->
+</body>
+</html>
--- a/client/src/data/constants.tsx
+++ b/client/src/data/constants.tsx
@ -1,10 +1,17 @@
+
 import {LngLatBoundsLike} from 'maplibre-gl';
 import {isMobile as isMobileReactDeviceDetect} from 'react-device-detect';

 const XYZ_SUFFIX = '{z}/{x}/{y}.pbf';
 export const featureURLForTilesetName = (tilesetName :string ) : string => {
+  // The feature tile base URL 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;
+
  return [
-    process.env.GATSBY_DATA_ROOT_PATH,
+    featureTileBaseURL,
    process.env.GATSBY_DATA_PIPELINE_SCORE_PATH,
    process.env.GATSBY_MAP_TILES_PATH,
    tilesetName,
--- a/client/src/data/copy/about.tsx
+++ b/client/src/data/copy/about.tsx
@ -6,6 +6,11 @@ export const PAGE = defineMessages({
    defaultMessage: 'About',
    description: 'about page title text',
  },
+  HEADING: {
+    id: 'index.heading.about.us',
+    defaultMessage: 'About us',
+    description: 'main heading for about page',
+  },
  HEADING_1: {
    id: 'index.heading.screentool',
    defaultMessage: 'The screening tool',
--- a/client/src/data/copy/common.tsx
+++ b/client/src/data/copy/common.tsx
@ -104,6 +104,11 @@ export const FOOTER = defineMessages({
    defaultMessage: 'Find a contact at USA.gov',
    description: 'Footer find contact link text',
  },
+  CONTACT: {
+    id: 'footer.contactheader',
+    defaultMessage: 'Contact',
+    description: 'Footer column header',
+  },
 });

 export const FOOTER_CEQ_ADDRESS = {
--- a/client/src/pages/snapshots/contact.test.tsx.snap
+++ b/client/src/pages/snapshots/contact.test.tsx.snap
@ -2,142 +2,142 @@

 exports[`rendering of the DatasetContainer checks if various text fields are visible 1`] = `
 <DocumentFragment>
-  <section
-    class="usa-banner"
-    data-testid="govBanner"
-  >
-    <div
-      class="usa-accordion"
-    >
-      <header
-        class="usa-banner__header"
-      >
-        <div
-          class="usa-banner__inner"
-        >
-          <div
-            class="grid-col-auto"
-          >
-            <img
-              alt="U.S. flag"
-              class="usa-banner__header-flag"
-              src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAMAAABBPP0LAAAAG1BMVEUdM7EeNLIeM7HgQCDaPh/bPh/bPx/////bPyBEby41AAAAUElEQVQI123MNw4CABDEwD3jC/9/MQ1BQrgeOSkIqYe2o2FZtthXgQLgbHVMZdlsfUQFQnHtjP1+8BUhBDKOqtmfot6ojqPzR7TjdU+f6vkED+IDPhTBcMAAAAAASUVORK5CYII="
-            />
-          </div>
-          <div
-            class="grid-col-fill tablet:grid-col-auto"
-          >
-            <p
-              class="usa-banner__header-text"
-            >
-              An official website of the United States government
-            </p>
-            <p
-              aria-hidden="true"
-              class="usa-banner__header-action"
-            >
-              Here’s how you know
-            </p>
-          </div>
-          <button
-            aria-controls="gov-banner"
-            aria-expanded="false"
-            class="usa-accordion__button usa-banner__button"
-            type="button"
-          >
-            <span
-              class="usa-banner__button-text"
-            >
-              Here’s how you know
-            </span>
-          </button>
-        </div>
-      </header>
-      <div
-        class="usa-banner__content usa-accordion__content"
-        hidden=""
-        id="gov-banner"
-      >
-        <div
-          class="grid-row grid-gap-lg"
-        >
-          <div
-            class="usa-banner__guidance tablet:grid-col-6"
-          >
-            <img
-              alt=""
-              aria-hidden="true"
-              class="usa-banner__icon usa-media-block__img"
-              role="img"
-              src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNjQgNjQiPjx0aXRsZT5pY29uLWRvdC1nb3Y8L3RpdGxlPjxwYXRoIGZpbGw9IiMyMzc4QzMiIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTMyIDBjMTcuNjczIDAgMzIgMTQuMzI3IDMyIDMyIDAgMTcuNjczLTE0LjMyNyAzMi0zMiAzMkMxNC4zMjcgNjQgMCA0OS42NzMgMCAzMiAwIDE0LjMyNyAxNC4zMjcgMCAzMiAwem0wIDEuMjA4QzE0Ljk5NCAxLjIwOCAxLjIwOCAxNC45OTQgMS4yMDggMzJTMTQuOTk0IDYyLjc5MiAzMiA2Mi43OTIgNjIuNzkyIDQ5LjAwNiA2Mi43OTIgMzIgNDkuMDA2IDEuMjA4IDMyIDEuMjA4em0xMC41OSAzOC44NThhLjg1Ny44NTcgMCAwIDEgLjg4Mi44MjJ2MS42NDJIMTguODg2di0xLjY0MmEuODU3Ljg1NyAwIDAgMSAuODgyLS44MjJINDIuNTl6TTI1LjQ0MyAyNy43NzR2OS44MjloMS42NDJ2LTkuODNoMy4yNzN2OS44M0gzMnYtOS44M2gzLjI3MnY5LjgzaDEuNjQzdi05LjgzaDMuMjcydjkuODNoLjc2YS44NTcuODU3IDAgMCAxIC44ODIuODIxdi44MjFoLTIxLjN2LS44MDlhLjg1Ny44NTcgMCAwIDEgLjg4LS44MmguNzYydi05Ljg0MmgzLjI3MnptNS43MzYtOC4xODhsMTIuMjkzIDQuOTE1djEuNjQyaC0xLjYzYS44NTcuODU3IDAgMCAxLS44ODIuODIySDIxLjQxYS44NTcuODU3IDAgMCAxLS44ODItLjgyMmgtMS42NDJ2LTEuNjQybDEyLjI5My00LjkxNXoiLz48L3N2Zz4="
-            />
-            <div
-              class="usa-media-block__body"
-            >
-              <p>
-                <strong>
-                  Official websites use .gov
-                </strong>
-                <br />
-                A 
-                <strong>
-                  .gov
-                </strong>
-                 website belongs to an official government organization in the United States.
-              </p>
-            </div>
-          </div>
-          <div
-            class="usa-banner__guidance tablet:grid-col-6"
-          >
-            <img
-              alt=""
-              aria-hidden="true"
-              class="usa-banner__icon usa-media-block__img"
-              role="img"
-              src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNjQgNjQiPjx0aXRsZT5pY29uLWh0dHBzPC90aXRsZT48cGF0aCBmaWxsPSIjNzE5RjJBIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0zMiAwYzE3LjY3MyAwIDMyIDE0LjMyNyAzMiAzMiAwIDE3LjY3My0xNC4zMjcgMzItMzIgMzJDMTQuMzI3IDY0IDAgNDkuNjczIDAgMzIgMCAxNC4zMjcgMTQuMzI3IDAgMzIgMHptMCAxLjIwOEMxNC45OTQgMS4yMDggMS4yMDggMTQuOTk0IDEuMjA4IDMyUzE0Ljk5NCA2Mi43OTIgMzIgNjIuNzkyIDYyLjc5MiA0OS4wMDYgNjIuNzkyIDMyIDQ5LjAwNiAxLjIwOCAzMiAxLjIwOHptMCAxOC44ODZhNy4yNDUgNy4yNDUgMCAwIDEgNy4yNDUgNy4yNDV2My4xMDNoLjUyYy44NiAwIDEuNTU3LjY5OCAxLjU1NyAxLjU1OHY5LjMyMmMwIC44Ni0uNjk3IDEuNTU4LTEuNTU3IDEuNTU4aC0xNS41M2MtLjg2IDAtMS41NTctLjY5Ny0xLjU1Ny0xLjU1OFYzMmMwLS44Ni42OTctMS41NTggMS41NTctMS41NThoLjUyVjI3LjM0QTcuMjQ1IDcuMjQ1IDAgMCAxIDMyIDIwLjA5NHptMCAzLjEwM2E0LjE0MiA0LjE0MiAwIDAgMC00LjE0MiA0LjE0MnYzLjEwM2g4LjI4NFYyNy4zNEE0LjE0MiA0LjE0MiAwIDAgMCAzMiAyMy4xOTd6Ii8+PC9zdmc+"
-            />
-            <div
-              class="usa-media-block__body"
-            >
-              <p>
-                <strong>
-                  Secure .gov websites use HTTPS
-                </strong>
-                <br />
-                A 
-                <strong>
-                  lock (
-                  <span
-                    class="icon-lock"
-                  >
-                    <img
-                      alt="lock"
-                      class="usa-banner__lock-image"
-                      role="img"
-                      src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjUyIiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNTIgNjQiPjx0aXRsZT5sb2NrPC90aXRsZT48cGF0aCBmaWxsPSIjMUIxQjFCIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0yNiAwYzEwLjQ5MyAwIDE5IDguNTA3IDE5IDE5djloM2E0IDQgMCAwIDEgNCA0djI4YTQgNCAwIDAgMS00IDRINGE0IDQgMCAwIDEtNC00VjMyYTQgNCAwIDAgMSA0LTRoM3YtOUM3IDguNTA3IDE1LjUwNyAwIDI2IDB6bTAgOGMtNS45NzkgMC0xMC44NDMgNC43Ny0xMC45OTYgMTAuNzEyTDE1IDE5djloMjJ2LTljMC02LjA3NS00LjkyNS0xMS0xMS0xMXoiLz48L3N2Zz4="
-                      title="Lock"
-                    />
-                  </span>
-                  )
-                </strong>
-                 or 
-                <strong>
-                  https://
-                </strong>
-                 means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites.
-              </p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </section>
  <header
    class="usa-header usa-header--basic usa-header j40-header"
    data-testid="header"
    role="banner"
  >
+    <section
+      class="usa-banner"
+      data-testid="govBanner"
+    >
+      <div
+        class="usa-accordion"
+      >
+        <header
+          class="usa-banner__header"
+        >
+          <div
+            class="usa-banner__inner"
+          >
+            <div
+              class="grid-col-auto"
+            >
+              <img
+                alt="U.S. flag"
+                class="usa-banner__header-flag"
+                src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAMAAABBPP0LAAAAG1BMVEUdM7EeNLIeM7HgQCDaPh/bPh/bPx/////bPyBEby41AAAAUElEQVQI123MNw4CABDEwD3jC/9/MQ1BQrgeOSkIqYe2o2FZtthXgQLgbHVMZdlsfUQFQnHtjP1+8BUhBDKOqtmfot6ojqPzR7TjdU+f6vkED+IDPhTBcMAAAAAASUVORK5CYII="
+              />
+            </div>
+            <div
+              class="grid-col-fill tablet:grid-col-auto"
+            >
+              <p
+                class="usa-banner__header-text"
+              >
+                An official website of the United States government
+              </p>
+              <p
+                aria-hidden="true"
+                class="usa-banner__header-action"
+              >
+                Here’s how you know
+              </p>
+            </div>
+            <button
+              aria-controls="gov-banner"
+              aria-expanded="false"
+              class="usa-accordion__button usa-banner__button"
+              type="button"
+            >
+              <span
+                class="usa-banner__button-text"
+              >
+                Here’s how you know
+              </span>
+            </button>
+          </div>
+        </header>
+        <div
+          class="usa-banner__content usa-accordion__content"
+          hidden=""
+          id="gov-banner"
+        >
+          <div
+            class="grid-row grid-gap-lg"
+          >
+            <div
+              class="usa-banner__guidance tablet:grid-col-6"
+            >
+              <img
+                alt=""
+                aria-hidden="true"
+                class="usa-banner__icon usa-media-block__img"
+                role="img"
+                src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNjQgNjQiPjx0aXRsZT5pY29uLWRvdC1nb3Y8L3RpdGxlPjxwYXRoIGZpbGw9IiMyMzc4QzMiIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTMyIDBjMTcuNjczIDAgMzIgMTQuMzI3IDMyIDMyIDAgMTcuNjczLTE0LjMyNyAzMi0zMiAzMkMxNC4zMjcgNjQgMCA0OS42NzMgMCAzMiAwIDE0LjMyNyAxNC4zMjcgMCAzMiAwem0wIDEuMjA4QzE0Ljk5NCAxLjIwOCAxLjIwOCAxNC45OTQgMS4yMDggMzJTMTQuOTk0IDYyLjc5MiAzMiA2Mi43OTIgNjIuNzkyIDQ5LjAwNiA2Mi43OTIgMzIgNDkuMDA2IDEuMjA4IDMyIDEuMjA4em0xMC41OSAzOC44NThhLjg1Ny44NTcgMCAwIDEgLjg4Mi44MjJ2MS42NDJIMTguODg2di0xLjY0MmEuODU3Ljg1NyAwIDAgMSAuODgyLS44MjJINDIuNTl6TTI1LjQ0MyAyNy43NzR2OS44MjloMS42NDJ2LTkuODNoMy4yNzN2OS44M0gzMnYtOS44M2gzLjI3MnY5LjgzaDEuNjQzdi05LjgzaDMuMjcydjkuODNoLjc2YS44NTcuODU3IDAgMCAxIC44ODIuODIxdi44MjFoLTIxLjN2LS44MDlhLjg1Ny44NTcgMCAwIDEgLjg4LS44MmguNzYydi05Ljg0MmgzLjI3MnptNS43MzYtOC4xODhsMTIuMjkzIDQuOTE1djEuNjQyaC0xLjYzYS44NTcuODU3IDAgMCAxLS44ODIuODIySDIxLjQxYS44NTcuODU3IDAgMCAxLS44ODItLjgyMmgtMS42NDJ2LTEuNjQybDEyLjI5My00LjkxNXoiLz48L3N2Zz4="
+              />
+              <div
+                class="usa-media-block__body"
+              >
+                <p>
+                  <strong>
+                    Official websites use .gov
+                  </strong>
+                  <br />
+                  A 
+                  <strong>
+                    .gov
+                  </strong>
+                   website belongs to an official government organization in the United States.
+                </p>
+              </div>
+            </div>
+            <div
+              class="usa-banner__guidance tablet:grid-col-6"
+            >
+              <img
+                alt=""
+                aria-hidden="true"
+                class="usa-banner__icon usa-media-block__img"
+                role="img"
+                src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNjQgNjQiPjx0aXRsZT5pY29uLWh0dHBzPC90aXRsZT48cGF0aCBmaWxsPSIjNzE5RjJBIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0zMiAwYzE3LjY3MyAwIDMyIDE0LjMyNyAzMiAzMiAwIDE3LjY3My0xNC4zMjcgMzItMzIgMzJDMTQuMzI3IDY0IDAgNDkuNjczIDAgMzIgMCAxNC4zMjcgMTQuMzI3IDAgMzIgMHptMCAxLjIwOEMxNC45OTQgMS4yMDggMS4yMDggMTQuOTk0IDEuMjA4IDMyUzE0Ljk5NCA2Mi43OTIgMzIgNjIuNzkyIDYyLjc5MiA0OS4wMDYgNjIuNzkyIDMyIDQ5LjAwNiAxLjIwOCAzMiAxLjIwOHptMCAxOC44ODZhNy4yNDUgNy4yNDUgMCAwIDEgNy4yNDUgNy4yNDV2My4xMDNoLjUyYy44NiAwIDEuNTU3LjY5OCAxLjU1NyAxLjU1OHY5LjMyMmMwIC44Ni0uNjk3IDEuNTU4LTEuNTU3IDEuNTU4aC0xNS41M2MtLjg2IDAtMS41NTctLjY5Ny0xLjU1Ny0xLjU1OFYzMmMwLS44Ni42OTctMS41NTggMS41NTctMS41NThoLjUyVjI3LjM0QTcuMjQ1IDcuMjQ1IDAgMCAxIDMyIDIwLjA5NHptMCAzLjEwM2E0LjE0MiA0LjE0MiAwIDAgMC00LjE0MiA0LjE0MnYzLjEwM2g4LjI4NFYyNy4zNEE0LjE0MiA0LjE0MiAwIDAgMCAzMiAyMy4xOTd6Ii8+PC9zdmc+"
+              />
+              <div
+                class="usa-media-block__body"
+              >
+                <p>
+                  <strong>
+                    Secure .gov websites use HTTPS
+                  </strong>
+                  <br />
+                  A 
+                  <strong>
+                    lock (
+                    <span
+                      class="icon-lock"
+                    >
+                      <img
+                        alt="lock"
+                        class="usa-banner__lock-image"
+                        role="img"
+                        src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjUyIiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNTIgNjQiPjx0aXRsZT5sb2NrPC90aXRsZT48cGF0aCBmaWxsPSIjMUIxQjFCIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0yNiAwYzEwLjQ5MyAwIDE5IDguNTA3IDE5IDE5djloM2E0IDQgMCAwIDEgNCA0djI4YTQgNCAwIDAgMS00IDRINGE0IDQgMCAwIDEtNC00VjMyYTQgNCAwIDAgMSA0LTRoM3YtOUM3IDguNTA3IDE1LjUwNyAwIDI2IDB6bTAgOGMtNS45NzkgMC0xMC44NDMgNC43Ny0xMC45OTYgMTAuNzEyTDE1IDE5djloMjJ2LTljMC02LjA3NS00LjkyNS0xMS0xMS0xMXoiLz48L3N2Zz4="
+                        title="Lock"
+                      />
+                    </span>
+                    )
+                  </strong>
+                   or 
+                  <strong>
+                    https://
+                  </strong>
+                   means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites.
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </section>
    <div
      class="usa-nav-container"
    >
@ -316,28 +316,26 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
    class="j40-footer"
  >
    <div
-      class="usa-footer__primary-section pb"
+      class="usa-footer__primary-section pb2"
    >
      <div
        class="grid-container-desktop-lg"
        data-testid="gridContainer"
      >
        <div
-          class="grid-row grid-gap-4 padding-bottom-6 tablet-lg:grid-col4"
+          class="grid-row tablet-lg:grid-col4"
        >
          <div
            class="mobile-lg:grid-col-12 desktop:grid-col-4"
          >
-            <section
-              class="usa-footer__primary-content"
-            >
-              <h4
-                class="padding-top-1 padding-bottom-0"
+            <section>
+              <div
+                class="j40-h4"
              >
                Contact
-              </h4>
+              </div>
              <ul
-                class="usa-list usa-list--unstyled padding-bottom-4"
+                class="usa-list usa-list--unstyled"
              >
                <li
                  class="usa-footer__secondary-link"
@ -377,16 +375,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
          <div
            class="mobile-lg:grid-col-12 desktop:grid-col-4"
          >
-            <section
-              class="usa-footer__primary-content"
-            >
-              <h4
-                class="padding-top-1 padding-bottom-0"
+            <section>
+              <div
+                class="j40-h4"
              >
                More information
-              </h4>
+              </div>
              <ul
-                class="usa-list usa-list--unstyled padding-bottom-4"
+                class="usa-list usa-list--unstyled"
              >
                <li
                  class="usa-footer__secondary-link"
@ -428,16 +424,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
          <div
            class="mobile-lg:grid-col-12 desktop:grid-col-4"
          >
-            <section
-              class="usa-footer__primary-content"
-            >
-              <h4
-                class="padding-top-1 padding-bottom-0"
+            <section>
+              <div
+                class="j40-h4"
              >
                Have a question about government services?
-              </h4>
+              </div>
              <ul
-                class="usa-list usa-list--unstyled padding-bottom-4"
+                class="usa-list usa-list--unstyled"
              >
                <li
                  class="usa-footer__secondary-link"
@ -478,9 +472,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
          <div
            class="mobile-lg:grid-col-auto"
          >
-            <h5>
+            <div
+              class="j40-footer-ceq-font"
+            >
              Council on Environmental Quality
-            </h5>
+            </div>
          </div>
        </div>
      </div>
--- a/client/src/pages/snapshots/index.test.tsx.snap
+++ b/client/src/pages/snapshots/index.test.tsx.snap
@ -2,142 +2,142 @@

 exports[`rendering of the DatasetContainer checks if various text fields are visible 1`] = `
 <DocumentFragment>
-  <section
-    class="usa-banner"
-    data-testid="govBanner"
-  >
-    <div
-      class="usa-accordion"
-    >
-      <header
-        class="usa-banner__header"
-      >
-        <div
-          class="usa-banner__inner"
-        >
-          <div
-            class="grid-col-auto"
-          >
-            <img
-              alt="U.S. flag"
-              class="usa-banner__header-flag"
-              src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAMAAABBPP0LAAAAG1BMVEUdM7EeNLIeM7HgQCDaPh/bPh/bPx/////bPyBEby41AAAAUElEQVQI123MNw4CABDEwD3jC/9/MQ1BQrgeOSkIqYe2o2FZtthXgQLgbHVMZdlsfUQFQnHtjP1+8BUhBDKOqtmfot6ojqPzR7TjdU+f6vkED+IDPhTBcMAAAAAASUVORK5CYII="
-            />
-          </div>
-          <div
-            class="grid-col-fill tablet:grid-col-auto"
-          >
-            <p
-              class="usa-banner__header-text"
-            >
-              An official website of the United States government
-            </p>
-            <p
-              aria-hidden="true"
-              class="usa-banner__header-action"
-            >
-              Here’s how you know
-            </p>
-          </div>
-          <button
-            aria-controls="gov-banner"
-            aria-expanded="false"
-            class="usa-accordion__button usa-banner__button"
-            type="button"
-          >
-            <span
-              class="usa-banner__button-text"
-            >
-              Here’s how you know
-            </span>
-          </button>
-        </div>
-      </header>
-      <div
-        class="usa-banner__content usa-accordion__content"
-        hidden=""
-        id="gov-banner"
-      >
-        <div
-          class="grid-row grid-gap-lg"
-        >
-          <div
-            class="usa-banner__guidance tablet:grid-col-6"
-          >
-            <img
-              alt=""
-              aria-hidden="true"
-              class="usa-banner__icon usa-media-block__img"
-              role="img"
-              src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNjQgNjQiPjx0aXRsZT5pY29uLWRvdC1nb3Y8L3RpdGxlPjxwYXRoIGZpbGw9IiMyMzc4QzMiIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTMyIDBjMTcuNjczIDAgMzIgMTQuMzI3IDMyIDMyIDAgMTcuNjczLTE0LjMyNyAzMi0zMiAzMkMxNC4zMjcgNjQgMCA0OS42NzMgMCAzMiAwIDE0LjMyNyAxNC4zMjcgMCAzMiAwem0wIDEuMjA4QzE0Ljk5NCAxLjIwOCAxLjIwOCAxNC45OTQgMS4yMDggMzJTMTQuOTk0IDYyLjc5MiAzMiA2Mi43OTIgNjIuNzkyIDQ5LjAwNiA2Mi43OTIgMzIgNDkuMDA2IDEuMjA4IDMyIDEuMjA4em0xMC41OSAzOC44NThhLjg1Ny44NTcgMCAwIDEgLjg4Mi44MjJ2MS42NDJIMTguODg2di0xLjY0MmEuODU3Ljg1NyAwIDAgMSAuODgyLS44MjJINDIuNTl6TTI1LjQ0MyAyNy43NzR2OS44MjloMS42NDJ2LTkuODNoMy4yNzN2OS44M0gzMnYtOS44M2gzLjI3MnY5LjgzaDEuNjQzdi05LjgzaDMuMjcydjkuODNoLjc2YS44NTcuODU3IDAgMCAxIC44ODIuODIxdi44MjFoLTIxLjN2LS44MDlhLjg1Ny44NTcgMCAwIDEgLjg4LS44MmguNzYydi05Ljg0MmgzLjI3MnptNS43MzYtOC4xODhsMTIuMjkzIDQuOTE1djEuNjQyaC0xLjYzYS44NTcuODU3IDAgMCAxLS44ODIuODIySDIxLjQxYS44NTcuODU3IDAgMCAxLS44ODItLjgyMmgtMS42NDJ2LTEuNjQybDEyLjI5My00LjkxNXoiLz48L3N2Zz4="
-            />
-            <div
-              class="usa-media-block__body"
-            >
-              <p>
-                <strong>
-                  Official websites use .gov
-                </strong>
-                <br />
-                A 
-                <strong>
-                  .gov
-                </strong>
-                 website belongs to an official government organization in the United States.
-              </p>
-            </div>
-          </div>
-          <div
-            class="usa-banner__guidance tablet:grid-col-6"
-          >
-            <img
-              alt=""
-              aria-hidden="true"
-              class="usa-banner__icon usa-media-block__img"
-              role="img"
-              src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNjQgNjQiPjx0aXRsZT5pY29uLWh0dHBzPC90aXRsZT48cGF0aCBmaWxsPSIjNzE5RjJBIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0zMiAwYzE3LjY3MyAwIDMyIDE0LjMyNyAzMiAzMiAwIDE3LjY3My0xNC4zMjcgMzItMzIgMzJDMTQuMzI3IDY0IDAgNDkuNjczIDAgMzIgMCAxNC4zMjcgMTQuMzI3IDAgMzIgMHptMCAxLjIwOEMxNC45OTQgMS4yMDggMS4yMDggMTQuOTk0IDEuMjA4IDMyUzE0Ljk5NCA2Mi43OTIgMzIgNjIuNzkyIDYyLjc5MiA0OS4wMDYgNjIuNzkyIDMyIDQ5LjAwNiAxLjIwOCAzMiAxLjIwOHptMCAxOC44ODZhNy4yNDUgNy4yNDUgMCAwIDEgNy4yNDUgNy4yNDV2My4xMDNoLjUyYy44NiAwIDEuNTU3LjY5OCAxLjU1NyAxLjU1OHY5LjMyMmMwIC44Ni0uNjk3IDEuNTU4LTEuNTU3IDEuNTU4aC0xNS41M2MtLjg2IDAtMS41NTctLjY5Ny0xLjU1Ny0xLjU1OFYzMmMwLS44Ni42OTctMS41NTggMS41NTctMS41NThoLjUyVjI3LjM0QTcuMjQ1IDcuMjQ1IDAgMCAxIDMyIDIwLjA5NHptMCAzLjEwM2E0LjE0MiA0LjE0MiAwIDAgMC00LjE0MiA0LjE0MnYzLjEwM2g4LjI4NFYyNy4zNEE0LjE0MiA0LjE0MiAwIDAgMCAzMiAyMy4xOTd6Ii8+PC9zdmc+"
-            />
-            <div
-              class="usa-media-block__body"
-            >
-              <p>
-                <strong>
-                  Secure .gov websites use HTTPS
-                </strong>
-                <br />
-                A 
-                <strong>
-                  lock (
-                  <span
-                    class="icon-lock"
-                  >
-                    <img
-                      alt="lock"
-                      class="usa-banner__lock-image"
-                      role="img"
-                      src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjUyIiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNTIgNjQiPjx0aXRsZT5sb2NrPC90aXRsZT48cGF0aCBmaWxsPSIjMUIxQjFCIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0yNiAwYzEwLjQ5MyAwIDE5IDguNTA3IDE5IDE5djloM2E0IDQgMCAwIDEgNCA0djI4YTQgNCAwIDAgMS00IDRINGE0IDQgMCAwIDEtNC00VjMyYTQgNCAwIDAgMSA0LTRoM3YtOUM3IDguNTA3IDE1LjUwNyAwIDI2IDB6bTAgOGMtNS45NzkgMC0xMC44NDMgNC43Ny0xMC45OTYgMTAuNzEyTDE1IDE5djloMjJ2LTljMC02LjA3NS00LjkyNS0xMS0xMS0xMXoiLz48L3N2Zz4="
-                      title="Lock"
-                    />
-                  </span>
-                  )
-                </strong>
-                 or 
-                <strong>
-                  https://
-                </strong>
-                 means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites.
-              </p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </section>
  <header
    class="usa-header usa-header--basic usa-header j40-header"
    data-testid="header"
    role="banner"
  >
+    <section
+      class="usa-banner"
+      data-testid="govBanner"
+    >
+      <div
+        class="usa-accordion"
+      >
+        <header
+          class="usa-banner__header"
+        >
+          <div
+            class="usa-banner__inner"
+          >
+            <div
+              class="grid-col-auto"
+            >
+              <img
+                alt="U.S. flag"
+                class="usa-banner__header-flag"
+                src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAMAAABBPP0LAAAAG1BMVEUdM7EeNLIeM7HgQCDaPh/bPh/bPx/////bPyBEby41AAAAUElEQVQI123MNw4CABDEwD3jC/9/MQ1BQrgeOSkIqYe2o2FZtthXgQLgbHVMZdlsfUQFQnHtjP1+8BUhBDKOqtmfot6ojqPzR7TjdU+f6vkED+IDPhTBcMAAAAAASUVORK5CYII="
+              />
+            </div>
+            <div
+              class="grid-col-fill tablet:grid-col-auto"
+            >
+              <p
+                class="usa-banner__header-text"
+              >
+                An official website of the United States government
+              </p>
+              <p
+                aria-hidden="true"
+                class="usa-banner__header-action"
+              >
+                Here’s how you know
+              </p>
+            </div>
+            <button
+              aria-controls="gov-banner"
+              aria-expanded="false"
+              class="usa-accordion__button usa-banner__button"
+              type="button"
+            >
+              <span
+                class="usa-banner__button-text"
+              >
+                Here’s how you know
+              </span>
+            </button>
+          </div>
+        </header>
+        <div
+          class="usa-banner__content usa-accordion__content"
+          hidden=""
+          id="gov-banner"
+        >
+          <div
+            class="grid-row grid-gap-lg"
+          >
+            <div
+              class="usa-banner__guidance tablet:grid-col-6"
+            >
+              <img
+                alt=""
+                aria-hidden="true"
+                class="usa-banner__icon usa-media-block__img"
+                role="img"
+                src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNjQgNjQiPjx0aXRsZT5pY29uLWRvdC1nb3Y8L3RpdGxlPjxwYXRoIGZpbGw9IiMyMzc4QzMiIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTMyIDBjMTcuNjczIDAgMzIgMTQuMzI3IDMyIDMyIDAgMTcuNjczLTE0LjMyNyAzMi0zMiAzMkMxNC4zMjcgNjQgMCA0OS42NzMgMCAzMiAwIDE0LjMyNyAxNC4zMjcgMCAzMiAwem0wIDEuMjA4QzE0Ljk5NCAxLjIwOCAxLjIwOCAxNC45OTQgMS4yMDggMzJTMTQuOTk0IDYyLjc5MiAzMiA2Mi43OTIgNjIuNzkyIDQ5LjAwNiA2Mi43OTIgMzIgNDkuMDA2IDEuMjA4IDMyIDEuMjA4em0xMC41OSAzOC44NThhLjg1Ny44NTcgMCAwIDEgLjg4Mi44MjJ2MS42NDJIMTguODg2di0xLjY0MmEuODU3Ljg1NyAwIDAgMSAuODgyLS44MjJINDIuNTl6TTI1LjQ0MyAyNy43NzR2OS44MjloMS42NDJ2LTkuODNoMy4yNzN2OS44M0gzMnYtOS44M2gzLjI3MnY5LjgzaDEuNjQzdi05LjgzaDMuMjcydjkuODNoLjc2YS44NTcuODU3IDAgMCAxIC44ODIuODIxdi44MjFoLTIxLjN2LS44MDlhLjg1Ny44NTcgMCAwIDEgLjg4LS44MmguNzYydi05Ljg0MmgzLjI3MnptNS43MzYtOC4xODhsMTIuMjkzIDQuOTE1djEuNjQyaC0xLjYzYS44NTcuODU3IDAgMCAxLS44ODIuODIySDIxLjQxYS44NTcuODU3IDAgMCAxLS44ODItLjgyMmgtMS42NDJ2LTEuNjQybDEyLjI5My00LjkxNXoiLz48L3N2Zz4="
+              />
+              <div
+                class="usa-media-block__body"
+              >
+                <p>
+                  <strong>
+                    Official websites use .gov
+                  </strong>
+                  <br />
+                  A 
+                  <strong>
+                    .gov
+                  </strong>
+                   website belongs to an official government organization in the United States.
+                </p>
+              </div>
+            </div>
+            <div
+              class="usa-banner__guidance tablet:grid-col-6"
+            >
+              <img
+                alt=""
+                aria-hidden="true"
+                class="usa-banner__icon usa-media-block__img"
+                role="img"
+                src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNjQgNjQiPjx0aXRsZT5pY29uLWh0dHBzPC90aXRsZT48cGF0aCBmaWxsPSIjNzE5RjJBIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0zMiAwYzE3LjY3MyAwIDMyIDE0LjMyNyAzMiAzMiAwIDE3LjY3My0xNC4zMjcgMzItMzIgMzJDMTQuMzI3IDY0IDAgNDkuNjczIDAgMzIgMCAxNC4zMjcgMTQuMzI3IDAgMzIgMHptMCAxLjIwOEMxNC45OTQgMS4yMDggMS4yMDggMTQuOTk0IDEuMjA4IDMyUzE0Ljk5NCA2Mi43OTIgMzIgNjIuNzkyIDYyLjc5MiA0OS4wMDYgNjIuNzkyIDMyIDQ5LjAwNiAxLjIwOCAzMiAxLjIwOHptMCAxOC44ODZhNy4yNDUgNy4yNDUgMCAwIDEgNy4yNDUgNy4yNDV2My4xMDNoLjUyYy44NiAwIDEuNTU3LjY5OCAxLjU1NyAxLjU1OHY5LjMyMmMwIC44Ni0uNjk3IDEuNTU4LTEuNTU3IDEuNTU4aC0xNS41M2MtLjg2IDAtMS41NTctLjY5Ny0xLjU1Ny0xLjU1OFYzMmMwLS44Ni42OTctMS41NTggMS41NTctMS41NThoLjUyVjI3LjM0QTcuMjQ1IDcuMjQ1IDAgMCAxIDMyIDIwLjA5NHptMCAzLjEwM2E0LjE0MiA0LjE0MiAwIDAgMC00LjE0MiA0LjE0MnYzLjEwM2g4LjI4NFYyNy4zNEE0LjE0MiA0LjE0MiAwIDAgMCAzMiAyMy4xOTd6Ii8+PC9zdmc+"
+              />
+              <div
+                class="usa-media-block__body"
+              >
+                <p>
+                  <strong>
+                    Secure .gov websites use HTTPS
+                  </strong>
+                  <br />
+                  A 
+                  <strong>
+                    lock (
+                    <span
+                      class="icon-lock"
+                    >
+                      <img
+                        alt="lock"
+                        class="usa-banner__lock-image"
+                        role="img"
+                        src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjUyIiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNTIgNjQiPjx0aXRsZT5sb2NrPC90aXRsZT48cGF0aCBmaWxsPSIjMUIxQjFCIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0yNiAwYzEwLjQ5MyAwIDE5IDguNTA3IDE5IDE5djloM2E0IDQgMCAwIDEgNCA0djI4YTQgNCAwIDAgMS00IDRINGE0IDQgMCAwIDEtNC00VjMyYTQgNCAwIDAgMSA0LTRoM3YtOUM3IDguNTA3IDE1LjUwNyAwIDI2IDB6bTAgOGMtNS45NzkgMC0xMC44NDMgNC43Ny0xMC45OTYgMTAuNzEyTDE1IDE5djloMjJ2LTljMC02LjA3NS00LjkyNS0xMS0xMS0xMXoiLz48L3N2Zz4="
+                        title="Lock"
+                      />
+                    </span>
+                    )
+                  </strong>
+                   or 
+                  <strong>
+                    https://
+                  </strong>
+                   means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites.
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </section>
    <div
      class="usa-nav-container"
    >
@ -284,6 +284,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
      class="grid-container-desktop-lg"
      data-testid="gridContainer"
    >
+      <h1>
+        About us
+      </h1>
      <div
        class="grid-row grid-gap-lg j40-aboutcard-container "
        data-testid="grid"
@ -629,28 +632,26 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
    class="j40-footer"
  >
    <div
-      class="usa-footer__primary-section pb"
+      class="usa-footer__primary-section pb2"
    >
      <div
        class="grid-container-desktop-lg"
        data-testid="gridContainer"
      >
        <div
-          class="grid-row grid-gap-4 padding-bottom-6 tablet-lg:grid-col4"
+          class="grid-row tablet-lg:grid-col4"
        >
          <div
            class="mobile-lg:grid-col-12 desktop:grid-col-4"
          >
-            <section
-              class="usa-footer__primary-content"
-            >
-              <h4
-                class="padding-top-1 padding-bottom-0"
+            <section>
+              <div
+                class="j40-h4"
              >
                Contact
-              </h4>
+              </div>
              <ul
-                class="usa-list usa-list--unstyled padding-bottom-4"
+                class="usa-list usa-list--unstyled"
              >
                <li
                  class="usa-footer__secondary-link"
@ -690,16 +691,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
          <div
            class="mobile-lg:grid-col-12 desktop:grid-col-4"
          >
-            <section
-              class="usa-footer__primary-content"
-            >
-              <h4
-                class="padding-top-1 padding-bottom-0"
+            <section>
+              <div
+                class="j40-h4"
              >
                More information
-              </h4>
+              </div>
              <ul
-                class="usa-list usa-list--unstyled padding-bottom-4"
+                class="usa-list usa-list--unstyled"
              >
                <li
                  class="usa-footer__secondary-link"
@ -741,16 +740,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
          <div
            class="mobile-lg:grid-col-12 desktop:grid-col-4"
          >
-            <section
-              class="usa-footer__primary-content"
-            >
-              <h4
-                class="padding-top-1 padding-bottom-0"
+            <section>
+              <div
+                class="j40-h4"
              >
                Have a question about government services?
-              </h4>
+              </div>
              <ul
-                class="usa-list usa-list--unstyled padding-bottom-4"
+                class="usa-list usa-list--unstyled"
              >
                <li
                  class="usa-footer__secondary-link"
@ -791,9 +788,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
          <div
            class="mobile-lg:grid-col-auto"
          >
-            <h5>
+            <div
+              class="j40-footer-ceq-font"
+            >
              Council on Environmental Quality
-            </h5>
+            </div>
          </div>
        </div>
      </div>
--- a/client/src/pages/snapshots/methodology.test.tsx.snap
+++ b/client/src/pages/snapshots/methodology.test.tsx.snap
@ -2,142 +2,142 @@

 exports[`rendering of the DatasetContainer checks if various text fields are visible 1`] = `
 <DocumentFragment>
-  <section
-    class="usa-banner"
-    data-testid="govBanner"
-  >
-    <div
-      class="usa-accordion"
-    >
-      <header
-        class="usa-banner__header"
-      >
-        <div
-          class="usa-banner__inner"
-        >
-          <div
-            class="grid-col-auto"
-          >
-            <img
-              alt="U.S. flag"
-              class="usa-banner__header-flag"
-              src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAMAAABBPP0LAAAAG1BMVEUdM7EeNLIeM7HgQCDaPh/bPh/bPx/////bPyBEby41AAAAUElEQVQI123MNw4CABDEwD3jC/9/MQ1BQrgeOSkIqYe2o2FZtthXgQLgbHVMZdlsfUQFQnHtjP1+8BUhBDKOqtmfot6ojqPzR7TjdU+f6vkED+IDPhTBcMAAAAAASUVORK5CYII="
-            />
-          </div>
-          <div
-            class="grid-col-fill tablet:grid-col-auto"
-          >
-            <p
-              class="usa-banner__header-text"
-            >
-              An official website of the United States government
-            </p>
-            <p
-              aria-hidden="true"
-              class="usa-banner__header-action"
-            >
-              Here’s how you know
-            </p>
-          </div>
-          <button
-            aria-controls="gov-banner"
-            aria-expanded="false"
-            class="usa-accordion__button usa-banner__button"
-            type="button"
-          >
-            <span
-              class="usa-banner__button-text"
-            >
-              Here’s how you know
-            </span>
-          </button>
-        </div>
-      </header>
-      <div
-        class="usa-banner__content usa-accordion__content"
-        hidden=""
-        id="gov-banner"
-      >
-        <div
-          class="grid-row grid-gap-lg"
-        >
-          <div
-            class="usa-banner__guidance tablet:grid-col-6"
-          >
-            <img
-              alt=""
-              aria-hidden="true"
-              class="usa-banner__icon usa-media-block__img"
-              role="img"
-              src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNjQgNjQiPjx0aXRsZT5pY29uLWRvdC1nb3Y8L3RpdGxlPjxwYXRoIGZpbGw9IiMyMzc4QzMiIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTMyIDBjMTcuNjczIDAgMzIgMTQuMzI3IDMyIDMyIDAgMTcuNjczLTE0LjMyNyAzMi0zMiAzMkMxNC4zMjcgNjQgMCA0OS42NzMgMCAzMiAwIDE0LjMyNyAxNC4zMjcgMCAzMiAwem0wIDEuMjA4QzE0Ljk5NCAxLjIwOCAxLjIwOCAxNC45OTQgMS4yMDggMzJTMTQuOTk0IDYyLjc5MiAzMiA2Mi43OTIgNjIuNzkyIDQ5LjAwNiA2Mi43OTIgMzIgNDkuMDA2IDEuMjA4IDMyIDEuMjA4em0xMC41OSAzOC44NThhLjg1Ny44NTcgMCAwIDEgLjg4Mi44MjJ2MS42NDJIMTguODg2di0xLjY0MmEuODU3Ljg1NyAwIDAgMSAuODgyLS44MjJINDIuNTl6TTI1LjQ0MyAyNy43NzR2OS44MjloMS42NDJ2LTkuODNoMy4yNzN2OS44M0gzMnYtOS44M2gzLjI3MnY5LjgzaDEuNjQzdi05LjgzaDMuMjcydjkuODNoLjc2YS44NTcuODU3IDAgMCAxIC44ODIuODIxdi44MjFoLTIxLjN2LS44MDlhLjg1Ny44NTcgMCAwIDEgLjg4LS44MmguNzYydi05Ljg0MmgzLjI3MnptNS43MzYtOC4xODhsMTIuMjkzIDQuOTE1djEuNjQyaC0xLjYzYS44NTcuODU3IDAgMCAxLS44ODIuODIySDIxLjQxYS44NTcuODU3IDAgMCAxLS44ODItLjgyMmgtMS42NDJ2LTEuNjQybDEyLjI5My00LjkxNXoiLz48L3N2Zz4="
-            />
-            <div
-              class="usa-media-block__body"
-            >
-              <p>
-                <strong>
-                  Official websites use .gov
-                </strong>
-                <br />
-                A 
-                <strong>
-                  .gov
-                </strong>
-                 website belongs to an official government organization in the United States.
-              </p>
-            </div>
-          </div>
-          <div
-            class="usa-banner__guidance tablet:grid-col-6"
-          >
-            <img
-              alt=""
-              aria-hidden="true"
-              class="usa-banner__icon usa-media-block__img"
-              role="img"
-              src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNjQgNjQiPjx0aXRsZT5pY29uLWh0dHBzPC90aXRsZT48cGF0aCBmaWxsPSIjNzE5RjJBIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0zMiAwYzE3LjY3MyAwIDMyIDE0LjMyNyAzMiAzMiAwIDE3LjY3My0xNC4zMjcgMzItMzIgMzJDMTQuMzI3IDY0IDAgNDkuNjczIDAgMzIgMCAxNC4zMjcgMTQuMzI3IDAgMzIgMHptMCAxLjIwOEMxNC45OTQgMS4yMDggMS4yMDggMTQuOTk0IDEuMjA4IDMyUzE0Ljk5NCA2Mi43OTIgMzIgNjIuNzkyIDYyLjc5MiA0OS4wMDYgNjIuNzkyIDMyIDQ5LjAwNiAxLjIwOCAzMiAxLjIwOHptMCAxOC44ODZhNy4yNDUgNy4yNDUgMCAwIDEgNy4yNDUgNy4yNDV2My4xMDNoLjUyYy44NiAwIDEuNTU3LjY5OCAxLjU1NyAxLjU1OHY5LjMyMmMwIC44Ni0uNjk3IDEuNTU4LTEuNTU3IDEuNTU4aC0xNS41M2MtLjg2IDAtMS41NTctLjY5Ny0xLjU1Ny0xLjU1OFYzMmMwLS44Ni42OTctMS41NTggMS41NTctMS41NThoLjUyVjI3LjM0QTcuMjQ1IDcuMjQ1IDAgMCAxIDMyIDIwLjA5NHptMCAzLjEwM2E0LjE0MiA0LjE0MiAwIDAgMC00LjE0MiA0LjE0MnYzLjEwM2g4LjI4NFYyNy4zNEE0LjE0MiA0LjE0MiAwIDAgMCAzMiAyMy4xOTd6Ii8+PC9zdmc+"
-            />
-            <div
-              class="usa-media-block__body"
-            >
-              <p>
-                <strong>
-                  Secure .gov websites use HTTPS
-                </strong>
-                <br />
-                A 
-                <strong>
-                  lock (
-                  <span
-                    class="icon-lock"
-                  >
-                    <img
-                      alt="lock"
-                      class="usa-banner__lock-image"
-                      role="img"
-                      src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjUyIiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNTIgNjQiPjx0aXRsZT5sb2NrPC90aXRsZT48cGF0aCBmaWxsPSIjMUIxQjFCIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0yNiAwYzEwLjQ5MyAwIDE5IDguNTA3IDE5IDE5djloM2E0IDQgMCAwIDEgNCA0djI4YTQgNCAwIDAgMS00IDRINGE0IDQgMCAwIDEtNC00VjMyYTQgNCAwIDAgMSA0LTRoM3YtOUM3IDguNTA3IDE1LjUwNyAwIDI2IDB6bTAgOGMtNS45NzkgMC0xMC44NDMgNC43Ny0xMC45OTYgMTAuNzEyTDE1IDE5djloMjJ2LTljMC02LjA3NS00LjkyNS0xMS0xMS0xMXoiLz48L3N2Zz4="
-                      title="Lock"
-                    />
-                  </span>
-                  )
-                </strong>
-                 or 
-                <strong>
-                  https://
-                </strong>
-                 means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites.
-              </p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </section>
  <header
    class="usa-header usa-header--basic usa-header j40-header"
    data-testid="header"
    role="banner"
  >
+    <section
+      class="usa-banner"
+      data-testid="govBanner"
+    >
+      <div
+        class="usa-accordion"
+      >
+        <header
+          class="usa-banner__header"
+        >
+          <div
+            class="usa-banner__inner"
+          >
+            <div
+              class="grid-col-auto"
+            >
+              <img
+                alt="U.S. flag"
+                class="usa-banner__header-flag"
+                src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAMAAABBPP0LAAAAG1BMVEUdM7EeNLIeM7HgQCDaPh/bPh/bPx/////bPyBEby41AAAAUElEQVQI123MNw4CABDEwD3jC/9/MQ1BQrgeOSkIqYe2o2FZtthXgQLgbHVMZdlsfUQFQnHtjP1+8BUhBDKOqtmfot6ojqPzR7TjdU+f6vkED+IDPhTBcMAAAAAASUVORK5CYII="
+              />
+            </div>
+            <div
+              class="grid-col-fill tablet:grid-col-auto"
+            >
+              <p
+                class="usa-banner__header-text"
+              >
+                An official website of the United States government
+              </p>
+              <p
+                aria-hidden="true"
+                class="usa-banner__header-action"
+              >
+                Here’s how you know
+              </p>
+            </div>
+            <button
+              aria-controls="gov-banner"
+              aria-expanded="false"
+              class="usa-accordion__button usa-banner__button"
+              type="button"
+            >
+              <span
+                class="usa-banner__button-text"
+              >
+                Here’s how you know
+              </span>
+            </button>
+          </div>
+        </header>
+        <div
+          class="usa-banner__content usa-accordion__content"
+          hidden=""
+          id="gov-banner"
+        >
+          <div
+            class="grid-row grid-gap-lg"
+          >
+            <div
+              class="usa-banner__guidance tablet:grid-col-6"
+            >
+              <img
+                alt=""
+                aria-hidden="true"
+                class="usa-banner__icon usa-media-block__img"
+                role="img"
+                src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNjQgNjQiPjx0aXRsZT5pY29uLWRvdC1nb3Y8L3RpdGxlPjxwYXRoIGZpbGw9IiMyMzc4QzMiIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTMyIDBjMTcuNjczIDAgMzIgMTQuMzI3IDMyIDMyIDAgMTcuNjczLTE0LjMyNyAzMi0zMiAzMkMxNC4zMjcgNjQgMCA0OS42NzMgMCAzMiAwIDE0LjMyNyAxNC4zMjcgMCAzMiAwem0wIDEuMjA4QzE0Ljk5NCAxLjIwOCAxLjIwOCAxNC45OTQgMS4yMDggMzJTMTQuOTk0IDYyLjc5MiAzMiA2Mi43OTIgNjIuNzkyIDQ5LjAwNiA2Mi43OTIgMzIgNDkuMDA2IDEuMjA4IDMyIDEuMjA4em0xMC41OSAzOC44NThhLjg1Ny44NTcgMCAwIDEgLjg4Mi44MjJ2MS42NDJIMTguODg2di0xLjY0MmEuODU3Ljg1NyAwIDAgMSAuODgyLS44MjJINDIuNTl6TTI1LjQ0MyAyNy43NzR2OS44MjloMS42NDJ2LTkuODNoMy4yNzN2OS44M0gzMnYtOS44M2gzLjI3MnY5LjgzaDEuNjQzdi05LjgzaDMuMjcydjkuODNoLjc2YS44NTcuODU3IDAgMCAxIC44ODIuODIxdi44MjFoLTIxLjN2LS44MDlhLjg1Ny44NTcgMCAwIDEgLjg4LS44MmguNzYydi05Ljg0MmgzLjI3MnptNS43MzYtOC4xODhsMTIuMjkzIDQuOTE1djEuNjQyaC0xLjYzYS44NTcuODU3IDAgMCAxLS44ODIuODIySDIxLjQxYS44NTcuODU3IDAgMCAxLS44ODItLjgyMmgtMS42NDJ2LTEuNjQybDEyLjI5My00LjkxNXoiLz48L3N2Zz4="
+              />
+              <div
+                class="usa-media-block__body"
+              >
+                <p>
+                  <strong>
+                    Official websites use .gov
+                  </strong>
+                  <br />
+                  A 
+                  <strong>
+                    .gov
+                  </strong>
+                   website belongs to an official government organization in the United States.
+                </p>
+              </div>
+            </div>
+            <div
+              class="usa-banner__guidance tablet:grid-col-6"
+            >
+              <img
+                alt=""
+                aria-hidden="true"
+                class="usa-banner__icon usa-media-block__img"
+                role="img"
+                src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNjQgNjQiPjx0aXRsZT5pY29uLWh0dHBzPC90aXRsZT48cGF0aCBmaWxsPSIjNzE5RjJBIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0zMiAwYzE3LjY3MyAwIDMyIDE0LjMyNyAzMiAzMiAwIDE3LjY3My0xNC4zMjcgMzItMzIgMzJDMTQuMzI3IDY0IDAgNDkuNjczIDAgMzIgMCAxNC4zMjcgMTQuMzI3IDAgMzIgMHptMCAxLjIwOEMxNC45OTQgMS4yMDggMS4yMDggMTQuOTk0IDEuMjA4IDMyUzE0Ljk5NCA2Mi43OTIgMzIgNjIuNzkyIDYyLjc5MiA0OS4wMDYgNjIuNzkyIDMyIDQ5LjAwNiAxLjIwOCAzMiAxLjIwOHptMCAxOC44ODZhNy4yNDUgNy4yNDUgMCAwIDEgNy4yNDUgNy4yNDV2My4xMDNoLjUyYy44NiAwIDEuNTU3LjY5OCAxLjU1NyAxLjU1OHY5LjMyMmMwIC44Ni0uNjk3IDEuNTU4LTEuNTU3IDEuNTU4aC0xNS41M2MtLjg2IDAtMS41NTctLjY5Ny0xLjU1Ny0xLjU1OFYzMmMwLS44Ni42OTctMS41NTggMS41NTctMS41NThoLjUyVjI3LjM0QTcuMjQ1IDcuMjQ1IDAgMCAxIDMyIDIwLjA5NHptMCAzLjEwM2E0LjE0MiA0LjE0MiAwIDAgMC00LjE0MiA0LjE0MnYzLjEwM2g4LjI4NFYyNy4zNEE0LjE0MiA0LjE0MiAwIDAgMCAzMiAyMy4xOTd6Ii8+PC9zdmc+"
+              />
+              <div
+                class="usa-media-block__body"
+              >
+                <p>
+                  <strong>
+                    Secure .gov websites use HTTPS
+                  </strong>
+                  <br />
+                  A 
+                  <strong>
+                    lock (
+                    <span
+                      class="icon-lock"
+                    >
+                      <img
+                        alt="lock"
+                        class="usa-banner__lock-image"
+                        role="img"
+                        src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjUyIiBoZWlnaHQ9IjY0IiB2aWV3Qm94PSIwIDAgNTIgNjQiPjx0aXRsZT5sb2NrPC90aXRsZT48cGF0aCBmaWxsPSIjMUIxQjFCIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0yNiAwYzEwLjQ5MyAwIDE5IDguNTA3IDE5IDE5djloM2E0IDQgMCAwIDEgNCA0djI4YTQgNCAwIDAgMS00IDRINGE0IDQgMCAwIDEtNC00VjMyYTQgNCAwIDAgMSA0LTRoM3YtOUM3IDguNTA3IDE1LjUwNyAwIDI2IDB6bTAgOGMtNS45NzkgMC0xMC44NDMgNC43Ny0xMC45OTYgMTAuNzEyTDE1IDE5djloMjJ2LTljMC02LjA3NS00LjkyNS0xMS0xMS0xMXoiLz48L3N2Zz4="
+                        title="Lock"
+                      />
+                    </span>
+                    )
+                  </strong>
+                   or 
+                  <strong>
+                    https://
+                  </strong>
+                   means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites.
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </section>
    <div
      class="usa-nav-container"
    >
@ -333,6 +333,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
                      >
                        <div>
                          <img
+                            alt="download icon for download package"
                            src="test-file-stub"
                          />
                           
@ -1018,12 +1019,12 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
            <li
              class="usa-process-list__item"
            >
-              <h4
+              <h3
                class="usa-process-list__heading"
                data-testid="processListHeading"
              >
                Gather datasets
-              </h4>
+              </h3>
              <p>
                 
              </p>
@ -1069,12 +1070,12 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
            <li
              class="usa-process-list__item"
            >
-              <h4
+              <h3
                class="usa-process-list__heading"
                data-testid="processListHeading"
              >
                Determine communites of focus
-              </h4>
+              </h3>
              <p>
                 
              </p>
@ -1120,28 +1121,26 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
    class="j40-footer"
  >
    <div
-      class="usa-footer__primary-section pb"
+      class="usa-footer__primary-section pb2"
    >
      <div
        class="grid-container-desktop-lg"
        data-testid="gridContainer"
      >
        <div
-          class="grid-row grid-gap-4 padding-bottom-6 tablet-lg:grid-col4"
+          class="grid-row tablet-lg:grid-col4"
        >
          <div
            class="mobile-lg:grid-col-12 desktop:grid-col-4"
          >
-            <section
-              class="usa-footer__primary-content"
-            >
-              <h4
-                class="padding-top-1 padding-bottom-0"
+            <section>
+              <div
+                class="j40-h4"
              >
                Contact
-              </h4>
+              </div>
              <ul
-                class="usa-list usa-list--unstyled padding-bottom-4"
+                class="usa-list usa-list--unstyled"
              >
                <li
                  class="usa-footer__secondary-link"
@ -1181,16 +1180,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
          <div
            class="mobile-lg:grid-col-12 desktop:grid-col-4"
          >
-            <section
-              class="usa-footer__primary-content"
-            >
-              <h4
-                class="padding-top-1 padding-bottom-0"
+            <section>
+              <div
+                class="j40-h4"
              >
                More information
-              </h4>
+              </div>
              <ul
-                class="usa-list usa-list--unstyled padding-bottom-4"
+                class="usa-list usa-list--unstyled"
              >
                <li
                  class="usa-footer__secondary-link"
@ -1232,16 +1229,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
          <div
            class="mobile-lg:grid-col-12 desktop:grid-col-4"
          >
-            <section
-              class="usa-footer__primary-content"
-            >
-              <h4
-                class="padding-top-1 padding-bottom-0"
+            <section>
+              <div
+                class="j40-h4"
              >
                Have a question about government services?
-              </h4>
+              </div>
              <ul
-                class="usa-list usa-list--unstyled padding-bottom-4"
+                class="usa-list usa-list--unstyled"
              >
                <li
                  class="usa-footer__secondary-link"
@ -1282,9 +1277,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
          <div
            class="mobile-lg:grid-col-auto"
          >
-            <h5>
+            <div
+              class="j40-footer-ceq-font"
+            >
              Council on Environmental Quality
-            </h5>
+            </div>
          </div>
        </div>
      </div>
--- a/client/src/pages/index.tsx
+++ b/client/src/pages/index.tsx
@ -41,7 +41,7 @@ const IndexPage = ({location}: IndexPageProps) => {
      </J40MainGridContainer>

      <J40MainGridContainer>
-
+        <h1>{intl.formatMessage(ABOUT_COPY.PAGE.HEADING)}</h1>
        <AboutCardsContainer>
          <AboutCard
            size={'large'}
--- a/client/src/pages/timeline.tsx
+++ b/client/src/pages/timeline.tsx
@ -1,66 +0,0 @@
-import * as React from 'react';
-import Layout from '../components/layout';
-
-// THIS COMPONENT IS NOT BEING USED
-
-// @ts-ignore
-// import renewIcon from '/node_modules/uswds/dist/img/usa-icons/autorenew.svg';
-
-interface TimelinePageProps {
-  location: Location;
-}
-
-const TimelinePage = ({location}: TimelinePageProps) => {
-  return (<Layout location={location} title={'Timeline'}>
-    <section>
-      {/* <h1>Timelin</h1>
-      <h2>Throughout the Process</h2>
-      <div className="grid-col">
-        <div className="grid-row grid-gap-lg">
-          <div className="grid-col-1">
-            <img
-              className={''}
-              src={renewIcon} alt={'renew icon'}/>
-          </div>
-          <div className={'text-asset-container ' +
-          'grid-col-fill'}>
-            <p>Continuously engage with stakeholders and community
-              members to get feedback on the screening tool, scoring,
-              and overall process.</p>
-            <p>Continuously source data that meets data principles as
-              defined through community input.</p>
-          </div>
-        </div>
-      </div>
-
-      <h2>Milestones</h2>
-      <ol className={'usa-process-list'}>
-        <li
-          className={'j40-usa-process-list__item--complete ' +
-            'usa-process-list__item padding-bottom-4 '}
-          aria-label={'milestone 1 done'}>
-          <h4 className={'usa-process-list__heading'}>Milestone 1</h4>
-          <p className={'margin-top-05'}>
-            Publish data principles on this site by June 2021.</p>
-        </li>
-        <li
-          className={'usa-process-list__item padding-bottom-4'}
-          aria-label={'milestone 2 next'}>
-          <h4 className={'usa-process-list__heading'}>Milestone 2</h4>
-          <p>Make the first version of a screening tool
-            available by July 2021.</p>
-        </li>
-        <li
-          className={'usa-process-list__item padding-bottom-4'}
-          aria-label={'milestone 3'}>
-          <h4 className={'usa-process-list__heading'}>Milestone 3</h4>
-          <p>Create a public scorecard to ensure accountability of
-              investments by February 2022.</p>
-        </li>
-      </ol> */}
-    </section>
-  </Layout>
-  );
-};
-
-export default TimelinePage;
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@ -60,7 +60,7 @@ h3 {
  @include j40-element('lg', 2, 'bold', 4 );
 }

-h4 {
+h4, .j40-h4 {
  @include j40-element('sm', 1, 'bold', 3 );
 }

@ -94,8 +94,9 @@ p.flush {
  @include u-margin-bottom(3)
 }

-
-
+.j40-footer-ceq-font {
+  @include j40-element('lg', 2, 'bold', 0 );
+}

 /***************** LAYOUT STYLES **************************************************************
 This section will outline styles for components that are on each page. These 
@ -213,7 +214,7 @@ components include:
 */ 
 .j40-footer {

-  .usa-footer__primary-section.pb{
+  .usa-footer__primary-section.pb2{
    @include u-padding-bottom(2);
  }

--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -31,6 +31,8 @@ services:
    container_name: j40_website_1
    build: ./client
    environment:
+    # See the client readme for more info on environment variables: 
+    # https://github.com/usds/justice40-tool/blob/main/client/README.md
      DATA_SOURCE: local
    volumes:
      - ./client/src:/client/src