Updating contact form classified warning message

Fixing our programs link in footer
Updating text in 404
Global heading size adjustments

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>
                 }

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"

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>

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>

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 } },