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 ccf1b46577..d8435af7fb 100644
--- a/CSETWebNg/src/app/layout/layout-main/layout-main.component.html
+++ b/CSETWebNg/src/app/layout/layout-main/layout-main.component.html
@@ -60,45 +60,51 @@
     </div>
 
     <!-- Footer -->
-    <ngb-accordion #acc="ngbAccordion" type="primary" class="footer row no-gutters sticky-footer"
+    <div ngbAccordion type="primary" class="footer row no-gutters sticky-footer"
       *ngIf="layoutSvc.isFooterShown(this.router.url)">
-      <ngb-panel id="footerPanel">
-        <ng-template ngbPanelTitle>
-          <button id="footerExpanderButton" class="cset-footer-expand-button"
-            [ngClass]="{'cset-icons-chevron-down flex-11a': isFooterOpen(), 'cset-icons-chevron-up flex-00a': !isFooterOpen()}"></button>
-        </ng-template>
-        <ng-template ngbPanelContent>
-          <div class="footer-section-2 p-2">
-            <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
-              <ng-container *ngIf="isRunningAnonymous()">
-                <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer" (click)="showDisclaimer()">INL
-                  Privacy & Accessibility</a>
-                <span class="mr-2 ml-2">|</span>
-                <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
-                  href=" https://doe.responsibledisclosure.com/hc/en-us">Vulnerability Disclosure Program</a>
-                <span class="mr-2 ml-2">|</span>
-              </ng-container>
-              <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
-                href="https://www.us-cert.gov/ics/Frequently-Asked-Questions">FAQ</a>
-              <span class="mr-2 ml-2">|</span>
-              <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
-                href="http://www.us-cert.gov/tlp/">Traffic Light Protocol</a>
-              <span class="mr-2 ml-2">|</span>
-              <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
-                href="http://www.us-cert.gov/privacy/">Privacy &amp; Use</a>
-              <span class="mr-2 ml-2">|</span>
-              <a target="_blank" rel="noopener noreferrer"
-                href="http://www.us-cert.gov/accessibility/">Accessibility</a>
-            </div>
-            <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
-              <a target="_blank" rel="noopener noreferrer" href="https://www.cisa.gov/">CISA</a>
-              <span style="padding: 2px">is part of the</span>
-              <a target="_blank" rel="noopener noreferrer" href="http://www.dhs.gov">Department of Homeland Security</a>
-            </div>
+      <div ngbAccordionItem id="footerPanel" [collapsed]="footerClosed">
+        <h4 ngbAccordionHeader>
+         
+            <button ngbAccordionButton id="footerExpanderButton" class="cset-footer-expand-button" (click)="isFooterOpen()"
+              [ngClass]="{'cset-icons-chevron-down flex-11a': !footerClosed, 'cset-icons-chevron-up flex-00a': footerClosed}"></button>
+        </h4>
+        <div ngbAccordionCollapse>
+            <div ngbAccordionBody>
+           
+            <ng-template >
+              <div class="footer-section-2 p-2">
+                <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
+                  <ng-container *ngIf="isRunningAnonymous()">
+                    <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer" (click)="showDisclaimer()">INL
+                      Privacy & Accessibility</a>
+                    <span class="mr-2 ml-2">|</span>
+                    <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
+                      href=" https://doe.responsibledisclosure.com/hc/en-us">Vulnerability Disclosure Program</a>
+                    <span class="mr-2 ml-2">|</span>
+                  </ng-container>
+                  <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
+                    href="https://www.us-cert.gov/ics/Frequently-Asked-Questions">FAQ</a>
+                  <span class="mr-2 ml-2">|</span>
+                  <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
+                    href="http://www.us-cert.gov/tlp/">Traffic Light Protocol</a>
+                  <span class="mr-2 ml-2">|</span>
+                  <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
+                    href="http://www.us-cert.gov/privacy/">Privacy &amp; Use</a>
+                  <span class="mr-2 ml-2">|</span>
+                  <a target="_blank" rel="noopener noreferrer"
+                    href="http://www.us-cert.gov/accessibility/">Accessibility</a>
+                </div>
+                <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
+                  <a target="_blank" rel="noopener noreferrer" href="https://www.cisa.gov/">CISA</a>
+                  <span style="padding: 2px">is part of the</span>
+                  <a target="_blank" rel="noopener noreferrer" href="http://www.dhs.gov">Department of Homeland Security</a>
+                </div>
+              </div>
+            </ng-template>
           </div>
-        </ng-template>
-      </ngb-panel>
-    </ngb-accordion>
+        </div>
+      </div>
+    </div>
   </div>
 
   <div class="bgc-white dhs-seal-background"
diff --git a/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss b/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss
index 1852d2a4a2..9138d664e0 100644
--- a/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss
+++ b/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss
@@ -494,7 +494,8 @@ label[required]::after {
 }
 
 .accordion-header {
-  padding: 0.2em;
+  padding-top: 0.2em;
+  margin-bottom:0;
 }
 
 .footer .bg-primary {
diff --git a/CSETWebNg/src/app/layout/layout-main/layout-main.component.ts b/CSETWebNg/src/app/layout/layout-main/layout-main.component.ts
index f070c169e2..6b3f073a30 100644
--- a/CSETWebNg/src/app/layout/layout-main/layout-main.component.ts
+++ b/CSETWebNg/src/app/layout/layout-main/layout-main.component.ts
@@ -24,7 +24,6 @@
 import { AfterViewInit, Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { Router } from '@angular/router';
-import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap';
 import { AggregationService } from '../../services/aggregation.service';
 import { AssessmentService } from '../../services/assessment.service';
 import { AuthenticationService } from '../../services/authentication.service';
@@ -48,9 +47,8 @@ export class LayoutMainComponent implements OnInit, AfterViewInit {
   docUrl: string;
   dialogRef: MatDialogRef<any>;
   isFooterVisible: boolean = false;
-
-  @ViewChild('acc') accordion: NgbAccordion;
-
+  footerClosed: boolean = true;
+  
   constructor(
     public auth: AuthenticationService,
     public assessSvc: AssessmentService,
@@ -70,9 +68,7 @@ export class LayoutMainComponent implements OnInit, AfterViewInit {
   }
 
   ngAfterViewInit() {
-    setTimeout(() => {
-      this.isFooterOpen();
-    }, 200);
+   
   }
 
   /**
@@ -93,10 +89,10 @@ export class LayoutMainComponent implements OnInit, AfterViewInit {
   }
 
   isFooterOpen() {
-    if (!!this.accordion) {
-      return this.accordion.isExpanded('footerPanel');
+    if (!this.footerClosed) {
+      return this.footerClosed = true;
     }
-    return false;
+    return this.footerClosed = false;
   }
 
   isRunningAnonymous() {
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 27a134fe3a..5bc4e6e599 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
@@ -61,34 +61,40 @@
     </div>
 
     <!-- Footer -->
-    <ngb-accordion #acc="ngbAccordion" type="primary" class="footer row no-gutters sticky-footer"
+     <div ngbAccordion type="primary" class="footer row no-gutters sticky-footer"
       *ngIf="layoutSvc.isFooterShown(this.router.url)">
-      <ngb-panel id="footerPanel">
-        <ng-template ngbPanelTitle>
-          <button id="footerExpanderButton" class="cset-footer-expand-button"
-            [ngClass]="{'cset-icons-chevron-down flex-11a': isFooterOpen(), 'cset-icons-chevron-up flex-00a': !isFooterOpen()}"></button>
-        </ng-template>
-        <ng-template ngbPanelContent>
-          <div class="footer-section-2 p-2">
-            <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
-              <ng-container *ngIf="isRunningAnonymous()">
-                <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer" (click)="showDisclaimer()">INL
-                  Privacy & Accessibility</a>
-                <span class="mr-2 ml-2">|</span>
-                <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
-                  href=" https://doe.responsibledisclosure.com/hc/en-us">Vulnerability Disclosure Program</a>
-                <span class="mr-2 ml-2">|</span>
-              </ng-container>
-              <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
-                href="http://www.us-cert.gov/tlp/">Traffic Light Protocol</a>
-              <span class="mr-2 ml-2">|</span>
-              <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
-                href="https://www.cisa.gov/topics/industrial-control-systems">FAQ</a>
-            </div>
-            <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
+      <div ngbAccordionItem id="footerPanel" [collapsed]="footerClosed">
+        <h4 ngbAccordionHeader>
+         
+            <button ngbAccordionButton id="footerExpanderButton" class="cset-footer-expand-button" (click)="isFooterOpen()"
+              [ngClass]="{'cset-icons-chevron-down flex-11a': !footerClosed, 'cset-icons-chevron-up flex-00a': footerClosed}"></button>
+        </h4>
+        <div ngbAccordionCollapse>
+            <div ngbAccordionBody>
+              <ng-template ngbPanelContent>
+                <div class="footer-section-2 p-2">
+                  <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
+                    <ng-container *ngIf="isRunningAnonymous()">
+                      <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer" (click)="showDisclaimer()">INL
+                        Privacy & Accessibility</a>
+                      <span class="mr-2 ml-2">|</span>
+                      <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
+                        href=" https://doe.responsibledisclosure.com/hc/en-us">Vulnerability Disclosure Program</a>
+                      <span class="mr-2 ml-2">|</span>
+                    </ng-container>
+                    <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
+                      href="http://www.us-cert.gov/tlp/">Traffic Light Protocol</a>
+                    <span class="mr-2 ml-2">|</span>
+                    <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
+                      href="https://www.cisa.gov/topics/industrial-control-systems">FAQ</a>
+                  </div>
+                  <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
+                  </div>
+                </div>
+              </ng-template>
             </div>
           </div>
-        </ng-template>
-      </ngb-panel>
-    </ngb-accordion>
+        </div>
+      </div>
+    </div>
   </div>
diff --git a/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.scss b/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.scss
index 9f18404980..3035bce1f0 100644
--- a/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.scss
+++ b/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.scss
@@ -514,7 +514,8 @@ label[required]::after {
 }
 
 .accordion-header {
-  padding: 0.2em;
+  padding-top: 0.2em;
+  margin-bottom:0;
 }
 
 .footer .bg-primary {
diff --git a/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.ts b/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.ts
index 96c4b11ce6..99323a7e0b 100644
--- a/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.ts
+++ b/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.ts
@@ -24,7 +24,6 @@
 import { AfterViewInit, Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { Router } from '@angular/router';
-import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap';
 import { AggregationService } from '../../services/aggregation.service';
 import { AssessmentService } from '../../services/assessment.service';
 import { AuthenticationService } from '../../services/authentication.service';
@@ -47,8 +46,7 @@ export class RenewLayoutMainComponent implements OnInit, AfterViewInit {
   docUrl: string;
   dialogRef: MatDialogRef<any>;
   isFooterVisible: boolean = false;
-
-  @ViewChild('acc') accordion: NgbAccordion;
+  footerClosed:boolean = true;
 
   constructor(
     public auth: AuthenticationService,
@@ -89,10 +87,10 @@ export class RenewLayoutMainComponent implements OnInit, AfterViewInit {
   }
 
   isFooterOpen() {
-    if (!!this.accordion) {
-      return this.accordion.isExpanded('footerPanel');
+    if (!this.footerClosed) {
+      return this.footerClosed = true;
     }
-    return false;
+    return this.footerClosed = false;
   }
 
     isRunningAnonymous() {
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 6898c69938..4e0016d75b 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
@@ -197,37 +197,42 @@
       </div>
   
       <!-- Footer -->
-      <ngb-accordion #acc="ngbAccordion" type="primary" class="footer row no-gutters"
-        *ngIf="layoutSvc.isFooterShown(router.url)">
-        <ngb-panel id="footerPanel">
-          <ng-template ngbPanelTitle>
-            <button id="footerExpanderButton" class="cset-footer-expand-button"
-              [ngClass]="{'cset-icons-chevron-down flex-11a': isFooterOpen(), 'cset-icons-chevron-up flex-00a': !isFooterOpen()}"></button>
-          </ng-template>
-          <ng-template ngbPanelContent>
-            <div class="footer-section-2 p-2">
-              <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
-                <a class="mr-2" target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
-                  href="https://www.us-cert.gov/ics/Frequently-Asked-Questions">FAQ</a>
-                <span class="mr-2 ml-2">|</span>
-                <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
-                  href="http://www.us-cert.gov/tlp/">Traffic Light Protocol</a>
-                <span class="mr-2 ml-2">|</span>
-                <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
-                  href="http://www.us-cert.gov/privacy/">Privacy &amp; Use</a>
-                <span class="mr-2 ml-2">|</span>
-                <a target="_blank" rel="noopener noreferrer"
-                  href="http://www.us-cert.gov/accessibility/">Accessibility</a>
-              </div>
-              <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
-                <a target="_blank" rel="noopener noreferrer" href="https://www.cisa.gov/">CISA</a>
-                <span style="padding: 2px">is part of the</span>
-                <a target="_blank" rel="noopener noreferrer" href="http://www.dhs.gov">Department of Homeland Security</a>
-              </div>
+      <div ngbAccordion type="primary" class="footer row no-gutters sticky-footer"
+      *ngIf="layoutSvc.isFooterShown(this.router.url)">
+      <div ngbAccordionItem id="footerPanel" [collapsed]="footerClosed">
+        <h4 ngbAccordionHeader>
+         
+            <button ngbAccordionButton id="footerExpanderButton" class="cset-footer-expand-button" (click)="isFooterOpen()"
+              [ngClass]="{'cset-icons-chevron-down flex-11a': !footerClosed, 'cset-icons-chevron-up flex-00a': footerClosed}"></button>
+        </h4>
+        <div ngbAccordionCollapse>
+            <div ngbAccordionBody>
+              <ng-template>
+                <div class="footer-section-2 p-2">
+                  <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
+                    <a class="mr-2" target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
+                      href="https://www.us-cert.gov/ics/Frequently-Asked-Questions">FAQ</a>
+                    <span class="mr-2 ml-2">|</span>
+                    <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
+                      href="http://www.us-cert.gov/tlp/">Traffic Light Protocol</a>
+                    <span class="mr-2 ml-2">|</span>
+                    <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
+                      href="http://www.us-cert.gov/privacy/">Privacy &amp; Use</a>
+                    <span class="mr-2 ml-2">|</span>
+                    <a target="_blank" rel="noopener noreferrer"
+                      href="http://www.us-cert.gov/accessibility/">Accessibility</a>
+                  </div>
+                  <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
+                    <a target="_blank" rel="noopener noreferrer" href="https://www.cisa.gov/">CISA</a>
+                    <span style="padding: 2px">is part of the</span>
+                    <a target="_blank" rel="noopener noreferrer" href="http://www.dhs.gov">Department of Homeland Security</a>
+                  </div>
+                </div>
+              </ng-template>
             </div>
-          </ng-template>
-        </ngb-panel>
-      </ngb-accordion>
+          </div>
+        </div>
+      </div>
     </div>
   
     <div class="bgc-white dhs-seal-background"
diff --git a/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.scss b/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.scss
index a69b2a2a5f..5714b69e9f 100644
--- a/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.scss
+++ b/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.scss
@@ -410,7 +410,8 @@ label[required]::after {
 }
 
 .accordion-header {
-  padding: 0.2em;
+  padding-top: 0.2em;
+  margin-bottom:0;
 }
 
 .footer .bg-primary {
diff --git a/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.ts b/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.ts
index 1fcf74bbf8..22554a503d 100644
--- a/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.ts
+++ b/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.ts
@@ -24,7 +24,6 @@
 import { AfterViewInit, Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { Router } from '@angular/router';
-import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap';
 import { AggregationService } from '../../services/aggregation.service';
 import { AssessmentService } from '../../services/assessment.service';
 import { AuthenticationService } from '../../services/authentication.service';
@@ -45,8 +44,7 @@ export class RraLayoutMainComponent implements OnInit, AfterViewInit {
 
   docUrl: string;
   dialogRef: MatDialogRef<any>;
-
-  @ViewChild('acc') accordion: NgbAccordion;
+  footerClosed:boolean = true;
 
   constructor(
     public auth: AuthenticationService,
@@ -95,10 +93,10 @@ export class RraLayoutMainComponent implements OnInit, AfterViewInit {
   }
 
   isFooterOpen() {
-    if (!!this.accordion) {
-      return this.accordion.isExpanded('footerPanel');
+    if (!this.footerClosed) {
+      return this.footerClosed = true;
     }
-    return false;
+    return this.footerClosed = false;
   }
 
 }
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 07b19491d5..6d2e919b54 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
@@ -60,39 +60,44 @@
     </div>
 
     <!-- Footer -->
-    <ngb-accordion #acc="ngbAccordion" type="primary" class="footer row no-gutters sticky-footer"
+    <div ngbAccordion type="primary" class="footer row no-gutters sticky-footer"
       *ngIf="layoutSvc.isFooterShown(this.router.url)">
-      <ngb-panel id="footerPanel">
-        <ng-template ngbPanelTitle>
-          <button id="footerExpanderButton" class="cset-footer-expand-button"
-            [ngClass]="{'cset-icons-chevron-down flex-11a': isFooterOpen(), 'cset-icons-chevron-up flex-00a': !isFooterOpen()}"></button>
-        </ng-template>
-        <ng-template ngbPanelContent>
-          <div class="footer-section-2 p-2">
-            <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
-              <ng-container *ngIf="isRunningAnonymous()">
-                <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
-                  (click)="showDisclaimer()">INL Privacy & Accessibility</a>
-                <span class="mr-2 ml-2">|</span>
-                <a target="_blank" rel="noopener noreferrer"
-                  href=" https://doe.responsibledisclosure.com/hc/en-us">Vulnerability Disclosure Program</a>
-                <span class="mr-2 ml-2">|</span>
-              </ng-container>
-              <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
-                href="https://www.tsa.gov/travel/frequently-asked-questions">FAQ</a>
-              <span class="mr-2 ml-2">|</span>
-              <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
-                href="https://www.tsa.gov/privacy-policy">Privacy &amp; Use</a>
-              <span class="mr-2 ml-2">|</span>
-              <a target="_blank" rel="noopener noreferrer" href="https://www.tsa.gov/accessibility">Accessibility</a>
-            </div>
-            <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
-              <a target="_blank" rel="noopener noreferrer" href="https://www.tsa.gov">TSA</a>
-              <span style="padding: 2px">is part of the</span>
-              <a target="_blank" rel="noopener noreferrer" href="http://www.dhs.gov">Department of Homeland Security</a>
+      <div ngbAccordionItem id="footerPanel" [collapsed]="footerClosed">
+        <h4 ngbAccordionHeader>
+         
+            <button ngbAccordionButton id="footerExpanderButton" class="cset-footer-expand-button" (click)="isFooterOpen()"
+              [ngClass]="{'cset-icons-chevron-down flex-11a': !footerClosed, 'cset-icons-chevron-up flex-00a': footerClosed}"></button>
+        </h4>
+        <div ngbAccordionCollapse>
+            <div ngbAccordionBody>
+              <ng-template>
+                <div class="footer-section-2 p-2">
+                  <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
+                    <ng-container *ngIf="isRunningAnonymous()">
+                      <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
+                        (click)="showDisclaimer()">INL Privacy & Accessibility</a>
+                      <span class="mr-2 ml-2">|</span>
+                      <a target="_blank" rel="noopener noreferrer"
+                        href=" https://doe.responsibledisclosure.com/hc/en-us">Vulnerability Disclosure Program</a>
+                      <span class="mr-2 ml-2">|</span>
+                    </ng-container>
+                    <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
+                      href="https://www.tsa.gov/travel/frequently-asked-questions">FAQ</a>
+                    <span class="mr-2 ml-2">|</span>
+                    <a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer"
+                      href="https://www.tsa.gov/privacy-policy">Privacy &amp; Use</a>
+                    <span class="mr-2 ml-2">|</span>
+                    <a target="_blank" rel="noopener noreferrer" href="https://www.tsa.gov/accessibility">Accessibility</a>
+                  </div>
+                  <div class="d-flex flex-row flex-wrap justify-content-center flex-11a">
+                    <a target="_blank" rel="noopener noreferrer" href="https://www.tsa.gov">TSA</a>
+                    <span style="padding: 2px">is part of the</span>
+                    <a target="_blank" rel="noopener noreferrer" href="http://www.dhs.gov">Department of Homeland Security</a>
+                  </div>
+                </div>
+              </ng-template>
             </div>
           </div>
-        </ng-template>
-      </ngb-panel>
-    </ngb-accordion>
+        </div>
+      </div>
   </div>
diff --git a/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.scss b/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.scss
index fdcdef431c..f2c68bbf12 100644
--- a/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.scss
+++ b/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.scss
@@ -502,7 +502,8 @@ label[required]::after {
 }
 
 .accordion-header {
-  padding: 0.2em;
+  padding-top: 0.2em;
+  margin-bottom:0;
 }
 
 .footer .bg-primary {
diff --git a/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.ts b/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.ts
index bc1c5821bc..4ac388cdd3 100644
--- a/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.ts
+++ b/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.ts
@@ -24,7 +24,6 @@
 import { AfterViewInit, Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { Router } from '@angular/router';
-import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap';
 import { AggregationService } from '../../services/aggregation.service';
 import { AssessmentService } from '../../services/assessment.service';
 import { AuthenticationService } from '../../services/authentication.service';
@@ -47,8 +46,7 @@ export class TsaLayoutMainComponent implements OnInit, AfterViewInit {
   docUrl: string;
   dialogRef: MatDialogRef<any>;
   isFooterVisible: boolean = false;
-
-  @ViewChild('acc') accordion: NgbAccordion;
+  footerClosed:boolean=true;
 
   constructor(
     public auth: AuthenticationService,
@@ -89,10 +87,10 @@ export class TsaLayoutMainComponent implements OnInit, AfterViewInit {
   }
 
   isFooterOpen() {
-    if (!!this.accordion) {
-      return this.accordion.isExpanded('footerPanel');
+    if (!this.footerClosed) {
+      return this.footerClosed = true;
     }
-    return false;
+    return this.footerClosed = false;
   }
 
   isRunningAnonymous() {