From 8c334400d2282473a738d5540f4ebac4799a27e5 Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Tue, 22 Apr 2025 17:22:05 -0400
Subject: [PATCH 01/18] save changes

---
 src/app/core/auth/login/login.component.html  |  2 +-
 src/app/core/auth/login/login.component.ts    | 14 +++++++-
 src/app/core/base/base.component.html         | 18 ++++++++--
 src/app/core/base/base.component.scss         | 20 +++++++++++
 src/app/core/base/base.component.ts           | 33 +++++++++++++++++--
 src/app/core/config/config.model.ts           |  3 ++
 .../main-notification.component.html          |  3 +-
 .../main-notification.component.scss          |  6 ++++
 .../main-notification.component.ts            | 10 +++++-
 .../substance-form.component.html             |  2 +-
 .../substance-form.component.scss             |  4 +++
 .../substance-form.component.ts               |  7 ++++
 .../substance-text-search.component.scss      |  2 +-
 src/app/fda/config/config.json                |  5 +++
 src/index.html                                |  2 +-
 src/styles/_mat-side-nav.scss                 |  2 +-
 16 files changed, 121 insertions(+), 12 deletions(-)

diff --git a/src/app/core/auth/login/login.component.html b/src/app/core/auth/login/login.component.html
index 0e227889c..d5dbfb54c 100644
--- a/src/app/core/auth/login/login.component.html
+++ b/src/app/core/auth/login/login.component.html
@@ -1,5 +1,5 @@
 <div class="login-container">
-  <mat-card *ngIf="isLoaded">
+  <mat-card *ngIf="isLoaded && showLogin">
     <mat-card-title>
       Login
     </mat-card-title>
diff --git a/src/app/core/auth/login/login.component.ts b/src/app/core/auth/login/login.component.ts
index 4ab7eae16..1854bd4f7 100644
--- a/src/app/core/auth/login/login.component.ts
+++ b/src/app/core/auth/login/login.component.ts
@@ -31,6 +31,7 @@ export class LoginComponent implements OnInit, OnDestroy {
   private newuserinfo = {};
   private emailFormUserRegConf: any = undefined;
   public emailFormUserRegActive: boolean = false;
+  showLogin = false;
 
   constructor(
     private authService: AuthService,
@@ -52,7 +53,18 @@ export class LoginComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.loadingService.setLoading(true);
-    // As we develop more types of userRegistration, make a utility service to provide configuration information.  
+    // As we develop more types of userRegistration, make a utility service to provide configuration information. 
+
+    if(this.configService.configData.showLogin === undefined) {
+      this.showLogin = true;
+    } else {
+      if(this.configService.configData.showLogin === false) { 
+        this.showLogin = false;
+      } else {
+        this.showLogin = true;
+      }
+    }
+   
     this.loadedComponents = this.configService.configData.loadedComponents || null;
     if(typeof this.configService.configData.userRegistration !== "undefined" ) {
       this.emailFormUserRegConf =
diff --git a/src/app/core/base/base.component.html b/src/app/core/base/base.component.html
index 4194f0be6..757742afb 100644
--- a/src/app/core/base/base.component.html
+++ b/src/app/core/base/base.component.html
@@ -1,4 +1,15 @@
-<mat-toolbar class="mat-elevation-z3" color="primary" *ngIf="showHeaderBar === 'true' && (!customToolbarComponent || customToolbarComponent.length == 0)">
+<div style="position: relative; height: 100px; border: 1px solid red;">
+
+<div> hello there 2</div>
+
+<div style="clear: both;"></div>
+
+<div style="position: relative; top: 100px;">
+
+<div *ngIf = "showTopBanner"> 
+  <div class = "top-banner">{{bannerText}}</div>
+</div>
+<mat-toolbar [ngClass]="['mat-elevation-z3', showTopBanner ? 'with-top-banner': '']" color="primary" *ngIf="showHeaderBar === 'true' && (!customToolbarComponent || customToolbarComponent.length == 0)">
   <div class="logo-container">
     <span class="logo">
       <a routerLink="/home" aria-label="home">
@@ -174,7 +185,7 @@
     (closed)="removeZindex()">
   </app-substance-text-search>
   <div>
-    <button mat-button class="login-link" (click)="routeToLogin()" *ngIf="!auth && mainPathSegment !== 'login'">
+    <button mat-button class="login-link" (click)="routeToLogin()" *ngIf=" showLogin && !auth && mainPathSegment !== 'login'">
       Login
     </button>
     <div class="logged-in" *ngIf="auth">
@@ -225,3 +236,6 @@
 <app-session-expiration></app-session-expiration>
 <app-loading></app-loading>
 <router-outlet></router-outlet>
+</div>
+
+</div>
diff --git a/src/app/core/base/base.component.scss b/src/app/core/base/base.component.scss
index 8dca2150c..78e2e3d7d 100644
--- a/src/app/core/base/base.component.scss
+++ b/src/app/core/base/base.component.scss
@@ -114,6 +114,11 @@
   z-index: 1001;
 }
 
+.with-top-banner {
+  top: 28px;
+}
+
+
 .logo {
   height: 35px;
   margin-right: 20px;
@@ -256,4 +261,19 @@
     }
   }
 
+  .top-banner {
+    width:100%;
+    padding: 5px;
+    font-size: 16px;
+    font-family:Arial, Helvetica, sans-serif;
+    text-align: center;
+    align-content: center;
+    color:#b71c1c;
+    background-color: white;
+    position: fixed;
+    top: 0;
+    z-index: 1001;
+    font-weight: 600;
+  }
+
 
diff --git a/src/app/core/base/base.component.ts b/src/app/core/base/base.component.ts
index 1d12fe9bb..730e18145 100644
--- a/src/app/core/base/base.component.ts
+++ b/src/app/core/base/base.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewEncapsulation, HostListener, OnDestroy } from '@angular/core';
+import { Component, OnInit, ViewEncapsulation, HostListener, OnDestroy, AfterViewInit } from '@angular/core';
 import { Router, RouterEvent, NavigationExtras, ActivatedRoute, NavigationStart, ResolveEnd, ParamMap } from '@angular/router';
 import { Environment } from '../../../environments/environment.model';
 import { AuthService } from '../auth/auth.service';
@@ -30,7 +30,7 @@ import { UserQueryListDialogComponent } from '@gsrs-core/bulk-search/user-query-
   styleUrls: ['./base.component.scss'],
   encapsulation: ViewEncapsulation.None
 })
-export class BaseComponent implements OnInit, OnDestroy {
+export class BaseComponent implements OnInit, AfterViewInit, OnDestroy {
   mainPathSegment = '';
   logoSrcPath: string;
   auth?: Auth;
@@ -61,6 +61,9 @@ export class BaseComponent implements OnInit, OnDestroy {
   private wildCardText: string;
   private classicLinkQueryParams = {};
   showHeaderBar = 'true';
+  bannerText: string = "This repository is under review for potential modification in compliance with Administration directives.";
+  showTopBanner = true;
+  showLogin = false;
 
   constructor(
     private router: Router,
@@ -139,10 +142,14 @@ export class BaseComponent implements OnInit, OnDestroy {
     }
   }
 
+
+
+
   ngOnInit() {
     this.showHeaderBar = this.activatedRoute.snapshot.queryParams['header'] || 'true';
     this.loadedComponents = this.configService.configData.loadedComponents || null;
 
+
     this.classicLinkPath = this.configService.environment.clasicBaseHref;
     this.clasicBaseHref = this.configService.environment.clasicBaseHref;
     this.classicLinkQueryParamsString = '';
@@ -299,6 +306,28 @@ export class BaseComponent implements OnInit, OnDestroy {
     this.router.navigate(['/login'], navigationExtras);
   }
 
+  ngAfterViewInit() {
+ 
+    if(this.configService.configData.bannerText) {
+      this.bannerText = this.configService.configData.bannerText;
+    }
+
+    if(this.configService.configData.showTopBanner !== undefined) {
+      this.showTopBanner = this.configService.configData.showTopBanner;
+    }
+
+    if(this.configService.configData.showLogin === undefined) {
+      this.showLogin = true;
+    } else {
+      if(this.configService.configData.showLogin === false) { 
+        this.showLogin = false;
+      } else {
+        this.showLogin = true;
+      }
+    }
+  }
+
+
   processSubstanceSearch(searchValue: string) {
     this.wildCardService.getTopSearchBoxText(searchValue);
     this.navigateToSearchResults(searchValue);
diff --git a/src/app/core/config/config.model.ts b/src/app/core/config/config.model.ts
index 0b2822688..4e03bf7c5 100644
--- a/src/app/core/config/config.model.ts
+++ b/src/app/core/config/config.model.ts
@@ -88,6 +88,9 @@ export interface Config {
     enableStructureFeatures?: boolean;
     StructureFeaturePriority?: Array<string>;
     structureEditSearch?: boolean;
+    bannerText?: string;
+    showTopBanner?: boolean;
+    showLogin?: boolean;
     editPagingOptionSettings?: PagingOptionSettings;
     expandedComponents?: Array<string>;
     enablePDFDownload ?: DownloadAsPDF;
diff --git a/src/app/core/main-notification/main-notification/main-notification.component.html b/src/app/core/main-notification/main-notification/main-notification.component.html
index db47d4519..842271593 100644
--- a/src/app/core/main-notification/main-notification/main-notification.component.html
+++ b/src/app/core/main-notification/main-notification/main-notification.component.html
@@ -1,3 +1,4 @@
-<div class="main-notification hidden" #notification>
+<!-- <div class="main-notification hidden" #notification> -->
+  <div [ngClass]="['main-notification hidden', showTopBanner ? 'with-top-banner' : '']" #notification>
   {{notificationMessage}}
 </div>
\ No newline at end of file
diff --git a/src/app/core/main-notification/main-notification/main-notification.component.scss b/src/app/core/main-notification/main-notification/main-notification.component.scss
index c4362dcc2..28b6b155a 100644
--- a/src/app/core/main-notification/main-notification/main-notification.component.scss
+++ b/src/app/core/main-notification/main-notification/main-notification.component.scss
@@ -1,5 +1,11 @@
 @import '~@angular/material/theming';
 
+
+.with-top-banner {
+    top: 92px !important;
+  }
+  
+
 .main-notification {
     width: 100%;
     text-align: center;
diff --git a/src/app/core/main-notification/main-notification/main-notification.component.ts b/src/app/core/main-notification/main-notification/main-notification.component.ts
index f2780a1d3..864d32791 100644
--- a/src/app/core/main-notification/main-notification/main-notification.component.ts
+++ b/src/app/core/main-notification/main-notification/main-notification.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
 import { MainNotificationService } from '../main-notification.service';
 import { AppNotification, NotificationType } from '../notification.model';
 import { Subscription } from 'rxjs';
+import { ConfigService } from '@gsrs-core/config/config.service';
 
 @Component({
   selector: 'app-main-notification',
@@ -14,12 +15,19 @@ export class MainNotificationComponent implements OnInit, OnDestroy {
   private notifcationType: NotificationType;
   public notificationMessage: string;
   private subscriptions: Array<Subscription> = [];
+  public showTopBanner = false;
 
   constructor(
-    private notificationService: MainNotificationService
+    private notificationService: MainNotificationService,
+    private configService: ConfigService
   ) { }
 
   ngOnInit() {
+    if(this.configService.configData.showTopBanner !== undefined) {
+      this.showTopBanner = this.configService.configData.showTopBanner;
+    }
+
+
     this.appNotification.nativeElement.classList.add('hidden');
     const subscription = this.notificationService.notificationEvent.subscribe(notification => {
       this.setNotification(notification);
diff --git a/src/app/core/substance-form/substance-form.component.html b/src/app/core/substance-form/substance-form.component.html
index 53dcff11f..a3a207d03 100644
--- a/src/app/core/substance-form/substance-form.component.html
+++ b/src/app/core/substance-form/substance-form.component.html
@@ -6,7 +6,7 @@
 </div>
 
 <div *ngIf="!simplifiedForm; else simplifiedActionsComponent">
-  <div class="top-fixed" *ngIf = "!featuresOnly">
+  <div [ngClass]="['top-fixed', showTopBanner ? 'with-top-banner': '']" *ngIf = "!featuresOnly">
     <div class="actions-container">
       <button mat-flat-button color="primary" (click)="saveDraft()">Save Draft</button>
       <button mat-flat-button color="primary" class="draft-button" (click)="showDrafts()">Show Drafts <span
diff --git a/src/app/core/substance-form/substance-form.component.scss b/src/app/core/substance-form/substance-form.component.scss
index a7fe25f9b..c90adaa04 100644
--- a/src/app/core/substance-form/substance-form.component.scss
+++ b/src/app/core/substance-form/substance-form.component.scss
@@ -54,6 +54,10 @@
   cursor: pointer;
 }
 
+.with-top-banner {
+  top: 92px;
+}
+
 .top-fixed {
   position: fixed;
   display: flex;
diff --git a/src/app/core/substance-form/substance-form.component.ts b/src/app/core/substance-form/substance-form.component.ts
index 4dc39a717..703b30876 100644
--- a/src/app/core/substance-form/substance-form.component.ts
+++ b/src/app/core/substance-form/substance-form.component.ts
@@ -119,6 +119,7 @@ export class SubstanceFormComponent implements OnInit, AfterViewInit, OnDestroy
   previousState: number;
   useApprovalAPI = false;
     featuresOnly = false;
+  showTopBanner = false;
 
   constructor(
     private activatedRoute: ActivatedRoute,
@@ -311,6 +312,12 @@ export class SubstanceFormComponent implements OnInit, AfterViewInit, OnDestroy
     if (this.configService.configData && this.configService.configData.useApprovalAPI) {
       this.useApprovalAPI = this.configService.configData.useApprovalAPI;
     }
+
+    if(this.configService.configData.showTopBanner !== undefined) {
+      this.showTopBanner = this.configService.configData.showTopBanner;
+    }
+
+
     this.isAdmin = this.authService.hasRoles('admin');
     this.isUpdater = this.authService.hasAnyRoles('Updater', 'SuperUpdater');
     this.overlayContainer = this.overlayContainerService.getContainerElement();
diff --git a/src/app/core/substance-text-search/substance-text-search.component.scss b/src/app/core/substance-text-search/substance-text-search.component.scss
index aded369fd..9396ea2c6 100644
--- a/src/app/core/substance-text-search/substance-text-search.component.scss
+++ b/src/app/core/substance-text-search/substance-text-search.component.scss
@@ -84,7 +84,7 @@ form {
       right: 0;
       width: 100%;
       left: 0;
-      height: 64px;
+      height: 92px;
       padding-right: 210px;
       padding-left: 16px;
       background-color: var(--primary-color);
diff --git a/src/app/fda/config/config.json b/src/app/fda/config/config.json
index 380bb9b5f..38d6ed4f3 100644
--- a/src/app/fda/config/config.json
+++ b/src/app/fda/config/config.json
@@ -1,4 +1,9 @@
 {
+  "showTopBanner": true,
+  "apiBaseUrl": "https://gsrs-dev-public.ncats.io/ginas/app/",
+  "gsrsHomeBaseUrl": "https://gsrs-dev-public.ncats.io/ginas/app/",
+  "apiSSG4mBaseUrl": "http://gsrs-dev-public.ncats.io/ginas/app/",
+  "occasionalApiBasePath": "/ginas/app",
   "version": "3.1.2",
   "contactEmail": "GSRSSupport@fda.hhs.gov",
   "displayMatchApplication": "true",
diff --git a/src/index.html b/src/index.html
index dfe4d8f6f..8aabce792 100644
--- a/src/index.html
+++ b/src/index.html
@@ -32,7 +32,7 @@
 
 <link rel="stylesheet" href="/assets/styles/styles.custom.css">
 <body>
-  <app-root></app-root>
+    <app-root></app-root>
 </body>
 
 </html>
diff --git a/src/styles/_mat-side-nav.scss b/src/styles/_mat-side-nav.scss
index 648abbd52..3b7f69e42 100644
--- a/src/styles/_mat-side-nav.scss
+++ b/src/styles/_mat-side-nav.scss
@@ -1,6 +1,6 @@
 .mat-drawer-container.mat-sidenav-container {
     position: fixed;
-    top: 64px;
+    top: 92px;
     left: 0;
     right: 0;
     bottom: 0;

From f991d7ed7ccbed3e8470b173c6af76e14c413810 Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Wed, 23 Apr 2025 11:13:07 -0400
Subject: [PATCH 02/18] misc

---
 src/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.html b/src/index.html
index 8aabce792..dfe4d8f6f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -32,7 +32,7 @@
 
 <link rel="stylesheet" href="/assets/styles/styles.custom.css">
 <body>
-    <app-root></app-root>
+  <app-root></app-root>
 </body>
 
 </html>

From a167fe697837416876d074ecc04651c7a646f696 Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Mon, 5 May 2025 19:01:18 -0400
Subject: [PATCH 03/18] save exp. changes

---
 src/app/core/base/base.component.html         | 408 +++++++++---------
 src/app/core/base/base.component.scss         |  50 ++-
 src/app/core/base/base.component.ts           |  14 +-
 .../main-notification.component.ts            |  15 +-
 .../substance-form.component.html             |   2 +-
 .../substance-form.component.scss             |  17 +-
 .../substance-form.component.ts               |  12 +-
 .../substance-ssg2-form.component.html        |   3 +-
 .../substance-ssg2-form.component.scss        |   4 +
 .../substance-ssg2-form.component.ts          |  12 +
 .../substance-ssg4m-form.component.html       |  17 +-
 .../substance-ssg4m-form.component.scss       |  15 +-
 .../substance-ssg4m-form.component.ts         |  12 +
 src/app/fda/config/config.json                |  12 +-
 src/index.html                                |   6 +-
 src/styles/_mat-side-nav.scss                 |   3 +-
 16 files changed, 352 insertions(+), 250 deletions(-)

diff --git a/src/app/core/base/base.component.html b/src/app/core/base/base.component.html
index 757742afb..cd90cbff3 100644
--- a/src/app/core/base/base.component.html
+++ b/src/app/core/base/base.component.html
@@ -1,173 +1,149 @@
-<div style="position: relative; height: 100px; border: 1px solid red;">
-
-<div> hello there 2</div>
-
-<div style="clear: both;"></div>
-
-<div style="position: relative; top: 100px;">
-
-<div *ngIf = "showTopBanner"> 
-  <div class = "top-banner">{{bannerText}}</div>
+<div class="base-page-wrapper">
+  <div *ngIf = "showTopBanner"> 
+    <div class = "top-banner">{{bannerText}}</div>
 </div>
-<mat-toolbar [ngClass]="['mat-elevation-z3', showTopBanner ? 'with-top-banner': '']" color="primary" *ngIf="showHeaderBar === 'true' && (!customToolbarComponent || customToolbarComponent.length == 0)">
-  <div class="logo-container">
-    <span class="logo">
-      <a routerLink="/home" aria-label="home">
-        <img [src]="logoSrcPath" alt="gsrs-logo" />
-      </a>
-    </span>
-    <span class="version" *ngIf="version && version !== ''" [matTooltip]="versionTooltipMessage"
-      matTooltipPosition="below">Ver. {{version}}</span>
-  </div>
+  <div [ngClass]="['base-menu-wrapper', (showTopBanner) ? 'base-menu-wrapper-with-top-banner': '']">
+    <mat-toolbar class="mat-elevation-z3" color="primary" *ngIf="showHeaderBar === 'true' && (!customToolbarComponent || customToolbarComponent.length == 0)">
 
-  <!-- <span class="nav-big">
-    <span class="nav-item" *ngFor="let navItem of navItems">
-      <a [routerLink]="['/' + navItem.path]" [ngClass]="{active: mainPathSegment == navItem.path}">
-        {{navItem.display}}
-      </a>
-    </span>
-  </span> -->
-  <!-- <span class="middle-fill"></span> -->
-  <span class="nav-small">
-    <button class = "top-button" mat-button mat-primary-button  style = "color:white;padding-top:10px; padding-bottom:10px;" [matMenuTriggerFor]="nav" (click)="increaseMenuZindex()" aria-label="main menu">
-     <span style = "font-size:16px;">Menu &nbsp;</span><mat-icon svgIcon="menu"></mat-icon>
-    </button>
-    <mat-menu #nav="matMenu" (closed)="removeZindex()" class = "reg-a">
-      <div *ngFor="let navItem of navItems">
-        <a mat-menu-item [routerLink]="['/' + navItem.path]" *ngIf="navItem.path">
-          {{navItem.display}}
-        </a>
-        <a mat-menu-item [href]="navItem.externalPath" target="_blank" *ngIf="navItem.externalPath">
-          {{navItem.display}}
+    <div class="logo-container">
+      <span class="logo">
+        <a routerLink="/home" aria-label="home">
+          <img [src]="logoSrcPath" alt="gsrs-logo" />
         </a>
-        <a mat-menu-item [href]="transformMailToPath(navItem)"
-          *ngIf="navItem.mailToPath">
+      </span>
+      <span class="version" *ngIf="version && version !== ''" [matTooltip]="versionTooltipMessage"
+        matTooltipPosition="below">Ver. {{version}}</span>
+    </div>
+
+    <!-- <span class="nav-big">
+      <span class="nav-item" *ngFor="let navItem of navItems">
+        <a [routerLink]="['/' + navItem.path]" [ngClass]="{active: mainPathSegment == navItem.path}">
           {{navItem.display}}
         </a>
-
-
-        <ng-container *ngIf="navItem.children">
-          <a mat-menu-item [matMenuTriggerFor]="childrenMenu">
+      </span>
+    </span> -->
+    <!-- <span class="middle-fill"></span> -->
+    <span class="nav-small">
+      <button class = "top-button" mat-button mat-primary-button  style = "color:white;padding-top:10px; padding-bottom:10px;" [matMenuTriggerFor]="nav" (click)="increaseMenuZindex()" aria-label="main menu">
+      <span style = "font-size:16px;">Menu &nbsp;</span><mat-icon svgIcon="menu"></mat-icon>
+      </button>
+      <mat-menu #nav="matMenu" (closed)="removeZindex()" class = "reg-a">
+        <div *ngFor="let navItem of navItems">
+          <a mat-menu-item [routerLink]="['/' + navItem.path]" *ngIf="navItem.path">
             {{navItem.display}}
           </a>
-          <mat-menu #childrenMenu="matMenu">
-            <div *ngFor="let childNavItem of navItem.children">
-              <a mat-menu-item [routerLink]="['/' + childNavItem.path]" [queryParams]="childNavItem.params||{}"
-                *ngIf="childNavItem.path">
-                {{childNavItem.display}}
-              </a>
-              <a mat-menu-item [href]="[childNavItem.href]"
-                *ngIf="childNavItem.href">
-                {{childNavItem.display}}
-              </a>
-              <a mat-menu-item [href]="transformMailToPath(childNavItem)"
-                *ngIf="childNavItem.mailToPath">
-                {{childNavItem.display}}
-              </a>
-            </div>
-            <a mat-menu-item *ngIf="navItem.display === 'Register'" (click)="importDialog()">
-              Import Substance
+          <a mat-menu-item [href]="navItem.externalPath" target="_blank" *ngIf="navItem.externalPath">
+            {{navItem.display}}
+          </a>
+          <a mat-menu-item [href]="transformMailToPath(navItem)"
+            *ngIf="navItem.mailToPath">
+            {{navItem.display}}
+          </a>
+
+
+          <ng-container *ngIf="navItem.children">
+            <a mat-menu-item [matMenuTriggerFor]="childrenMenu">
+              {{navItem.display}}
             </a>
-          </mat-menu>
-        </ng-container>
-      </div>
-      <a mat-menu-item *ngIf="isAdmin" routerLink="/admin">
-        Admin Panel
-      </a>
-    </mat-menu>
-  </span>
-  <div >
-    <button class = "top-button extra-item " mat-button mat-primary-button style = "font-size:16px;color:white; padding-right:10px;margin-right:15px;padding-top:10px; padding-bottom:10px;" class = "menu-button extra-item"
-    [routerLink]="['/browse-substance']" aria-label="browse substances" >Browse Substances</button>
-  </div>
-  <div *ngIf = "this.loadedComponents">
-      <button class = "top-button extra-browse" mat-button mat-primary-button  style = "color:white;font-size:16px;padding-top:10px; padding-bottom:10px;" [matMenuTriggerFor]="browse" (click)="increaseMenuZindex()" aria-label="main menu" *ngIf = "loadedComponents">
-          <span style = "font-size:16px;">Browse Other</span>
-         <mat-icon svgIcon="chevron_down"></mat-icon>
-         </button>
-         <mat-menu #browse="matMenu" (closed)="removeZindex()">
-           <span *ngIf = "loadedComponents.applications">
-      <a mat-menu-item routerLink="/browse-applications" >
-        Browse Applications
-      </a>
-      <mat-divider></mat-divider>
-    </span>
-    <span *ngIf = "loadedComponents.products">
-      <a mat-menu-item routerLink="/browse-products">
-        Browse Products
-      </a>
-      <mat-divider></mat-divider>
+            <mat-menu #childrenMenu="matMenu">
+              <div *ngFor="let childNavItem of navItem.children">
+                <a mat-menu-item [routerLink]="['/' + childNavItem.path]" [queryParams]="childNavItem.params||{}"
+                  *ngIf="childNavItem.path">
+                  {{childNavItem.display}}
+                </a>
+                <a mat-menu-item [href]="[childNavItem.href]"
+                  *ngIf="childNavItem.href">
+                  {{childNavItem.display}}
+                </a>
+                <a mat-menu-item [href]="transformMailToPath(childNavItem)"
+                  *ngIf="childNavItem.mailToPath">
+                  {{childNavItem.display}}
+                </a>
+              </div>
+              <a mat-menu-item *ngIf="navItem.display === 'Register'" (click)="importDialog()">
+                Import Substance
+              </a>
+            </mat-menu>
+          </ng-container>
+        </div>
+        <a mat-menu-item *ngIf="isAdmin" routerLink="/admin">
+          Admin Panel
+        </a>
+      </mat-menu>
     </span>
-    <span *ngIf = "loadedComponents.clinicaltrials">
-      <a mat-menu-item routerLink="/browse-clinical-trials">
-        Browse Clinical Trials
-      </a>
-      <mat-divider></mat-divider>
-          </span>
-
-    <span *ngIf = "loadedComponents.adverseevents">
-      <a mat-menu-item routerLink="/browse-adverse-events">
-        Browse Adverse Events
-      </a>
-      <mat-divider></mat-divider>
-      <div *ngIf="adverseEventShinyHomepageDisplay === true">
+    <div >
+      <button class = "top-button extra-item " mat-button mat-primary-button style = "font-size:16px;color:white; padding-right:10px;margin-right:15px;padding-top:10px; padding-bottom:10px;" class = "menu-button extra-item"
+      [routerLink]="['/browse-substance']" aria-label="browse substances" >Browse Substances</button>
+    </div>
+    <div *ngIf = "this.loadedComponents">
+        <button class = "top-button extra-browse" mat-button mat-primary-button  style = "color:white;font-size:16px;padding-top:10px; padding-bottom:10px;" [matMenuTriggerFor]="browse" (click)="increaseMenuZindex()" aria-label="main menu" *ngIf = "loadedComponents">
+            <span style = "font-size:16px;">Browse Other</span>
+          <mat-icon svgIcon="chevron_down"></mat-icon>
+          </button>
+          <mat-menu #browse="matMenu" (closed)="removeZindex()">
+            <span *ngIf = "loadedComponents.applications">
+        <a mat-menu-item routerLink="/browse-applications" >
+          Browse Applications
+        </a>
         <mat-divider></mat-divider>
-
-        <a mat-menu-item [href]="adverseEventShinyHomepageURL" target="_blank">
-          Browse Adverse Events
+      </span>
+      <span *ngIf = "loadedComponents.products">
+        <a mat-menu-item routerLink="/browse-products">
+          Browse Products
         </a>
-        </div>
+        <mat-divider></mat-divider>
       </span>
+      <span *ngIf = "loadedComponents.clinicaltrials">
+        <a mat-menu-item routerLink="/browse-clinical-trials">
+          Browse Clinical Trials
+        </a>
+        <mat-divider></mat-divider>
+            </span>
 
-      <span *ngIf = "loadedComponents.invitropharmacology">
-        <a mat-menu-item routerLink="/browse-invitro-pharm">
-          Browse In-vitro Pharmacology
+      <span *ngIf = "loadedComponents.adverseevents">
+        <a mat-menu-item routerLink="/browse-adverse-events">
+          Browse Adverse Events
         </a>
-      </span>
+        <mat-divider></mat-divider>
+        <div *ngIf="adverseEventShinyHomepageDisplay === true">
+          <mat-divider></mat-divider>
 
-      </mat-menu>
-      </div>
+          <a mat-menu-item [href]="adverseEventShinyHomepageURL" target="_blank">
+            Browse Adverse Events
+          </a>
+          </div>
+        </span>
 
-      <div>
-        <button class = "top-button extra-item" mat-button mat-primary-button
-        style = "color:white;font-size:16px;padding-top:10px; padding-bottom:10px;"
-        [matMenuTriggerFor]="reg" (click)="increaseMenuZindex()"
-        aria-label="main menu" *ngIf = "canRegister">
-          <span style = "font-size:16px;">Register</span>
-          <mat-icon svgIcon="chevron_down"></mat-icon>
-        </button>
+        <span *ngIf = "loadedComponents.invitropharmacology">
+          <a mat-menu-item routerLink="/browse-invitro-pharm">
+            Browse In-vitro Pharmacology
+          </a>
+        </span>
 
-        <button class = "top-button extra-item" mat-button mat-primary-button
-        style = "color:white;font-size:16px;padding-top:10px; padding-bottom:10px;"
-        [matMenuTriggerFor]="search" (click)="increaseMenuZindex()" aria-label="search menu">
-          <span style = "font-size:16px;">Search</span>
-          <mat-icon svgIcon="chevron_down"></mat-icon>
-        </button>
+        </mat-menu>
+        </div>
 
-  </div>
+        <div>
+          <button class = "top-button extra-item" mat-button mat-primary-button
+          style = "color:white;font-size:16px;padding-top:10px; padding-bottom:10px;"
+          [matMenuTriggerFor]="reg" (click)="increaseMenuZindex()"
+          aria-label="main menu" *ngIf = "canRegister">
+            <span style = "font-size:16px;">Register</span>
+            <mat-icon svgIcon="chevron_down"></mat-icon>
+          </button>
+
+          <button class = "top-button extra-item" mat-button mat-primary-button
+          style = "color:white;font-size:16px;padding-top:10px; padding-bottom:10px;"
+          [matMenuTriggerFor]="search" (click)="increaseMenuZindex()" aria-label="search menu">
+            <span style = "font-size:16px;">Search</span>
+            <mat-icon svgIcon="chevron_down"></mat-icon>
+          </button>
 
-     <div>
-     <mat-menu #reg="matMenu" (closed)="removeZindex()">
-       <div *ngFor="let navItem of registerNav">
-         <a mat-menu-item [routerLink]="['/' + navItem.path]" *ngIf="navItem.path">
-           {{navItem.display}}
-         </a>
-         <a mat-menu-item [href]="navItem.externalPath" target="_blank" *ngIf="navItem.externalPath">
-           {{navItem.display}}
-         </a>
-
-       </div>
-       <div>
-          <a mat-menu-item (click)="importDialog()">
-              Import Substance
-            </a>
-       </div>
-     </mat-menu>
     </div>
 
-    <div>
-      <mat-menu #search="matMenu" (closed)="removeZindex()">
-        <div *ngFor="let navItem of searchNav">
+      <div>
+      <mat-menu #reg="matMenu" (closed)="removeZindex()">
+        <div *ngFor="let navItem of registerNav">
           <a mat-menu-item [routerLink]="['/' + navItem.path]" *ngIf="navItem.path">
             {{navItem.display}}
           </a>
@@ -176,66 +152,86 @@
           </a>
 
         </div>
-       </mat-menu>
-    </div>
+        <div>
+            <a mat-menu-item (click)="importDialog()">
+                Import Substance
+              </a>
+        </div>
+      </mat-menu>
+      </div>
 
-    <span class="middle-fill"></span>
-  <app-substance-text-search class="top-search" [searchValue]="searchValue" placeholder = "Search Substances"
-    (searchPerformed)="processSubstanceSearch($event)" eventCategory="topSearch" (opened)="increaseMenuZindex()"
-    (closed)="removeZindex()">
-  </app-substance-text-search>
-  <div>
-    <button mat-button class="login-link" (click)="routeToLogin()" *ngIf=" showLogin && !auth && mainPathSegment !== 'login'">
-      Login
-    </button>
-    <div class="logged-in" *ngIf="auth">
-      <button aria-label="User Account" class="user-button main-button" mat-icon-button [matMenuTriggerFor]="accountMenu" (click)="increaseMenuZindex()" >
-        <mat-icon class="user-icon" svgIcon="account_circle" ></mat-icon>
-      </button>
-      <button aria-label="User Account dropdown" class="user-button arrow-button test-class" mat-icon-button [matMenuTriggerFor]="accountMenu" (click)="increaseMenuZindex()" >
-        <mat-icon class="user-icon icon-two" svgIcon="chevron_down"></mat-icon>
+      <div>
+        <mat-menu #search="matMenu" (closed)="removeZindex()">
+          <div *ngFor="let navItem of searchNav">
+            <a mat-menu-item [routerLink]="['/' + navItem.path]" *ngIf="navItem.path">
+              {{navItem.display}}
+            </a>
+            <a mat-menu-item [href]="navItem.externalPath" target="_blank" *ngIf="navItem.externalPath">
+              {{navItem.display}}
+            </a>
+
+          </div>
+        </mat-menu>
+      </div>
+
+      <span class="middle-fill"></span>
+    <app-substance-text-search class="top-search" [searchValue]="searchValue" placeholder = "Search Substances"
+      (searchPerformed)="processSubstanceSearch($event)" eventCategory="topSearch" (opened)="increaseMenuZindex()"
+      (closed)="removeZindex()">
+    </app-substance-text-search>
+    <div>
+      <button mat-button class="login-link" (click)="routeToLogin()" *ngIf=" showLogin && !auth && mainPathSegment !== 'login'">
+        Login
       </button>
-      <br />
-      <span class="user" *ngIf="auth && auth.identifier" matTooltip="{{auth.identifier}}">{{auth.identifier}}</span>
+      <div class="logged-in" *ngIf="auth">
+        <button aria-label="User Account" class="user-button main-button" mat-icon-button [matMenuTriggerFor]="accountMenu" (click)="increaseMenuZindex()" >
+          <mat-icon class="user-icon" svgIcon="account_circle" ></mat-icon>
+        </button>
+        <button aria-label="User Account dropdown" class="user-button arrow-button test-class" mat-icon-button [matMenuTriggerFor]="accountMenu" (click)="increaseMenuZindex()" >
+          <mat-icon class="user-icon icon-two" svgIcon="chevron_down"></mat-icon>
+        </button>
+        <br />
+        <span class="user" *ngIf="auth && auth.identifier" matTooltip="{{auth.identifier}}">{{auth.identifier}}</span>
+      </div>
+      <mat-menu #accountMenu="matMenu" (closed)="removeZindex()">
+        <a mat-menu-item (click)="openProfile()">
+          <span>Profile</span>
+        </a>
+        <a mat-menu-item routerLink="/user-downloads">
+          <span>User Downloads</span>
+        </a>
+        <a mat-menu-item (click)="viewLists()">
+          <span>User Saved Lists</span>
+        </a>
+        <a mat-menu-item (click)="viewDrafts()">
+          <span>Saved Edit Drafts</span>
+        </a>
+        <a routerLink="/admin" mat-menu-item *ngIf="isAdmin">
+          <span>Admin Panel</span>
+        </a>
+        <a [routerLink]="['/registrars']" class = "add-at-low-res" *ngIf = "canRegister" mat-menu-item >
+          <span>Registrars</span>
+        </a>
+        <button mat-menu-item (click)="logout()">
+          <span>Logout</span>
+        </button>
+      </mat-menu>
     </div>
-    <mat-menu #accountMenu="matMenu" (closed)="removeZindex()">
-      <a mat-menu-item (click)="openProfile()">
-        <span>Profile</span>
-      </a>
-      <a mat-menu-item routerLink="/user-downloads">
-        <span>User Downloads</span>
-      </a>
-      <a mat-menu-item (click)="viewLists()">
-        <span>User Saved Lists</span>
-      </a>
-      <a mat-menu-item (click)="viewDrafts()">
-        <span>Saved Edit Drafts</span>
-      </a>
-      <a routerLink="/admin" mat-menu-item *ngIf="isAdmin">
-        <span>Admin Panel</span>
-      </a>
-      <a [routerLink]="['/registrars']" class = "add-at-low-res" *ngIf = "canRegister" mat-menu-item >
-        <span>Registrars</span>
-      </a>
-      <button mat-menu-item (click)="logout()">
-        <span>Logout</span>
-      </button>
-    </mat-menu>
-  </div>
-  <div class="classic-view-container"  *ngIf="auth && auth.identifier">
-      <a class = "top-button hide-at-low-res" mat-button mat-primary-button  style = "color:white;font-size:16px;padding-top:10px; padding-bottom:10px;" [routerLink]="['/registrars']" *ngIf = "canRegister">
-          <span style = "font-size:16px;">Registrars</span>
+    <div class="classic-view-container"  *ngIf="auth && auth.identifier">
+        <a class = "top-button hide-at-low-res" mat-button mat-primary-button  style = "color:white;font-size:16px;padding-top:10px; padding-bottom:10px;" [routerLink]="['/registrars']" *ngIf = "canRegister">
+            <span style = "font-size:16px;">Registrars</span>
 
-  </a>
+    </a>
+    </div>
+  </mat-toolbar>
+    <div *ngIf="customToolbarComponent == 'precisionFDA'">
+      <app-pfda-toolbar></app-pfda-toolbar>
+    </div>
   </div>
-</mat-toolbar>
-<div *ngIf="customToolbarComponent == 'precisionFDA'">
-  <app-pfda-toolbar></app-pfda-toolbar>
-</div>
-<app-main-notification></app-main-notification>
-<app-session-expiration></app-session-expiration>
-<app-loading></app-loading>
-<router-outlet></router-outlet>
-</div>
-
+  <div [ngClass]="['base-main-wrapper', (showTopBanner) ? 'base-main-wrapper-with-top-banner': '']">
+      <app-main-notification></app-main-notification>
+      <app-session-expiration></app-session-expiration>
+      <app-loading></app-loading>
+      <router-outlet></router-outlet>
+    </div>
 </div>
diff --git a/src/app/core/base/base.component.scss b/src/app/core/base/base.component.scss
index 78e2e3d7d..de89e19fa 100644
--- a/src/app/core/base/base.component.scss
+++ b/src/app/core/base/base.component.scss
@@ -1,5 +1,45 @@
 @import '../../../styles/variables';
 
+.base-page-wrapper {
+  width: 100%;
+  display: inline;
+  position: fixed;
+  top: 0px;
+}
+
+.base-menu-wrapper {
+  width: 100%;
+  display: inline;
+
+  position: fixed;
+  top: 0px;
+}
+
+.base-menu-wrapper-with-top-banner {
+  top: 32px !important; 
+}
+
+.base-main-wrapper {
+  border: 1px solid purple;
+  overflow: scroll;
+  height:100%;
+  width: 100%;
+  display: inline;
+  position: fixed;
+  top: 64px;
+}
+
+.base-main-wrapper-with-top-banner {
+  top: 102px !important; 
+}
+
+.base-main-notification-wrapper {
+  width: 100%;
+  display: inline;
+  position: fixed;
+
+}
+
 .version {
   color: var(--version-text-color);
   font-size: 10pt;
@@ -110,15 +150,9 @@
 
 .mat-toolbar {
   position: fixed;
-  top: 0;
   z-index: 1001;
 }
 
-.with-top-banner {
-  top: 28px;
-}
-
-
 .logo {
   height: 35px;
   margin-right: 20px;
@@ -268,10 +302,10 @@
     font-family:Arial, Helvetica, sans-serif;
     text-align: center;
     align-content: center;
-    color:#b71c1c;
+    color: #4793d1;
     background-color: white;
     position: fixed;
-    top: 0;
+    top: 0px;
     z-index: 1001;
     font-weight: 600;
   }
diff --git a/src/app/core/base/base.component.ts b/src/app/core/base/base.component.ts
index 730e18145..9b8d992dd 100644
--- a/src/app/core/base/base.component.ts
+++ b/src/app/core/base/base.component.ts
@@ -62,8 +62,8 @@ export class BaseComponent implements OnInit, AfterViewInit, OnDestroy {
   private classicLinkQueryParams = {};
   showHeaderBar = 'true';
   bannerText: string = "This repository is under review for potential modification in compliance with Administration directives.";
-  showTopBanner = true;
-  showLogin = false;
+  showTopBanner: boolean;
+  showLogin: boolean;
 
   constructor(
     private router: Router,
@@ -312,8 +312,14 @@ export class BaseComponent implements OnInit, AfterViewInit, OnDestroy {
       this.bannerText = this.configService.configData.bannerText;
     }
 
-    if(this.configService.configData.showTopBanner !== undefined) {
-      this.showTopBanner = this.configService.configData.showTopBanner;
+    if(this.configService.configData.showTopBanner === undefined) {
+      this.showTopBanner = false;
+    } else {
+      if(this.configService.configData.showTopBanner === false) { 
+        this.showTopBanner = false;
+      } else {
+        this.showTopBanner = true;
+      }
     }
 
     if(this.configService.configData.showLogin === undefined) {
diff --git a/src/app/core/main-notification/main-notification/main-notification.component.ts b/src/app/core/main-notification/main-notification/main-notification.component.ts
index 864d32791..30024d789 100644
--- a/src/app/core/main-notification/main-notification/main-notification.component.ts
+++ b/src/app/core/main-notification/main-notification/main-notification.component.ts
@@ -15,7 +15,7 @@ export class MainNotificationComponent implements OnInit, OnDestroy {
   private notifcationType: NotificationType;
   public notificationMessage: string;
   private subscriptions: Array<Subscription> = [];
-  public showTopBanner = false;
+  public showTopBanner:boolean;
 
   constructor(
     private notificationService: MainNotificationService,
@@ -23,10 +23,17 @@ export class MainNotificationComponent implements OnInit, OnDestroy {
   ) { }
 
   ngOnInit() {
-    if(this.configService.configData.showTopBanner !== undefined) {
-      this.showTopBanner = this.configService.configData.showTopBanner;
-    }
 
+    if(this.configService.configData.showTopBanner === undefined) {
+      this.showTopBanner = false;
+    } else {
+      if(this.configService.configData.showTopBanner === false) { 
+        this.showTopBanner = false;
+      } else {
+        this.showTopBanner = true;
+      }
+    }
+    
 
     this.appNotification.nativeElement.classList.add('hidden');
     const subscription = this.notificationService.notificationEvent.subscribe(notification => {
diff --git a/src/app/core/substance-form/substance-form.component.html b/src/app/core/substance-form/substance-form.component.html
index a3a207d03..f7eebd4c6 100644
--- a/src/app/core/substance-form/substance-form.component.html
+++ b/src/app/core/substance-form/substance-form.component.html
@@ -6,7 +6,7 @@
 </div>
 
 <div *ngIf="!simplifiedForm; else simplifiedActionsComponent">
-  <div [ngClass]="['top-fixed', showTopBanner ? 'with-top-banner': '']" *ngIf = "!featuresOnly">
+  <div [ngClass]="['top-fixed', showTopBanner ? 'top-fixed-with-top-banner': '']" *ngIf = "!featuresOnly">
     <div class="actions-container">
       <button mat-flat-button color="primary" (click)="saveDraft()">Save Draft</button>
       <button mat-flat-button color="primary" class="draft-button" (click)="showDrafts()">Show Drafts <span
diff --git a/src/app/core/substance-form/substance-form.component.scss b/src/app/core/substance-form/substance-form.component.scss
index c90adaa04..ba7ba6d44 100644
--- a/src/app/core/substance-form/substance-form.component.scss
+++ b/src/app/core/substance-form/substance-form.component.scss
@@ -1,3 +1,10 @@
+// .scrollable-container {
+//   height: 1800px;
+//   overflow: scroll;
+//   border: 1px solid blue;
+//  }
+
+
 #overlay {
   position: fixed; /* Sit on top of the page content */
   display: block; /* Hidden by default */
@@ -54,15 +61,13 @@
   cursor: pointer;
 }
 
-.with-top-banner {
-  top: 92px;
-}
 
 .top-fixed {
+  /* keep this relative to prevent having to set top at component level. 0 is top of component window. */
   position: fixed;
+  top: 64px; 
   display: flex;
   flex-direction: column;
-  top: 64px;
   width: 100%;
   background-color: var(--regular-white-color);
   align-items: center;
@@ -71,6 +76,10 @@
   z-index: 1001;
 }
 
+.top-fixed-with-top-banner {
+  top: 92px;
+} 
+
 .cdk-overlay-pane {
   z-index: 1005;
 }
diff --git a/src/app/core/substance-form/substance-form.component.ts b/src/app/core/substance-form/substance-form.component.ts
index 703b30876..fe0581bbf 100644
--- a/src/app/core/substance-form/substance-form.component.ts
+++ b/src/app/core/substance-form/substance-form.component.ts
@@ -119,7 +119,7 @@ export class SubstanceFormComponent implements OnInit, AfterViewInit, OnDestroy
   previousState: number;
   useApprovalAPI = false;
     featuresOnly = false;
-  showTopBanner = false;
+  showTopBanner: boolean;
 
   constructor(
     private activatedRoute: ActivatedRoute,
@@ -313,8 +313,14 @@ export class SubstanceFormComponent implements OnInit, AfterViewInit, OnDestroy
       this.useApprovalAPI = this.configService.configData.useApprovalAPI;
     }
 
-    if(this.configService.configData.showTopBanner !== undefined) {
-      this.showTopBanner = this.configService.configData.showTopBanner;
+    if(this.configService.configData.showTopBanner === undefined) {
+      this.showTopBanner = false;
+    } else {
+      if(this.configService.configData.showTopBanner === false) { 
+        this.showTopBanner = false;
+      } else {
+        this.showTopBanner = true;
+      }
     }
 
 
diff --git a/src/app/core/substance-ssg2/substance-ssg2-form.component.html b/src/app/core/substance-ssg2/substance-ssg2-form.component.html
index b638a24c4..91ec9664a 100644
--- a/src/app/core/substance-ssg2/substance-ssg2-form.component.html
+++ b/src/app/core/substance-ssg2/substance-ssg2-form.component.html
@@ -5,7 +5,8 @@
   <img (click)="showHidePopup()" class = "image-popped-up" appSubstanceImage [entityId]="unit && (unit.uuid || (unit._structure && unit._structure.id))">
 </div>
 -->
-<div class="top-fixed">
+<div [ngClass]="['top-fixed', showTopBanner ? 'top-fixed-with-top-banner': '']">
+
   <div class="actions-container">
       <!--
       <button mat-flat-button color="primary" (click)="saveDraft()">Save Draft</button>
diff --git a/src/app/core/substance-ssg2/substance-ssg2-form.component.scss b/src/app/core/substance-ssg2/substance-ssg2-form.component.scss
index 902fc4561..19fd43b19 100644
--- a/src/app/core/substance-ssg2/substance-ssg2-form.component.scss
+++ b/src/app/core/substance-ssg2/substance-ssg2-form.component.scss
@@ -60,6 +60,10 @@
     z-index: 1001;
 }
 
+.top-fixed-with-top-banner {
+  top: 92px;
+} 
+
 .cdk-overlay-pane {
   z-index: 1005;
 }
diff --git a/src/app/core/substance-ssg2/substance-ssg2-form.component.ts b/src/app/core/substance-ssg2/substance-ssg2-form.component.ts
index a53f17e7b..71af42908 100644
--- a/src/app/core/substance-ssg2/substance-ssg2-form.component.ts
+++ b/src/app/core/substance-ssg2/substance-ssg2-form.component.ts
@@ -99,6 +99,7 @@ export class SubstanceSsg2FormComponent implements OnInit, AfterViewInit, OnDest
   UNII: string;
   approvalType = 'lastEditedBy';
   previousState: number;
+  showTopBanner: boolean;
 
   constructor(
     private activatedRoute: ActivatedRoute,
@@ -282,6 +283,17 @@ export class SubstanceSsg2FormComponent implements OnInit, AfterViewInit, OnDest
     if (this.configService.configData && this.configService.configData.autoSaveWait) {
       this.autoSaveWait = this.configService.configData.autoSaveWait;
     }
+
+    if(this.configService.configData.showTopBanner === undefined) {
+      this.showTopBanner = false;
+    } else {
+      if(this.configService.configData.showTopBanner === false) { 
+        this.showTopBanner = false;
+      } else {
+        this.showTopBanner = true;
+      }
+    }
+
     this.isAdmin = this.authService.hasRoles('admin');
     this.isUpdater = this.authService.hasAnyRoles('Updater', 'SuperUpdater');
     this.overlayContainer = this.overlayContainerService.getContainerElement();
diff --git a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.html b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.html
index 0560b73ad..925c2c1f9 100644
--- a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.html
+++ b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.html
@@ -1,5 +1,13 @@
-<div class="main-container">
-  <div class="top-fixed" [ngClass]="{'top-fixed-top': showHeaderBar === 'true', zindex2000 : saveDelayedMessage}">
+<div class="main-container" [ngClass]="['top-fixed', showTopBanner ? 'top-fixed-with-top-banner': '']">
+
+  <!--keep <div [ngClass]="['top-fixed', showTopBanner ? 'top-fixed-with-top-banner': '']"  style="width: 100%"> -->
+
+    <div class="top-fixed" [ngClass]="{'top-fixed-with-top-banner': showTopBanner , zindex2000 : saveDelayedMessage}">
+
+
+      <!--__aw__ original was like this -->
+
+  <!-- <div class="top-fixed" [ngClass]="{'top-fixed-top': showHeaderBar === 'true', zindex2000 : saveDelayedMessage}"> -->
     <div class="actions-container">
 
       <!-- SAVING DELAY: Display Cancel button if it is taking too long to save -->
@@ -11,7 +19,7 @@
         <button mat-flat-button *ngIf="isCancelBtnClicked === false" color="primary" class="validate-button"
           (click)="cancelSubmit()" [disabled]="showFormReadOnly === 'true'">Cancel
         </button>
-        <button mat-flat-button *ngIf="isCancelBtnClicked === true && isSavedSuccessful === true" color="primary"
+        <button mat-flat-button *ngIf="isCancelBtnClicked === true && isSavedSuccessful === true" color="	primary"
           class="validate-button" (click)="refreshPage()" [disabled]="showFormReadOnly === 'true'">Refresh
         </button>
       </div> <!-- SAVING DELAY -->
@@ -100,7 +108,7 @@
     </div> <!-- Validation Message -->
   </div>
 
-  <div class="form-content-container" [ngClass]="{'padtop70px': showHeaderBar === 'false'}">
+  <div class="form-content-container" [ngClass]="{'padtop70px': showHeaderBar === 'false'}" style="width: 100%; scroll: auto; border: 1px soid purple;">
     <!--
   <div class="form-header"
     [ngClass]="{'form-header-no-title-top': (showHeaderBar === 'true' && showRegisterEditTitle === 'false'), 'form-header-title-top': (showHeaderBar === 'true' && showRegisterEditTitle === 'true')}">
@@ -148,4 +156,5 @@
         </div>
       </div>
     </div>
+    </div>
   </div>
\ No newline at end of file
diff --git a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss
index b369adaad..63453d0ee 100644
--- a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss
+++ b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss
@@ -2,7 +2,8 @@
   position: fixed;
   display: flex;
   flex-direction: column;
-  /*top: 64px; */
+  // __aw__ this was commented out, turned on because seems like is on by default
+  top: 64px;
   width: 100%;
   background-color: var(--regular-white-color);
   align-items: center;
@@ -12,9 +13,15 @@
   justify-content: flex-end;
 }
 
-.top-fixed-top {
-  top: 64px;
-}
+.top-fixed-with-top-banner {
+  top: 92px;
+} 
+
+
+// __aw__, see how this works with showHeaderBar? 
+// .top-fixed-top {
+//   top: 64px;
+// }
 
 .zindex2000 {
   z-index: 2000;
diff --git a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.ts b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.ts
index 070477b57..a115d9b4e 100644
--- a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.ts
+++ b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.ts
@@ -115,6 +115,7 @@ export class SubstanceSsg4ManufactureFormComponent implements OnInit, AfterViewI
     `${environment.baseHref || ''}assets/pathway/d3v4.js`,
     `${environment.baseHref || ''}assets/pathway/pathwayviz.js`
   ];
+  showTopBanner: boolean;
 
   constructor(
     private activatedRoute: ActivatedRoute,
@@ -150,6 +151,17 @@ export class SubstanceSsg4ManufactureFormComponent implements OnInit, AfterViewI
       this.showRegisterEditTitle = this.configSsg4Form.showRegisterEditTitle;
     }
 
+    if(this.configService.configData.showTopBanner === undefined) {
+      this.showTopBanner = false;
+    } else {
+      if(this.configService.configData.showTopBanner === false) { 
+        this.showTopBanner = false;
+      } else {
+        this.showTopBanner = true;
+      }
+    }
+
+
     this.substanceClass = 'specifiedSubstanceG4m';
 
     const routeSubscription = this.activatedRoute
diff --git a/src/app/fda/config/config.json b/src/app/fda/config/config.json
index 38d6ed4f3..ecae5e431 100644
--- a/src/app/fda/config/config.json
+++ b/src/app/fda/config/config.json
@@ -1,10 +1,9 @@
 {
-  "showTopBanner": true,
-  "apiBaseUrl": "https://gsrs-dev-public.ncats.io/ginas/app/",
-  "gsrsHomeBaseUrl": "https://gsrs-dev-public.ncats.io/ginas/app/",
-  "apiSSG4mBaseUrl": "http://gsrs-dev-public.ncats.io/ginas/app/",
-  "occasionalApiBasePath": "/ginas/app",
-  "version": "3.1.2",
+  "customToolbarComponent": "precisionFDA",
+  "apiBaseUrl": "http://localhost:9081/ginas/app/",
+  "gsrsHomeBaseUrl": "http://localhost:9081/ginas/app/",
+  "apiSSG4mBaseUrl": "http://localhost:9081/ginas/app/",
+  "occasionalApiBasePath": "/ginas/app",  "version": "3.1.2",
   "contactEmail": "GSRSSupport@fda.hhs.gov",
   "displayMatchApplication": "true",
   "adverseEventShinyHomepageDisplay": "true",
@@ -20,6 +19,7 @@
   "useDataUrl": false,
   "showCrossEntitySearchDropdown": true,
   "restApiPrefix": "/ginas/app",
+  "showTopBanner": true, 
   "authenticateAs": {
     "apiUsername": null,
     "apiPassword": null,
diff --git a/src/index.html b/src/index.html
index dfe4d8f6f..4a6dce81f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -2,14 +2,14 @@
 <html lang="en">
 
 <head>
-  <script src="/assets/js/analytics.custom.js"></script>
+  <script src="/ginas/app/ui/assets/js/analytics.custom.js"></script>
 
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
   <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
   <meta charset="utf-8">
   <title>GSRS</title>
-  <base href="/">
+  <base href="/ginas/app/ui/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="apple-touch-icon" sizes="57x57" href="/assets/favicon/apple-icon-57x57.png">
   <link rel="apple-touch-icon" sizes="60x60" href="/assets/favicon/apple-icon-60x60.png">
@@ -30,7 +30,7 @@
   <meta name="theme-color" content="#ffffff">
 </head>
 
-<link rel="stylesheet" href="/assets/styles/styles.custom.css">
+<link rel="stylesheet" href="ginas/app/ui/assets/styles/styles.custom.css">
 <body>
   <app-root></app-root>
 </body>
diff --git a/src/styles/_mat-side-nav.scss b/src/styles/_mat-side-nav.scss
index 3b7f69e42..d0bc052fc 100644
--- a/src/styles/_mat-side-nav.scss
+++ b/src/styles/_mat-side-nav.scss
@@ -1,6 +1,5 @@
 .mat-drawer-container.mat-sidenav-container {
-    position: fixed;
-    top: 92px;
+    /* let .base-main-container set top */
     left: 0;
     right: 0;
     bottom: 0;

From 831c01df5904120ccc730dea930ed3291b9f6877 Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Mon, 5 May 2025 20:32:32 -0400
Subject: [PATCH 04/18] edits

---
 src/app/core/base/base.component.scss | 1 -
 src/app/fda/config/config.json        | 9 ++-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/app/core/base/base.component.scss b/src/app/core/base/base.component.scss
index de89e19fa..eed216405 100644
--- a/src/app/core/base/base.component.scss
+++ b/src/app/core/base/base.component.scss
@@ -20,7 +20,6 @@
 }
 
 .base-main-wrapper {
-  border: 1px solid purple;
   overflow: scroll;
   height:100%;
   width: 100%;
diff --git a/src/app/fda/config/config.json b/src/app/fda/config/config.json
index ecae5e431..115f4d53f 100644
--- a/src/app/fda/config/config.json
+++ b/src/app/fda/config/config.json
@@ -1,9 +1,5 @@
 {
-  "customToolbarComponent": "precisionFDA",
-  "apiBaseUrl": "http://localhost:9081/ginas/app/",
-  "gsrsHomeBaseUrl": "http://localhost:9081/ginas/app/",
-  "apiSSG4mBaseUrl": "http://localhost:9081/ginas/app/",
-  "occasionalApiBasePath": "/ginas/app",  "version": "3.1.2",
+  "version": "3.1.2",
   "contactEmail": "GSRSSupport@fda.hhs.gov",
   "displayMatchApplication": "true",
   "adverseEventShinyHomepageDisplay": "true",
@@ -19,7 +15,6 @@
   "useDataUrl": false,
   "showCrossEntitySearchDropdown": true,
   "restApiPrefix": "/ginas/app",
-  "showTopBanner": true, 
   "authenticateAs": {
     "apiUsername": null,
     "apiPassword": null,
@@ -1769,4 +1764,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file

From 3a63badb8c08a3b12dbe39703d2a9d27a5174c98 Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Mon, 5 May 2025 22:12:28 -0400
Subject: [PATCH 05/18] try footer

---
 src/app/core/app.module.ts                |  8 +++--
 src/app/core/base/base.component.html     |  8 +++++
 src/app/core/footer/footer.component.html |  4 +++
 src/app/core/footer/footer.component.scss |  0
 src/app/core/footer/footer.component.ts   | 43 +++++++++++++++++++++++
 src/app/fda/config/config.json            | 10 ++++++
 src/index.html                            |  9 ++++-
 7 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 src/app/core/footer/footer.component.html
 create mode 100644 src/app/core/footer/footer.component.scss
 create mode 100644 src/app/core/footer/footer.component.ts

diff --git a/src/app/core/app.module.ts b/src/app/core/app.module.ts
index 2e463de0c..a7c271fd0 100644
--- a/src/app/core/app.module.ts
+++ b/src/app/core/app.module.ts
@@ -119,6 +119,8 @@ import { UserQueryListDialogComponent } from '@gsrs-core/bulk-search/user-query-
 import { ListCreateDialogComponent } from '@gsrs-core/substances-browse/list-create-dialog/list-create-dialog.component';
 import { ImportScrubberComponent } from '@gsrs-core/admin/import-management/import-scrubber/import-scrubber.component';
 import { PrivacyStatementModule } from './privacy-statement/privacy-statement.module';
+import { FooterComponent } from './footer/footer.component';
+
 import { CsrfTokenInterceptor } from '@gsrs-core/auth/csrf-token.interceptor';
 import { CrossEntitySearchModule } from '../fda/cross-entity-search/cross-entity-search.module';
 import { FileSelectModule } from './file-select/file-select.module';
@@ -162,8 +164,8 @@ import { NitrosamineStandaloneModule } from './nitrosamine-standalone/nitrosamin
     MergeActionDialogComponent,
     UserQueryListDialogComponent,
     ListCreateDialogComponent,
-    ImportScrubberComponent
-
+    ImportScrubberComponent,
+    FooterComponent
   ],
   imports: [
     BrowserModule.withServerTransition({ appId: 'gsrs' }),
@@ -281,4 +283,4 @@ import { NitrosamineStandaloneModule } from './nitrosamine-standalone/nitrosamin
     SubstanceStatusPipe
   ]
 })
-export class AppModule {}
+export class AppModule {}
\ No newline at end of file
diff --git a/src/app/core/base/base.component.html b/src/app/core/base/base.component.html
index cd90cbff3..5cb357e5b 100644
--- a/src/app/core/base/base.component.html
+++ b/src/app/core/base/base.component.html
@@ -1,3 +1,6 @@
+<div fxLayout="column" fxFlexFill>
+  <div fxFlex>
+
 <div class="base-page-wrapper">
   <div *ngIf = "showTopBanner"> 
     <div class = "top-banner">{{bannerText}}</div>
@@ -235,3 +238,8 @@
       <router-outlet></router-outlet>
     </div>
 </div>
+
+</div>
+<app-footer></app-footer>
+</div>
+
diff --git a/src/app/core/footer/footer.component.html b/src/app/core/footer/footer.component.html
new file mode 100644
index 000000000..67b8375ee
--- /dev/null
+++ b/src/app/core/footer/footer.component.html
@@ -0,0 +1,4 @@
+<div class="content-container"> 
+    <!-- [style.bottom]="0" [style.position]="'fixed'"> -->
+    This is a footer components
+</div>
\ No newline at end of file
diff --git a/src/app/core/footer/footer.component.scss b/src/app/core/footer/footer.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/core/footer/footer.component.ts b/src/app/core/footer/footer.component.ts
new file mode 100644
index 000000000..5e8f4de93
--- /dev/null
+++ b/src/app/core/footer/footer.component.ts
@@ -0,0 +1,43 @@
+import { HttpClient } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+import { DomSanitizer } from '@angular/platform-browser';
+import { ConfigService } from '@gsrs-core/config';
+import { fromEvent, throttleTime } from 'rxjs';
+import { filter, first, map, tap } from 'rxjs/operators';
+
+@Component({
+  selector: 'app-footer',
+  templateUrl: './footer.component.html',
+  styleUrls: ['./footer.component.scss']
+})
+export class FooterComponent implements OnInit {
+  bottom : number = 0;
+  htmlText;
+  constructor(
+    private http:HttpClient,
+    private sanitizer:DomSanitizer,
+    private configService: ConfigService
+  ){ }
+  ngOnInit(){
+    // const privacyStatement = this.configService.configData.privacyStatement;
+    // if(privacyStatement) {
+    //   // if used, privacyStatement should be a json encoded string in config.json
+    //   this.htmlText = this.sanitizer.bypassSecurityTrustHtml(privacyStatement);
+    // } else {
+    //   // if used overwrite this file with a simple html version of your privacy statement.
+    //   this.http.get('assets/html/privacy-statement.html',{responseType:'text'}).subscribe(result=>{
+    //         this.htmlText = this.sanitizer.bypassSecurityTrustHtml(result);
+    //   }, error => {
+    //       this.htmlText = "Error fetching page content";
+    //   });
+    // }
+
+
+
+  }
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/app/fda/config/config.json b/src/app/fda/config/config.json
index 115f4d53f..c7ed8caa6 100644
--- a/src/app/fda/config/config.json
+++ b/src/app/fda/config/config.json
@@ -1,4 +1,13 @@
 {
+  "_customToolbarComponent": "precisionFDA",
+  "_apiBaseUrl": "http://localhost:9081/ginas/app/",
+  "_gsrsHomeBaseUrl": "http://localhost:9081/ginas/app/",
+  "_apiSSG4mBaseUrl": "http://localhost:9081/ginas/app/",
+
+  "apiBaseUrl": "https://gsrs-dev-public.ncats.io/ginas/app/",
+  "gsrsHomeBaseUrl": "https://gsrs-dev-public.ncats.io/ginas/app/ui/",
+  "apiSSG4mBaseUrl": "https://gsrs-dev-public.ncats.io/ginas/app/",
+  "occasionalApiBasePath": "/ginas/app",
   "version": "3.1.2",
   "contactEmail": "GSRSSupport@fda.hhs.gov",
   "displayMatchApplication": "true",
@@ -15,6 +24,7 @@
   "useDataUrl": false,
   "showCrossEntitySearchDropdown": true,
   "restApiPrefix": "/ginas/app",
+  "showTopBanner": true, 
   "authenticateAs": {
     "apiUsername": null,
     "apiPassword": null,
diff --git a/src/index.html b/src/index.html
index 4a6dce81f..bb2860c27 100644
--- a/src/index.html
+++ b/src/index.html
@@ -9,7 +9,7 @@
   <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
   <meta charset="utf-8">
   <title>GSRS</title>
-  <base href="/ginas/app/ui/">
+  <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="apple-touch-icon" sizes="57x57" href="/assets/favicon/apple-icon-57x57.png">
   <link rel="apple-touch-icon" sizes="60x60" href="/assets/favicon/apple-icon-60x60.png">
@@ -31,6 +31,13 @@
 </head>
 
 <link rel="stylesheet" href="ginas/app/ui/assets/styles/styles.custom.css">
+<style>
+html, body {
+  height: 100%;
+  box-sizing: border-box;
+  margin: 0;
+}
+</style>
 <body>
   <app-root></app-root>
 </body>

From 164fcb997107616ee805d2e5c8eb1d422af680f7 Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Tue, 6 May 2025 15:05:29 -0400
Subject: [PATCH 06/18] save work

---
 src/app/core/base/base.component.html               | 12 ++++--------
 src/app/core/base/base.component.scss               |  1 +
 src/app/core/base/base.component.ts                 | 13 +++++++++++++
 src/app/core/config/config.model.ts                 |  1 +
 src/app/core/footer/footer.component.html           | 13 +++++++++++--
 src/app/core/home/home.component.html               |  4 +++-
 .../substance-form/substance-form.component.scss    |  1 +
 .../substance-ssg2-form.component.scss              |  3 ++-
 .../substance-ssg4m-form.component.scss             |  2 ++
 .../substances-browse.component.html                |  1 +
 .../application-form.component.scss                 |  1 +
 src/app/fda/config/config.json                      |  1 +
 .../impurities-details-form.component.scss          |  2 ++
 .../impurities-form/impurities-form.component.scss  |  1 +
 .../impurities-inorganic-form.component.scss        |  2 ++
 .../impurities-inorganic-form-test.component.scss   |  1 +
 ...impurities-residual-solvents-form.component.scss |  1 +
 ...impurities-residual-solvents-test.component.scss |  1 +
 .../impurities-substance-form.component.scss        |  1 +
 .../impurities-test-form.component.scss             |  1 +
 .../impurities-total-form.component.scss            |  1 +
 .../impurities-unspecified-form.component.scss      |  1 +
 ...ro-pharmacology-assay-data-import.component.scss |  1 +
 .../invitro-pharmacology-assay-form.component.scss  |  1 +
 ...nvitro-pharmacology-assayset-form.component.scss |  1 +
 .../invitro-pharmacology-form.component.scss        |  1 +
 ...invitro-pharmacology-summary-form.component.scss |  1 +
 ...harmacology-screening-data-import.component.scss |  1 +
 .../invitro-pharmacology.component.scss             |  1 +
 .../product-form/product-form.component.scss        |  1 +
 src/index.html                                      |  8 +-------
 src/styles/_mat-side-nav.scss                       |  5 ++++-
 32 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/src/app/core/base/base.component.html b/src/app/core/base/base.component.html
index 5cb357e5b..3d9fad730 100644
--- a/src/app/core/base/base.component.html
+++ b/src/app/core/base/base.component.html
@@ -1,6 +1,3 @@
-<div fxLayout="column" fxFlexFill>
-  <div fxFlex>
-
 <div class="base-page-wrapper">
   <div *ngIf = "showTopBanner"> 
     <div class = "top-banner">{{bannerText}}</div>
@@ -237,9 +234,8 @@
       <app-loading></app-loading>
       <router-outlet></router-outlet>
     </div>
-</div>
-
-</div>
-<app-footer></app-footer>
-</div>
+  </div>
 
+<div *ngIf="showFooter" class="footer-wrapper">
+  <app-footer></app-footer>
+</div>
\ No newline at end of file
diff --git a/src/app/core/base/base.component.scss b/src/app/core/base/base.component.scss
index eed216405..fb16b5e3e 100644
--- a/src/app/core/base/base.component.scss
+++ b/src/app/core/base/base.component.scss
@@ -26,6 +26,7 @@
   display: inline;
   position: fixed;
   top: 64px;
+  border: 1px solid purple;
 }
 
 .base-main-wrapper-with-top-banner {
diff --git a/src/app/core/base/base.component.ts b/src/app/core/base/base.component.ts
index 9b8d992dd..e3e7aee38 100644
--- a/src/app/core/base/base.component.ts
+++ b/src/app/core/base/base.component.ts
@@ -63,6 +63,7 @@ export class BaseComponent implements OnInit, AfterViewInit, OnDestroy {
   showHeaderBar = 'true';
   bannerText: string = "This repository is under review for potential modification in compliance with Administration directives.";
   showTopBanner: boolean;
+  showFooter: boolean;
   showLogin: boolean;
 
   constructor(
@@ -331,6 +332,18 @@ export class BaseComponent implements OnInit, AfterViewInit, OnDestroy {
         this.showLogin = true;
       }
     }
+
+    if(this.configService.configData.showFooter === undefined) {
+      this.showFooter = false;
+    } else {
+      if(this.configService.configData.showFooter === false) { 
+        this.showFooter = false;
+      } else {
+        this.showFooter = true;
+      }
+    }
+
+
   }
 
 
diff --git a/src/app/core/config/config.model.ts b/src/app/core/config/config.model.ts
index 8b4ab5384..e2dd7748b 100644
--- a/src/app/core/config/config.model.ts
+++ b/src/app/core/config/config.model.ts
@@ -91,6 +91,7 @@ export interface Config {
     bannerText?: string;
     showTopBanner?: boolean;
     showLogin?: boolean;
+    showFooter?: boolean; 
     editPagingOptionSettings?: PagingOptionSettings;
     expandedComponents?: Array<string>;
     enablePDFDownload ?: DownloadAsPDF;
diff --git a/src/app/core/footer/footer.component.html b/src/app/core/footer/footer.component.html
index 67b8375ee..fbaab629f 100644
--- a/src/app/core/footer/footer.component.html
+++ b/src/app/core/footer/footer.component.html
@@ -1,4 +1,13 @@
-<div class="content-container"> 
-    <!-- [style.bottom]="0" [style.position]="'fixed'"> -->
+<div class="content-container" style="
+width: 100%;
+bottom: 0px;
+position: fixed;
+height: 60px;
+background: #252525;
+color: #fff;
+display: flex;
+align-items: center;
+gap: 10px;
+">
     This is a footer components
 </div>
\ No newline at end of file
diff --git a/src/app/core/home/home.component.html b/src/app/core/home/home.component.html
index 55fc4b4c1..96cd2681e 100644
--- a/src/app/core/home/home.component.html
+++ b/src/app/core/home/home.component.html
@@ -392,5 +392,7 @@ <h3 class = "resource-link">
     </ng-template>
 
     </div>
+
     </mat-sidenav-content>
-    </mat-sidenav-container>
\ No newline at end of file
+    </mat-sidenav-container>
+
diff --git a/src/app/core/substance-form/substance-form.component.scss b/src/app/core/substance-form/substance-form.component.scss
index ba7ba6d44..8531e6a63 100644
--- a/src/app/core/substance-form/substance-form.component.scss
+++ b/src/app/core/substance-form/substance-form.component.scss
@@ -120,6 +120,7 @@ mat-select-panel {
 .form-content-container {
   overflow: hidden;
   padding-top: 121px;
+  margin-bottom: 200px;
 }
 
 
diff --git a/src/app/core/substance-ssg2/substance-ssg2-form.component.scss b/src/app/core/substance-ssg2/substance-ssg2-form.component.scss
index 19fd43b19..a84fa24f8 100644
--- a/src/app/core/substance-ssg2/substance-ssg2-form.component.scss
+++ b/src/app/core/substance-ssg2/substance-ssg2-form.component.scss
@@ -106,7 +106,8 @@ mat-select-panel{
     // left: 0;
     overflow: hidden;
     padding-top: 121px;
-}
+    margin-bottom: 200px;
+  }
 
 .actions-container {
     max-width: 1128px;
diff --git a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss
index 63453d0ee..0de56389d 100644
--- a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss
+++ b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss
@@ -45,6 +45,8 @@
   overflow: hidden;
   margin-top: -100;
   padding-top: 0;
+  margin-bottom: 200px;
+
 }
 
 .cards-container {
diff --git a/src/app/core/substances-browse/substances-browse.component.html b/src/app/core/substances-browse/substances-browse.component.html
index b25f6cdb5..47952a6e5 100644
--- a/src/app/core/substances-browse/substances-browse.component.html
+++ b/src/app/core/substances-browse/substances-browse.component.html
@@ -743,3 +743,4 @@ <h3>{{privateSearchType | titlecase }} Search is Processing...</h3><br/>
 </ng-template>
 
 
+<div style="height: 80px; clear: both;">&nbsp;</div>
\ No newline at end of file
diff --git a/src/app/fda/application/application-form/application-form.component.scss b/src/app/fda/application/application-form/application-form.component.scss
index ad6358d4a..bf808d0cb 100644
--- a/src/app/fda/application/application-form/application-form.component.scss
+++ b/src/app/fda/application/application-form/application-form.component.scss
@@ -14,6 +14,7 @@
 .form-content-container {
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/app/fda/config/config.json b/src/app/fda/config/config.json
index c7ed8caa6..56087114d 100644
--- a/src/app/fda/config/config.json
+++ b/src/app/fda/config/config.json
@@ -7,6 +7,7 @@
   "apiBaseUrl": "https://gsrs-dev-public.ncats.io/ginas/app/",
   "gsrsHomeBaseUrl": "https://gsrs-dev-public.ncats.io/ginas/app/ui/",
   "apiSSG4mBaseUrl": "https://gsrs-dev-public.ncats.io/ginas/app/",
+  "showFooter": true,
   "occasionalApiBasePath": "/ginas/app",
   "version": "3.1.2",
   "contactEmail": "GSRSSupport@fda.hhs.gov",
diff --git a/src/app/fda/impurities/impurities-form/impurities-details-form/impurities-details-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-details-form/impurities-details-form.component.scss
index fa57cfd2f..2803daa06 100644
--- a/src/app/fda/impurities/impurities-form/impurities-details-form/impurities-details-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-details-form/impurities-details-form.component.scss
@@ -14,6 +14,8 @@
 .form-content-container {
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
+
 }
 
 .scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-form.component.scss
index a91127c64..2f0d6e219 100644
--- a/src/app/fda/impurities/impurities-form/impurities-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-form.component.scss
@@ -14,6 +14,7 @@
 .form-content-container {
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-inorganic-form/impurities-inorganic-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-inorganic-form/impurities-inorganic-form.component.scss
index 2ef96d249..b511753e6 100644
--- a/src/app/fda/impurities/impurities-form/impurities-inorganic-form/impurities-inorganic-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-inorganic-form/impurities-inorganic-form.component.scss
@@ -14,6 +14,8 @@
 .form-content-container {
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
+
 }
 
 .scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-inorganic-test-form/impurities-inorganic-form-test.component.scss b/src/app/fda/impurities/impurities-form/impurities-inorganic-test-form/impurities-inorganic-form-test.component.scss
index aa1724f9d..c77c860e9 100644
--- a/src/app/fda/impurities/impurities-form/impurities-inorganic-test-form/impurities-inorganic-form-test.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-inorganic-test-form/impurities-inorganic-form-test.component.scss
@@ -14,6 +14,7 @@
 .form-content-container {
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-residual-solvents-form/impurities-residual-solvents-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-residual-solvents-form/impurities-residual-solvents-form.component.scss
index 25cff4d8d..6c311cca8 100644
--- a/src/app/fda/impurities/impurities-form/impurities-residual-solvents-form/impurities-residual-solvents-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-residual-solvents-form/impurities-residual-solvents-form.component.scss
@@ -14,6 +14,7 @@
 .form-content-container {
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-residual-solvents-test-form/impurities-residual-solvents-test.component.scss b/src/app/fda/impurities/impurities-form/impurities-residual-solvents-test-form/impurities-residual-solvents-test.component.scss
index 77755a9a4..dcfcbb727 100644
--- a/src/app/fda/impurities/impurities-form/impurities-residual-solvents-test-form/impurities-residual-solvents-test.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-residual-solvents-test-form/impurities-residual-solvents-test.component.scss
@@ -14,6 +14,7 @@
   .form-content-container {
     overflow: hidden;
     padding-top: 110px;
+    margin-bottom: 200px;
   }
 
   .scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-substance-form/impurities-substance-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-substance-form/impurities-substance-form.component.scss
index e1610d1b0..8561beca2 100644
--- a/src/app/fda/impurities/impurities-form/impurities-substance-form/impurities-substance-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-substance-form/impurities-substance-form.component.scss
@@ -14,6 +14,7 @@
   .form-content-container {
     overflow: hidden;
     padding-top: 110px;
+    margin-bottom: 200px;
   }
   
   .scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-test-form/impurities-test-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-test-form/impurities-test-form.component.scss
index 4531e1988..617588385 100644
--- a/src/app/fda/impurities/impurities-form/impurities-test-form/impurities-test-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-test-form/impurities-test-form.component.scss
@@ -14,6 +14,7 @@
 .form-content-container {
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-total-form/impurities-total-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-total-form/impurities-total-form.component.scss
index da6989cd2..877e95c3c 100644
--- a/src/app/fda/impurities/impurities-form/impurities-total-form/impurities-total-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-total-form/impurities-total-form.component.scss
@@ -14,6 +14,7 @@
   .form-content-container {
     overflow: hidden;
     padding-top: 110px;
+    margin-bottom: 200px;
   }
   
   .scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-unspecified-form/impurities-unspecified-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-unspecified-form/impurities-unspecified-form.component.scss
index 293dceae9..feacb42ff 100644
--- a/src/app/fda/impurities/impurities-form/impurities-unspecified-form/impurities-unspecified-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-unspecified-form/impurities-unspecified-form.component.scss
@@ -14,6 +14,7 @@
 .form-content-container {
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology-assay-data-import/invitro-pharmacology-assay-data-import.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology-assay-data-import/invitro-pharmacology-assay-data-import.component.scss
index 5c26f6ad4..724f1fbea 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology-assay-data-import/invitro-pharmacology-assay-data-import.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology-assay-data-import/invitro-pharmacology-assay-data-import.component.scss
@@ -15,6 +15,7 @@
   overflow-x: auto;
   overflow-y: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assay-form/invitro-pharmacology-assay-form.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assay-form/invitro-pharmacology-assay-form.component.scss
index edb03cbe3..d51fd6a17 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assay-form/invitro-pharmacology-assay-form.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assay-form/invitro-pharmacology-assay-form.component.scss
@@ -14,6 +14,7 @@
 .form-content-container {
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assayset-form/invitro-pharmacology-assayset-form.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assayset-form/invitro-pharmacology-assayset-form.component.scss
index a5390baf5..8341a58f9 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assayset-form/invitro-pharmacology-assayset-form.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assayset-form/invitro-pharmacology-assayset-form.component.scss
@@ -14,6 +14,7 @@
 .form-content-container {
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-form.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-form.component.scss
index afef7e4a1..f485b9f4d 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-form.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-form.component.scss
@@ -16,6 +16,7 @@
   margin: 0 auto;
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-summary-form/invitro-pharmacology-summary-form.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-summary-form/invitro-pharmacology-summary-form.component.scss
index deecb7ca1..80bef5ed2 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-summary-form/invitro-pharmacology-summary-form.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-summary-form/invitro-pharmacology-summary-form.component.scss
@@ -16,6 +16,7 @@
   margin: 0 auto;
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology-screening-data-import/invitro-pharmacology-screening-data-import.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology-screening-data-import/invitro-pharmacology-screening-data-import.component.scss
index 7c7fcae5e..75063108d 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology-screening-data-import/invitro-pharmacology-screening-data-import.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology-screening-data-import/invitro-pharmacology-screening-data-import.component.scss
@@ -15,6 +15,7 @@
   overflow-x: auto;
   overflow-y: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology.component.scss
index ad6358d4a..bf808d0cb 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology.component.scss
@@ -14,6 +14,7 @@
 .form-content-container {
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/app/fda/product/product-form/product-form.component.scss b/src/app/fda/product/product-form/product-form.component.scss
index 44ccdeb65..3cf26bd39 100644
--- a/src/app/fda/product/product-form/product-form.component.scss
+++ b/src/app/fda/product/product-form/product-form.component.scss
@@ -14,6 +14,7 @@
 .form-content-container {
   overflow: hidden;
   padding-top: 110px;
+  margin-bottom: 200px;
 }
 
 .scrollable-container {
diff --git a/src/index.html b/src/index.html
index bb2860c27..da581fc34 100644
--- a/src/index.html
+++ b/src/index.html
@@ -31,13 +31,7 @@
 </head>
 
 <link rel="stylesheet" href="ginas/app/ui/assets/styles/styles.custom.css">
-<style>
-html, body {
-  height: 100%;
-  box-sizing: border-box;
-  margin: 0;
-}
-</style>
+
 <body>
   <app-root></app-root>
 </body>
diff --git a/src/styles/_mat-side-nav.scss b/src/styles/_mat-side-nav.scss
index d0bc052fc..63c411644 100644
--- a/src/styles/_mat-side-nav.scss
+++ b/src/styles/_mat-side-nav.scss
@@ -2,8 +2,11 @@
     /* let .base-main-container set top */
     left: 0;
     right: 0;
-    bottom: 0;
+    /* why? */
+    // bottom: 0;
+    margin-bottom: 200px;
     background-color: var(--regular-transparent-color);
+    border: 1px solid green;
 }
 
 mat-sidenav {

From 6cc570256b13b0fd472b60475d554b1e85a3ebda Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Tue, 6 May 2025 17:25:11 -0400
Subject: [PATCH 07/18] changes to footer code

---
 src/app/core/footer/footer.component.html | 41 +++++++++++-----
 src/app/core/footer/footer.component.scss | 60 +++++++++++++++++++++++
 2 files changed, 89 insertions(+), 12 deletions(-)

diff --git a/src/app/core/footer/footer.component.html b/src/app/core/footer/footer.component.html
index fbaab629f..0280a3c7a 100644
--- a/src/app/core/footer/footer.component.html
+++ b/src/app/core/footer/footer.component.html
@@ -1,13 +1,30 @@
-<div class="content-container" style="
-width: 100%;
-bottom: 0px;
-position: fixed;
-height: 60px;
-background: #252525;
-color: #fff;
-display: flex;
-align-items: center;
-gap: 10px;
-">
-    This is a footer components
+<div class="content-container">
+    <div class="footer-row">
+        <ul class="single-column">
+            <li><a href="http://www.hhs.gov" target="_blank" rel="noopener noreferrer">U.S. Department of Health &amp; Human Services</a></li>
+            <li><a href="http://www.nih.gov" target="_blank" rel="noopener noreferrer">National Institutes of Health</a></li>
+        </ul>
+    </div>
+    <div class="footer-row">
+        <ul class="single-row">
+            <li><a href="https://www.hhs.gov/vulnerability-disclosure-policy/index.html" target="_blank" rel="noopener noreferrer">HHS Vulnerability Disclosure</a></li>
+            <li>|</li>
+            <li><a href="http://www.ncats.nih.gov/">NCATS Home</a></li>
+            <li>|</li>
+            <li><a href="http://www.nih.gov/about/access.htm" target="_blank" rel="noopener noreferrer">Accessibility</a></li>
+            <li>|</li>
+            <li><a href="./privacy.html">Privacy Notice</a></li>
+            <li>|</li>
+            <li><a href="./licensing.html">Licensing</a></li>
+            <li>|</li>
+            <li><a href="http://www.ncats.nih.gov/about/foia.html">FOIA</a></li>
+            <li>|</li>
+            <li><a href="http://oig.hhs.gov/" target="_blank" rel="noopener noreferrer">OIG</a></li>   
+        </ul>
+    </div>
+    <div class="footer-row">
+        <ul class="single-column">
+            <li>National Center for Advancing Translational Sciences (NCATS), 6701 Democracy Boulevard, Bethesda MD 20892-4874 | 301-435-0888</li>
+        </ul>
+    </div>
 </div>
\ No newline at end of file
diff --git a/src/app/core/footer/footer.component.scss b/src/app/core/footer/footer.component.scss
index e69de29bb..396e94c81 100644
--- a/src/app/core/footer/footer.component.scss
+++ b/src/app/core/footer/footer.component.scss
@@ -0,0 +1,60 @@
+.content-container { 
+    width: 100%;
+    bottom: 0px;
+    position: fixed;
+    height: 100px;
+    background: #4793d1;
+    color: #fff;
+    display: flex;
+    align-items: center;
+    gap: 0px;
+    font-size: 14px;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-start;
+    flex-wrap: wrap;
+    padding: 10px;
+}
+
+.footer-row { 
+    display: flex;
+    width: auto;
+    color: WhiteSmoke;
+}
+
+.footer-row a {
+    color: WhiteSmoke;
+    text-decoration: none;
+}
+
+.footer-row ul {
+    padding: 0px;
+    margin: 0px;
+}
+
+.footer-row ul.single-column {
+    display: flex;
+    flex-direction: column;
+    row-gap: 0;
+}
+
+
+.footer-row ul.single-row {
+    display: flex;
+    flex-direction: row;
+}
+    
+.footer-row ul.single-column li { 
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+}
+
+.footer-row ul.single-row li { 
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 5px;
+}

From 671e9e1f7bd1a43a45adbdd2f3d3983504eb473e Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Wed, 14 May 2025 18:06:54 -0400
Subject: [PATCH 08/18] process index changes

---
 process-index.js | 11 ++++++++++-
 src/index.html   |  7 +++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/process-index.js b/process-index.js
index 4351cb887..96510a4fb 100644
--- a/process-index.js
+++ b/process-index.js
@@ -24,6 +24,15 @@ fs.readFile(indexFilePath, 'utf8', function (err, data) {
       }
     });
 
+    const scriptAnalyticsCustom = $('script#analytics-custom');
+    scriptAnalyticsCustom.each((index, _element) => {
+      const element = $(_element);
+      if (element.attr('src') && element.attr('src').match(/^\/assets\//) || element.attr('src').match(/^assets\//)) {
+        const currentHref = element.attr('src').replace(/^\//, '');
+        element.attr('src', baseHref + currentHref);
+      }
+    });
+
     const metas = $('meta');
     links.each((index, _element) => {
       const element = $(_element);
@@ -38,4 +47,4 @@ fs.readFile(indexFilePath, 'utf8', function (err, data) {
   fs.writeFile(indexFilePath, $.html(), function (err) {
     if (err) return console.log(err);
   });
-});
\ No newline at end of file
+});
diff --git a/src/index.html b/src/index.html
index da581fc34..951a68b01 100644
--- a/src/index.html
+++ b/src/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 
 <head>
-  <script src="/ginas/app/ui/assets/js/analytics.custom.js"></script>
+  <script id="analytics-custom" src="/assets/js/analytics.custom.js"></script>
 
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -30,10 +30,9 @@
   <meta name="theme-color" content="#ffffff">
 </head>
 
-<link rel="stylesheet" href="ginas/app/ui/assets/styles/styles.custom.css">
-
+<link rel="stylesheet" href="/assets/styles/styles.custom.css">
 <body>
   <app-root></app-root>
 </body>
 
-</html>
+</html>
\ No newline at end of file

From 9d1163a86bfe2007c67fe02684c4b14155b97559 Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Tue, 20 May 2025 18:33:42 -0400
Subject: [PATCH 09/18] make products work with top banner

---
 src/app/core/base/base.component.scss           |  1 -
 .../product-form/product-form.component.html    |  3 ++-
 .../product-form/product-form.component.scss    |  4 ++++
 .../product-form/product-form.component.ts      | 17 ++++++++++++++++-
 src/styles/_mat-side-nav.scss                   |  1 -
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/app/core/base/base.component.scss b/src/app/core/base/base.component.scss
index fb16b5e3e..eed216405 100644
--- a/src/app/core/base/base.component.scss
+++ b/src/app/core/base/base.component.scss
@@ -26,7 +26,6 @@
   display: inline;
   position: fixed;
   top: 64px;
-  border: 1px solid purple;
 }
 
 .base-main-wrapper-with-top-banner {
diff --git a/src/app/fda/product/product-form/product-form.component.html b/src/app/fda/product/product-form/product-form.component.html
index 5f0d38f4b..6fe36a139 100644
--- a/src/app/fda/product/product-form/product-form.component.html
+++ b/src/app/fda/product/product-form/product-form.component.html
@@ -1,4 +1,5 @@
-<div class="top-fixed">
+<div [ngClass]="['top-fixed', showTopBanner ? 'top-fixed-with-top-banner': '']">
+
   <div class="actions-container">
     <button mat-flat-button color="primary" *ngIf="!message" (click)="showJSON()">Show JSON</button>&nbsp;&nbsp;&nbsp;
 
diff --git a/src/app/fda/product/product-form/product-form.component.scss b/src/app/fda/product/product-form/product-form.component.scss
index 3cf26bd39..066d7044a 100644
--- a/src/app/fda/product/product-form/product-form.component.scss
+++ b/src/app/fda/product/product-form/product-form.component.scss
@@ -11,6 +11,10 @@
   z-index: 1001;
 }
 
+.top-fixed-with-top-banner {
+  top: 92px;
+} 
+
 .form-content-container {
   overflow: hidden;
   padding-top: 110px;
diff --git a/src/app/fda/product/product-form/product-form.component.ts b/src/app/fda/product/product-form/product-form.component.ts
index d57cae9e4..b9c6b1ab9 100644
--- a/src/app/fda/product/product-form/product-form.component.ts
+++ b/src/app/fda/product/product-form/product-form.component.ts
@@ -20,6 +20,7 @@ import { OverlayContainer } from '@angular/cdk/overlay';
 import { SubstanceEditImportDialogComponent } from '@gsrs-core/substance-edit-import-dialog/substance-edit-import-dialog.component';
 import { JsonDialogFdaComponent } from '../../json-dialog-fda/json-dialog-fda.component';
 import { ConfirmDialogComponent } from '../../confirm-dialog/confirm-dialog.component';
+import { ConfigService } from '@gsrs-core/config';
 
 @Component({
   selector: 'app-product-form',
@@ -53,6 +54,7 @@ export class ProductFormComponent implements OnInit, AfterViewInit, OnDestroy {
   jsonFileName: string;
   provenanceFieldMessage: Array<String> = [];
   effectiveTimeMessage: any[][] = [];
+  showTopBanner: boolean;
 
   constructor(
     private productService: ProductService,
@@ -67,13 +69,26 @@ export class ProductFormComponent implements OnInit, AfterViewInit, OnDestroy {
     private overlayContainerService: OverlayContainer,
     private dialog: MatDialog,
     private titleService: Title,
-    private sanitizer: DomSanitizer) { }
+    private sanitizer: DomSanitizer,
+    private configService: ConfigService) { }
 
   ngOnInit() {
     this.isAdmin = this.authService.hasRoles('admin');
     this.loadingService.setLoading(true);
     this.overlayContainer = this.overlayContainerService.getContainerElement();
     this.username = this.authService.getUser();
+
+
+    if(this.configService.configData.showTopBanner === undefined) {
+      this.showTopBanner = false;
+    } else {
+      if(this.configService.configData.showTopBanner === false) { 
+        this.showTopBanner = false;
+      } else {
+        this.showTopBanner = true;
+      }
+    }
+
     const routeSubscription = this.activatedRoute
       .params
       .subscribe(params => {
diff --git a/src/styles/_mat-side-nav.scss b/src/styles/_mat-side-nav.scss
index 63c411644..5a27b53df 100644
--- a/src/styles/_mat-side-nav.scss
+++ b/src/styles/_mat-side-nav.scss
@@ -6,7 +6,6 @@
     // bottom: 0;
     margin-bottom: 200px;
     background-color: var(--regular-transparent-color);
-    border: 1px solid green;
 }
 
 mat-sidenav {

From e7dc725a7d625acf1646f9f881a2d511363469a7 Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Fri, 30 May 2025 15:12:21 -0400
Subject: [PATCH 10/18] collapse height 0

---
 .../core/substances-browse/substances-browse.component.html | 4 ++--
 src/styles/_misc.scss                                       | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/core/substances-browse/substances-browse.component.html b/src/app/core/substances-browse/substances-browse.component.html
index 98140d3f8..8c1f3383f 100644
--- a/src/app/core/substances-browse/substances-browse.component.html
+++ b/src/app/core/substances-browse/substances-browse.component.html
@@ -1,4 +1,5 @@
 <mat-sidenav-container [hasBackdrop]="hasBackdrop" [ngClass]="{ collapsed: showExactMatches }">
+
   <mat-sidenav [disableClose]="!isCollapsed" #matSideNavInstance mode="side" opened="false">
     <mat-form-field style = "margin-left: 30px;" *ngIf="isAdmin" id = "facetView" class = "facetView">
       <mat-label>Facet View:</mat-label>
@@ -746,5 +747,4 @@ <h3>{{privateSearchType | titlecase }} Search is Processing...</h3><br/>
   </mat-dialog>
 </ng-template>
 
-
-<div style="height: 80px; clear: both;">&nbsp;</div>
\ No newline at end of file
+<div style="height: 200px; clear: both;">&nbsp;</div>
\ No newline at end of file
diff --git a/src/styles/_misc.scss b/src/styles/_misc.scss
index 336d65e0c..8be489117 100644
--- a/src/styles/_misc.scss
+++ b/src/styles/_misc.scss
@@ -304,6 +304,12 @@ textarea {
 
 .collapsed {
   width: 0;
+  /* 
+  __aw__ added height 0 so while doing footer stuff. Without it 
+  things appeared at bottom of screen when doing substance search and exact 
+  match found.
+  */
+  height: 0;
   overflow: hidden;
 }
 

From 5a9194c52eda7600fffe86c1c56435dbc66ff287 Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Mon, 23 Jun 2025 19:53:40 -0400
Subject: [PATCH 11/18] minor edits

---
 src/app/core/base/base.component.html               |  2 +-
 src/app/core/home/home.component.html               |  2 --
 .../substance-form/substance-form.component.scss    | 13 ++-----------
 .../substance-ssg4m-form.component.html             |  4 ++--
 .../substance-ssg4m-form.component.scss             | 11 ++---------
 .../substance-text-search.component.scss            |  1 +
 .../substances-browse.component.html                |  3 +--
 7 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/app/core/base/base.component.html b/src/app/core/base/base.component.html
index b50d6d7fa..87472dc89 100644
--- a/src/app/core/base/base.component.html
+++ b/src/app/core/base/base.component.html
@@ -180,7 +180,7 @@
     (closed)="removeZindex()">
   </app-substance-text-search>
   <div>
-      <button mat-button class="login-link" (click)="routeToLogin()" *ngIf=" showLogin && !auth && mainPathSegment !== 'login'">
+    <button mat-button class="login-link" (click)="routeToLogin()" *ngIf=" showLogin && !auth && mainPathSegment !== 'login'">
       Login
     </button>
     <div class="logged-in" *ngIf="auth">
diff --git a/src/app/core/home/home.component.html b/src/app/core/home/home.component.html
index 2d156b544..f922b122b 100644
--- a/src/app/core/home/home.component.html
+++ b/src/app/core/home/home.component.html
@@ -392,7 +392,5 @@ <h3 class = "resource-link">
     </ng-template>
 
     </div>
-
     </mat-sidenav-content>
     </mat-sidenav-container>
-
diff --git a/src/app/core/substance-form/substance-form.component.scss b/src/app/core/substance-form/substance-form.component.scss
index 8531e6a63..dacc388e1 100644
--- a/src/app/core/substance-form/substance-form.component.scss
+++ b/src/app/core/substance-form/substance-form.component.scss
@@ -1,10 +1,3 @@
-// .scrollable-container {
-//   height: 1800px;
-//   overflow: scroll;
-//   border: 1px solid blue;
-//  }
-
-
 #overlay {
   position: fixed; /* Sit on top of the page content */
   display: block; /* Hidden by default */
@@ -61,13 +54,11 @@
   cursor: pointer;
 }
 
-
 .top-fixed {
-  /* keep this relative to prevent having to set top at component level. 0 is top of component window. */
   position: fixed;
-  top: 64px; 
   display: flex;
   flex-direction: column;
+  top: 64px;
   width: 100%;
   background-color: var(--regular-white-color);
   align-items: center;
@@ -280,4 +271,4 @@ mat-select-panel {
 
 .mat-button, .mat-icon-button, .mat-stroked-button, .mat-flat-button {
   min-width: auto;
-}
\ No newline at end of file
+}
diff --git a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.html b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.html
index 925c2c1f9..cf5f3e57c 100644
--- a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.html
+++ b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.html
@@ -108,7 +108,7 @@
     </div> <!-- Validation Message -->
   </div>
 
-  <div class="form-content-container" [ngClass]="{'padtop70px': showHeaderBar === 'false'}" style="width: 100%; scroll: auto; border: 1px soid purple;">
+  <div class="form-content-container" [ngClass]="{'padtop70px': showHeaderBar === 'false'}" style="width: 100%; scroll: auto;">
     <!--
   <div class="form-header"
     [ngClass]="{'form-header-no-title-top': (showHeaderBar === 'true' && showRegisterEditTitle === 'false'), 'form-header-title-top': (showHeaderBar === 'true' && showRegisterEditTitle === 'true')}">
@@ -157,4 +157,4 @@
       </div>
     </div>
     </div>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss
index 0de56389d..3cad296ea 100644
--- a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss
+++ b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss
@@ -15,13 +15,7 @@
 
 .top-fixed-with-top-banner {
   top: 92px;
-} 
-
-
-// __aw__, see how this works with showHeaderBar? 
-// .top-fixed-top {
-//   top: 64px;
-// }
+}
 
 .zindex2000 {
   z-index: 2000;
@@ -46,7 +40,6 @@
   margin-top: -100;
   padding-top: 0;
   margin-bottom: 200px;
-
 }
 
 .cards-container {
@@ -307,4 +300,4 @@ app-substance-form-ssg4m-process-card button[color=primary] {
 
 .main-container {
   position: relative;
-}
\ No newline at end of file
+}
diff --git a/src/app/core/substance-text-search/substance-text-search.component.scss b/src/app/core/substance-text-search/substance-text-search.component.scss
index 9396ea2c6..0da640be7 100644
--- a/src/app/core/substance-text-search/substance-text-search.component.scss
+++ b/src/app/core/substance-text-search/substance-text-search.component.scss
@@ -84,6 +84,7 @@ form {
       right: 0;
       width: 100%;
       left: 0;
+     // __aw__not_sure
       height: 92px;
       padding-right: 210px;
       padding-left: 16px;
diff --git a/src/app/core/substances-browse/substances-browse.component.html b/src/app/core/substances-browse/substances-browse.component.html
index 8c1f3383f..c783c6a5d 100644
--- a/src/app/core/substances-browse/substances-browse.component.html
+++ b/src/app/core/substances-browse/substances-browse.component.html
@@ -1,5 +1,4 @@
 <mat-sidenav-container [hasBackdrop]="hasBackdrop" [ngClass]="{ collapsed: showExactMatches }">
-
   <mat-sidenav [disableClose]="!isCollapsed" #matSideNavInstance mode="side" opened="false">
     <mat-form-field style = "margin-left: 30px;" *ngIf="isAdmin" id = "facetView" class = "facetView">
       <mat-label>Facet View:</mat-label>
@@ -747,4 +746,4 @@ <h3>{{privateSearchType | titlecase }} Search is Processing...</h3><br/>
   </mat-dialog>
 </ng-template>
 
-<div style="height: 200px; clear: both;">&nbsp;</div>
\ No newline at end of file
+<div style="height: 200px; clear: both;">&nbsp;</div>

From 06b60752f3df0a86836ee3e42adb9e5219b2614b Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Tue, 24 Jun 2025 13:24:21 -0400
Subject: [PATCH 12/18] add margin-bottom to searches

---
 src/app/core/base/base.component.ts                        | 7 +++++++
 src/app/core/bulk-search/bulk-query.component.scss         | 1 +
 src/app/core/config/config.model.ts                        | 1 +
 .../core/sequence-search/sequence-search.component.scss    | 2 ++
 .../core/structure-search/structure-search.component.scss  | 1 +
 src/app/fda/advanced-search/advanced-search.component.scss | 1 +
 6 files changed, 13 insertions(+)

diff --git a/src/app/core/base/base.component.ts b/src/app/core/base/base.component.ts
index e3e7aee38..83ee7cb91 100644
--- a/src/app/core/base/base.component.ts
+++ b/src/app/core/base/base.component.ts
@@ -41,6 +41,7 @@ export class BaseComponent implements OnInit, AfterViewInit, OnDestroy {
   classicLinkQueryParamsString: string;
   isAdmin = false;
   contactEmail: string;
+  contactEmailAlt: string;
   version?: string;
   versionTooltipMessage = '';
   appId: string;
@@ -155,6 +156,8 @@ export class BaseComponent implements OnInit, AfterViewInit, OnDestroy {
     this.clasicBaseHref = this.configService.environment.clasicBaseHref;
     this.classicLinkQueryParamsString = '';
     this.contactEmail = this.configService.configData.contactEmail || null;
+    this.contactEmailAlt = this.configService.configData.contactEmailAlt || null;
+    
     this.navItems = this.configService.configData.navItems || null;
 
   let notempty = false;
@@ -418,6 +421,10 @@ export class BaseComponent implements OnInit, AfterViewInit, OnDestroy {
       if(item.kind==='contact-us') {
         email = this.contactEmail;
       }
+      if(item.kind==='contact-us-alt') {
+        email = this.contactEmailAlt;
+      }
+
       if(item?.queryParams) {
         if(item?.queryParams?.subject) {
           subject = item.queryParams.subject;
diff --git a/src/app/core/bulk-search/bulk-query.component.scss b/src/app/core/bulk-search/bulk-query.component.scss
index 13cb95c5d..63d56e1bb 100644
--- a/src/app/core/bulk-search/bulk-query.component.scss
+++ b/src/app/core/bulk-search/bulk-query.component.scss
@@ -5,6 +5,7 @@
     align-items: center;
     justify-content: center;
     padding: 65px 5px 0 5px;
+    margin-bottom: 400px;
 }
 
 .mat-card {
diff --git a/src/app/core/config/config.model.ts b/src/app/core/config/config.model.ts
index e2dd7748b..fbd785119 100644
--- a/src/app/core/config/config.model.ts
+++ b/src/app/core/config/config.model.ts
@@ -20,6 +20,7 @@ export interface Config {
     homeHeader?: string;
     homeContents?: string;
     contactEmail?: string;
+    contactEmailAlt?: string;    
     defaultCodeSystem?: string;
     primaryCode?: string;
     typeaheadFields?: Array<string>;
diff --git a/src/app/core/sequence-search/sequence-search.component.scss b/src/app/core/sequence-search/sequence-search.component.scss
index 09a25700a..54ee0c96e 100644
--- a/src/app/core/sequence-search/sequence-search.component.scss
+++ b/src/app/core/sequence-search/sequence-search.component.scss
@@ -4,6 +4,8 @@
     align-items: center;
     justify-content: center;
     padding: 65px 5px 0 5px;
+    margin-bottom: 400px;
+
 }
 
 .mat-card {
diff --git a/src/app/core/structure-search/structure-search.component.scss b/src/app/core/structure-search/structure-search.component.scss
index 8840b6e79..491533377 100644
--- a/src/app/core/structure-search/structure-search.component.scss
+++ b/src/app/core/structure-search/structure-search.component.scss
@@ -5,6 +5,7 @@
     align-items: center;
     justify-content: center;
     padding: 65px 5px 0 5px;
+    margin-bottom: 400px;
 }
 
 .mat-card-title {
diff --git a/src/app/fda/advanced-search/advanced-search.component.scss b/src/app/fda/advanced-search/advanced-search.component.scss
index 2d9bb2dd2..80ddee60b 100644
--- a/src/app/fda/advanced-search/advanced-search.component.scss
+++ b/src/app/fda/advanced-search/advanced-search.component.scss
@@ -4,6 +4,7 @@
   margin: auto;
   /*height: 200px; */
   /*margin: 0 auto;*/
+  margin-bottom: 400px;
 }
 
 .div-flex {

From f6a3dc4db1332133053f41e04fb124d4d225dc23 Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Thu, 26 Jun 2025 18:44:04 -0400
Subject: [PATCH 13/18] corect some links

---
 src/app/core/footer/footer.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/core/footer/footer.component.html b/src/app/core/footer/footer.component.html
index 0280a3c7a..8be795c28 100644
--- a/src/app/core/footer/footer.component.html
+++ b/src/app/core/footer/footer.component.html
@@ -13,9 +13,9 @@
             <li>|</li>
             <li><a href="http://www.nih.gov/about/access.htm" target="_blank" rel="noopener noreferrer">Accessibility</a></li>
             <li>|</li>
-            <li><a href="./privacy.html">Privacy Notice</a></li>
+            <li><a href="./privacy">Privacy Notice</a></li>
             <li>|</li>
-            <li><a href="./licensing.html">Licensing</a></li>
+            <li><a href="./licensing">Licensing</a></li>
             <li>|</li>
             <li><a href="http://www.ncats.nih.gov/about/foia.html">FOIA</a></li>
             <li>|</li>

From 08de087eee6c84b26d8675693ae27300847b432b Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Thu, 26 Jun 2025 18:52:57 -0400
Subject: [PATCH 14/18] corect some links

---
 src/app/core/footer/footer.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/core/footer/footer.component.html b/src/app/core/footer/footer.component.html
index 8be795c28..1bd658b22 100644
--- a/src/app/core/footer/footer.component.html
+++ b/src/app/core/footer/footer.component.html
@@ -13,9 +13,9 @@
             <li>|</li>
             <li><a href="http://www.nih.gov/about/access.htm" target="_blank" rel="noopener noreferrer">Accessibility</a></li>
             <li>|</li>
-            <li><a href="./privacy">Privacy Notice</a></li>
+            <li><a href="/privacy">Privacy Notice</a></li>
             <li>|</li>
-            <li><a href="./licensing">Licensing</a></li>
+            <li><a href="/licensing">Licensing</a></li>
             <li>|</li>
             <li><a href="http://www.ncats.nih.gov/about/foia.html">FOIA</a></li>
             <li>|</li>

From 080f9d4cc71dac438b111b096bdc9f8b692211b0 Mon Sep 17 00:00:00 2001
From: alx652 <58182629+alx652@users.noreply.github.com>
Date: Mon, 14 Jul 2025 13:49:28 -0400
Subject: [PATCH 15/18] Update Scilligence.JSDraw2.Pro.js

---
 src/app/core/assets/jsdraw/Scilligence.JSDraw2.Pro.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/core/assets/jsdraw/Scilligence.JSDraw2.Pro.js b/src/app/core/assets/jsdraw/Scilligence.JSDraw2.Pro.js
index b007bf5b5..d4e0b1148 100644
--- a/src/app/core/assets/jsdraw/Scilligence.JSDraw2.Pro.js
+++ b/src/app/core/assets/jsdraw/Scilligence.JSDraw2.Pro.js
@@ -25,9 +25,8 @@ JSDraw2.password = { encrypt: true, key: null, iv: null };
 // Place the license code below
 // Licensed to: FDA
 // Product: JSDraw
-// Expiration Date: 2025-Jul-30
-JSDraw2.licensecode='405562538916781761723242424242424131213141512181';
-
+// Expiration Date: 2026-Jul-30
+JSDraw2.licensecode='405562537916781761723242424242424131213141512181';
 
 //////////////////////////////////////////////////////////////////////////////////
 // JSDraw default settings

From 94afe1725a8916d1b78927ed82e6f3843eefd2ee Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Fri, 8 Aug 2025 08:44:56 -0400
Subject: [PATCH 16/18] cv scroll

---
 .../cv-management/cv-term-dialog/cv-term-dialog.component.scss  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.scss b/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.scss
index bf87def14..ce82964be 100644
--- a/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.scss
+++ b/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.scss
@@ -54,7 +54,7 @@ margin-bottom:5px;
 .content-fix {
     min-height: 250px;
     padding: 15px 20px;
-
+    overflow: scroll;
 }
 
 .src-column {

From fba7f13b43d3197e576622c738a6ead8374bc5d1 Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Fri, 8 Aug 2025 09:36:51 -0400
Subject: [PATCH 17/18] showLoginButton option, make footer better

---
 src/app/core/base/base.component.html     |  6 ++-
 src/app/core/base/base.component.ts       | 11 ++++++
 src/app/core/config/config.model.ts       |  1 +
 src/app/core/footer/footer.component.html | 46 ++++++++++++-----------
 src/app/core/footer/footer.component.scss | 45 +++-------------------
 5 files changed, 46 insertions(+), 63 deletions(-)

diff --git a/src/app/core/base/base.component.html b/src/app/core/base/base.component.html
index 87472dc89..94f28b96f 100644
--- a/src/app/core/base/base.component.html
+++ b/src/app/core/base/base.component.html
@@ -180,9 +180,11 @@
     (closed)="removeZindex()">
   </app-substance-text-search>
   <div>
-    <button mat-button class="login-link" (click)="routeToLogin()" *ngIf=" showLogin && !auth && mainPathSegment !== 'login'">
+   <div *ngIf="showLoginButton">
+     <button mat-button class="login-link" (click)="routeToLogin()" *ngIf=" showLogin && !auth && mainPathSegment !== 'login'">
       Login
-    </button>
+     </button>
+   </div>
     <div class="logged-in" *ngIf="auth">
       <button aria-label="User Account" class="user-button main-button" mat-icon-button [matMenuTriggerFor]="accountMenu" (click)="increaseMenuZindex()" >
         <mat-icon class="user-icon" svgIcon="account_circle" ></mat-icon>
diff --git a/src/app/core/base/base.component.ts b/src/app/core/base/base.component.ts
index 83ee7cb91..2bf9b5a3d 100644
--- a/src/app/core/base/base.component.ts
+++ b/src/app/core/base/base.component.ts
@@ -66,6 +66,7 @@ export class BaseComponent implements OnInit, AfterViewInit, OnDestroy {
   showTopBanner: boolean;
   showFooter: boolean;
   showLogin: boolean;
+  showLoginButton: boolean;
 
   constructor(
     private router: Router,
@@ -326,6 +327,16 @@ export class BaseComponent implements OnInit, AfterViewInit, OnDestroy {
       }
     }
 
+    if(this.configService.configData.showLoginButton === undefined) {
+      this.showLoginButton = true;
+    } else {
+      if(this.configService.configData.showLoginButton === false) { 
+        this.showLoginButton = false;
+      } else {
+        this.showLoginButton = true;
+      }
+    }
+
     if(this.configService.configData.showLogin === undefined) {
       this.showLogin = true;
     } else {
diff --git a/src/app/core/config/config.model.ts b/src/app/core/config/config.model.ts
index a741a5e5e..88d3bcdf3 100644
--- a/src/app/core/config/config.model.ts
+++ b/src/app/core/config/config.model.ts
@@ -93,6 +93,7 @@ export interface Config {
     bannerText?: string;
     showTopBanner?: boolean;
     showLogin?: boolean;
+    showLoginButton?: boolean;
     showFooter?: boolean; 
     editPagingOptionSettings?: PagingOptionSettings;
     expandedComponents?: Array<string>;
diff --git a/src/app/core/footer/footer.component.html b/src/app/core/footer/footer.component.html
index 1bd658b22..5475ecd41 100644
--- a/src/app/core/footer/footer.component.html
+++ b/src/app/core/footer/footer.component.html
@@ -1,30 +1,32 @@
 <div class="content-container">
     <div class="footer-row">
-        <ul class="single-column">
-            <li><a href="http://www.hhs.gov" target="_blank" rel="noopener noreferrer">U.S. Department of Health &amp; Human Services</a></li>
-            <li><a href="http://www.nih.gov" target="_blank" rel="noopener noreferrer">National Institutes of Health</a></li>
-        </ul>
+            <a href="http://www.hhs.gov" target="_blank" rel="noopener noreferrer">U.S. Department of Health &amp; Human Services</a>
     </div>
+ 
     <div class="footer-row">
-        <ul class="single-row">
-            <li><a href="https://www.hhs.gov/vulnerability-disclosure-policy/index.html" target="_blank" rel="noopener noreferrer">HHS Vulnerability Disclosure</a></li>
-            <li>|</li>
-            <li><a href="http://www.ncats.nih.gov/">NCATS Home</a></li>
-            <li>|</li>
-            <li><a href="http://www.nih.gov/about/access.htm" target="_blank" rel="noopener noreferrer">Accessibility</a></li>
-            <li>|</li>
-            <li><a href="/privacy">Privacy Notice</a></li>
-            <li>|</li>
-            <li><a href="/licensing">Licensing</a></li>
-            <li>|</li>
-            <li><a href="http://www.ncats.nih.gov/about/foia.html">FOIA</a></li>
-            <li>|</li>
-            <li><a href="http://oig.hhs.gov/" target="_blank" rel="noopener noreferrer">OIG</a></li>   
-        </ul>
+ 
+            <a href="http://www.nih.gov" target="_blank" rel="noopener noreferrer">National Institutes of Health</a>
     </div>
     <div class="footer-row">
-        <ul class="single-column">
-            <li>National Center for Advancing Translational Sciences (NCATS), 6701 Democracy Boulevard, Bethesda MD 20892-4874 | 301-435-0888</li>
-        </ul>
+            <a href="https://www.hhs.gov/vulnerability-disclosure-policy/index.html" target="_blank" rel="noopener noreferrer">HHS Vulnerability Disclosure</a>
+            |
+            <a href="http://www.ncats.nih.gov/">NCATS Home</a>
+            |
+            <a href="http://www.nih.gov/about/access.htm" target="_blank" rel="noopener noreferrer">Accessibility</a>
+            |
+            <a href="/privacy">Privacy Notice</a>
+            |
+            <a href="/licensing">Licensing</a>
+            |
+            <a href="http://www.ncats.nih.gov/about/foia.html">FOIA</a>
+            |
+            <a href="http://oig.hhs.gov/" target="_blank" rel="noopener noreferrer">OIG</a>   
+
+        
+    </div>
+
+ 
+    <div class="footer-row">
+            National Center for Advancing Translational Sciences (NCATS), 6701 Democracy Boulevard, Bethesda MD 20892-4874 | 301-435-0888
     </div>
 </div>
\ No newline at end of file
diff --git a/src/app/core/footer/footer.component.scss b/src/app/core/footer/footer.component.scss
index 396e94c81..fd7923520 100644
--- a/src/app/core/footer/footer.component.scss
+++ b/src/app/core/footer/footer.component.scss
@@ -5,56 +5,23 @@
     height: 100px;
     background: #4793d1;
     color: #fff;
-    display: flex;
-    align-items: center;
-    gap: 0px;
-    font-size: 14px;
-    flex-direction: column;
-    align-items: center;
-    justify-content: flex-start;
-    flex-wrap: wrap;
     padding: 10px;
+    overflow: scroll;
 }
 
 .footer-row { 
+    margin-top: 3px;
     display: flex;
-    width: auto;
+    width: 100%;
     color: WhiteSmoke;
+    justify-content: center;
 }
 
 .footer-row a {
     color: WhiteSmoke;
     text-decoration: none;
+    padding-left: 3px;
+    padding-right: 3px;
 }
 
-.footer-row ul {
-    padding: 0px;
-    margin: 0px;
-}
 
-.footer-row ul.single-column {
-    display: flex;
-    flex-direction: column;
-    row-gap: 0;
-}
-
-
-.footer-row ul.single-row {
-    display: flex;
-    flex-direction: row;
-}
-    
-.footer-row ul.single-column li { 
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-}
-
-.footer-row ul.single-row li { 
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 5px;
-}

From 632fa6765d9a5ea2063f6074ea4ec259aeabf244 Mon Sep 17 00:00:00 2001
From: alx652 <welscha2@nih.gov>
Date: Fri, 8 Aug 2025 10:53:29 -0400
Subject: [PATCH 18/18] foot style improvements

---
 src/app/core/footer/footer.component.html | 41 +++++++++++++----------
 src/app/core/footer/footer.component.scss | 25 ++++++++++++--
 2 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/src/app/core/footer/footer.component.html b/src/app/core/footer/footer.component.html
index 5475ecd41..00a83f795 100644
--- a/src/app/core/footer/footer.component.html
+++ b/src/app/core/footer/footer.component.html
@@ -8,25 +8,32 @@
             <a href="http://www.nih.gov" target="_blank" rel="noopener noreferrer">National Institutes of Health</a>
     </div>
     <div class="footer-row">
-            <a href="https://www.hhs.gov/vulnerability-disclosure-policy/index.html" target="_blank" rel="noopener noreferrer">HHS Vulnerability Disclosure</a>
-            |
-            <a href="http://www.ncats.nih.gov/">NCATS Home</a>
-            |
-            <a href="http://www.nih.gov/about/access.htm" target="_blank" rel="noopener noreferrer">Accessibility</a>
-            |
-            <a href="/privacy">Privacy Notice</a>
-            |
-            <a href="/licensing">Licensing</a>
-            |
-            <a href="http://www.ncats.nih.gov/about/foia.html">FOIA</a>
-            |
-            <a href="http://oig.hhs.gov/" target="_blank" rel="noopener noreferrer">OIG</a>   
-
-        
+        <div class="parent-nf">
+            <span class="link"><a href="https://www.hhs.gov/vulnerability-disclosure-policy/index.html" target="_blank" rel="noopener noreferrer">HHS Vulnerability Disclosure</a></span>
+            <span class="separator"> | </span>
+            <span class="link"><a href="http://www.ncats.nih.gov/">NCATS Home</a></span>
+            <span class="separator"> | </span>
+            <span class="link"><a href="http://www.nih.gov/about/access.htm" target="_blank" rel="noopener noreferrer">Accessibility</a></span>
+            <span class="separator"> | </span>
+            <span class="link"><a href="/privacy">Privacy Notice</a></span>
+            <span class="separator"> | </span>
+            <span class="link"><a href="/licensing">Licensing</a></span>
+            <span class="separator"> | </span>
+            <span class="link"><a href="http://www.ncats.nih.gov/about/foia.html">FOIA</a></span>
+            <span class="separator"> | </span>
+            <span class="link"><a href="http://oig.hhs.gov/" target="_blank" rel="noopener noreferrer">OIG</a></span>
+        </div>
     </div>
-
  
     <div class="footer-row">
-            National Center for Advancing Translational Sciences (NCATS), 6701 Democracy Boulevard, Bethesda MD 20892-4874 | 301-435-0888
+        <div class="parent-nf">
+            <span class="fragment">National Center for Advancing Translational Sciences (NCATS)</span>
+            <span class="separator">, </span>
+            <span class="fragment">6701 Democracy Boulevard</span>
+            <span class="separator">, </span>
+            <span class="fragment">Bethesda MD 20892-4874</span>
+            <span class="separator"> | </span>
+            <span class="fragment">301-435-0888</span>
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/app/core/footer/footer.component.scss b/src/app/core/footer/footer.component.scss
index fd7923520..8d2ee6df0 100644
--- a/src/app/core/footer/footer.component.scss
+++ b/src/app/core/footer/footer.component.scss
@@ -17,11 +17,32 @@
     justify-content: center;
 }
 
+
 .footer-row a {
     color: WhiteSmoke;
     text-decoration: none;
-    padding-left: 3px;
-    padding-right: 3px;
 }
 
+@media (max-width:800px) {
+.parent-nf { 
+    flex: none;
+    display: block;
+    width: 100%;
+}
+.separator {
+    display: none;
+}
+.link {
+    flex: none;
+    display: block;
+    width: 100%;
+    text-align: center;
+}
+.fragment {
+    flex: none;
+    display: block;
+    width: 100%;
+    text-align: center;
+}
 
+}