diff --git a/react-app/src/features/faq/content/abpTemplate.tsx b/react-app/src/features/faq/content/abpTemplate.ts
similarity index 100%
rename from react-app/src/features/faq/content/abpTemplate.tsx
rename to react-app/src/features/faq/content/abpTemplate.ts
diff --git a/react-app/src/features/faq/content/chpGuides.tsx b/react-app/src/features/faq/content/chpGuides.ts
similarity index 100%
rename from react-app/src/features/faq/content/chpGuides.tsx
rename to react-app/src/features/faq/content/chpGuides.ts
diff --git a/react-app/src/features/faq/content/chpTemplates.tsx b/react-app/src/features/faq/content/chpTemplates.ts
similarity index 100%
rename from react-app/src/features/faq/content/chpTemplates.tsx
rename to react-app/src/features/faq/content/chpTemplates.ts
diff --git a/react-app/src/features/faq/content/oneMACFAQContent.tsx b/react-app/src/features/faq/content/oneMACFAQContent.tsx
index 73f521b7aa..bbfbe2b6de 100644
--- a/react-app/src/features/faq/content/oneMACFAQContent.tsx
+++ b/react-app/src/features/faq/content/oneMACFAQContent.tsx
@@ -224,7 +224,7 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "spa-admendments",
         question: "Which state plan amendments (SPAs) can I submit in OneMAC?",
         answerJSX: (
-          <div className="w-full space-y-3">
+          <div className="w-full space-y-2">
             <p>
               All Medicaid and CHIP state plan amendments (SPAs), <b>except </b>
               Medicaid SPA submissions processed in the Medicaid & CHIP Program System portal
@@ -304,19 +304,22 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "spa-id-format",
         question: "What format is used to enter a SPA ID?",
         answerJSX: (
-          <>
-            Enter the State Plan Amendment transmittal number. Assign consecutive numbers on a
-            calendar year basis (e.g., 20-0001-XXXX, 20-0002-XXXX, etc.).
-            <br />
-            The Official Submission package SPA ID must follow the format SS-YY-#### OR
-            SS-YY-####-XXXX to include:
-            <ul>
+          <div className="space-y-2">
+            <p>
+              Enter the State Plan Amendment transmittal number. Assign consecutive numbers on a
+              calendar year basis (e.g., 20-0001-XXXX, 20-0002-XXXX, etc.).
+            </p>
+            <p>
+              The Official Submission package SPA ID must follow the format SS-YY-#### OR
+              SS-YY-####-XXXX to include:
+            </p>
+            <ul className="list-disc ml-7 space-y-2">
               <li>SS = 2 alpha character (State Abbreviation)</li>
               <li>YY = 2 numeric digits (Year)</li>
               <li>#### = 4 numeric digits (Serial number)</li>
               <li>XXXX = OPTIONAL, 4 characters alpha/numeric modifier (Suffix)</li>
             </ul>
-          </>
+          </div>
         ),
       },
       {
@@ -489,7 +492,7 @@ export const oneMACFAQContent: FAQContent[] = [
                 <tr>
                   <td className="border border-gray-300 px-4 py-2">Budget Docs</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Updated 1-year budget if applicable of the State’s planned expenditures if the
+                    Updated 1-year budget if applicable of the State's planned expenditures if the
                     CHIP SPA submission has a significant impact on the approved budget
                   </td>
                 </tr>
@@ -596,9 +599,9 @@ export const oneMACFAQContent: FAQContent[] = [
         question:
           "How do I submit a Formal Request for Additional Information (RAI) Response for a Medicaid SPA?",
         answerJSX: (
-          <div className="w-full space-y-3">
+          <div className="w-full space-y-2">
             <p>When necessary, states will receive an RAI via email from CMS.</p>
-            <ul className="list-disc ml-8 space-y-2">
+            <ul className="list-disc ml-7 space-y-2">
               <li>The state will respond to the RAI through OneMAC.</li>
               <li>
                 A Request for Additional Information (RAI) stops the 90-day clock, is a formal
@@ -612,7 +615,7 @@ export const oneMACFAQContent: FAQContent[] = [
             <p>
               To respond to a Medicaid SPA RAI, select the SPA Tab view from the Package Dashboard.
             </p>
-            <ul className="list-disc ml-8 space-y-2">
+            <ul className="list-disc ml-7 space-y-2">
               <li>
                 Select the link to the SPA ID. Packages which are in need of an RAI response from
                 the state will have a Status of <b>RAI Issued.</b>
@@ -633,12 +636,12 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "withdraw-spa-rai-response",
         question: "How do I Withdraw a Formal RAI Response for a Medicaid SPA?",
         answerJSX: (
-          <div className="w-full space-y-3">
+          <div className="w-full space-y-2">
             <p>
               If a state wishes to withdraw a Formal RAI Response, the state must first contact
               their CMS Point of Contact so the action can be enabled.
             </p>
-            <ul className="list-disc ml-8">
+            <ul className="list-disc ml-7">
               <li>
                 As a CMS user, log in to OneMAC and select the link to the SPA ID from the dashboard
               </li>
@@ -663,7 +666,7 @@ export const oneMACFAQContent: FAQContent[] = [
                 taken.
               </b>
             </p>
-            <ul className="list-disc ml-8 space-y-2">
+            <ul className="list-disc ml-7 space-y-2">
               <li>
                 On the Formal RAI Response Withdraw form, upload any supporting documentation and
                 fill out the Additional Information section explaining your need to withdraw the
@@ -684,7 +687,7 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "withdraw-package-spa",
         question: "How do I Withdraw a Package for a Medicaid SPA?",
         answerJSX: (
-          <div className="w-full space-y-3">
+          <div className="w-full space-y-2">
             <p>
               A state can withdraw a submission package if it is in the Under Review or RAI Issued
               status. However, please note that once withdrawn, a submission package cannot be
@@ -716,7 +719,7 @@ export const oneMACFAQContent: FAQContent[] = [
         question:
           "How do I submit a Formal Request for Additional Information (RAI) Response for a CHIP SPA?",
         answerJSX: (
-          <div className="w-full space-y-3">
+          <div className="w-full space-y-2">
             <p>When necessary, states will receive an RAI via email from CMS.</p>
             <ul className="ml-8 list-disc space-y-2">
               <li>The state will respond to the RAI through OneMAC.</li>
@@ -751,12 +754,12 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "withdraw-chip-spa-rai-response",
         question: "How do I Withdraw a Formal RAI Response for a CHIP SPA?",
         answerJSX: (
-          <div className="w-full space-y-3">
+          <div className="w-full space-y-2">
             <p>
               If a state wishes to withdraw a Formal RAI Response, the state must first contact
               their CMS Point of Contact so the action can be enabled.
             </p>
-            <ul className="list-disc ml-8">
+            <ul className="list-disc ml-7">
               <li>
                 As a CMS user, log in to OneMAC and select the link to the SPA ID from the dashboard
               </li>
@@ -781,7 +784,7 @@ export const oneMACFAQContent: FAQContent[] = [
                 taken.
               </b>
             </p>
-            <ul className="list-disc ml-8 space-y-2">
+            <ul className="list-disc ml-7 space-y-2">
               <li>
                 On the Formal RAI Response Withdraw form, upload any supporting documentation and
                 fill out the Additional Information section explaining your need to withdraw the
@@ -802,7 +805,7 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "withdraw-package-chip-spa",
         question: "How do I Withdraw a Package for a CHIP SPA?",
         answerJSX: (
-          <div className="w-full space-y-3">
+          <div className="w-full space-y-2">
             <p>
               A state can withdraw a submission package if it is in the Under Review or RAI Issued
               status. However, please note that once withdrawn, a submission package cannot be
@@ -833,13 +836,13 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "abp-spa-templates",
         question: "Where can I download Medicaid Alternative Benefit Plan (ABP) SPA templates?",
         answerJSX: (
-          <section id="abp-spa-templates" className="space-y-2 p-2">
+          <section id="abp-spa-templates" className="space-y-2">
             <p>
               Medicaid Alternative Benefit Plan (ABP) SPA templates can be downloaded at the links
               below. After downloading and completing the templates you need, upload them as part of
               the SPA submission.
             </p>
-            <ul className="list-disc pl-6 space-y-2">
+            <ul className="list-disc pl-7 space-y-2">
               {ABP_TEMPLATES.map((pdf) => (
                 <li key={pdf.title}>
                   <a
@@ -851,7 +854,7 @@ export const oneMACFAQContent: FAQContent[] = [
                     {pdf.title}: {pdf.text}
                   </a>
                   {pdf.subtext && (
-                    <ul className="list-disc pl-6 space-y-1">
+                    <ul className="list-disc pl-7 space-y-1">
                       {pdf.subtext.map((sub, index) => (
                         <li key={index} className="text-sm text-gray-600">
                           {sub}
@@ -870,12 +873,12 @@ export const oneMACFAQContent: FAQContent[] = [
         question:
           "Where can I download Medicaid Alternative Benefit Plan (ABP) SPA implementation guides?",
         answerJSX: (
-          <section className="space-y-2 p-2">
+          <section className="space-y-2">
             <p>
               Medicaid Alternative Benefit Plan (ABP) SPA implementation guides can be downloaded at
               the links below.
             </p>
-            <ul className="list-disc pl-6 space-y-2">
+            <ul className="list-disc pl-7 space-y-2">
               {ABP_GUIDES.map((pdf) => (
                 <li key={pdf.title}>
                   <a
@@ -896,13 +899,13 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "mpc-spa-templates",
         question: "Where can I download Medicaid Premiums and Cost Sharing (MPC) SPA templates?",
         answerJSX: (
-          <section className="space-y-2 p-2">
+          <section className="space-y-2">
             <p>
               Medicaid Premiums and Cost Sharing (MPC) SPA templates can be downloaded at the links
               below. After downloading and completing the templates you need, upload them as part of
               the SPA submission.
             </p>
-            <ul className="list-disc pl-6 space-y-2">
+            <ul className="list-disc pl-7 space-y-2">
               {MPC_TEMPLATES.map((pdf) => (
                 <li key={pdf.title}>
                   <a
@@ -924,12 +927,12 @@ export const oneMACFAQContent: FAQContent[] = [
         question:
           "Where can I download Medicaid Premiums and Cost Sharing (MPC) SPA implementation guides?",
         answerJSX: (
-          <section className="space-y-2 p-2">
+          <section className="space-y-2">
             <p>
               Medicaid Premiums and Cost Sharing (MPC) SPA implementation guides can be downloaded
               at the links below.
             </p>
-            <ul className="list-disc pl-6 space-y-2">
+            <ul className="list-disc pl-7 space-y-2">
               {MPC_GUIDES.map((pdf) => (
                 <li key={pdf.title}>
                   <a
@@ -955,7 +958,7 @@ export const oneMACFAQContent: FAQContent[] = [
               CHIP eligibility SPA templates can be downloaded at the links below. After downloading
               and completing the templates you need, upload them as part of the SPA submission.
             </p>
-            <ul className="list-disc pl-6 space-y-2 p-2">
+            <ul className="list-disc pl-7 space-y-2">
               {renderSection(
                 "MAGI Eligibility & Methods",
                 CHP_TEMPLATES,
@@ -971,25 +974,25 @@ export const oneMACFAQContent: FAQContent[] = [
                     "CS 15",
                     "CS 16",
                   ].includes(template.title),
-                "list-disc pl-6 space-y-2",
+                "list-disc pl-7 space-y-2",
               )}
               {renderSection(
                 "XXI Medicaid Expansion",
                 CHP_TEMPLATES,
                 (template) => template.title === "CS 3",
-                "list-disc pl-6 space-y-2",
+                "list-disc pl-7 space-y-2",
               )}
               {renderSection(
                 "Establish 2101(f) Group",
                 CHP_TEMPLATES,
                 (template) => template.title === "CS 14",
-                "list-disc pl-6 space-y-2",
+                "list-disc pl-7 space-y-2",
               )}
               {renderSection(
                 "Eligibility Processing",
                 CHP_TEMPLATES,
                 (template) => template.title === "CS 24",
-                "list-disc pl-6 space-y-2",
+                "list-disc pl-7 space-y-2",
               )}
               {renderSection(
                 "Non-Financial Eligibility",
@@ -1006,7 +1009,7 @@ export const oneMACFAQContent: FAQContent[] = [
                     "CS 28",
                     "CS 29",
                   ].includes(template.title),
-                "list-disc pl-6 space-y-2",
+                "list-disc pl-7 space-y-2",
               )}
             </ul>
           </section>
@@ -1018,7 +1021,7 @@ export const oneMACFAQContent: FAQContent[] = [
         answerJSX: (
           <section className="space-y-2 ">
             <p>CHIP eligibility SPA implementation guides can be downloaded at the links below.</p>
-            <ul className="list-disc pl-6 space-y-2">
+            <ul className="list-disc pl-7 space-y-2">
               {renderSection(
                 "MAGI Eligibility & Methods",
                 CHP_GUIDES,
@@ -1034,25 +1037,25 @@ export const oneMACFAQContent: FAQContent[] = [
                     "CS 15",
                     "CS 16",
                   ].includes(guide.title),
-                "list-disc pl-6 space-y-2 text-blue-600",
+                "list-disc pl-7 space-y-2 text-blue-600",
               )}
               {renderSection(
                 "XXI Medicaid Expansion",
                 CHP_GUIDES,
                 (guide) => guide.title === "CS 3",
-                "list-disc pl-6 space-y-2 text-blue-600",
+                "list-disc pl-7 space-y-2 text-blue-600",
               )}
               {renderSection(
                 "Establish 2101(f) Group",
                 CHP_GUIDES,
                 (guide) => guide.title === "CS 14",
-                "list-disc pl-6 space-y-2 text-blue-600",
+                "list-disc pl-7 space-y-2 text-blue-600",
               )}
               {renderSection(
                 "Eligibility Processing",
                 CHP_GUIDES,
                 (guide) => guide.title === "CS 24",
-                "list-disc pl-6 space-y-2 text-blue-600",
+                "list-disc pl-7 space-y-2 text-blue-600",
               )}
               {renderSection(
                 "Non-Financial Eligibility",
@@ -1069,7 +1072,7 @@ export const oneMACFAQContent: FAQContent[] = [
                     "CS 28",
                     "CS 29",
                   ].includes(guide.title),
-                "list-disc pl-6 space-y-2 text-blue-600",
+                "list-disc pl-7 space-y-2 text-blue-600",
               )}
             </ul>
           </section>
@@ -1084,12 +1087,12 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "initial-waiver-id-format",
         question: "What format is used to enter a 1915(b) Initial Waiver number?",
         answerJSX: (
-          <>
+          <div className="space-y-2">
             <p>
               1915(b) Initial Waiver numbers must follow the format SS-####.R00.00 or
               SS-#####.R00.00 to include:
             </p>
-            <ul>
+            <ul className="list-disc pl-7 space-y-2">
               <li>SS = 2 character state abbreviation</li>
               <li>##### = 4 or 5 digit initial waiver number</li>
               <li>R00 = initial number</li>
@@ -1101,19 +1104,19 @@ export const oneMACFAQContent: FAQContent[] = [
               of Kentucky, with an initial waiver number of 0003, no renewal number (R00), and no
               amendment number (00).
             </p>
-          </>
+          </div>
         ),
       },
       {
         anchorText: "waiver-renewal-id-format",
         question: "What format is used to enter a 1915(b) Waiver Renewal number?",
         answerJSX: (
-          <>
+          <div className="space-y-2">
             <p>
               1915(b) Waiver Renewal must follow the format SS-####.R##.00 or SS-#####.R##.00 to
               include:
             </p>
-            <ul>
+            <ul className="list-disc pl-7 space-y-2">
               <li>SS = 2 character state abbreviation</li>
               <li>####(#)= 4 or 5 digit initial waiver number</li>
               <li>R## = renewal number (R01, R02, ...)</li>
@@ -1125,19 +1128,19 @@ export const oneMACFAQContent: FAQContent[] = [
               of Kentucky, with a initial waiver number of 0003, a second renewal (R02), and no
               amendment number (00).
             </p>
-          </>
+          </div>
         ),
       },
       {
         anchorText: "waiver-amendment-id-format",
         question: "What format is used to enter a 1915(b) Waiver Amendment number?",
         answerJSX: (
-          <>
+          <div className="space-y-2">
             <p>
               1915(b) Waiver Amendment must follow the format SS-####.R##.## or SS-#####.R##.## to
               include:
             </p>
-            <ul>
+            <ul className="list-disc pl-7 space-y-2">
               <li>SS = 2 character state abbreviation</li>
               <li>####(#)= 4 or 5 digit initial waiver number</li>
               <li>R## = renewal number (R01, R02, ...)</li>
@@ -1150,7 +1153,7 @@ export const oneMACFAQContent: FAQContent[] = [
               second amendment (02). Amendments for initial waivers without renewals should use
               “R00” as their renewal number.
             </p>
-          </>
+          </div>
         ),
       },
       {
@@ -1170,11 +1173,11 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "waiver-c-id",
         question: "What format is used to enter a 1915(c) waiver number?",
         answerJSX: (
-          <>
+          <div className="space-y-2">
             <p>
               Waiver number must follow the format SS-####.R##.## or SS-#####.R##.## to include:
             </p>
-            <ul>
+            <ul className="list-disc pl-7 space-y-2">
               <li>SS = 2 character state abbreviation</li>
               <li>##### = 4 or 5 digit waiver initial number</li>
               <li>R## = renewal number (R01, R02, ...) (Use R00 for waivers without renewals)</li>
@@ -1187,7 +1190,7 @@ export const oneMACFAQContent: FAQContent[] = [
               second appendix K amendment (02). Initial waivers without renewals should use “R00” as
               their renewal number.
             </p>
-          </>
+          </div>
         ),
       },
       {
@@ -1307,12 +1310,12 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "waiver-extension-id-format",
         question: "What format is used to enter a 1915(b) or 1915(c) Temporary Extension number?",
         answerJSX: (
-          <>
+          <div className="space-y-2">
             <p>
               Temporary extension numbers must follow the format SS-####.R##.TE## or
               SS-#####.R##.TE## to include:
             </p>
-            <ul>
+            <ul className="list-disc pl-7 space-y-2">
               <li>SS = 2 character state abbreviation</li>
               <li>####(#)= 4 or 5 digit initial waiver number</li>
               <li>R## = renewal number (R01, R02, ...) (Use R00 for waivers without renewals)</li>
@@ -1325,7 +1328,7 @@ export const oneMACFAQContent: FAQContent[] = [
               second temporary extension (02). Initial waivers without renewals should use “R00” as
               their renewal number.
             </p>
-          </>
+          </div>
         ),
       },
       {
@@ -1456,7 +1459,7 @@ export const oneMACFAQContent: FAQContent[] = [
         question:
           "How do I submit a Formal Request for Additional Information (RAI) Response for a Waiver?",
         answerJSX: (
-          <div className="w-full space-y-3">
+          <div className="w-full space-y-2">
             <p>When necessary, states will receive an RAI via email from CMS.</p>
             <ul className="ml-8 list-disc space-y-2">
               <li>The state will respond to the RAI through OneMAC.</li>
@@ -1493,12 +1496,12 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "withdraw-waiver-rai-response",
         question: "How do I Withdraw a Formal RAI Response for a Medicaid Waiver?",
         answerJSX: (
-          <div className="w-full space-y-3">
+          <div className="w-full space-y-2">
             <p>
               If a state wishes to withdraw a Formal RAI Response, the state must first contact
               their CMS Point of Contact so the action can be enabled.
             </p>
-            <ul className="list-disc ml-8">
+            <ul className="list-disc ml-7">
               <li>
                 As a CMS user, log in to OneMAC and select the link to the Waiver number from the
                 dashboard
@@ -1524,7 +1527,7 @@ export const oneMACFAQContent: FAQContent[] = [
                 taken.
               </b>
             </p>
-            <ul className="list-disc ml-8 space-y-2">
+            <ul className="list-disc ml-7 space-y-2">
               <li>
                 On the Formal RAI Response Withdraw form, upload any supporting documentation and
                 fill out the Additional Information section explaining your need to withdraw the
@@ -1545,7 +1548,7 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "withdraw-package-waiver",
         question: "How do I Withdraw a Package for a Waiver?",
         answerJSX: (
-          <div className="w-full space-y-3">
+          <div className="w-full space-y-2">
             <p>
               A state can withdraw a submission package if it is in the Under Review or RAI Issued
               status. However, please note that once withdrawn, a submission package cannot be
@@ -1553,7 +1556,7 @@ export const oneMACFAQContent: FAQContent[] = [
               <b>Completing this action will conclude the review of this SPA package.</b>
             </p>
             <p>There are two methods you can use to withdraw a submission package:</p>
-            <ul className="list-disc ml-8 space-y-2">
+            <ul className="list-disc ml-7 space-y-2">
               <li>
                 In OneMAC, Locate and select the link to the Waiver ID. Then, under Package Actions,
                 select the Withdraw Package link.