diff --git a/CSETWebNg/angular.json b/CSETWebNg/angular.json
index 0c79f2915..03068cc89 100644
--- a/CSETWebNg/angular.json
+++ b/CSETWebNg/angular.json
@@ -86,7 +86,14 @@
           },
           "configurations": {
             "development": {
-              "optimization": true,
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                },
+                "fonts": true
+              },
               "sourceMap": true,
               "namedChunks": true,
               "extractLicenses": true,
@@ -112,7 +119,14 @@
                   "maximumWarning": "400kb"
                 }
               ],
-              "optimization": true,
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                },
+                "fonts": true
+              },
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
@@ -134,7 +148,14 @@
                   "maximumWarning": "6kb"
                 }
               ],
-              "optimization": true,
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                },
+                "fonts": true
+              },
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
@@ -240,5 +261,5 @@
     ],
     "cache": {
       "enabled": false
-  }
-}
+    }
+  }
\ No newline at end of file
diff --git a/CSETWebNg/src/app/layout/cf-layout-main/cf-layout-main.component.html b/CSETWebNg/src/app/layout/cf-layout-main/cf-layout-main.component.html
index 8d96967fa..2fdf5b268 100644
--- a/CSETWebNg/src/app/layout/cf-layout-main/cf-layout-main.component.html
+++ b/CSETWebNg/src/app/layout/cf-layout-main/cf-layout-main.component.html
@@ -66,7 +66,7 @@
 
 
     <!-- Footer -->
-    <div class="accordion" id="accordionFooter">
+    <div class="accordion sticky-footer" id="accordionFooter">
       <div class="text-center">
         <h4 class="accordion-header pb-1" id="headingOne">
           <button id="footerExpanderButton" class="cset-footer-expand-button"
diff --git a/CSETWebNg/src/app/layout/cie-layout-main/cie-layout-main.component.html b/CSETWebNg/src/app/layout/cie-layout-main/cie-layout-main.component.html
index 79ace5d25..acd5f0c22 100644
--- a/CSETWebNg/src/app/layout/cie-layout-main/cie-layout-main.component.html
+++ b/CSETWebNg/src/app/layout/cie-layout-main/cie-layout-main.component.html
@@ -67,7 +67,7 @@
 
 
     <!-- Footer -->
-    <div class="accordion" id="accordionFooter">
+    <div class="accordion sticky-footer" id="accordionFooter">
       <div class="text-center">
         <h4 class="accordion-header pb-1" id="headingOne">
           <button id="footerExpanderButton" class="cset-footer-expand-button"
diff --git a/CSETWebNg/src/app/layout/iod-layout/iod-layout.component.html b/CSETWebNg/src/app/layout/iod-layout/iod-layout.component.html
index 5a48a5bf4..2a9e5b07d 100644
--- a/CSETWebNg/src/app/layout/iod-layout/iod-layout.component.html
+++ b/CSETWebNg/src/app/layout/iod-layout/iod-layout.component.html
@@ -76,7 +76,7 @@
 
 
     <!-- Footer -->
-    <div class="accordion" id="accordionFooter">
+    <div class="accordion sticky-footer" id="accordionFooter">
       <div class="text-center">
         <h4 class="accordion-header pb-1" id="headingOne">
           <button id="footerExpanderButton" class="cset-footer-expand-button"
diff --git a/CSETWebNg/src/app/layout/layout-main/layout-main.component.html b/CSETWebNg/src/app/layout/layout-main/layout-main.component.html
index 1f24824c7..83aeb22d8 100644
--- a/CSETWebNg/src/app/layout/layout-main/layout-main.component.html
+++ b/CSETWebNg/src/app/layout/layout-main/layout-main.component.html
@@ -71,7 +71,7 @@
     </div>
 
     <!-- Footer -->
-    <div class="accordion" id="accordionFooter">
+    <div class="accordion sticky-footer" id="accordionFooter">
       <div class="text-center">
         <h4 class="accordion-header pb-1" id="headingOne">
           <button id="footerExpanderButton" class="cset-footer-expand-button"
diff --git a/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.html b/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.html
index 25aefee13..12aee486f 100644
--- a/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.html
+++ b/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.html
@@ -67,7 +67,7 @@
 
 
     <!-- Footer -->
-    <div class="accordion" id="accordionFooter">
+    <div class="accordion sticky-footer" id="accordionFooter">
       <div class="text-center">
         <h4 class="accordion-header pb-1" id="headingOne">
           <button id="footerExpanderButton" class="cset-footer-expand-button"
diff --git a/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.html b/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.html
index 327bb8d44..ea2dff9a2 100644
--- a/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.html
+++ b/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.html
@@ -200,7 +200,7 @@
 
 
         <!-- Footer -->
-        <div class="accordion" id="accordionFooter">
+        <div class="accordion sticky-footer" id="accordionFooter">
           <div class="text-center">
             <h4 class="accordion-header pb-1" id="headingOne">
               <button id="footerExpanderButton" class="cset-footer-expand-button"
diff --git a/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.html b/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.html
index df69ffe2b..3946846a2 100644
--- a/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.html
+++ b/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.html
@@ -65,7 +65,7 @@
 
 
     <!-- Footer -->
-    <div class="accordion" id="accordionFooter">
+    <div class="accordion sticky-footer" id="accordionFooter">
       <div class="text-center">
         <h4 class="accordion-header pb-1" id="headingOne">
           <button id="footerExpanderButton" class="cset-footer-expand-button"