diff --git a/components/ContentType/ContentPage/contentPage.module.css b/components/ContentType/ContentPage/contentPage.module.css
index 357376ad9..026aa6065 100644
--- a/components/ContentType/ContentPage/contentPage.module.css
+++ b/components/ContentType/ContentPage/contentPage.module.css
@@ -34,8 +34,7 @@
 }
 
 .contentContainer {
-  display: flex;
-  flex-direction: column;
+  display: grid;
   padding: var(--Spacing-x4) var(--Spacing-x2) 0;
   gap: var(--Spacing-x4);
 }
@@ -44,10 +43,6 @@
   width: 100%;
 }
 
-.innerContent {
-  width: 100%;
-}
-
 @media (min-width: 768px) {
   .headerIntro {
     gap: var(--Spacing-x3);
@@ -59,7 +54,6 @@
     padding: var(--Spacing-x4) 0;
   }
   .contentContainer {
-    display: grid;
     grid-template-columns: var(--max-width-text-block) 1fr;
     gap: var(--Spacing-x9);
     max-width: var(--max-width-content);
diff --git a/components/ContentType/ContentPage/index.tsx b/components/ContentType/ContentPage/index.tsx
index 5b9807d2e..5c5c63893 100644
--- a/components/ContentType/ContentPage/index.tsx
+++ b/components/ContentType/ContentPage/index.tsx
@@ -25,30 +25,32 @@ export default async function ContentPage() {
       <section className={styles.contentPage}>
         <header className={styles.header}>
           <div className={styles.headerContent}>
-            <div className={styles.headerIntro}>
-              <Title as="h2">{header.heading}</Title>
-              <Preamble>{header.preamble}</Preamble>
-            </div>
-            {header.navigation_links ? (
-              <LinkChips chips={header.navigation_links} />
+            {header ? (
+              <>
+                <div className={styles.headerIntro}>
+                  <Title as="h2">{header.heading}</Title>
+                  <Preamble>{header.preamble}</Preamble>
+                </div>
+                {header.navigation_links ? (
+                  <LinkChips chips={header.navigation_links} />
+                ) : null}
+              </>
             ) : null}
           </div>
         </header>
 
-        {hero_image && (
+        {hero_image ? (
           <div className={styles.heroContainer}>
             <Hero
               alt={hero_image.meta.alt || hero_image.meta.caption || ""}
               src={hero_image.url}
             />
           </div>
-        )}
+        ) : null}
 
         <div className={styles.contentContainer}>
           <main className={styles.mainContent}>
-            <div className={styles.innerContent}>
-              {blocks ? <Blocks blocks={blocks} /> : null}
-            </div>
+            {blocks ? <Blocks blocks={blocks} /> : null}
           </main>
 
           {sidebar?.length ? <Sidebar blocks={sidebar} /> : null}