From b0560d1f8d840f51a1535051b3f1745911851bbc Mon Sep 17 00:00:00 2001
From: Kevin Calva <kcalva@roundarch.com>
Date: Fri, 9 Apr 2021 15:43:55 -0500
Subject: [PATCH 1/9]  updated the accessibilty features for the site feedback
 form and engagement request form

---
 src/components/ContactForm.js    | 26 +++++++++++++++++++++-----
 src/components/FeedbackFooter.js |  2 +-
 src/components/FeedbackForm.js   | 29 ++++++++++++++++++++++++-----
 src/pages/solutions.js           | 10 ++++++++--
 4 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/src/components/ContactForm.js b/src/components/ContactForm.js
index 6c85a2b..25d50de 100644
--- a/src/components/ContactForm.js
+++ b/src/components/ContactForm.js
@@ -16,7 +16,7 @@ import { PrimaryButton } from './core';
 
 const korolevFont = 'korolev, Helvetica Neue, Helvetica, Arial, sans-serif';
 
-const ContactForm = ({ onClose }) => {
+const ContactForm = ({ onClose, ...rest }) => {
   const [submitting, setSubmitting] = useState();
   const [success, setSuccess] = useState();
 
@@ -37,7 +37,12 @@ const ContactForm = ({ onClose }) => {
   };
 
   return (
-    <Box>
+    <Box
+      role={rest.role}
+      aria-modal={rest.ariaModal}
+      tabIndex={rest.tabIndex}
+      a11yTitle={rest.a11yTitle}
+    >
       <Box
         pad="medium"
         background="black"
@@ -54,7 +59,13 @@ const ContactForm = ({ onClose }) => {
         >
           REQUEST A CONSULTATION
         </Heading>
-        {onClose && <Button icon={<Close />} onClick={onClose}></Button>}
+        {onClose && (
+          <Button
+            icon={<Close />}
+            onClick={onClose}
+            a11yTitle="close this dialog"
+          ></Button>
+        )}
       </Box>
       <Box
         pad="medium"
@@ -144,7 +155,7 @@ const ContactForm = ({ onClose }) => {
                 <PrimaryButton
                   pad={{ vertical: 'large' }}
                   type="submit"
-                  a11yTitle="Submit"
+                  a11yTitle="Submit this consultation request form"
                   label="Submit"
                   style={{ width: onClose ? '250px' : '100%' }}
                 />
@@ -186,7 +197,12 @@ const ContactForm = ({ onClose }) => {
           </Box>
         )}
         {success && (
-          <Box pad="large" align="center" justify="center">
+          <Box
+            pad="large"
+            align="center"
+            justify="center"
+            aria-live="assertive"
+          >
             <Heading
               level={3}
               style={{ fontFamily: korolevFont }}
diff --git a/src/components/FeedbackFooter.js b/src/components/FeedbackFooter.js
index e6c139b..c1bb88a 100644
--- a/src/components/FeedbackFooter.js
+++ b/src/components/FeedbackFooter.js
@@ -62,7 +62,7 @@ const FeedbackFooter = () => {
             },
           }}
         >
-          <Layer animation="fadeIn">
+          <Layer animation="fadeIn" aria-hidden="true">
             <FeedbackForm onClose={handleToggleOpen} />
           </Layer>
         </ThemeContext.Extend>
diff --git a/src/components/FeedbackForm.js b/src/components/FeedbackForm.js
index e1741d1..2053df7 100644
--- a/src/components/FeedbackForm.js
+++ b/src/components/FeedbackForm.js
@@ -38,7 +38,12 @@ const FeedbackForm = ({ onClose }) => {
   };
 
   return (
-    <Box>
+    <Box
+      role="dialog"
+      aria-modal="true"
+      tabIndex={0}
+      a11yTitle="Send us your feedback"
+    >
       <Box
         pad="medium"
         background="black"
@@ -55,7 +60,11 @@ const FeedbackForm = ({ onClose }) => {
         >
           SEND US YOUR FEEDBACK
         </Heading>
-        <Button icon={<Close />} onClick={onClose}></Button>
+        <Button
+          icon={<Close />}
+          onClick={onClose}
+          a11yTitle="close this dialog"
+        ></Button>
       </Box>
       <Box pad="medium" style={{ position: 'relative' }}>
         {!success && (
@@ -136,7 +145,7 @@ const FeedbackForm = ({ onClose }) => {
                 <PrimaryButton
                   pad={{ vertical: 'large' }}
                   type="submit"
-                  a11yTitle="Submit"
+                  a11yTitle="Submit your feedback"
                   label="Submit"
                   style={{ width: '250px' }}
                 />
@@ -178,7 +187,13 @@ const FeedbackForm = ({ onClose }) => {
           </Box>
         )}
         {success && (
-          <Box pad="large" align="center" justify="center" gap="small">
+          <Box
+            pad="large"
+            align="center"
+            justify="center"
+            gap="small"
+            aria-live="assertive"
+          >
             <Heading
               level={3}
               style={{ fontFamily: korolevFont }}
@@ -187,7 +202,11 @@ const FeedbackForm = ({ onClose }) => {
               FEEDBACK SENT
             </Heading>
             <Text textAlign="center">Thanks for sharing with us.</Text>
-            <SecondaryButton onClick={onClose} label="Close" />
+            <SecondaryButton
+              onClick={onClose}
+              label="Close"
+              a11yTitle="Close this dialog"
+            />
           </Box>
         )}
       </Box>
diff --git a/src/pages/solutions.js b/src/pages/solutions.js
index 356e6c2..9b0808c 100644
--- a/src/pages/solutions.js
+++ b/src/pages/solutions.js
@@ -110,8 +110,14 @@ const Solutions = ({ data }) => {
                   },
                 }}
               >
-                <Layer animation="fadeIn">
-                  <ContactForm onClose={handleModalToggle} />
+                <Layer animation="fadeIn" aria-hidden="true">
+                  <ContactForm
+                    onClose={handleModalToggle}
+                    role="dialog"
+                    ariaModal="true"
+                    tabIndex={0}
+                    a11yTitle="request a consultation"
+                  />
                 </Layer>
               </ThemeContext.Extend>
             )}
-- 
GitLab


From 4bc29ed3a60930f43c785eec93f3259ea287a479 Mon Sep 17 00:00:00 2001
From: Kevin Calva <kcalva@roundarch.com>
Date: Mon, 12 Apr 2021 12:34:24 -0500
Subject: [PATCH 2/9] updated the accessibility to the forms so that the
 keyboard arrow navigation can work and removed the tabIndex from modal

---
 src/components/ContactForm.js    |  9 ++-------
 src/components/FeedbackFooter.js |  2 +-
 src/components/FeedbackForm.js   |  7 +------
 src/pages/solutions.js           | 10 ++--------
 4 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/components/ContactForm.js b/src/components/ContactForm.js
index 25d50de..c9416b9 100644
--- a/src/components/ContactForm.js
+++ b/src/components/ContactForm.js
@@ -16,7 +16,7 @@ import { PrimaryButton } from './core';
 
 const korolevFont = 'korolev, Helvetica Neue, Helvetica, Arial, sans-serif';
 
-const ContactForm = ({ onClose, ...rest }) => {
+const ContactForm = ({ onClose }) => {
   const [submitting, setSubmitting] = useState();
   const [success, setSuccess] = useState();
 
@@ -37,12 +37,7 @@ const ContactForm = ({ onClose, ...rest }) => {
   };
 
   return (
-    <Box
-      role={rest.role}
-      aria-modal={rest.ariaModal}
-      tabIndex={rest.tabIndex}
-      a11yTitle={rest.a11yTitle}
-    >
+    <Box role="dialog" aria-modal="true" a11yTitle="request a consultation">
       <Box
         pad="medium"
         background="black"
diff --git a/src/components/FeedbackFooter.js b/src/components/FeedbackFooter.js
index c1bb88a..e6c139b 100644
--- a/src/components/FeedbackFooter.js
+++ b/src/components/FeedbackFooter.js
@@ -62,7 +62,7 @@ const FeedbackFooter = () => {
             },
           }}
         >
-          <Layer animation="fadeIn" aria-hidden="true">
+          <Layer animation="fadeIn">
             <FeedbackForm onClose={handleToggleOpen} />
           </Layer>
         </ThemeContext.Extend>
diff --git a/src/components/FeedbackForm.js b/src/components/FeedbackForm.js
index 2053df7..179c475 100644
--- a/src/components/FeedbackForm.js
+++ b/src/components/FeedbackForm.js
@@ -38,12 +38,7 @@ const FeedbackForm = ({ onClose }) => {
   };
 
   return (
-    <Box
-      role="dialog"
-      aria-modal="true"
-      tabIndex={0}
-      a11yTitle="Send us your feedback"
-    >
+    <Box role="dialog" aria-modal="true" a11yTitle="Send us your feedback">
       <Box
         pad="medium"
         background="black"
diff --git a/src/pages/solutions.js b/src/pages/solutions.js
index 9b0808c..356e6c2 100644
--- a/src/pages/solutions.js
+++ b/src/pages/solutions.js
@@ -110,14 +110,8 @@ const Solutions = ({ data }) => {
                   },
                 }}
               >
-                <Layer animation="fadeIn" aria-hidden="true">
-                  <ContactForm
-                    onClose={handleModalToggle}
-                    role="dialog"
-                    ariaModal="true"
-                    tabIndex={0}
-                    a11yTitle="request a consultation"
-                  />
+                <Layer animation="fadeIn">
+                  <ContactForm onClose={handleModalToggle} />
                 </Layer>
               </ThemeContext.Extend>
             )}
-- 
GitLab


From 3efdc8beb03987e10dd6ab45ffd45e95a3573ea1 Mon Sep 17 00:00:00 2001
From: Kevin Calva <kcalva@roundarch.com>
Date: Mon, 12 Apr 2021 13:45:53 -0500
Subject: [PATCH 3/9] adding the rest prop properly (spreading it to child
 component)

---
 src/components/ContactForm.js | 4 ++--
 src/pages/solutions.js        | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/ContactForm.js b/src/components/ContactForm.js
index c9416b9..03463a7 100644
--- a/src/components/ContactForm.js
+++ b/src/components/ContactForm.js
@@ -16,7 +16,7 @@ import { PrimaryButton } from './core';
 
 const korolevFont = 'korolev, Helvetica Neue, Helvetica, Arial, sans-serif';
 
-const ContactForm = ({ onClose }) => {
+const ContactForm = ({ onClose, ...rest }) => {
   const [submitting, setSubmitting] = useState();
   const [success, setSuccess] = useState();
 
@@ -37,7 +37,7 @@ const ContactForm = ({ onClose }) => {
   };
 
   return (
-    <Box role="dialog" aria-modal="true" a11yTitle="request a consultation">
+    <Box {...rest}>
       <Box
         pad="medium"
         background="black"
diff --git a/src/pages/solutions.js b/src/pages/solutions.js
index 356e6c2..04ed73e 100644
--- a/src/pages/solutions.js
+++ b/src/pages/solutions.js
@@ -111,7 +111,12 @@ const Solutions = ({ data }) => {
                 }}
               >
                 <Layer animation="fadeIn">
-                  <ContactForm onClose={handleModalToggle} />
+                  <ContactForm
+                    onClose={handleModalToggle}
+                    role="dialog"
+                    aria-modal="true"
+                    a11yTitle="request a consultation"
+                  />
                 </Layer>
               </ThemeContext.Extend>
             )}
-- 
GitLab


From edfe1528b06f59f6807bca5d92c8ca22a53bdd8c Mon Sep 17 00:00:00 2001
From: Anne Demey <anneyvdemey@gmail.com>
Date: Tue, 13 Apr 2021 11:26:35 -0500
Subject: [PATCH 4/9] Turning contact form to controlled Adding default
 services to contact form Adding scroll for mobile forms

---
 src/components/ContactForm.js   | 59 +++++++++++++++++++++++++++------
 src/components/FeedbackForm.js  |  4 +--
 src/templates/ServiceDetail.js  |  2 +-
 src/templates/SolutionDetail.js |  2 +-
 4 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/src/components/ContactForm.js b/src/components/ContactForm.js
index 6c85a2b..dd3bc2f 100644
--- a/src/components/ContactForm.js
+++ b/src/components/ContactForm.js
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import {
   Box,
   Heading,
@@ -16,12 +16,26 @@ import { PrimaryButton } from './core';
 
 const korolevFont = 'korolev, Helvetica Neue, Helvetica, Arial, sans-serif';
 
-const ContactForm = ({ onClose }) => {
+const ContactForm = ({ onClose, defaultService }) => {
+  const [name, setName] = useState('');
+  const [email, setEmail] = useState('');
+  const [services, setServices] = useState('');
+  const [comments, setComments] = useState('');
+
   const [submitting, setSubmitting] = useState();
   const [success, setSuccess] = useState();
 
+  useEffect(() => {
+    setServices(defaultService);
+  }, [defaultService]);
+
   const handleSubmit = (event) => {
-    const data = new FormData(event.target);
+    const data = new FormData();
+    data.set('entry.1114584563', name);
+    data.set('emailAddress', email);
+    data.set('entry.533506743', services);
+    data.set('entry.297731592', comments);
+
     setSubmitting(true);
     fetch(
       'https://docs.google.com/forms/d/e/1FAIpQLScsfrAHD8yKJGKF-yI_T9676FR-LDmmuBG_m8uY2TmP_zmZUg/formResponse',
@@ -59,7 +73,7 @@ const ContactForm = ({ onClose }) => {
       <Box
         pad="medium"
         border={{ color: 'light-1', size: 'xsmall', side: 'all' }}
-        style={{ position: 'relative' }}
+        style={{ position: 'relative', overflowY: 'auto' }}
       >
         {!success && (
           <Box>
@@ -71,11 +85,15 @@ const ContactForm = ({ onClose }) => {
               in, and someone from our team will reach out soon.
             </Text>
             <Text size="small" color="accent-1">
-              Submit{' '}
+              Do not submit{' '}
+              <Text weight="bold" size="small" color="accent-1">
+                classified
+              </Text>{' '}
+              or{' '}
               <Text weight="bold" size="small" color="accent-1">
-                unclassified
+                CUI
               </Text>{' '}
-              data only.
+              data.
             </Text>
             <Form onSubmit={handleSubmit}>
               <FormField
@@ -91,7 +109,12 @@ const ContactForm = ({ onClose }) => {
                 }
                 required
               >
-                <TextInput id="text-input-name" name="entry.1114584563" />
+                <TextInput
+                  id="text-input-name"
+                  name="entry.1114584563"
+                  value={name}
+                  onChange={(e) => setName(e.target.value)}
+                />
               </FormField>
               <FormField
                 name="emailAddress"
@@ -106,7 +129,12 @@ const ContactForm = ({ onClose }) => {
                 }
                 required
               >
-                <TextInput id="text-input-email" name="emailAddress" />
+                <TextInput
+                  id="text-input-email"
+                  name="emailAddress"
+                  value={email}
+                  onChange={(e) => setEmail(e.target.value)}
+                />
               </FormField>
               <FormField
                 name="entry.533506743"
@@ -120,7 +148,12 @@ const ContactForm = ({ onClose }) => {
                   </Text>
                 }
               >
-                <TextInput id="text-input-services" name="entry.533506743" />
+                <TextInput
+                  id="text-input-services"
+                  name="entry.533506743"
+                  value={services}
+                  onChange={(e) => setServices(e.target.value)}
+                />
               </FormField>
               <FormField
                 name="entry.297731592"
@@ -137,6 +170,8 @@ const ContactForm = ({ onClose }) => {
                 <TextArea
                   id="text-input-comments"
                   name="entry.297731592"
+                  value={comments}
+                  onChange={(e) => setComments(e.target.value)}
                   style={{ height: '100px' }}
                 />
               </FormField>
@@ -207,4 +242,8 @@ const ContactForm = ({ onClose }) => {
   );
 };
 
+ContactForm.defaultProps = {
+  defaultService: '',
+};
+
 export default ContactForm;
diff --git a/src/components/FeedbackForm.js b/src/components/FeedbackForm.js
index e1741d1..1f8174c 100644
--- a/src/components/FeedbackForm.js
+++ b/src/components/FeedbackForm.js
@@ -57,7 +57,7 @@ const FeedbackForm = ({ onClose }) => {
         </Heading>
         <Button icon={<Close />} onClick={onClose}></Button>
       </Box>
-      <Box pad="medium" style={{ position: 'relative' }}>
+      <Box pad="medium" style={{ position: 'relative', overflowY: 'auto' }}>
         {!success && (
           <Box>
             <Form onSubmit={handleSubmit}>
@@ -95,7 +95,7 @@ const FeedbackForm = ({ onClose }) => {
                         </Text>
                         <Text size="small">
                           Help us by volunteering an occasional hour of your
-                          time to provide insights and test ideas for ow C3I&N
+                          time to provide insights and test ideas for how C3I&N
                           can best serve our IT customers.
                         </Text>
                       </Box>
diff --git a/src/templates/ServiceDetail.js b/src/templates/ServiceDetail.js
index 334f6db..744aed0 100644
--- a/src/templates/ServiceDetail.js
+++ b/src/templates/ServiceDetail.js
@@ -55,7 +55,7 @@ const ServiceDetailTemplate = ({ data }) => {
                   basis={breakLayout ? 'auto' : '460px'}
                   flex={{ shrink: 0 }}
                 >
-                  <ContactForm />
+                  <ContactForm defaultService={frontmatter.title} />
                 </Box>
               </Column>
             </ContentContainer>
diff --git a/src/templates/SolutionDetail.js b/src/templates/SolutionDetail.js
index 7d0fb9a..632ba12 100644
--- a/src/templates/SolutionDetail.js
+++ b/src/templates/SolutionDetail.js
@@ -56,7 +56,7 @@ const SolutionDetailTemplate = ({ data }) => {
                     basis={breakLayout ? 'auto' : '460px'}
                     flex={{ shrink: 0 }}
                   >
-                    <ContactForm />
+                    <ContactForm defaultService={frontmatter.title} />
                   </Box>
                 </Box>
               </Column>
-- 
GitLab


From cfa515ee9cac914a26dcdd89bf019cbad0b16d9e Mon Sep 17 00:00:00 2001
From: Anne Demey <anneyvdemey@gmail.com>
Date: Tue, 13 Apr 2021 12:21:38 -0500
Subject: [PATCH 5/9] Adjusting aria live tags for contact forms

---
 src/components/ContactForm.js  | 10 +++-------
 src/components/FeedbackForm.js |  5 +++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/ContactForm.js b/src/components/ContactForm.js
index 03463a7..2b4e4c0 100644
--- a/src/components/ContactForm.js
+++ b/src/components/ContactForm.js
@@ -83,7 +83,7 @@ const ContactForm = ({ onClose, ...rest }) => {
               </Text>{' '}
               data only.
             </Text>
-            <Form onSubmit={handleSubmit}>
+            <Form onSubmit={handleSubmit} aria-live="assertive">
               <FormField
                 name="entry.1114584563"
                 htmlFor="text-input-name"
@@ -186,18 +186,14 @@ const ContactForm = ({ onClose, ...rest }) => {
               style={{
                 fontFamily: korolevFont,
               }}
+              aria-live="polite"
             >
               REQUESTING CONSULTATION
             </Text>
           </Box>
         )}
         {success && (
-          <Box
-            pad="large"
-            align="center"
-            justify="center"
-            aria-live="assertive"
-          >
+          <Box pad="large" align="center" justify="center" aria-live="polite">
             <Heading
               level={3}
               style={{ fontFamily: korolevFont }}
diff --git a/src/components/FeedbackForm.js b/src/components/FeedbackForm.js
index 179c475..ac50358 100644
--- a/src/components/FeedbackForm.js
+++ b/src/components/FeedbackForm.js
@@ -64,7 +64,7 @@ const FeedbackForm = ({ onClose }) => {
       <Box pad="medium" style={{ position: 'relative' }}>
         {!success && (
           <Box>
-            <Form onSubmit={handleSubmit}>
+            <Form onSubmit={handleSubmit} aria-live="assertive">
               <FormField
                 name="entry.675672969"
                 htmlFor="text-input-comments"
@@ -176,6 +176,7 @@ const FeedbackForm = ({ onClose }) => {
               style={{
                 fontFamily: korolevFont,
               }}
+              aria-live="polite"
             >
               SENDING FEEDBACK
             </Text>
@@ -187,7 +188,7 @@ const FeedbackForm = ({ onClose }) => {
             align="center"
             justify="center"
             gap="small"
-            aria-live="assertive"
+            aria-live="polite"
           >
             <Heading
               level={3}
-- 
GitLab


From b7adc2c5c75be1943a819657cace0456430aafe3 Mon Sep 17 00:00:00 2001
From: Anne Demey <anneyvdemey@gmail.com>
Date: Wed, 14 Apr 2021 13:56:06 -0500
Subject: [PATCH 6/9] Updating contact form classified warning message Fixing
 our programs link in footer Updating text in 404 Global heading size
 adjustments

---
 src/components/ContactForm.js                      | 12 ++++--------
 src/components/app/Footer.js                       |  2 +-
 .../pages/service-category/ServiceList.js          | 11 ++++++++---
 src/pages/404.js                                   |  4 +---
 src/styles/theme.js                                | 14 +++++++++++++-
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/components/ContactForm.js b/src/components/ContactForm.js
index 4bfffb7..f075059 100644
--- a/src/components/ContactForm.js
+++ b/src/components/ContactForm.js
@@ -91,15 +91,11 @@ const ContactForm = ({ onClose, defaultService, ...rest }) => {
               in, and someone from our team will reach out soon.
             </Text>
             <Text size="small" color="accent-1">
-              Do not submit{' '}
+              Do{' '}
               <Text weight="bold" size="small" color="accent-1">
-                classified
+                not
               </Text>{' '}
-              or{' '}
-              <Text weight="bold" size="small" color="accent-1">
-                CUI
-              </Text>{' '}
-              data.
+              submit classified or CUI data.
             </Text>
             <Form onSubmit={handleSubmit} aria-live="assertive">
               <FormField
@@ -168,7 +164,7 @@ const ContactForm = ({ onClose, defaultService, ...rest }) => {
                   <Text weight="bold" size="small">
                     Comments or details{' '}
                     <Text weight="normal" size="small">
-                      (optional)
+                      (optional, no classified or CUI data)
                     </Text>
                   </Text>
                 }
diff --git a/src/components/app/Footer.js b/src/components/app/Footer.js
index 19ef788..0e37475 100644
--- a/src/components/app/Footer.js
+++ b/src/components/app/Footer.js
@@ -29,7 +29,7 @@ const Footer = () => {
               About Us
             </Link>
             <Link
-              to="/our-other-programs/"
+              to="/other-programs/"
               color="light-1"
               size="small"
               weight="bold"
diff --git a/src/components/pages/service-category/ServiceList.js b/src/components/pages/service-category/ServiceList.js
index 3484a1c..510c017 100644
--- a/src/components/pages/service-category/ServiceList.js
+++ b/src/components/pages/service-category/ServiceList.js
@@ -29,7 +29,7 @@ const listQuery = graphql`
 `;
 
 const ServiceItem = ({ node, isMobile }) => (
-  <Box basis="1/2" pad={isMobile ? '0' : 'medium'}>
+  <Box basis="1/2" pad={{ horizontal: isMobile ? '0' : 'medium' }}>
     <Heading level={4}>{node.frontmatter.title}</Heading>
     <Classification
       levels={node.frontmatter.levels}
@@ -63,7 +63,7 @@ const ServiceList = ({ categories }) => {
   const isMobile = ['xsmall', 'small'].includes(size);
 
   return (
-    <Box pad={{ vertical: 'large' }} id="main-content">
+    <Box pad={{ vertical: 'large' }} id="main-content" gap="large">
       {catGroup.map((group, i) => (
         <Box key={categories[i]} gap="small">
           {categories.length > 1 && (
@@ -71,7 +71,12 @@ const ServiceList = ({ categories }) => {
               <Column>
                 <Box direction="row" align="center" gap="small">
                   {!isMobile && <DtSquare color="black" size="small" />}
-                  <Heading level={2}>{categories[i]}</Heading>
+                  <Heading
+                    level={2}
+                    margin={{ vertical: isMobile ? 'medium' : '0' }}
+                  >
+                    {categories[i]}
+                  </Heading>
                 </Box>
               </Column>
             </Container>
diff --git a/src/pages/404.js b/src/pages/404.js
index 63804e1..bfe1f9d 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -9,9 +9,7 @@ const NotFoundPage = () => (
     <Container>
       <Column>
         <Heading>404: Not Found</Heading>
-        <Paragraph>
-          You just hit a route that doesn&#39;t exist... the sadness.
-        </Paragraph>
+        <Paragraph>You just hit a route that doesn&#39;t exist.</Paragraph>
       </Column>
     </Container>
   </AppLayout>
diff --git a/src/styles/theme.js b/src/styles/theme.js
index 678048f..db0eb27 100644
--- a/src/styles/theme.js
+++ b/src/styles/theme.js
@@ -119,7 +119,19 @@ export const themeOverrides = {
         textTransform: 'uppercase',
       },
     level: {
-      3: { font: { family: helveticaFont } },
+      2: {
+        medium: {
+          size: '30px',
+          height: '32px',
+        },
+      },
+      3: {
+        font: { family: helveticaFont },
+        medium: {
+          size: '22px',
+          height: '26px',
+        },
+      },
       4: { font: { family: helveticaFont } },
       5: { font: { family: helveticaFont } },
       6: { font: { family: helveticaFont } },
-- 
GitLab


From 8ef1595b089c08550de3274a37b67858f5bf604c Mon Sep 17 00:00:00 2001
From: Anne Demey <anneyvdemey@gmail.com>
Date: Wed, 14 Apr 2021 14:03:43 -0500
Subject: [PATCH 7/9] Adding new link in footer plus icons

---
 src/components/app/Footer.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/app/Footer.js b/src/components/app/Footer.js
index 0e37475..01bcdf7 100644
--- a/src/components/app/Footer.js
+++ b/src/components/app/Footer.js
@@ -1,5 +1,6 @@
 import React, { useContext } from 'react';
 import { Box, ResponsiveContext } from 'grommet';
+import { Share } from 'grommet-icons';
 import { Container, Column } from '../layout';
 import { Link } from '../core';
 import AFLogo from '../../images/af-logo.svg';
@@ -36,12 +37,22 @@ const Footer = () => {
             >
               Our Other Programs
             </Link>
+
+            <Link
+              to="https://usaf.dps.mil/teams/EntInt/FrontDoor/SitePages/Home.aspx"
+              color="light-1"
+              size="small"
+              justify="center"
+            >
+              CCC IT/Cyber Services <Share size="small" />
+            </Link>
             <Link
               to="https://www.wpafb.af.mil/Welcome/Fact-Sheets/Display/Article/835716/88-abw-freedom-of-information-act-foia-88-abw-installation-privacy-office/"
               color="light-1"
               size="small"
+              justify="center"
             >
-              FOIA
+              FOIA <Share size="small" />
             </Link>
           </Box>
           <Box
-- 
GitLab


From 79bbd3bf1f054f91a9bc67bb76338f73c80cbd9b Mon Sep 17 00:00:00 2001
From: Anne Demey <anneyvdemey@gmail.com>
Date: Wed, 14 Apr 2021 15:01:17 -0500
Subject: [PATCH 8/9] Subtitle for about page

---
 src/content/generic/about-us.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/generic/about-us.md b/src/content/generic/about-us.md
index 5bb6d65..020b1ca 100644
--- a/src/content/generic/about-us.md
+++ b/src/content/generic/about-us.md
@@ -1,7 +1,7 @@
 ---
 slug: '/about-us/'
 title: About Us
-subtitle: AFLCMC / C3I&N
+subtitle: AFLCMC / HN C3I&N
 description: Learn more about C3I&N's mission and our digital storefront.
 image: '../../images/detail-header.png'
 ---
-- 
GitLab


From 6b2b8675b48caabd969a104d338ba057ab8960c8 Mon Sep 17 00:00:00 2001
From: Ben Wynn <ben.wynn@us.isobar.com>
Date: Thu, 15 Apr 2021 09:47:20 -0400
Subject: [PATCH 9/9] content updates; expanding acronyms

---
 src/content/generic/about-us.md                         | 6 +++---
 src/content/other-programs/eitaas.md                    | 2 +-
 src/content/service-category/networking-connectivity.md | 1 -
 src/content/service-detail/core-rock.md                 | 4 ++--
 src/content/service-detail/cv2.md                       | 6 +++---
 src/content/service-detail/fences.md                    | 2 +-
 src/content/service-detail/iss.md                       | 8 ++++----
 src/content/service-detail/sgn.md                       | 8 ++++----
 8 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/content/generic/about-us.md b/src/content/generic/about-us.md
index 5bb6d65..4297404 100644
--- a/src/content/generic/about-us.md
+++ b/src/content/generic/about-us.md
@@ -8,11 +8,11 @@ image: '../../images/detail-header.png'
 
 ### Our Mission
 
-The C3I&N Directorate is responsible for executing, developing, acquiring, deploying and sustaining cyberspace, communication, cryptologic and space/nuclear network capabilities across Air Force as well as Joint and inter-Agency communities. Our focus is on delivering solutions to drive dynamic integration of information/systems in support of air, space, and cyberspace domains.
+The C3I&N Directorate is responsible for executing, developing, acquiring, deploying and sustaining cyberspace, communication, and cryptologic capabilities across Air Force as well as Joint and inter-Agency communities. Our focus is on delivering solutions to drive dynamic integration of information/systems in support of air, space, and cyberspace domains.
 
 ### What We Provide
 
-To meet our mission, we offer a broad portfolio of IT services spanning networking, compute & store, digital engineering, and more. Through our scalable, enterprise services, we reduce cost and eliminate duplications of effort across the digital Air Force. Our IT solutions leverage industry best practices to deliver optimal security, performance and end-user experience. Beyond our service offerings, we also own and manage key enterprise IT initiatives, such as [EITaaS](/other-programs/), [SEITaaS](/solutions/seitaas/) and [CHES](/other-programs/). 
+To meet our mission, we offer a broad portfolio of IT services spanning networking, compute & store, digital engineering, and more. Through our scalable, enterprise services, we reduce cost and eliminate duplications of effort across the digital Air Force. Our IT solutions leverage industry best practices to deliver optimal security, performance and end-user experience. Beyond our service offerings, we also own and manage key enterprise IT initiatives, such as [Enterprise IT as a Service (EITaaS)](/other-programs/), [Special Access Program (SAP) Enterprise Information Technology as a Service (SEITaaS)](/services/seitaas-summit/) and [Cloud-Hosted Enterprise Services (CHES)](/other-programs/). 
 
 ### What is “Digital Trinity?”
 
@@ -28,7 +28,7 @@ Digital Trinity is meant to foster a virtual acquisition process that centers on
 
 Our digital storefront and engagement process is meant to enable customers to easily find and take advantage of our enterprise IT services.
 
-Our DTE Team supporting this effort is run by AFLCMC/HNJ out of Hanscom AFB. We help match your organization’s IT requirements to the best HN service offerings. Acting as a sort of concierge, our DTE Team leads the engagement from initial consultation through configuration and delivery.
+Our Digital Transformation Engagement Team supporting this effort is run by AFLCMC/HN out of Hanscom AFB. We help match your organization’s IT requirements to the best HN service offerings. Acting as a sort of concierge, our DTE Team leads the engagement from initial consultation through configuration and delivery.
 
 ### Help Improve Our Beta Website
 
diff --git a/src/content/other-programs/eitaas.md b/src/content/other-programs/eitaas.md
index 4b5ae54..f210ab9 100644
--- a/src/content/other-programs/eitaas.md
+++ b/src/content/other-programs/eitaas.md
@@ -2,7 +2,7 @@
 name: EITaaS
 index: 1
 ---
-## EITaaS
+## Enterprise IT as a Service (EITaaS)
 
 ###Cloud Compute & Store
 Compute & Store (C&S) provides secure access to cloud computing services, improving responsiveness to warfighter needs with faster access to systems and data for a more reliable, secure, consistent access to systems, data and just in time capacity for storage.
diff --git a/src/content/service-category/networking-connectivity.md b/src/content/service-category/networking-connectivity.md
index d833629..990f237 100644
--- a/src/content/service-category/networking-connectivity.md
+++ b/src/content/service-category/networking-connectivity.md
@@ -4,7 +4,6 @@ title: 'Networking & Connectivity'
 categories:
   - Global Connectivity / WAN
   - Local Connectivity / BAN
-  - Transport
   - Cloud Access
   - Reference Architectures
 image: '../../images/cat-header.png'
diff --git a/src/content/service-detail/core-rock.md b/src/content/service-detail/core-rock.md
index 48fca76..c229304 100644
--- a/src/content/service-detail/core-rock.md
+++ b/src/content/service-detail/core-rock.md
@@ -1,6 +1,6 @@
 ---
 slug: '/services/core/'
-title: 'CORE'
+title: 'Common Operating Environment (CORE)'
 categories: 
   - Communications
 levels: 
@@ -12,7 +12,7 @@ excerpt: 'A suite of multi-level web applications that provide file sharing and
 updated: April 1
 ---
 
-CORE is a suite of multi-level web applications that provide file sharing and webmail services enabling secure data and communication exchange between S//SAR, TS//SAR, and TS//SAR-SCI networks and users.
+Common Operating Environment (CORE) is a suite of multi-level web applications that provide file sharing and webmail services enabling secure data and communication exchange between S//SAR, TS//SAR, and TS//SAR-SCI networks and users.
 
 DoD, USAF and industry partners can utilize the capability.
 
diff --git a/src/content/service-detail/cv2.md b/src/content/service-detail/cv2.md
index 61ddb43..76cc6d8 100644
--- a/src/content/service-detail/cv2.md
+++ b/src/content/service-detail/cv2.md
@@ -1,6 +1,6 @@
 ---
 slug: '/services/cv2/'
-title: 'CV2'
+title: 'Combat Air Force Networks (CV2)'
 categories:
   - Networking & Connectivity
   - Global Connectivity / WAN
@@ -9,11 +9,11 @@ levels:
   - TS
   - TS-SAR
   - TS-SCI
-excerpt: 'CV2 is a Special Access Program (SAP),  Microsoft Windows-based, Wide Area Network hosted at three security levels:  Secret//SAR Level 3, Top Secret//SAR Level 4, and Top Secret//SCI//SAR Level 5.'
+excerpt: 'Combat Air Force Networks (CV2) is a Special Access Program (SAP),  Microsoft Windows-based, Wide Area Network hosted at three security levels:  Secret//SAR Level 3, Top Secret//SAR Level 4, and Top Secret//SCI//SAR Level 5.'
 share: '../../images/share/ogimage-networking_and_connectivity.png'
 updated: March 23, 2021 at 2:54:52 PM EDT
 ---
 
-CV2 is a Special Access Program (SAP),  Microsoft Windows-based, Wide Area Network hosted at three security levels:  Secret//SAR Level 3, Top Secret//SAR Level 4, and Top Secret//SCI//SAR Level 5.
+Combat Air Force Networks (CV2) is a Special Access Program (SAP),  Microsoft Windows-based, Wide Area Network hosted at three security levels:  Secret//SAR Level 3, Top Secret//SAR Level 4, and Top Secret//SCI//SAR Level 5.
 
 There are three distinct and separate systems with one at the S//SAR and the other at the TS//SAR//SCI level.  The system is managed by the MSC and all hardware (desktop, switches, routers, servers, etc) are under a strict configuration management policy centrally implemented and enforced.
diff --git a/src/content/service-detail/fences.md b/src/content/service-detail/fences.md
index ca8394b..bce7b3f 100644
--- a/src/content/service-detail/fences.md
+++ b/src/content/service-detail/fences.md
@@ -23,7 +23,7 @@ FENCES provides PL-2 workload templates for SAP customers that easily provide vi
 - IL-5 to TS/SCI platform accredited for ALL DoD environments
 - AWS Workspaces IL-5 and TS/SAR for Modeling and Sim
 - Parity in environments allows for replication to higher security levels
--[PlatformOne DevSecOps](/services/platform-one/) pipeline integration and tools
+- [PlatformOne DevSecOps](/services/platform-one/) pipeline integration and tools
 - Connectivity from CV2, JWICS, NPR, AppGate (Unclass) or with connection to Secure Web Services router (SWS)
 - Available managed services such as ACAS, McAfee, AD, WSUS, NTP
 - RMF inheritance over 35% with draft language to satisfy up to 80% of remaining controls
diff --git a/src/content/service-detail/iss.md b/src/content/service-detail/iss.md
index a88472b..dc4c195 100644
--- a/src/content/service-detail/iss.md
+++ b/src/content/service-detail/iss.md
@@ -1,6 +1,6 @@
 ---
 slug: '/services/iss/'
-title: 'ISS'
+title: 'Information Support System (ISS)'
 categories: 
   - Networking & Connectivity
   - Global Connectivity / WAN
@@ -8,12 +8,12 @@ levels:
   - S-SAR
   - TS-SAR
   - TS-SCI
-excerpt: 'ISS is a compartmented WAN that includes trusted MLS services, specifically providing an integrated PL-4 desktop environment with Automated Information System tools and functions.'
+excerpt: 'Information Support System (ISS) is a compartmented WAN that includes trusted MLS services, specifically providing an integrated PL-4 desktop environment with Automated Information System tools and functions.'
 share: '../../images/share/ogimage-networking_and_connectivity.png'
 updated: April 1
 ---
 
-ISS is a compartmented WAN that includes trusted MLS services, specifically providing an integrated PL-4 desktop environment with Automated Information System tools and functions.
+Information Support System (ISS) is a compartmented WAN that includes trusted MLS services, specifically providing an integrated PL-4 desktop environment with Automated Information System tools and functions.
 
 ## Benefits & Features
 
@@ -46,5 +46,5 @@ Required Documentation
 - JADE
 - [CORE](/services/core/)
 - Braces
-- Hawkeye
+- SIC
 - [FENCES](/services/fences/)
\ No newline at end of file
diff --git a/src/content/service-detail/sgn.md b/src/content/service-detail/sgn.md
index f91125b..e13abec 100644
--- a/src/content/service-detail/sgn.md
+++ b/src/content/service-detail/sgn.md
@@ -1,17 +1,17 @@
 ---
 slug: '/services/sgn/'
-title: 'SGN'
+title: 'Secure Global Network (SGN)'
 categories: 
   - Networking & Connectivity
   - Global Connectivity / WAN
 levels:
   - TS-SCI
-excerpt: 'SGN allows sites to communicate by using VoIP phones, email, file sharing, and other capabilities.'
+excerpt: 'Secure Global Network (SGN) allows sites to communicate by using VoIP phones, email, file sharing, and other capabilities.'
 share: '../../images/share/ogimage-networking_and_connectivity.png'
 updated: April 8
 ---
 
-SGN allows sites to communicate by using VoIP phones, email, file sharing, and other capabilities.
+Secure Global Network (SGN) allows sites to communicate by using VoIP phones, email, file sharing, and other capabilities.
 
 SGN is an Air Force Special Access Program (SAP) network approved for TS//SCI processing. DoD, AF, and industry facilities can utilize the optional SGN Remote Client (SRC) console to access SGN. SRC is a fully accredited and deployable SGN network node. A separately accredited information system may be used to connect to SGN, if required.
 
@@ -36,7 +36,7 @@ SGN is an Air Force Special Access Program (SAP) network approved for TS//SCI pr
 
 ## Supported Capabilities
 
-- Email and file sharing functionality via [CORE](/services/core/) and Hawkeye services
+- Email and file sharing functionality via [CORE](/services/core/) and SIC services
 - Voice/VoIP
 - Access to JADE personnel adjudication database
 
-- 
GitLab