From 1ad3af10bb7e9d61f1f75dbd594655e9737a1418 Mon Sep 17 00:00:00 2001
From: Natasha Pierre-Louis <natasha.pierre-louis@gsa.gov>
Date: Tue, 1 Oct 2024 12:33:27 -0600
Subject: [PATCH 1/2] Updated the faq page and added a security policy.

---
 SECURITY.md                     |  31 +++++++++
 _includes/layouts/faq-page.html | 118 +++++++++++++++++++++++---------
 2 files changed, 118 insertions(+), 31 deletions(-)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000..e44fe75
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,31 @@
+# Security Policy
+
+As a U.S. Government agency, the General Services Administration (GSA) takes
+seriously our responsibility to protect the public's information, including
+financial and personal information, from unwarranted disclosure.
+
+## Reporting a Vulnerability
+
+Services operated by the U.S. General Services Administration (GSA)
+are covered by the **GSA Vulnerability Disclosure Program (VDP)**.
+
+See the [GSA Vulnerability Disclosure Policy at https://www.gsa.gov/vulnerability-disclosure-policy](https://gsa.gov/vulnerability-disclosure-policy)
+for details including:
+
+* How to submit a report if you believe you have discovered a vulnerability.
+* Bug bounty scope.
+* GSA's coordinated disclosure policy.
+* Information on how you may conduct security research on GSA developed
+  software and systems.
+* Important legal and policy guidance.
+
+## Supported Versions
+
+Please note that only certain branches are supported with security updates.
+
+| Version (Branch) | Supported          |
+| ---------------- | ------------------ |
+| main             | :white_check_mark: |
+| other            | :x:                |
+
+When using this code or reporting vulnerabilities please only use supported versions.
diff --git a/_includes/layouts/faq-page.html b/_includes/layouts/faq-page.html
index 6f29aba..1541245 100644
--- a/_includes/layouts/faq-page.html
+++ b/_includes/layouts/faq-page.html
@@ -15,43 +15,99 @@ <h1 class="title">{{title}}</h1>
           <p class="question introText">This page offers answers to frequently asked questions about mutual aid
             assistance for local building department officials.</p>
           <div class="question">
-            <h3>What building department functions can mutual aid help with after disasters?</h3>
-            <p>Mutual aid can be utilized to assist with post-disaster inspections, permitting and enforcement tasks.
-            </p>
+            <h3>What is mutual aid?</h3>
+            <p>Mutual aid is a straightforward concept where state and local governments step in to assist each other in
+              the wake of a catastrophic event. Typically, mutual aid provides personnel or resources to affected
+              communities in the immediate aftermath of a disaster. The main goal is to accelerate community recovery
+              and reduce future risks. While mutual aid resources are often provided without charge, it's worth noting
+              that specific arrangements can vary depending on the agreements in place between jurisdictions.</p>
+          </div>
+          <div class="question">
+            <h3>What is mutual aid for building departments?</h3>
+            <p>Natural disasters can often leave local building officials overwhelmed with the task of assessing
+              structural damage and ensuring public safety. Mutual aid for building departments is a straightforward
+              concept where skilled professionals from neighboring jurisdictions step in to assist communities with
+              inspections, hazard mitigation, and other building department functions in the wake of a catastrophic
+              event.</p>
           </div>
           <div class="question">
-            <h3>Who are these people coming to help?</h3>
-            <p>Mutual aid personnel can be classified in two categories: Public-Sector Personnel, also referred to as
-              state assets and can include local, state, and federal officials; and Private-Sector Personnel. The
-              ability to use mutual aid for private sector resources varies from state to state.</p>
-            <p>The following public and private-sector resources are capable of assisting communities after disaster:
+            <h3>Who responds to mutual aid for building departments? </h3>
+            <p>Typically, mutual aid can provide communities with additional building inspectors, plan reviewers, or
+              code enforcement officers in the immediate aftermath of a disaster. These are often civil servants from
+              neighboring communities and states. In some cases, mutual aid responders can also include private
+              engineers, architects and other skilled professionals. </p>
+          </div>
+          <div class="question">
+            <h3>What assistance can mutual aid provide to a building department? </h3>
+            <p>Mutual aid can provide additional building inspectors, plan reviewers, and code enforcement officers to a
+              building department in need. These professionals can help conduct rapid damage assessments, determine
+              building safety, and process emergency permits following a disaster. They can also assist with routine
+              inspections and plan reviews during periods of high workload or staff shortages. This support helps the
+              local building department maintain service levels, ensure public safety, and expedite recovery efforts.
             </p>
-            <ul>
-              <li>Building Code Officials</li>
-              <li>Building Safety & Code Inspectors</li>
-              <li>Floodplain Administrators</li>
-              <li>State NFIP Coordinators</li>
-              <li>Engineers & Architects</li>
-              <li>Technicians & Specialists</li>
-            </ul>
           </div>
           <div class="question">
-            <h3>What is DRRA 1206 and how can it help me?</h3>
-            <p>The Disaster Recovery Reform Act of 2018, Section 1206 (DRRA-1206) authorizes FEMA Public Assistance
-              grant funding to support recovery staffing needs of local building code and floodplain management
-              departments up to 180 days following the date of the major disaster declaration. DRRA-1206 can help
-              reimburse communities that seek out trained and certified mutual aid responder teams that meet specific
-              criteria.</p>
-            <p>For answers to frequently asked questions (FAQs) about DRRA-1206, refer to FEMA's
-              <a class="usa-link usa-link--external" target="_blank"
-                href="https://www.fema.gov/sites/default/files/documents/fema_drcc-section-1206-faq-volume-1.pdf">
-                FAQ Volume 1
-              </a> and
-              <a class="usa-link usa-link--external" target="_blank"
-                href="https://www.fema.gov/sites/default/files/documents/fema_drcc-section-1206-faq-volume-2.pdf">
-                Volume 2
-              </a>.
+            <h3>Does mutual aid for building departments work the same in every state?</h3>
+            <p>The details of implementation, resource sharing, and reimbursement can differ significantly from one
+              state to another. Some states have formalized statewide mutual aid systems, while others rely more on
+              local or regional agreements. It's important for building officials to understand their state's specific
+              mutual aid framework and any interstate compacts that may apply. The state search tool on our <a
+                class="usa-link" href="{{ '/' | url }}">main page</a> can help you begin to explore your state's mutual
+              aid system.</p>
+          </div>
+          <div class="question">
+            <h3>Are there protections against liability?</h3>
+            <p>Many states have enacted legislation that offers some degree of liability protection for mutual aid
+              providers lending assistance under official mutual aid agreements. This protection can vary depending on
+              state laws and specific mutual aid agreements. The contacts provided by our search tool can help you
+              understand the liability protections in place for your individual situation.</p>
+          </div>
+          <div class="question">
+            <h3>Will mutual aid cost my community?</h3>
+            <p>Reimbursement between communities in the same state can vary by state, as each state, district, and
+              territory has its own specific regulations and procedures. Typically, the requesting community (the one
+              that received aid) is responsible for reimbursing the assisting community for eligible costs. This usually
+              follows a "neighbor helping neighbor" principle, where the community benefiting from the assistance bears
+              the financial responsibility. Some states have established funds or mechanisms to help cover these costs,
+              especially in cases of larger emergencies or disasters. In such instances, the state might step in to
+              reimburse the assisting communities directly or provide funds to the requesting community for this
+              purpose.</p>
+            <p>Under the Emergency Mutual Aid Compact (EMAC), which facilitates interstate assistance, the requesting
+              state is responsible for reimbursing the assisting state, but this is often eligible for federal disaster
+              reimbursement. However, it's important to note that while the immediate deployment may not have an upfront
+              cost, your community may need to budget for potential reimbursements or cost-sharing depending on the
+              specific agreement and disaster declaration status. For example, the standard cost-share for FEMA Public
+              Assistance is typically 75% federal and 25% non-federal, though this can sometimes be adjusted for
+              catastrophic events. The requesting state would be responsible for the non-federal share, which they may
+              pass on to the local jurisdiction that received the aid.</p>
+          </div>
+          <div class="question">
+            <h3>Is an emergency declaration required to utilize mutual aid for building departments? </h3>
+            <p>Mutual aid for building departments can often be activated without a formal disaster declaration. Many
+              communities have agreements in place that allow for cooperation and resource sharing for smaller-scale
+              incidents that do not meet the threshold for a disaster declaration. However, it is important to note that
+              the specific rules and procedures can vary depending on your local and state regulations. Some areas may
+              have specific requirements for activating mutual aid, while others maintain flexible systems for sharing
+              resources.</p>
+            <p>In cases of larger disasters, a formal declaration can unlock additional resources and funding streams,
+              potentially making it easier to cover the costs of mutual aid. For interstate assistance through the
+              Emergency Management Assistance Compact (EMAC), a governor's declaration is required. EMAC is a national
+              interstate mutual aid agreement that enables states to share resources during large-scale disasters. Under
+              EMAC, the governor of the affected state must declare a state of emergency and request assistance before
+              other states can send aid. This process ensures a coordinated response and helps establish eligibility for
+              federal reimbursement.</p>
+          </div>
+          <div class="question">
+            <h3>What costs are eligible for reimbursement?</h3>
+            <p>When it comes to reimbursement under IMAC (Intrastate Mutual Aid Compact) and EMAC (Emergency Management
+              Assistance Compact), eligible costs can vary depending on the specific state agreements and the nature of
+              the emergency. Generally, reimbursable expenses often include personnel costs (such as salaries, overtime,
+              and benefits), travel expenses, equipment usage, and supplies directly related to the mutual aid response.
+              Some agreements may also cover costs for lodging, meals, and incidental expenses for deployed personnel.
             </p>
+            <p>To ensure proper reimbursement, it's essential for both requesting and assisting entities <span
+                class="text-bold">to carefully document all expenses</span> and follow the specific guidelines outlined
+              in their state's mutual aid agreements.</p>
           </div>
           {{ content }}
         </div>

From 61a8b199db9fb88df58731ce2d2a97cb62a4dfaf Mon Sep 17 00:00:00 2001
From: Natasha Pierre-Louis <natasha.pierre-louis@gsa.gov>
Date: Tue, 1 Oct 2024 13:03:27 -0600
Subject: [PATCH 2/2] Made minor updates to address testing issues

---
 _includes/layouts/contact.html         | 38 ++++++++++++++++++--------
 _includes/layouts/faq-page.html        |  2 +-
 _includes/meta.html                    | 36 +++++++-----------------
 _includes/theme/styles/_templates.scss |  4 +--
 4 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/_includes/layouts/contact.html b/_includes/layouts/contact.html
index f15d34c..83eb7aa 100644
--- a/_includes/layouts/contact.html
+++ b/_includes/layouts/contact.html
@@ -12,31 +12,45 @@ <h1 class="title">Contact</h1>
           <div class="usa-alert__body">
             <h2 class="usa-alert__heading">Emergency help</h2>
             <p>If you need emergency help with an active disaster event, please dial 9-1-1.</p>
-            <p>Visit FEMA's <a class="usa-link usa-link--external" href="https://www.fema.gov/disaster/current" target="_blank">Current Disasters page</a> for information about recent disasters.</p>
+            <p>Visit FEMA's <a class="usa-link usa-link--external" href="https://www.fema.gov/disaster/current"
+                target="_blank">Current Disasters page</a> for information about recent disasters.</p>
           </div>
         </div>
         <div class="contentRow">
-          <h class="margin-top-3">Please contact us regarding:</h3>
+          <h3 class="margin-top-3">Please contact us regarding:</h3>
           <ul class="usa-list">
             <li>Feedback or comments based on your experience using this website</li>
             <li>Questions about having an organization added to the site’s mutual aid resource results</li>
             <li>Issues, problems, or concerns you have using this website</li>
           </ul>
-          <p>Contact the web support team for the Mutual Aid Second Responder Community portal by emailing us at <a href="mailto:PlaceholderEmail@FEMA.gov">PlaceholderEmail@FEMA.gov</a>.</p> 
-        </div> 
+          <p>Contact the web support team for the Mutual Aid Second Responder Community portal by emailing us at <a
+              href="mailto:PlaceholderEmail@FEMA.gov">PlaceholderEmail@FEMA.gov</a>.</p>
+        </div>
         <div class="contentRow">
-          <h4>Other disaster recovery needs</h4>
-          <p>If you are interested in other disaster recovery resources outside of mutual aid for building departments,  FEMA offers a variety of tools and programs to assist in the recovery process. </p>
-          <p>Whether you need financial assistance, legal aid, or guidance on managing long-term recovery, FEMA provides comprehensive support to help you rebuild and recover. Below are some key resources and contact points to get you started:</p>
+          <h3>Other disaster recovery needs</h3>
+          <p>If you are interested in other disaster recovery resources outside of mutual aid for building departments, 
+            FEMA offers a variety of tools and programs to assist in the recovery process. </p>
+          <p>Whether you need financial assistance, legal aid, or guidance on managing long-term recovery, FEMA provides
+            comprehensive support to help you rebuild and recover. Below are some key resources and contact points to
+            get you started:</p>
           <ul class="usa-list">
-            <li><a class="usa-link usa-link--external" href="https://www.disasterassistance.gov/" target="_blank">DisasterAssistance.gov:</a>  Apply for individual disaster assistance and track your application status.</li>
-            <li><a class="usa-link" href="tel:%208006213362">FEMA Helpline:</a> Call <a href="tel:%208006213362">1-800-621-3362</a> for general questions about disaster assistance.</li>
-            <li><a class="usa-link usa-link--external" href="https://www.fema.gov/emergency-managers/practitioners/recovery-resources/community-toolkit" target="_blank">Community Recovery Management Toolkit:</a> Access resources to help manage long-term recovery.</li>
-            <li><a class="usa-link usa-link--external" href="https://www.fema.gov/emergency-managers/practitioners/recovery-resilience-resource-library" target="_blank">Recovery and Resilience Resource Library:</a> Find and research federal disaster recovery resources.</li>
+            <li><a class="usa-link usa-link--external" href="https://www.disasterassistance.gov/"
+                target="_blank">DisasterAssistance.gov:</a> Apply for individual disaster assistance and track your
+              application status.</li>
+            <li><a class="usa-link" href="tel:%208006213362">FEMA Helpline:</a> Call <a
+                href="tel:%208006213362">1-800-621-3362</a> for general questions about disaster assistance.</li>
+            <li><a class="usa-link usa-link--external"
+                href="https://www.fema.gov/emergency-managers/practitioners/recovery-resources/community-toolkit"
+                target="_blank">Community Recovery Management Toolkit:</a> Access resources to help manage long-term
+              recovery.</li>
+            <li><a class="usa-link usa-link--external"
+                href="https://www.fema.gov/emergency-managers/practitioners/recovery-resilience-resource-library"
+                target="_blank">Recovery and Resilience Resource Library:</a> Find and research federal disaster
+              recovery resources.</li>
           </ul>
         </div>
 
       </main>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/_includes/layouts/faq-page.html b/_includes/layouts/faq-page.html
index 1541245..ba2f347 100644
--- a/_includes/layouts/faq-page.html
+++ b/_includes/layouts/faq-page.html
@@ -8,7 +8,7 @@
     <h1 class="title">{{title}}</h1>
     <div class="usa-in-page-nav-container">
       <aside class="usa-in-page-nav" data-heading-elements="h3" data-title-text="On this page"
-        data-title-heading-level="h3" data-scroll-offset="0" data-root-margin="0px 0px 0px 0px" data-threshold="1">
+        data-title-heading-level="h2" data-scroll-offset="0" data-root-margin="0px 0px 0px 0px" data-threshold="1">
       </aside>
       <main class="grid-col-12 main-content usa-prose" id="main-content">
         <div class="contentRow margin-top-1">
diff --git a/_includes/meta.html b/_includes/meta.html
index f399e72..c30c9f5 100644
--- a/_includes/meta.html
+++ b/_includes/meta.html
@@ -1,7 +1,6 @@
 <head>
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <meta name="robots" content="noindex, nofollow" />
 
   <meta name="HandheldFriendly" content="True" />
   <meta name="MobileOptimized" content="320" />
@@ -14,7 +13,7 @@
   {% endif %}
 
   <meta property="og:site_name" content="{{- site.title -}}">
-  
+
   {% if item %}
   <meta property="og:title" content="{{ item.State }} | {{ site.title }}">
   {% else %}
@@ -23,7 +22,7 @@
 
   <meta name="description" content="{{- description }} {{ site.description }}">
   <meta property="og:description" content="{{- description -}}">
-  <meta property="og:locale" content="en_US"/>
+  <meta property="og:locale" content="en_US" />
 
   <link rel="canonical" href="{{- site.url -}}{{- page.url | url -}}">
   <meta content="{{- site.url -}}{{- page.url | url -}}" property="og:url">
@@ -33,11 +32,14 @@
 
   <meta content="IE=edge" http-equiv="X-UA-Compatible">
 
-  <link rel="apple-touch-icon" sizes="180x180" rel="noopener" target="_blank" href="{{ '/favicon/apple-touch-icon.png' | url }}">
-  <link rel="icon" type="image/png" sizes="32x32" rel="noopener" target="_blank" href="{{ '/favicon/favicon-32x32.png' | url }}">
-  <link rel="icon" type="image/png" sizes="16x16" rel="noopener" target="_blank" href="{{ '/favicon/favicon-16x16.png' | url }}">
+  <link rel="apple-touch-icon" sizes="180x180" rel="noopener" target="_blank"
+    href="{{ '/favicon/apple-touch-icon.png' | url }}">
+  <link rel="icon" type="image/png" sizes="32x32" rel="noopener" target="_blank"
+    href="{{ '/favicon/favicon-32x32.png' | url }}">
+  <link rel="icon" type="image/png" sizes="16x16" rel="noopener" target="_blank"
+    href="{{ '/favicon/favicon-16x16.png' | url }}">
   <link rel="icon" href="{{ '/myfavicon.ico' | url }}" type="image/x-icon" />
-  <link rel="shortcut icon" href="{{ '/myfavicon.ico' | url }}" type="image/x-icon" /> 
+  <link rel="shortcut icon" href="{{ '/myfavicon.ico' | url }}" type="image/x-icon" />
   <link rel="manifest" href="{{ '/favicon/site.webmanifest' | url }}">
   <link rel="mask-icon" href="{{ '/favicon/safari-pinned-tab.svg' | url }}" color="#3d4551">
   <meta name="msapplication-TileColor" content="#da532c">
@@ -45,22 +47,4 @@
 
   <link rel="preload" as="style" href="{{ assetPaths['index.css'] }}" />
   <link rel="stylesheet" href="{{ assetPaths['index.css'] }}" type="text/css" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</head>
+</head>
\ No newline at end of file
diff --git a/_includes/theme/styles/_templates.scss b/_includes/theme/styles/_templates.scss
index 03f218b..8e9563b 100644
--- a/_includes/theme/styles/_templates.scss
+++ b/_includes/theme/styles/_templates.scss
@@ -548,11 +548,11 @@ iframe:focus,
 
 .contact-page {
   h3 {
-    font-size: size('body', 8);
+    font-size: size('body', 7);
   }
 
   h4 {
-    font-size: size('body', 7);
+    font-size: size('body', 6);
   }
   
   .contentRow {