diff --git a/angular.json b/angular.json
index ab533141..f6326194 100644
--- a/angular.json
+++ b/angular.json
@@ -39,7 +39,8 @@
               "src/assets/styles/forms.css",
               "src/assets/styles/sidebar.css",
               "src/assets/styles/report.css",
-              "src/assets/styles/helpText.css"
+              "src/assets/styles/helpText.css",
+              "src/assets/styles/dashboards.css"
             ],
             "scripts": [
               "node_modules/bootstrap/dist/js/bootstrap.bundle.js",
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
deleted file mode 100644
index cbdadfe5..00000000
--- a/src/app/app-routing.module.ts
+++ /dev/null
@@ -1,319 +0,0 @@
-import { NgModule } from '@angular/core';
-import { ExtraOptions, RouterModule, Routes } from '@angular/router';
-import { WelcomeComponent } from './core-components/welcome/welcome.component';
-import { PageNotFoundComponent } from './core-components/page-not-found/page-not-found.component';
-import { UserDashboardComponent } from './user-dashboard/user-dashboard.component';
-import { UserDashboardHomeComponent } from './user-dashboard/user-dashboard-home/user-dashboard-home.component';
-import { CompanyDashboardComponent } from './company-dashboard/company-dashboard.component';
-import { CompanyDashboardHomeComponent } from './company-dashboard/company-dashboard-home/company-dashboard-home.component';
-import { FacilityDashboardComponent } from './facility-dashboard/facility-dashboard.component';
-import { FacilityDashboardHomeComponent } from './facility-dashboard/facility-dashboard-home/facility-dashboard-home.component';
-import { SetupWizardComponent } from './setup-wizard/setup-wizard.component';
-import { CompanySetupComponent } from './setup-wizard/pre-visit/company-setup/company-setup.component';
-import { FacilitySetupComponent } from './setup-wizard/pre-visit/facility-setup/facility-setup.component';
-import { UserSettingsComponent } from './user-dashboard/user-settings/user-settings.component';
-import { CompanySettingsComponent } from './company-dashboard/company-settings/company-settings.component';
-import { CompanyReportsComponent } from './company-dashboard/company-reports/company-reports.component';
-import { FacilitySettingsComponent } from './facility-dashboard/facility-settings/facility-settings.component';
-import { FacilityReportsComponent } from './facility-dashboard/facility-reports/facility-reports.component';
-import { UserDashboardHelpComponent } from './user-dashboard/user-dashboard-help/user-dashboard-help.component';
-import { ExploreNEBsComponent } from './user-dashboard/explore-nebs/explore-nebs.component';
-import { CompanyGoalsComponent } from './company-dashboard/company-goals/company-goals.component';
-import { FacilityGoalsComponent } from './facility-dashboard/facility-goals/facility-goals.component';
-import { AssessmentDashboardComponent } from './assessment-dashboard/assessment-dashboard.component';
-import { AssessmentDashboardHomeComponent } from './assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component';
-import { AssessmentSettingsComponent } from './assessment-dashboard/assessment-settings/assessment-settings.component';
-import { CompanyContactsSetupComponent } from './setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component';
-import { FacilityProcessEquipmentSetupComponent } from './setup-wizard/pre-visit/facility-process-equipment-setup/facility-process-equipment-setup.component';
-import { PreAssessmentSetupComponent } from './setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component';
-import { ReviewPreVisitSetupComponent } from './setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component';
-import { OnSiteAssessmentComponent } from './setup-wizard/data-collection/on-site-assessment/on-site-assessment.component';
-import { ReviewOnSiteComponent } from './setup-wizard/data-collection/review-on-site/review-on-site.component';
-import { PreVisitComponent } from './setup-wizard/pre-visit/pre-visit.component';
-import { DataCollectionComponent } from './setup-wizard/data-collection/data-collection.component';
-import { CompanyKpiSelectComponent } from './setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component';
-import { DataCollectionManageAssessmentsComponent } from './setup-wizard/data-collection/data-collection-manage-assessments/data-collection-manage-assessments.component';
-import { CompanyKpiDetailsComponent } from './setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component';
-import { AssessmentDetailsFormComponent } from './setup-wizard/data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component';
-import { AssessmentEnergyOpportunitiesFormComponent } from './setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component';
-import { AssessmentNebsFormComponent } from './setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component';
-import { CanDeactivateGuard } from './guards/can-deactivate.guard';
-import { DataEvaluationComponent } from './setup-wizard/data-evaluation/data-evaluation.component';
-import { DataFollowUpComponent } from './setup-wizard/data-evaluation/data-follow-up/data-follow-up.component';
-import { VisitReportComponent } from './setup-wizard/data-evaluation/visit-report/visit-report.component';
-import { AssessmentEvaluationComponent } from './setup-wizard/data-evaluation/assessment-evaluation/assessment-evaluation.component';
-import { OnSiteAssessmentResultsComponent } from './setup-wizard/data-collection/on-site-assessment/on-site-assessment-results/on-site-assessment-results.component';
-import { FacilityEnergyEquipmentSetupComponent } from './setup-wizard/pre-visit/facility-energy-equipment-setup/facility-energy-equipment-setup.component';
-import { FeedbackPageComponent } from './core-components/feedback-page/feedback-page.component';
-import { HelpComponent } from './core-components/help/help.component';
-import { AboutComponent } from './core-components/about/about.component';
-import { AcknowledgmentsComponent } from './core-components/acknowledgments/acknowledgments.component';
-import { NebsDatabaseComponent } from './nebs-database/nebs-database.component';
-
-const routes: Routes = [
-  {
-    path: '',
-    pathMatch: 'full',
-    redirectTo: 'welcome'
-  },
-  {
-    path: 'welcome',
-    component: WelcomeComponent
-  },
-  {
-    path: 'help',
-    component: HelpComponent
-  },
-  {
-    path: 'about',
-    component: AboutComponent
-  },
-  {
-    path: 'feedback',
-    component: FeedbackPageComponent
-  },
-  {
-    path: 'acknowledgments',
-    component: AcknowledgmentsComponent
-  },
-  {
-    path: 'nebs-database',
-    component: NebsDatabaseComponent,
-  },
-  {
-    path: 'setup-wizard',
-    component: SetupWizardComponent,
-    children: [
-      {
-        path: 'pre-visit/:id',
-        component: PreVisitComponent,
-        children: [
-          {
-            path: '',
-            pathMatch: 'full',
-            redirectTo: 'company-setup'
-          },
-          {
-            path: 'company-setup',
-            component: CompanySetupComponent,
-            canDeactivate: [CanDeactivateGuard]
-          },
-          {
-            path: 'company-kpi-select',
-            component: CompanyKpiSelectComponent
-          },
-          {
-            path: 'company-kpi-detail/:id',
-            component: CompanyKpiDetailsComponent
-          },
-          {
-            path: 'company-contacts',
-            component: CompanyContactsSetupComponent,
-            canDeactivate: [CanDeactivateGuard]
-          },
-          {
-            path: 'facility-setup',
-            component: FacilitySetupComponent,
-            canDeactivate: [CanDeactivateGuard]
-          },
-          {
-            path: 'energy-equipment',
-            component: FacilityEnergyEquipmentSetupComponent
-          },
-          {
-            path: 'end-uses',
-            component: FacilityProcessEquipmentSetupComponent
-          },
-          {
-            path: 'pre-assessment',
-            component: PreAssessmentSetupComponent
-          },
-          {
-            path: 'review-pre-visit',
-            component: ReviewPreVisitSetupComponent
-          }
-        ]
-      },
-      {
-        path: 'data-collection/:id',
-        component: DataCollectionComponent,
-        children: [
-          {
-            path: 'manage-assessments',
-            component: DataCollectionManageAssessmentsComponent
-          },
-          {
-            path: 'assessment/:id',
-            component: OnSiteAssessmentComponent,
-            children: [
-              {
-                path: '',
-                pathMatch: 'full',
-                redirectTo: 'details'
-              },
-              {
-                path: 'details',
-                component: AssessmentDetailsFormComponent
-              },
-              {
-                path: 'energy-opportunities',
-                component: AssessmentEnergyOpportunitiesFormComponent
-              },
-              {
-                path: 'nebs',
-                component: AssessmentNebsFormComponent
-              },
-              {
-                path: 'results',
-                component: OnSiteAssessmentResultsComponent
-              }
-            ]
-          },
-          {
-            path: 'review-data-collection',
-            component: ReviewOnSiteComponent
-          },
-        ]
-      },
-      {
-        path: 'data-evaluation/:id',
-        component: DataEvaluationComponent,
-        children: [
-          {
-            path: '',
-            pathMatch: 'full',
-            redirectTo: 'follow-up'
-          },
-          {
-            path: 'follow-up',
-            component: DataFollowUpComponent
-          },
-          {
-            path: 'assessment-report/:id',
-            component: AssessmentEvaluationComponent,
-          },
-          {
-            path: 'visit-report',
-            component: VisitReportComponent,
-          }
-        ]
-      }
-    ]
-  },
-  {
-    path: 'user',
-    component: UserDashboardComponent,
-    children: [
-      {
-        path: '',
-        pathMatch: 'full',
-        redirectTo: 'home'
-      },
-      {
-        path: 'home',
-        component: UserDashboardHomeComponent
-      },
-      {
-        path: 'settings',
-        component: UserSettingsComponent
-      },
-      {
-        path: 'help',
-        component: UserDashboardHelpComponent
-      },
-      {
-        path: 'nebs-database',
-        component: ExploreNEBsComponent
-      }
-    ]
-  },
-  {
-    path: 'company/:id',
-    component: CompanyDashboardComponent,
-    children: [
-      {
-        path: '',
-        pathMatch: 'full',
-        redirectTo: 'home'
-      },
-      {
-        path: 'home',
-        component: CompanyDashboardHomeComponent
-      },
-      {
-        path: 'settings',
-        component: CompanySettingsComponent
-      },
-      {
-        path: 'reports',
-        component: CompanyReportsComponent
-      },
-      {
-        path: 'goals',
-        component: CompanyGoalsComponent
-      }
-    ]
-  },
-  {
-    path: 'facility/:id',
-    component: FacilityDashboardComponent,
-    children: [
-      {
-        path: '',
-        pathMatch: 'full',
-        redirectTo: 'home'
-      },
-      {
-        path: 'home',
-        component: FacilityDashboardHomeComponent
-      },
-      {
-        path: 'settings',
-        component: FacilitySettingsComponent
-      },
-      {
-        path: 'reports',
-        component: FacilityReportsComponent
-      },
-      {
-        path: 'goals',
-        component: FacilityGoalsComponent
-      }
-    ]
-  },
-  {
-    path: 'assessment/:id',
-    component: AssessmentDashboardComponent,
-    children: [
-      {
-        path: '',
-        pathMatch: 'full',
-        redirectTo: 'home'
-      },
-      {
-        path: 'home',
-        component: AssessmentDashboardHomeComponent
-      },
-      {
-        path: 'settings',
-        component: AssessmentSettingsComponent
-      }
-    ]
-  },
-  //wildcard/page not found needs to be last route
-  //triggered after entire route tree is checked
-  { path: "**", component: PageNotFoundComponent },
-
-];
-
-const routerOptions: ExtraOptions = {
-  anchorScrolling: 'enabled',
-  scrollPositionRestoration: 'enabled',
-  useHash: true
-}
-
-@NgModule({
-  imports: [RouterModule.forRoot(routes, routerOptions)],
-  exports: [RouterModule]
-})
-export class AppRoutingModule { }
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index 085460c4..a4988607 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -3,115 +3,21 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { AppComponent } from './app.component';
 import { NavbarComponent } from './core-components/navbar/navbar.component';
 import { WelcomeComponent } from './core-components/welcome/welcome.component';
-import { CompanyIdbService } from './indexed-db/company-idb.service';
-import { FacilityIdbService } from './indexed-db/facility-idb.service';
-import { UserIdbService } from './indexed-db/user-idb.service';
 import { LoadingComponent } from './core-components/loading/loading.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { AssessmentIdbService } from './indexed-db/assessment-idb.service';
-import { ContactIdbService } from './indexed-db/contact-idb.service';
-import { NonEnergyBenefitsIdbService } from './indexed-db/non-energy-benefits-idb.service';
-import { OnSiteVisitIdbService } from './indexed-db/on-site-visit-idb.service';
 import { SetupWizardModalComponent } from './core-components/setup-wizard-modal/setup-wizard-modal.component';
-import { SetupWizardService } from './setup-wizard/setup-wizard.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbCompany } from './models/company';
-import { IdbFacility } from './models/facility';
-import { IdbUser } from './models/user';
-import { IdbAssessment } from './models/assessment';
-import { IdbContact } from './models/contact';
-import { IdbNonEnergyBenefit } from './models/nonEnergyBenefit';
-import { IdbOnSiteVisit } from './models/onSiteVisit';
-import { EnergyOpportunityIdbService } from './indexed-db/energy-opportunity-idb.service';
-import { IdbEnergyOpportunity } from './models/energyOpportunity';
-import { KeyPerformanceIndicatorsIdbService } from './indexed-db/key-performance-indicators-idb.service';
-import { IdbKeyPerformanceIndicator } from './models/keyPerformanceIndicator';
 import { ImportBackupModalComponent } from './core-components/import-backup-modal/import-backup-modal.component';
-import { EnergyEquipmentIdbService } from './indexed-db/energy-equipment-idb.service';
-import { IdbEnergyEquipment } from './models/energyEquipment';
-import { ProcessEquipmentIdbService } from './indexed-db/process-equipment-idb.service';
-import { IdbProcessEquipment } from './models/processEquipment';
-import { IdbKeyPerformanceMetricImpact } from './models/keyPerformanceMetricImpact';
-import { KeyPerformanceMetricImpactsIdbService } from './indexed-db/key-performance-metric-impacts-idb.service';
 import { FeedbackPageComponent } from './core-components/feedback-page/feedback-page.component';
 import { AlphaDisclaimerComponent } from './core-components/alpha-disclaimer/alpha-disclaimer.component';
-import { LocalStorageDataService } from './shared/shared-services/local-storage-data.service';
+import { stubServiceProviders } from './spec-helpers/spec-test-service-stub';
 
 describe('AppComponent', () => {
 
-  let companyIdbService: Partial<CompanyIdbService> = {
-    companies: new BehaviorSubject<Array<IdbCompany>>([]),
-    selectedCompany: new BehaviorSubject<IdbCompany>(undefined)
-  };
-
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    facilities: new BehaviorSubject<Array<IdbFacility>>([]),
-    selectedFacility: new BehaviorSubject<IdbFacility>(undefined)
-  };
-
-  let userIdbService: Partial<UserIdbService> = {
-    user: new BehaviorSubject<IdbUser>(undefined)
-  };
-
-  let energyOpportunityIdbService: Partial<EnergyOpportunityIdbService> = {
-    energyOpportunities: new BehaviorSubject<Array<IdbEnergyOpportunity>>([]),
-  };
-
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([]),
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(undefined)
-  };
-
-  let contactIdbService: Partial<ContactIdbService> = {
-    contacts: new BehaviorSubject<Array<IdbContact>>([])
-  };
-
-  let nonEnergyBenefitsIdbService: Partial<NonEnergyBenefitsIdbService> = {
-    nonEnergyBenefits: new BehaviorSubject<Array<IdbNonEnergyBenefit>>([])
-  };
-
-  let onSiteVisitIdbService: Partial<OnSiteVisitIdbService> = {
-    onSiteVisits: new BehaviorSubject<Array<IdbOnSiteVisit>>([])
-  };
-
-  let setupWizardService: Partial<SetupWizardService> = {};
-
-  let keyPerformanceIndicatorService: Partial<KeyPerformanceIndicatorsIdbService> = {
-    keyPerformanceIndicators: new BehaviorSubject<Array<IdbKeyPerformanceIndicator>>([])
-  }
-
-  let energyEquipmentIdbService: Partial<EnergyEquipmentIdbService> = {
-    energyEquipments: new BehaviorSubject<Array<IdbEnergyEquipment>>([])
-  };
-
-  let processEquipmentIdbService: Partial<ProcessEquipmentIdbService> = {
-    processEquipments: new BehaviorSubject<Array<IdbProcessEquipment>>([])
-  }
-
-  let keyPerformanceMetricImpactIdbService: Partial<KeyPerformanceMetricImpactsIdbService> = {
-    keyPerformanceMetricImpacts: new BehaviorSubject<Array<IdbKeyPerformanceMetricImpact>>([])
-  }
-
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [RouterTestingModule, FontAwesomeModule],
       declarations: [AppComponent, NavbarComponent, WelcomeComponent, LoadingComponent, SetupWizardModalComponent, ImportBackupModalComponent, AlphaDisclaimerComponent, FeedbackPageComponent],
-      providers: [
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: UserIdbService, useValue: userIdbService },
-        { provide: EnergyOpportunityIdbService, useValue: energyOpportunityIdbService },
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: ContactIdbService, useValue: contactIdbService },
-        { provide: NonEnergyBenefitsIdbService, useValue: nonEnergyBenefitsIdbService },
-        { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService },
-        { provide: SetupWizardService, useValue: setupWizardService },
-        { provide: KeyPerformanceIndicatorsIdbService, useValue: keyPerformanceIndicatorService },
-        { provide: EnergyEquipmentIdbService, useValue: energyEquipmentIdbService },
-        { provide: ProcessEquipmentIdbService, useValue: processEquipmentIdbService },
-        { provide: KeyPerformanceMetricImpactsIdbService, useValue: keyPerformanceMetricImpactIdbService },
-        { provide: LocalStorageDataService, useValue: {}},
-      ]
+      providers: stubServiceProviders
     })
   });
 
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 9162482e..7f4ad8c5 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -93,7 +93,7 @@ export class AppComponent {
       let user: IdbUser = this.userIdbService.user.getValue();
       if (user.skipSplashScreen) {
         //if user skips the home screen navigate to dashboard.
-        this.router.navigateByUrl('/user')
+        this.router.navigateByUrl('/portfolio')
       }
     }
   }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 1825235d..5434e34f 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,24 +1,21 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 
-import { AppRoutingModule } from './app-routing.module';
+import { AppRoutingModule } from './routing/app-routing.module';
 import { AppComponent } from './app.component';
 import { NavbarComponent } from './core-components/navbar/navbar.component';
 import { WelcomeComponent } from './core-components/welcome/welcome.component';
 import { PageNotFoundComponent } from './core-components/page-not-found/page-not-found.component';
-import { UserDashboardModule } from './user-dashboard/user-dashboard.module';
-import { CompanyDashboardModule } from './company-dashboard/company-dashboard.module';
-import { FacilityDashboardModule } from './facility-dashboard/facility-dashboard.module';
 import { IndexedDbModule } from './indexed-db/indexed-db.module';
 import { LoadingComponent } from './core-components/loading/loading.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { FormsModule } from '@angular/forms';
 import { SetupWizardModule } from './setup-wizard/setup-wizard.module';
 import { SidebarComponent } from './core-components/sidebar/sidebar.component';
-import { HelperPipesModule } from './shared/helper-pipes/helper-pipes.module';
-import { AssessmentDashboardModule } from './assessment-dashboard/assessment-dashboard.module';
+import { HelperPipesModule } from './shared/helper-pipes/_helper-pipes.module';
 import { SetupWizardModalComponent } from './core-components/setup-wizard-modal/setup-wizard-modal.component';
 import { ImportBackupModalComponent } from './core-components/import-backup-modal/import-backup-modal.component';
+import { UserPortfolioModule } from './user-portfolio/user-portfolio.module';
 import { PlotlyViaWindowModule } from 'angular-plotly.js';
 import { FeedbackPageComponent } from './core-components/feedback-page/feedback-page.component';
 import { AcknowledgmentsComponent } from './core-components/acknowledgments/acknowledgments.component';
@@ -48,15 +45,13 @@ import { NebsDatabaseModule } from './nebs-database/nebs-database.module';
   imports: [
     BrowserModule,
     AppRoutingModule,
-    UserDashboardModule,
-    CompanyDashboardModule,
-    FacilityDashboardModule,
     IndexedDbModule,
     FontAwesomeModule,
     FormsModule,
     SetupWizardModule,
     HelperPipesModule,
-    AssessmentDashboardModule,
+    UserPortfolioModule,
+    PlotlyViaWindowModule,
     PlotlyViaWindowModule,
     NebsDatabaseModule
   ],
diff --git a/src/app/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.html b/src/app/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.html
deleted file mode 100644
index 3c0236cf..00000000
--- a/src/app/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<div class="row pt-4 justify-content-center">
-    <div class="col-md-12 col-lg-9 pt-4 pb-2">
-        <nav class="navbar border-bottom">
-            <h4 class="mb-0">{{assessment.name}}</h4>
-            <button class="btn btn-sm btn-success float-end" (click)="openEditModal()">
-                <fa-icon [icon]="faWandMagicSparkles"></fa-icon> Setup Wizard
-            </button>
-        </nav>
-    </div>
-    <div class="col-md-12 col-lg-9">
-        <div class="card">
-            <div class="card-header">
-                {{assessment.name}} Details
-            </div>
-            <div class="card-body">
-                <table class="table">
-                    <tbody>
-                        <tr>
-                            <td>
-                                Equipment Type
-                            </td>
-                            <td>
-
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                Annual Energy Use
-                            </td>
-                            <td>
-                                {{assessment.energyUse}}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                Annual Costs
-                            </td>
-                            <td>
-                                {{assessment.cost}}
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-    <div class="col-md-12 col-lg-9">
-        <hr>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.spec.ts b/src/app/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.spec.ts
deleted file mode 100644
index 46c6ddb5..00000000
--- a/src/app/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.spec.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AssessmentDashboardHomeComponent } from './assessment-dashboard-home.component';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
-
-describe('AssessmentDashboardHomeComponent', () => {
-  let component: AssessmentDashboardHomeComponent;
-  let fixture: ComponentFixture<AssessmentDashboardHomeComponent>;
-
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings()))
-  };
-  let companyIdbService: Partial<CompanyIdbService> = {};
-  let facilityIdbService: Partial<FacilityIdbService> = {};
-  let setupWizardService: Partial<SetupWizardService> = {};
-  let onSiteVisitIdbService: Partial<OnSiteVisitIdbService> = {
-    onSiteVisits: new BehaviorSubject<Array<IdbOnSiteVisit>>([])
-  };
-
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [RouterTestingModule, FontAwesomeModule, HelperPipesModule],
-      declarations: [AssessmentDashboardHomeComponent],
-      providers: [
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: SetupWizardService, useValue: setupWizardService },
-        { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService },
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(AssessmentDashboardHomeComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/assessment-dashboard/assessment-dashboard-tabs/assessment-dashboard-tabs.component.html b/src/app/assessment-dashboard/assessment-dashboard-tabs/assessment-dashboard-tabs.component.html
deleted file mode 100644
index 4854e9c0..00000000
--- a/src/app/assessment-dashboard/assessment-dashboard-tabs/assessment-dashboard-tabs.component.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<ul class="nav nav-tabs">
-    <li class="nav-item">
-        <a class="nav-link" [routerLink]="'/user'">
-            <fa-icon [icon]="faFolderOpen"></fa-icon>
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" [routerLink]="'/company/'+assessment.companyId">
-            <fa-icon [icon]="faBuilding"></fa-icon>
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" [routerLink]="'/facility/'+assessment.facilityId" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faIndustry"></fa-icon>
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" routerLink="home" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faFileLines"></fa-icon>
-            {{assessment.name}}
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" routerLink="settings" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faGears"></fa-icon>
-            Settings
-        </a>
-    </li>
-</ul>
\ No newline at end of file
diff --git a/src/app/assessment-dashboard/assessment-dashboard-tabs/assessment-dashboard-tabs.component.spec.ts b/src/app/assessment-dashboard/assessment-dashboard-tabs/assessment-dashboard-tabs.component.spec.ts
deleted file mode 100644
index ef09e7a6..00000000
--- a/src/app/assessment-dashboard/assessment-dashboard-tabs/assessment-dashboard-tabs.component.spec.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AssessmentDashboardTabsComponent } from './assessment-dashboard-tabs.component';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { RouterTestingModule } from '@angular/router/testing';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
-
-describe('AssessmentDashboardTabsComponent', () => {
-  let component: AssessmentDashboardTabsComponent;
-  let fixture: ComponentFixture<AssessmentDashboardTabsComponent>;
-
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings()))
-  };
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [RouterTestingModule, FontAwesomeModule],
-      declarations: [AssessmentDashboardTabsComponent],
-      providers: [
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(AssessmentDashboardTabsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/assessment-dashboard/assessment-dashboard-tabs/assessment-dashboard-tabs.component.ts b/src/app/assessment-dashboard/assessment-dashboard-tabs/assessment-dashboard-tabs.component.ts
deleted file mode 100644
index a30a459b..00000000
--- a/src/app/assessment-dashboard/assessment-dashboard-tabs/assessment-dashboard-tabs.component.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Component } from '@angular/core';
-import { IconDefinition, faBuilding, faChartLine, faFileLines, faFolderOpen, faGears, faIndustry } from '@fortawesome/free-solid-svg-icons';
-import { Subscription } from 'rxjs';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-@Component({
-  selector: 'app-assessment-dashboard-tabs',
-  templateUrl: './assessment-dashboard-tabs.component.html',
-  styleUrl: './assessment-dashboard-tabs.component.css'
-})
-export class AssessmentDashboardTabsComponent {
-
-  faBuilding: IconDefinition = faBuilding;
-  faIndustry: IconDefinition = faIndustry;
-  faGears: IconDefinition = faGears;
-  faFolderOpen: IconDefinition = faFolderOpen;
-  faChartLine: IconDefinition = faChartLine;
-  faFileLines: IconDefinition = faFileLines;
-
-  assessment: IdbAssessment;
-  assessmentSub: Subscription;
-
-  constructor(private assessmentIdbService: AssessmentIdbService){
-  }
-
-  ngOnInit(){
-    this.assessmentSub = this.assessmentIdbService.selectedAssessment.subscribe(_assessment => {
-      this.assessment = _assessment;
-    });
-  }
-
-  ngOnDestroy(){
-    this.assessmentSub.unsubscribe();
-  }
-}
diff --git a/src/app/assessment-dashboard/assessment-dashboard.component.html b/src/app/assessment-dashboard/assessment-dashboard.component.html
deleted file mode 100644
index 6aaa11ca..00000000
--- a/src/app/assessment-dashboard/assessment-dashboard.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="container-fluid">
-    <app-assessment-dashboard-tabs></app-assessment-dashboard-tabs>
-    <router-outlet></router-outlet>
-</div>
\ No newline at end of file
diff --git a/src/app/assessment-dashboard/assessment-dashboard.component.ts b/src/app/assessment-dashboard/assessment-dashboard.component.ts
deleted file mode 100644
index 266e8422..00000000
--- a/src/app/assessment-dashboard/assessment-dashboard.component.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AssessmentIdbService } from '../indexed-db/assessment-idb.service';
-
-@Component({
-  selector: 'app-assessment-dashboard',
-  templateUrl: './assessment-dashboard.component.html',
-  styleUrl: './assessment-dashboard.component.css'
-})
-export class AssessmentDashboardComponent {
-
-  constructor(private activatedRoute: ActivatedRoute, private assessmentIdbService: AssessmentIdbService,
-    private router: Router) {
-  }
-
-  ngOnInit() {
-    this.activatedRoute.params.subscribe(params => {
-      let assessmentGUID: string = params['id'];
-      let assessmentExists: boolean = this.assessmentIdbService.setSelectedFromGUID(assessmentGUID);
-      if(!assessmentExists){
-        this.router.navigateByUrl('/user');
-      }
-    });
-  }
-}
diff --git a/src/app/assessment-dashboard/assessment-dashboard.module.ts b/src/app/assessment-dashboard/assessment-dashboard.module.ts
deleted file mode 100644
index 9e56ad9b..00000000
--- a/src/app/assessment-dashboard/assessment-dashboard.module.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { AssessmentDashboardComponent } from './assessment-dashboard.component';
-import { AssessmentDashboardHomeComponent } from './assessment-dashboard-home/assessment-dashboard-home.component';
-import { AssessmentDashboardTabsComponent } from './assessment-dashboard-tabs/assessment-dashboard-tabs.component';
-import { AssessmentSettingsComponent } from './assessment-settings/assessment-settings.component';
-import { RouterModule } from '@angular/router';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { ManageAssessmentComponent } from './assessment-settings/manage-assessment/manage-assessment.component';
-import { FormsModule } from '@angular/forms';
-import { HelperPipesModule } from '../shared/helper-pipes/helper-pipes.module';
-
-
-
-@NgModule({
-  declarations: [
-    AssessmentDashboardComponent,
-    AssessmentDashboardHomeComponent,
-    AssessmentDashboardTabsComponent,
-    AssessmentSettingsComponent,
-    ManageAssessmentComponent
-  ],
-  imports: [
-    CommonModule,
-    RouterModule,
-    FontAwesomeModule,
-    FormsModule,
-    HelperPipesModule
-  ]
-})
-export class AssessmentDashboardModule { }
diff --git a/src/app/assessment-dashboard/assessment-settings/assessment-settings.component.html b/src/app/assessment-dashboard/assessment-settings/assessment-settings.component.html
deleted file mode 100644
index 8038c8ab..00000000
--- a/src/app/assessment-dashboard/assessment-settings/assessment-settings.component.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="row justify-content-center">
-    <div class="col-md-12 col-lg-9 mt-4 mb-3">
-        <div class="card">
-            <div class="card-body">
-                <form>
-                    <label for="selectedAssessmentName">Name</label>
-                    <input type="text" id="selectedAssessmentName" name="selectedAssessmentName" class="form-control" [(ngModel)]="selectedAssessment.name" (input)="saveChanges()"
-                        onfocus="this.select();" minlength="1" maxlength="42" required>
-                </form>
-            </div>
-        </div>
-        <app-manage-assessment></app-manage-assessment>
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/src/app/assessment-dashboard/assessment-settings/assessment-settings.component.spec.ts b/src/app/assessment-dashboard/assessment-settings/assessment-settings.component.spec.ts
deleted file mode 100644
index 241bf80e..00000000
--- a/src/app/assessment-dashboard/assessment-settings/assessment-settings.component.spec.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AssessmentSettingsComponent } from './assessment-settings.component';
-import { ManageAssessmentComponent } from './manage-assessment/manage-assessment.component';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { FormsModule } from '@angular/forms';
-import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
-
-describe('AssessmentSettingsComponent', () => {
-  let component: AssessmentSettingsComponent;
-  let fixture: ComponentFixture<AssessmentSettingsComponent>;
-
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings()))
-  };
-  let companyIdbService: Partial<CompanyIdbService> = {};
-  let facilityIdbService: Partial<FacilityIdbService> = {};
-  let contactIdbService: Partial<ContactIdbService> = {};
-  let dbChangesService: Partial<DbChangesService> = {};
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, FormsModule],
-      declarations: [AssessmentSettingsComponent, ManageAssessmentComponent],
-      providers: [
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: ContactIdbService, useValue: contactIdbService },
-        { provide: DbChangesService, useValue: dbChangesService },
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(AssessmentSettingsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/assessment-dashboard/assessment-settings/assessment-settings.component.ts b/src/app/assessment-dashboard/assessment-settings/assessment-settings.component.ts
deleted file mode 100644
index a53b1e71..00000000
--- a/src/app/assessment-dashboard/assessment-settings/assessment-settings.component.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Component } from '@angular/core';
-import { Subscription } from 'rxjs';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-
-@Component({
-  selector: 'app-assessment-settings',
-  templateUrl: './assessment-settings.component.html',
-  styleUrl: './assessment-settings.component.css'
-})
-export class AssessmentSettingsComponent {
-  selectedAssessment: IdbAssessment;
-  selectedAssessmentSub: Subscription;
-  constructor(private assessmentIdbService: AssessmentIdbService) {
-  }
-
-  ngOnInit() {
-    this.selectedAssessmentSub = this.assessmentIdbService.selectedAssessment.subscribe(_assessment => {
-      this.selectedAssessment = _assessment;
-    });
-  }
-
-  ngOnDestroy() {
-    this.selectedAssessmentSub.unsubscribe();
-  }
-
- 
-  async saveChanges(){
-    await this.assessmentIdbService.asyncUpdate(this.selectedAssessment);
-  }
-}
diff --git a/src/app/assessment-dashboard/assessment-settings/manage-assessment/manage-assessment.component.html b/src/app/assessment-dashboard/assessment-settings/manage-assessment/manage-assessment.component.html
deleted file mode 100644
index 3ed7d71e..00000000
--- a/src/app/assessment-dashboard/assessment-settings/manage-assessment/manage-assessment.component.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-<div class="accordion" id="manageAssessmentAccordion">
-    <div class="accordion-item">
-        <h2 class="accordion-header">
-            <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseManageAssessment"
-                aria-expanded="true" aria-controls="collapseManageAssessment" [ngClass]="{'collapsed': !accordionOpen}"
-                (click)="toggleAccordion()">
-                <fa-icon [icon]="faPenToSquare" class="me-2"></fa-icon>
-                Manage Assessment
-            </button>
-        </h2>
-        <div id="collapseManageAssessment" class="accordion-collapse collapse" data-bs-parent="#manageAssessmentAccordion"
-            [ngClass]="{'show': accordionOpen}">
-            <div class="accordion-body">
-                <button class="btn btn-danger" (click)="openDeleteModal()">
-                    <fa-icon [icon]="faTrash"></fa-icon> Delete Assessment
-                </button>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-
-<div [ngClass]="{'window-overlay': displayDeleteModal}"></div>
-<div class="popup" [ngClass]="{'open': displayDeleteModal }">
-    <div class="popup-header">Delete Assessment?
-        <button type="button" class="btn-close float-end" aria-label="Close" (click)="closeDeleteModal()"></button>
-    </div>
-    <div class="popup-body">
-        <div class="alert alert-info">
-            Are you sure you want to delete <b>{{assessment.name}}</b>?
-        </div>
-        <hr>
-    </div>
-    <div class="popup-footer d-flex justify-content-end">
-        <button class="btn btn-secondary me-2" (click)="closeDeleteModal()">Cancel</button>
-        <button class="btn btn-danger" (click)="confirmDelete()">Confirm Delete</button>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/assessment-dashboard/assessment-settings/manage-assessment/manage-assessment.component.spec.ts b/src/app/assessment-dashboard/assessment-settings/manage-assessment/manage-assessment.component.spec.ts
deleted file mode 100644
index dfaa97d5..00000000
--- a/src/app/assessment-dashboard/assessment-settings/manage-assessment/manage-assessment.component.spec.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ManageAssessmentComponent } from './manage-assessment.component';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
-
-describe('ManageAssessmentComponent', () => {
-  let component: ManageAssessmentComponent;
-  let fixture: ComponentFixture<ManageAssessmentComponent>;
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings())),
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([])
-  };
-  let companyIdbService: Partial<CompanyIdbService> = {};
-  let facilityIdbService: Partial<FacilityIdbService> = {};
-  let energyOpportunityIdbService: Partial<EnergyOpportunityIdbService> = {};
-  let contactIdbService: Partial<ContactIdbService> = {};
-  let nonEnergyBenefitsIdbService: Partial<NonEnergyBenefitsIdbService> = {}
-  let dbChangesService: Partial<DbChangesService> = {}
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule],
-      declarations: [ManageAssessmentComponent],
-      providers: [
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: EnergyOpportunityIdbService, useValue: energyOpportunityIdbService },
-        { provide: ContactIdbService, useValue: contactIdbService },
-        { provide: NonEnergyBenefitsIdbService, useValue: nonEnergyBenefitsIdbService },
-        { provide: DbChangesService, useValue: dbChangesService }
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(ManageAssessmentComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/assessment-dashboard/assessment-settings/manage-assessment/manage-assessment.component.ts b/src/app/assessment-dashboard/assessment-settings/manage-assessment/manage-assessment.component.ts
deleted file mode 100644
index 8accdaf3..00000000
--- a/src/app/assessment-dashboard/assessment-settings/manage-assessment/manage-assessment.component.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-import { IconDefinition, faPenToSquare, faTrash } from '@fortawesome/free-solid-svg-icons';
-import { Subscription } from 'rxjs';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-
-@Component({
-  selector: 'app-manage-assessment',
-  templateUrl: './manage-assessment.component.html',
-  styleUrl: './manage-assessment.component.css'
-})
-export class ManageAssessmentComponent {
-
-  faPenToSquare: IconDefinition = faPenToSquare;
-  faTrash: IconDefinition = faTrash;
-
-  accordionOpen: boolean = false;
-  assessment: IdbAssessment;
-  assessmentSub: Subscription;
-  displayDeleteModal: boolean = false;
-  constructor(private assessmentIdbService: AssessmentIdbService,
-    private dbChangesService: DbChangesService, private router: Router) {
-  }
-
-  ngOnInit() {
-    this.assessmentSub = this.assessmentIdbService.selectedAssessment.subscribe(_assessment => {
-      this.assessment = _assessment;
-    });
-  }
-
-  ngOnDestroy() {
-    this.assessmentSub.unsubscribe();
-  }
-
-  toggleAccordion() {
-    this.accordionOpen = !this.accordionOpen;
-  }
-
-  openDeleteModal() {
-    this.displayDeleteModal = true;
-  }
-
-  closeDeleteModal() {
-    this.displayDeleteModal = false;
-  }
-
-  async confirmDelete() {
-    await this.dbChangesService.deleteAssessment(this.assessment);
-    this.router.navigateByUrl('/user')
-  }
-}
diff --git a/src/app/company-dashboard/company-dashboard-home/assessments-table/assessments-table.component.html b/src/app/company-dashboard/company-dashboard-home/assessments-table/assessments-table.component.html
deleted file mode 100644
index 8ceae03f..00000000
--- a/src/app/company-dashboard/company-dashboard-home/assessments-table/assessments-table.component.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<div class="card">
-    <div class="card-header">
-        <span class="h4">
-            <fa-icon [icon]="faFileLines"></fa-icon>
-            Assessments
-        </span>
-        <button class="btn btn-sm btn-success float-end" (click)="openAddNewModal()">
-            <fa-icon [icon]="faWandMagicSparkles"></fa-icon> Setup Wizard
-        </button>
-    </div>
-    <div class="card-body">
-
-        <ng-template [ngIf]="(company.guid | assessmentsList:assessments:true).length > 0" [ngIfElse]="noAssessmentsBlock">
-            <table class="table table-bordered table-hover">
-                <thead>
-                    <tr>
-                        <th class="w-25">
-                            Name
-                        </th>
-                        <th class="w-25">
-                            Facility
-                        </th>
-                        <th class="w-25">
-                            Visit Date
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr *ngFor="let assessment of company.guid | assessmentsList:assessments:true">
-                        <td>
-                            <a [routerLink]="'/assessment/'+assessment.guid">
-                                {{assessment.name}}
-                            </a>
-                        </td>
-                        <td>
-                            {{assessment.facilityId | facilityName:facilities}}
-                        </td>
-                        <td>
-                            <a class="click-link" (click)="goToVisit(assessment)">
-                                {{assessment.visitDate | date:'shortDate'}}
-                            </a>
-                        </td>
-                    </tr>
-
-                </tbody>
-            </table>
-        </ng-template>
-
-        <ng-template #noAssessmentsBlock>
-            <div class="alert alert-info">
-                No assessments found. Please click "Add New" to get started.
-            </div>
-        </ng-template>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/company-dashboard/company-dashboard-home/assessments-table/assessments-table.component.spec.ts b/src/app/company-dashboard/company-dashboard-home/assessments-table/assessments-table.component.spec.ts
deleted file mode 100644
index aec9d4bb..00000000
--- a/src/app/company-dashboard/company-dashboard-home/assessments-table/assessments-table.component.spec.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AssessmentsTableComponent } from './assessments-table.component';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
-import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
-import { BehaviorSubject } from 'rxjs';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
-
-describe('AssessmentsTableComponent', () => {
-  let component: AssessmentsTableComponent;
-  let fixture: ComponentFixture<AssessmentsTableComponent>;
-
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings())),
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([])
-  };
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', '')),
-    facilities: new BehaviorSubject<Array<IdbFacility>>([])
-  };
-  let companyIdbService: Partial<CompanyIdbService> = {
-    selectedCompany: new BehaviorSubject<IdbCompany>(getNewIdbCompany(''))
-  };
-  let setupWizardService: Partial<SetupWizardService> = {};
-  let onSiteVisitIdbService: Partial<OnSiteVisitIdbService> = {
-    onSiteVisits: new BehaviorSubject<Array<IdbOnSiteVisit>>([])
-  };
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, HelperPipesModule],
-      declarations: [AssessmentsTableComponent],
-      providers: [
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: SetupWizardService, useValue: setupWizardService },
-        { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService },
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(AssessmentsTableComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/company-dashboard/company-dashboard-home/assessments-table/assessments-table.component.ts b/src/app/company-dashboard/company-dashboard-home/assessments-table/assessments-table.component.ts
deleted file mode 100644
index 47adaa87..00000000
--- a/src/app/company-dashboard/company-dashboard-home/assessments-table/assessments-table.component.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-import { IconDefinition, faFileLines, faWandMagicSparkles } from '@fortawesome/free-solid-svg-icons';
-import { Subscription } from 'rxjs';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { IdbCompany } from 'src/app/models/company';
-import { IdbFacility } from 'src/app/models/facility';
-import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
-import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
-
-@Component({
-  selector: 'app-assessments-table',
-  templateUrl: './assessments-table.component.html',
-  styleUrl: './assessments-table.component.css'
-})
-export class AssessmentsTableComponent {
-
-  faWandMagicSparkles: IconDefinition = faWandMagicSparkles;
-  faFileLines: IconDefinition = faFileLines;
-
-  company: IdbCompany;
-  companySub: Subscription;
-
-  facilities: Array<IdbFacility>;
-  facilitiesSub: Subscription;
-
-  assessments: Array<IdbAssessment>;
-  assessmentsSub: Subscription;
-
-  constructor(private companyIdbService: CompanyIdbService,
-    private facilityIdbService: FacilityIdbService,
-    private assessmentIdbService: AssessmentIdbService,
-    private sharedDataService: SharedDataService,
-    private onSiteVisitIdbService: OnSiteVisitIdbService) {
-  }
-
-  ngOnInit() {
-    this.companySub = this.companyIdbService.selectedCompany.subscribe(_company => {
-      this.company = _company;
-    });
-
-    this.facilitiesSub = this.facilityIdbService.facilities.subscribe(_facilities => {
-      this.facilities = _facilities;
-    });
-    this.assessmentsSub = this.assessmentIdbService.assessments.subscribe(_assessments => {
-      this.assessments = _assessments;
-    })
-  }
-
-  ngOnDestroy() {
-    this.companySub.unsubscribe();
-    this.facilitiesSub.unsubscribe();
-    this.assessmentsSub.unsubscribe();
-  }
-
-  openAddNewModal() {
-    this.facilityIdbService.selectedFacility.next(undefined);
-    this.onSiteVisitIdbService.selectedVisit.next(undefined);
-    this.sharedDataService.createAssessmentModalOpen.next(true);
-  }
-  
-  goToVisit(assessment: IdbAssessment) {
-    this.companyIdbService.setSelectedFromGUID(assessment.companyId);
-    this.facilityIdbService.setSelectedFromGUID(assessment.facilityId);
-    this.onSiteVisitIdbService.setSelectedFromAssessmentGUID(assessment.guid);
-    this.sharedDataService.createAssessmentModalOpen.next(true);
-  }
-}
diff --git a/src/app/company-dashboard/company-dashboard-home/company-dashboard-home.component.html b/src/app/company-dashboard/company-dashboard-home/company-dashboard-home.component.html
deleted file mode 100644
index 51aa39c4..00000000
--- a/src/app/company-dashboard/company-dashboard-home/company-dashboard-home.component.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="row justify-content-center">
-    <div class="col-md-12 col-lg-9 pt-4 pb-2">
-        <nav class="navbar border-bottom">
-            <h4 class="mb-0">{{selectedCompany.generalInformation.name}}</h4>
-            <div class="float-end">
-                <button class="btn btn-secondary btn-sm">Import</button>
-                <button class="btn btn-secondary btn-sm ms-2">Export</button>
-            </div>
-        </nav>
-    </div>
-    <div class="col-md-12 col-lg-9">
-        <app-assessments-table></app-assessments-table>
-    </div>
-    <div class="col-md-12 col-lg-9">
-        <hr>
-    </div>
-    <div class="col-md-12 col-lg-9">
-        <app-facilities-table></app-facilities-table>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/company-dashboard/company-dashboard-home/company-dashboard-home.component.spec.ts b/src/app/company-dashboard/company-dashboard-home/company-dashboard-home.component.spec.ts
deleted file mode 100644
index 6c5de4a6..00000000
--- a/src/app/company-dashboard/company-dashboard-home/company-dashboard-home.component.spec.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CompanyDashboardHomeComponent } from './company-dashboard-home.component';
-import { RouterTestingModule } from '@angular/router/testing';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
-import { IdbFacility } from 'src/app/models/facility';
-import { FormsModule } from '@angular/forms';
-import { FacilitiesTableComponent } from './facilities-table/facilities-table.component';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-import { AssessmentsTableComponent } from './assessments-table/assessments-table.component';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { UserIdbService } from 'src/app/indexed-db/user-idb.service';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
-import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
-
-describe('CompanyDashboardHomeComponent', () => {
-  let component: CompanyDashboardHomeComponent;
-  let fixture: ComponentFixture<CompanyDashboardHomeComponent>;
-  let companyDbServiceStub: Partial<CompanyIdbService> = {
-    companies: new BehaviorSubject<Array<IdbCompany>>([]),
-    selectedCompany: new BehaviorSubject<IdbCompany>(getNewIdbCompany(''))
-  };
-  let facilityDbServiceStub: Partial<FacilityIdbService> = {
-    facilities: new BehaviorSubject<Array<IdbFacility>>([]),
-    selectedFacility: new BehaviorSubject<IdbFacility>(undefined)
-  }
-  let energyOpportunityIdbService: Partial<EnergyOpportunityIdbService> = {
-    energyOpportunities: new BehaviorSubject<Array<IdbEnergyOpportunity>>([])
-  };
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(undefined),
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([])
-  };
-  let contactIdbService: Partial<ContactIdbService> = {};
-  let userIdbService: Partial<UserIdbService> = {};
-
-  let onSiteVisitIdbService: Partial<OnSiteVisitIdbService> = {
-    onSiteVisits: new BehaviorSubject<Array<IdbOnSiteVisit>>([])
-  };
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [RouterTestingModule, FormsModule, FontAwesomeModule, HelperPipesModule],
-      declarations: [CompanyDashboardHomeComponent, FacilitiesTableComponent, AssessmentsTableComponent],
-      providers: [
-        { provide: CompanyIdbService, useValue: companyDbServiceStub },
-        { provide: FacilityIdbService, useValue: facilityDbServiceStub },
-        { provide: DbChangesService, useValue: {} },
-        { provide: EnergyOpportunityIdbService, useValue: energyOpportunityIdbService },
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: ContactIdbService, useValue: contactIdbService },
-        { provide: UserIdbService, useValue: userIdbService },
-        { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService },
-      ]
-    });
-    fixture = TestBed.createComponent(CompanyDashboardHomeComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/company-dashboard/company-dashboard-home/company-dashboard-home.component.ts b/src/app/company-dashboard/company-dashboard-home/company-dashboard-home.component.ts
deleted file mode 100644
index e48b8c77..00000000
--- a/src/app/company-dashboard/company-dashboard-home/company-dashboard-home.component.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-import { IconDefinition, faBuilding } from '@fortawesome/free-solid-svg-icons';
-import { Subscription } from 'rxjs';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { IdbCompany } from 'src/app/models/company';
-@Component({
-  selector: 'app-company-dashboard-home',
-  templateUrl: './company-dashboard-home.component.html',
-  styleUrls: ['./company-dashboard-home.component.css']
-})
-export class CompanyDashboardHomeComponent {
-
-  faBuilding: IconDefinition = faBuilding;
-
-  selectedCompany: IdbCompany;
-  selectedCompanySub: Subscription;
-  constructor(private companyIdbService: CompanyIdbService,
-    private dbChangesService: DbChangesService,
-    private router: Router) {
-  }
-
-  ngOnInit() {
-    this.selectedCompanySub = this.companyIdbService.selectedCompany.subscribe(_company => {
-      this.selectedCompany = _company;
-    });
-  }
-
-  ngOnDestroy() {
-    this.selectedCompanySub.unsubscribe();
-  }
-
-  async deleteCompany(){
-    await this.dbChangesService.deleteCompany(this.selectedCompany);
-    this.router.navigateByUrl('/user')
-  }
-}
diff --git a/src/app/company-dashboard/company-dashboard-home/facilities-table/facilities-table.component.html b/src/app/company-dashboard/company-dashboard-home/facilities-table/facilities-table.component.html
deleted file mode 100644
index 5ee96d35..00000000
--- a/src/app/company-dashboard/company-dashboard-home/facilities-table/facilities-table.component.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<div class="card">
-    <div class="card-header">
-        <span class="h4">
-            <fa-icon [icon]="faIndustry"></fa-icon>
-            Facilities
-        </span>
-        <button class="btn btn-sm btn-success float-end" (click)="openAddNewModal()">
-            <fa-icon [icon]="faPlus" title="Add Company"></fa-icon> Add New
-        </button>
-    </div>
-    <div class="card-body">
-        <ng-template [ngIf]="(company.guid| facilityList: facilities).length > 0" [ngIfElse]="noFacilitiesBlock">
-            <table class="table table-bordered table-hover">
-                <thead>
-                    <tr>
-                        <th class="w-25">
-                            Name
-                        </th>
-                        <th class="w-25">
-                            Location
-                        </th>
-                        <th>
-                            Assessments
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr *ngFor="let facility of company.guid| facilityList: facilities">
-                        <td>
-                            <a [routerLink]="'/facility/'+facility.guid">
-                                {{facility.generalInformation.name}}
-                            </a>
-                        </td>
-                        <td>
-                            {{facility.generalInformation | addressDisplay}}
-                        </td>
-                        <td>
-                            {{(facility.guid | assessmentsList: assessments).length}}
-                        </td>
-                    </tr>
-
-                </tbody>
-            </table>
-        </ng-template>
-
-        <ng-template #noFacilitiesBlock>
-            <div class="alert alert-info">
-                No facilities found. Please click "Add New" to get started.
-            </div>
-        </ng-template>
-    </div>
-</div>
-
-
-<div [ngClass]="{'window-overlay': displayAddNewModal}"></div>
-<div class="popup" [ngClass]="{'open': displayAddNewModal }">
-    <div class="popup-header">Create New Facility?
-        <button type="button" class="btn-close float-end" aria-label="Close" (click)="closeAddNewModal()"></button>
-    </div>
-    <div class="popup-body">
-        <div class="alert alert-info">
-            Are you sure you want to create a new facility for this company?
-        </div>
-        <hr>
-    </div>
-    <div class="popup-footer d-flex justify-content-end">
-        <button class="btn btn-secondary me-2" (click)="closeAddNewModal()">Cancel</button>
-        <button class="btn btn-success" (click)="confirmCreate()">Create Facility</button>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/company-dashboard/company-dashboard-home/facilities-table/facilities-table.component.spec.ts b/src/app/company-dashboard/company-dashboard-home/facilities-table/facilities-table.component.spec.ts
deleted file mode 100644
index a67b076b..00000000
--- a/src/app/company-dashboard/company-dashboard-home/facilities-table/facilities-table.component.spec.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FacilitiesTableComponent } from './facilities-table.component';
-import { UserIdbService } from 'src/app/indexed-db/user-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbUser, getNewIdbUser } from 'src/app/models/user';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility } from 'src/app/models/facility';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FormsModule } from '@angular/forms';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
-
-describe('FacilitiesTableComponent', () => {
-  let component: FacilitiesTableComponent;
-  let fixture: ComponentFixture<FacilitiesTableComponent>;
-  let userIdbService: Partial<UserIdbService> = {
-    user: new BehaviorSubject<IdbUser>(getNewIdbUser())
-  }
-  let companyIdbService: Partial<CompanyIdbService> = {
-    companies: new BehaviorSubject<Array<IdbCompany>>([]),
-    selectedCompany: new BehaviorSubject<IdbCompany>(getNewIdbCompany(''))
-  };
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    facilities: new BehaviorSubject<Array<IdbFacility>>([])
-  };
-
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings())),
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([])
-  };
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [RouterTestingModule, FormsModule, FontAwesomeModule, HelperPipesModule],
-      declarations: [FacilitiesTableComponent],    
-      providers: [
-      { provide: UserIdbService, useValue: userIdbService },
-      { provide: CompanyIdbService, useValue: companyIdbService },
-      { provide: FacilityIdbService, useValue: facilityIdbService },
-      { provide: AssessmentIdbService, useValue: assessmentIdbService },
-    ]
-    })
-    .compileComponents();
-    
-    fixture = TestBed.createComponent(FacilitiesTableComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/company-dashboard/company-dashboard-home/facilities-table/facilities-table.component.ts b/src/app/company-dashboard/company-dashboard-home/facilities-table/facilities-table.component.ts
deleted file mode 100644
index 02c04c03..00000000
--- a/src/app/company-dashboard/company-dashboard-home/facilities-table/facilities-table.component.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-import { IconDefinition, faIndustry, faPlus } from '@fortawesome/free-solid-svg-icons';
-import { Subscription, firstValueFrom } from 'rxjs';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { IdbCompany } from 'src/app/models/company';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-
-@Component({
-  selector: 'app-facilities-table',
-  templateUrl: './facilities-table.component.html',
-  styleUrl: './facilities-table.component.css'
-})
-export class FacilitiesTableComponent {
-  
-  faPlus: IconDefinition = faPlus;
-  faIndustry: IconDefinition = faIndustry;
-
-
-  facilities: Array<IdbFacility>;
-  facilitiesSub: Subscription;
-
-  assessments: Array<IdbAssessment>;
-  assessmentsSub: Subscription;
-
-  company: IdbCompany;
-  companySub: Subscription;
-  displayAddNewModal: boolean = false;
-  constructor(
-    private companyIdbService: CompanyIdbService,
-    private facilityIdbService: FacilityIdbService,
-    private assessmentIdbService: AssessmentIdbService,
-    private router: Router) {
-  }
-
-  ngOnInit() {
-    this.companySub = this.companyIdbService.selectedCompany.subscribe(_company => {
-      this.company = _company;
-    });
-    this.facilitiesSub = this.facilityIdbService.facilities.subscribe(_facilities => {
-      this.facilities = _facilities;
-    });
-    this.assessmentsSub = this.assessmentIdbService.assessments.subscribe(_assessments => {
-      this.assessments = _assessments;
-    })
-  }
-
-  ngOnDestroy() {
-    this.facilitiesSub.unsubscribe();
-    this.assessmentsSub.unsubscribe();
-    this.companySub.unsubscribe();
-  }
-
-
-  openAddNewModal() {
-    this.displayAddNewModal = true;
-  }
-
-  closeAddNewModal() {
-    this.displayAddNewModal = false;
-  }
-
-  async confirmCreate() {
-    let newFacility: IdbFacility = getNewIdbFacility(this.company.userId, this.company.guid);
-    newFacility = await firstValueFrom(this.facilityIdbService.addWithObservable(newFacility));
-    await this.facilityIdbService.setFacilities();
-    this.router.navigateByUrl('/facility/' + newFacility.guid + '/settings');
-  }
-}
diff --git a/src/app/company-dashboard/company-dashboard-tabs/company-dashboard-tabs.component.html b/src/app/company-dashboard/company-dashboard-tabs/company-dashboard-tabs.component.html
deleted file mode 100644
index 67bd04d5..00000000
--- a/src/app/company-dashboard/company-dashboard-tabs/company-dashboard-tabs.component.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<ul class="nav nav-tabs">
-    <li class="nav-item">
-        <a class="nav-link" [routerLink]="'/user'">
-            <fa-icon [icon]="faFolderOpen"></fa-icon> 
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" routerLink="home" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faBuilding"></fa-icon> 
-            {{company.generalInformation.name}}
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" routerLink="goals" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faBullseye"></fa-icon> 
-            Goals
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" routerLink="reports" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faChartLine"></fa-icon> 
-            Reports
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" routerLink="settings" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faGears"></fa-icon> 
-            Settings
-        </a>
-    </li>
-</ul>
\ No newline at end of file
diff --git a/src/app/company-dashboard/company-dashboard-tabs/company-dashboard-tabs.component.spec.ts b/src/app/company-dashboard/company-dashboard-tabs/company-dashboard-tabs.component.spec.ts
deleted file mode 100644
index 337cffcd..00000000
--- a/src/app/company-dashboard/company-dashboard-tabs/company-dashboard-tabs.component.spec.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CompanyDashboardTabsComponent } from './company-dashboard-tabs.component';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
-import { RouterTestingModule } from '@angular/router/testing';
-
-describe('CompanyDashboardTabsComponent', () => {
-  let component: CompanyDashboardTabsComponent;
-  let fixture: ComponentFixture<CompanyDashboardTabsComponent>;
-
-  beforeEach(async () => {
-    let companyIdbService: Partial<CompanyIdbService> = {
-      selectedCompany: new BehaviorSubject<IdbCompany>(getNewIdbCompany(''))
-    };
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, RouterTestingModule],
-      declarations: [CompanyDashboardTabsComponent],
-      providers: [
-        { provide: CompanyIdbService, useValue: companyIdbService }
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(CompanyDashboardTabsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/company-dashboard/company-dashboard-tabs/company-dashboard-tabs.component.ts b/src/app/company-dashboard/company-dashboard-tabs/company-dashboard-tabs.component.ts
deleted file mode 100644
index bea0318e..00000000
--- a/src/app/company-dashboard/company-dashboard-tabs/company-dashboard-tabs.component.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Component } from '@angular/core';
-import { IconDefinition, faBuilding, faBullseye, faChartLine, faChevronLeft, faFolderOpen, faGears } from '@fortawesome/free-solid-svg-icons';
-import { Subscription } from 'rxjs';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { IdbCompany } from 'src/app/models/company';
-
-@Component({
-  selector: 'app-company-dashboard-tabs',
-  templateUrl: './company-dashboard-tabs.component.html',
-  styleUrl: './company-dashboard-tabs.component.css'
-})
-export class CompanyDashboardTabsComponent {
-
-
-  faBuilding: IconDefinition = faBuilding;
-  faGears: IconDefinition = faGears;
-  faFolderOpen: IconDefinition = faFolderOpen;
-  faChartLine: IconDefinition = faChartLine;
-  faBullseye: IconDefinition = faBullseye
-
-  company: IdbCompany;
-  copmanySub: Subscription;
-
-  constructor(private companyIdbService: CompanyIdbService) {
-
-  }
-
-  ngOnInit() {
-    this.copmanySub = this.companyIdbService.selectedCompany.subscribe(_company => {
-      this.company = _company;
-    });
-  }
-
-  ngOnDestroy() {
-    this.copmanySub.unsubscribe();
-  }
-}
diff --git a/src/app/company-dashboard/company-dashboard.component.html b/src/app/company-dashboard/company-dashboard.component.html
deleted file mode 100644
index 3bbef2d9..00000000
--- a/src/app/company-dashboard/company-dashboard.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="container-fluid h-100 no-gutters">
-    <app-company-dashboard-tabs></app-company-dashboard-tabs>
-    <router-outlet></router-outlet>
-</div>
\ No newline at end of file
diff --git a/src/app/company-dashboard/company-dashboard.component.ts b/src/app/company-dashboard/company-dashboard.component.ts
deleted file mode 100644
index da56887e..00000000
--- a/src/app/company-dashboard/company-dashboard.component.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Component } from '@angular/core';
-import { CompanyIdbService } from '../indexed-db/company-idb.service';
-import { ActivatedRoute, Router } from '@angular/router';
-
-@Component({
-  selector: 'app-company-dashboard',
-  templateUrl: './company-dashboard.component.html',
-  styleUrls: ['./company-dashboard.component.css']
-})
-export class CompanyDashboardComponent {
-
-  constructor(private activatedRoute: ActivatedRoute, private companyIdbService: CompanyIdbService,
-    private router: Router) {
-  }
-
-  ngOnInit() {
-    this.activatedRoute.params.subscribe(params => {
-      let companyGUID: string = params['id'];
-      let companyExists: boolean = this.companyIdbService.setSelectedFromGUID(companyGUID);
-      if (!companyExists) {
-        this.router.navigateByUrl('/user');
-      }
-    });
-  }
-}
diff --git a/src/app/company-dashboard/company-dashboard.module.ts b/src/app/company-dashboard/company-dashboard.module.ts
deleted file mode 100644
index ea87d790..00000000
--- a/src/app/company-dashboard/company-dashboard.module.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { CompanyDashboardComponent } from './company-dashboard.component';
-import { CompanyDashboardHomeComponent } from './company-dashboard-home/company-dashboard-home.component';
-import { RouterModule } from '@angular/router';
-import { FormsModule } from '@angular/forms';
-import { HelperPipesModule } from '../shared/helper-pipes/helper-pipes.module';
-import { SharedSettingsFormsModule } from '../shared/shared-settings-forms/shared-settings-forms.module';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { CompanyGoalsComponent } from './company-goals/company-goals.component';
-import { CompanyDashboardTabsComponent } from './company-dashboard-tabs/company-dashboard-tabs.component';
-import { CompanyReportsComponent } from './company-reports/company-reports.component';
-import { CompanySettingsComponent } from './company-settings/company-settings.component';
-import { FacilitiesTableComponent } from './company-dashboard-home/facilities-table/facilities-table.component';
-import { AssessmentsTableComponent } from './company-dashboard-home/assessments-table/assessments-table.component';
-
-@NgModule({
-  declarations: [
-    CompanyDashboardComponent,
-    CompanyDashboardHomeComponent,
-    CompanyGoalsComponent,
-    CompanyDashboardTabsComponent,
-    CompanyReportsComponent,
-    CompanySettingsComponent,
-    FacilitiesTableComponent,
-    AssessmentsTableComponent
-  ],
-  imports: [
-    CommonModule,
-    RouterModule,
-    FormsModule,
-    HelperPipesModule,
-    SharedSettingsFormsModule,
-    FontAwesomeModule
-  ]
-})
-export class CompanyDashboardModule { }
diff --git a/src/app/company-dashboard/company-goals/company-goals.component.html b/src/app/company-dashboard/company-goals/company-goals.component.html
deleted file mode 100644
index a82e8d04..00000000
--- a/src/app/company-dashboard/company-goals/company-goals.component.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="row pt-4 justify-content-center">
-    <div class="col-md-12 col-lg-9">
-        <div class="accordion" id="companyGoalsAccordion">
-            <div class="accordion-item">
-                <h2 class="accordion-header">
-                    <button class="accordion-button" type="button" data-bs-toggle="collapse"
-                        data-bs-target="#collapseCompanyGoals" aria-expanded="true" aria-controls="collapseCompanyGoals"
-                        [ngClass]="{'collapsed': !accordionOpen}" (click)="toggleAccordion()">
-                        <fa-icon [icon]="faBullseye" class="me-2"></fa-icon>
-                        Company Goals
-                    </button>
-                </h2>
-                <div id="collapseCompanyGoals" class="accordion-collapse collapse"
-                    data-bs-parent="#companyGoalsAccordion" [ngClass]="{'show': accordionOpen}">
-                    <div class="accordion-body">
-
-                        <div class="row mt-2">
-                            <div class="col-4">
-                                Strategic Goals
-                            </div>
-                            <span class="placeholder col-8"></span>
-                        </div>
-                        <div class="row mt-2">
-                            <div class="col-4">
-                                Sustainability Goals
-                            </div>
-                            <span class="placeholder col-8"></span>
-                        </div>
-                        <div class="row mt-2">
-                            <div class="col-4">
-                                Marketing Goals
-                            </div>
-                            <span class="placeholder col-8"></span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/company-dashboard/company-goals/company-goals.component.spec.ts b/src/app/company-dashboard/company-goals/company-goals.component.spec.ts
deleted file mode 100644
index 3d7d4e4a..00000000
--- a/src/app/company-dashboard/company-goals/company-goals.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CompanyGoalsComponent } from './company-goals.component';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-
-describe('CompanyGoalsComponent', () => {
-  let component: CompanyGoalsComponent;
-  let fixture: ComponentFixture<CompanyGoalsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule]
-    })
-    .compileComponents();
-    
-    fixture = TestBed.createComponent(CompanyGoalsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/company-dashboard/company-goals/company-goals.component.ts b/src/app/company-dashboard/company-goals/company-goals.component.ts
deleted file mode 100644
index 913fc8d3..00000000
--- a/src/app/company-dashboard/company-goals/company-goals.component.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Component } from '@angular/core';
-import { IconDefinition, faBullseye } from '@fortawesome/free-solid-svg-icons';
-
-@Component({
-  selector: 'app-company-goals',
-  templateUrl: './company-goals.component.html',
-  styleUrl: './company-goals.component.css'
-})
-export class CompanyGoalsComponent {
-
-  faBullseye: IconDefinition = faBullseye;
-  accordionOpen: boolean = false;
-
-
-  constructor(){
-
-  }
-
-  toggleAccordion(){
-    this.accordionOpen = !this.accordionOpen;
-  }
-}
diff --git a/src/app/company-dashboard/company-reports/company-reports.component.html b/src/app/company-dashboard/company-reports/company-reports.component.html
deleted file mode 100644
index fb8d5aae..00000000
--- a/src/app/company-dashboard/company-reports/company-reports.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>company-reports works!</p>
diff --git a/src/app/company-dashboard/company-settings/company-settings.component.css b/src/app/company-dashboard/company-settings/company-settings.component.css
deleted file mode 100644
index 2d909ba7..00000000
--- a/src/app/company-dashboard/company-settings/company-settings.component.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.settings-content{
-    height: calc(100% - 3rem);
-    /* background-color: red; */
-    overflow-y: auto;
-}
\ No newline at end of file
diff --git a/src/app/company-dashboard/company-settings/company-settings.component.html b/src/app/company-dashboard/company-settings/company-settings.component.html
deleted file mode 100644
index e5abf0b7..00000000
--- a/src/app/company-dashboard/company-settings/company-settings.component.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<div class="settings-content">
-    <div class="row g-0 justify-content-center h-100 w-100 overflow-scroll">
-        <div class="col-10 pt-4 pb-4">
-            <div class="form-paper shadow">
-                <h5>
-                    <fa-icon [icon]="faBuilding" class="me-2"></fa-icon>Company Details
-                </h5>
-                <hr>
-                <form>
-                    <label class="bold" for="companyName">Company Name</label>
-                    <input name="companyName" type="text" class="form-control"
-                        [(ngModel)]="company.generalInformation.name" (input)="saveChanges()" minlength="1"
-                        maxlength="42" id="companyName">
-                </form>
-                <hr>
-                <label class="bold">Location</label>
-                <app-location-form [inCompany]="true"></app-location-form>
-                <hr>
-                <label class="bold">Additional Details</label>
-                <app-additional-details-form [inCompany]="true"></app-additional-details-form>
-                <hr>
-                <label class="bold">Manage Company</label>
-                <div class="d-flex p-2">
-                    <button class="btn btn-danger" (click)="openDeleteModal()">
-                        <fa-icon [icon]="faTrash"></fa-icon> Delete Company
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-
-<div [ngClass]="{'window-overlay': displayDeleteModal}"></div>
-<div class="popup" [ngClass]="{'open': displayDeleteModal }">
-    <div class="popup-header">Delete Company?
-        <button type="button" class="btn-close float-end" aria-label="Close" (click)="closeDeleteModal()"></button>
-    </div>
-    <div class="popup-body">
-        <div class="alert alert-info">
-            Are you sure you want to delete <b>{{company.generalInformation.name}}</b>?
-        </div>
-        <hr>
-    </div>
-    <div class="popup-footer d-flex justify-content-end">
-        <button class="btn btn-secondary me-2" (click)="closeDeleteModal()">Cancel</button>
-        <button class="btn btn-danger" (click)="confirmDelete()">Confirm Delete</button>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/company-dashboard/company-settings/company-settings.component.spec.ts b/src/app/company-dashboard/company-settings/company-settings.component.spec.ts
deleted file mode 100644
index b4c3e59f..00000000
--- a/src/app/company-dashboard/company-settings/company-settings.component.spec.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CompanySettingsComponent } from './company-settings.component';
-import { SharedSettingsFormsModule } from 'src/app/shared/shared-settings-forms/shared-settings-forms.module';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { FormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-import { LocalStorageDataService } from 'src/app/shared/shared-services/local-storage-data.service';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { UserIdbService } from 'src/app/indexed-db/user-idb.service';
-
-describe('CompanySettingsComponent', () => {
-  let component: CompanySettingsComponent;
-  let fixture: ComponentFixture<CompanySettingsComponent>;
-  let companyIdbService: Partial<CompanyIdbService> = {
-    companies: new BehaviorSubject<Array<IdbCompany>>([]),
-    selectedCompany: new BehaviorSubject<IdbCompany>(getNewIdbCompany(''))
-  };
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    facilities: new BehaviorSubject<Array<IdbFacility>>([]),
-    selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', ''))
-  };
-  let userIdbService: Partial<UserIdbService> = {};
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [SharedSettingsFormsModule, FontAwesomeModule, FormsModule, RouterTestingModule],
-      declarations: [CompanySettingsComponent],
-      providers: [
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: LocalStorageDataService, useValue: {}},
-        { provide: DbChangesService, useValue: {}},
-        { provide: UserIdbService, useValue: userIdbService}
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(CompanySettingsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/company-dashboard/company-settings/company-settings.component.ts b/src/app/company-dashboard/company-settings/company-settings.component.ts
deleted file mode 100644
index d568fed1..00000000
--- a/src/app/company-dashboard/company-settings/company-settings.component.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-import { IconDefinition, faBuilding, faTrash } from '@fortawesome/free-solid-svg-icons';
-import { Subscription } from 'rxjs';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { IdbCompany } from 'src/app/models/company';
-
-@Component({
-  selector: 'app-company-settings',
-  templateUrl: './company-settings.component.html',
-  styleUrl: './company-settings.component.css'
-})
-export class CompanySettingsComponent {
-
-
-  faBuilding: IconDefinition = faBuilding;
-  faTrash: IconDefinition = faTrash;
-  
-  company: IdbCompany;
-  companySub: Subscription;
-  isFormChange: boolean = false;
-  displayDeleteModal: boolean = false;
-  constructor(private companyIdbService: CompanyIdbService,
-    private dbChangesService: DbChangesService,
-    private router: Router
-  ) {
-  }
-
-  ngOnInit() {
-    this.companySub = this.companyIdbService.selectedCompany.subscribe(_company => {
-      if (!this.isFormChange) {
-        this.company = _company;
-      } else {
-        this.isFormChange = false;
-      }
-    });
-  }
-
-  ngOnDestroy() {
-    this.companySub.unsubscribe();
-  }
-
-  async saveChanges() {
-    this.isFormChange = true;
-    await this.companyIdbService.asyncUpdate(this.company);
-  }
-
-  openDeleteModal() {
-    this.displayDeleteModal = true;
-  }
-
-  closeDeleteModal() {
-    this.displayDeleteModal = false;
-  }
-
-  async confirmDelete() {
-    await this.dbChangesService.deleteCompany(this.company);
-    this.router.navigateByUrl('/user')
-  }
-}
diff --git a/src/app/core-components/sidebar/sidebar.component.html b/src/app/core-components/sidebar/sidebar.component.html
index f703700b..cf309d88 100644
--- a/src/app/core-components/sidebar/sidebar.component.html
+++ b/src/app/core-components/sidebar/sidebar.component.html
@@ -13,20 +13,16 @@
             </button>
             <hr>
             <li class="nav-item">
-                <a class="nav-link" [routerLink]="'/welcome'" [routerLinkActive]="['active']">
-                    <fa-icon [icon]="faHome"></fa-icon>
-                    Home</a>
-            </li>
-            <hr>
-            <li class="nav-item">
-                <a class="nav-link" [routerLink]="'/user'" [routerLinkActive]="['active']">
+                <a class="nav-link" [routerLink]="'/portfolio'" [routerLinkActive]="['active']"
+                    [routerLinkActiveOptions]="{exact: true}">
                     <fa-icon [icon]="faFolderOpen"></fa-icon>
                     My Portfolio</a>
             </li>
             <hr>
             <ng-container *ngFor="let company of companies">
                 <li class="nav-item">
-                    <a class="nav-link" [routerLink]="'/company/'+company.guid" [routerLinkActive]="['active']">
+                    <a class="nav-link" [routerLink]="'/portfolio/company/'+company.guid"
+                        [routerLinkActive]="['active']">
                         <fa-icon class="pe-1" [icon]="faBuilding"></fa-icon>
                         {{company.generalInformation.name}}
                     </a>
@@ -34,7 +30,7 @@
 
                 <ng-container *ngFor="let facility of company.guid | facilityList:facilities">
                     <li class="nav-item">
-                        <a class="nav-link facility-link" [routerLink]="'/facility/'+facility.guid"
+                        <a class="nav-link facility-link" [routerLink]="'/portfolio/facility/'+facility.guid"
                             [routerLinkActive]="['active']">
                             <fa-icon [icon]="faIndustry" class="pe-1"></fa-icon>
                             {{facility.generalInformation.name}}</a>
@@ -42,9 +38,9 @@
 
                     <ng-container *ngFor="let assessment of (facility.guid | assessmentsList:assessments)">
                         <li class="nav-item">
-                            <a class="nav-link assessment-link" [routerLink]="'/assessment/'+assessment.guid"
+                            <a class="nav-link assessment-link" [routerLink]="'/portfolio/assessment/'+assessment.guid"
                                 [routerLinkActive]="['active']">
-                                <fa-icon [icon]="faFileLines" class="pe-1"></fa-icon>
+                                <fa-icon [icon]="faScrewdriverWrench" class="pe-1"></fa-icon>
                                 {{assessment.name}}</a>
                         </li>
                     </ng-container>
diff --git a/src/app/core-components/sidebar/sidebar.component.ts b/src/app/core-components/sidebar/sidebar.component.ts
index d17e9427..457bdaba 100644
--- a/src/app/core-components/sidebar/sidebar.component.ts
+++ b/src/app/core-components/sidebar/sidebar.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { IconDefinition, faBuilding, faChevronDown, faChevronRight, faCircleInfo, faDatabase, faFileLines, faFolder, faFolderOpen, faHome, faInbox, faIndustry, faMinusSquare, faPlusSquare, faQuestionCircle, faTrophy, faWandMagicSparkles } from '@fortawesome/free-solid-svg-icons';
+import { IconDefinition, faBuilding, faChevronDown, faChevronRight, faCircleInfo, faDatabase, faFolder, faFolderOpen, faHome, faInbox, faIndustry, faMinusSquare, faPlusSquare, faQuestionCircle, faScrewdriverWrench, faTrophy, faWandMagicSparkles } from '@fortawesome/free-solid-svg-icons';
 import { Subscription } from 'rxjs';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
 import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
@@ -24,7 +24,7 @@ export class SidebarComponent {
   faChevronDown: IconDefinition = faChevronDown;
   faBuilding: IconDefinition = faBuilding;
   faIndustry: IconDefinition = faIndustry;
-  faFileLines: IconDefinition = faFileLines;
+  faScrewdriverWrench: IconDefinition = faScrewdriverWrench;
   faTrophy: IconDefinition = faTrophy;
   faCircleInfo: IconDefinition = faCircleInfo;
   faInbox: IconDefinition = faInbox;
diff --git a/src/app/core-components/toast-notifications/toast-notifications.component.html b/src/app/core-components/toast-notifications/toast-notifications.component.html
index 78fc82a5..40f4cef4 100644
--- a/src/app/core-components/toast-notifications/toast-notifications.component.html
+++ b/src/app/core-components/toast-notifications/toast-notifications.component.html
@@ -6,7 +6,7 @@
                 <strong class="me-auto">{{toastNotification.title}}</strong>
                 <button type="button" class="btn-close" (click)="closeToast()" aria-label="Close"></button>
             </div>
-            <div class="toast-body">
+            <div class="toast-body" *ngIf="toastNotification?.body">
                 <span [innerHTML]="toastNotification.body"></span>
             </div>
             <div class="toast-footer ps-2 pe-2 pb-2" *ngIf="toastNotification?.showDisable">
diff --git a/src/app/core-components/welcome/welcome.component.css b/src/app/core-components/welcome/welcome.component.css
index d35d9da9..5eb4d451 100644
--- a/src/app/core-components/welcome/welcome.component.css
+++ b/src/app/core-components/welcome/welcome.component.css
@@ -1,35 +1,3 @@
-.card{
-    border-radius: 0;
-}
-
-.card-title{
-    font-size: 26px;
-}
-
-.card-title.secondary{
-    font-size: 20px;
-}
-
-.card-text{
-    font-size: 14px;
-}
-
-th.actions, td.actions{
-    width: 15px;
-}
-
-table th, table td{
-    padding: .2rem;
-    vertical-align: middle;
-}
-
-.align-btn-end{
-    text-align: end;
-}
-
-/* .nav-link{
-    padding-left: .5em;
-} */
 
 .nav-link.facility-link{
     padding-left: 2rem;
diff --git a/src/app/core-components/welcome/welcome.component.html b/src/app/core-components/welcome/welcome.component.html
index f8aa4aa9..75cfb671 100644
--- a/src/app/core-components/welcome/welcome.component.html
+++ b/src/app/core-components/welcome/welcome.component.html
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid dashboard">
     <div class="row">
         <div class="col mt-3">
             <div class="card">
@@ -45,7 +45,7 @@
                                     from the portfolio window.
                                 </p>
                                 <div class="d-flex justify-content-center">
-                                    <button class="btn btn-primary" routerLink="/user">
+                                    <button class="btn nav-btn" routerLink="/portfolio">
                                         <fa-icon [icon]="faFolderOpen"></fa-icon>
                                         My Portfolio</button>
                                 </div>
@@ -88,7 +88,9 @@
                                         <tbody>
                                             <tr *ngFor="let visit of onSiteVisits">
                                                 <td>
-                                                    {{visit.facilityId | facilityName: facilities}}
+                                                    <a [routerLink]="'/portfolio/facility/'+visit.facilityId">
+                                                        {{visit.facilityId | facilityName: facilities}}
+                                                    </a>
                                                 </td>
                                                 <td>
                                                     {{visit.visitDate | date}}
diff --git a/src/app/facility-dashboard/facility-dashboard-home/assessments-table/assessments-table.component.html b/src/app/facility-dashboard/facility-dashboard-home/assessments-table/assessments-table.component.html
deleted file mode 100644
index 2fe84d5a..00000000
--- a/src/app/facility-dashboard/facility-dashboard-home/assessments-table/assessments-table.component.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<div class="card">
-    <div class="card-header">
-        <span class="h4">
-            <fa-icon [icon]="faFileLines"></fa-icon>
-            Assessments
-        </span>
-        <button class="btn btn-sm btn-success float-end" (click)="openAddNewModal()">
-            <fa-icon [icon]="faWandMagicSparkles"></fa-icon> Setup Wizard
-        </button>
-    </div>
-    <div class="card-body">
-
-        <ng-template [ngIf]="(facility.guid | assessmentsList:assessments).length > 0" [ngIfElse]="noAssessmentBlock">
-            <table class="table table-bordered table-hover">
-                <thead>
-                    <tr>
-                        <th class="w-25">
-                            Name
-                        </th>
-                        <th class="w-25">
-                            Visit Date
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr *ngFor="let assessment of facility.guid | assessmentsList:assessments">
-                        <td>
-                            <a [routerLink]="'/assessment/'+assessment.guid">
-                                {{assessment.name}}
-                            </a>
-                        </td>
-                        <td>
-                            <a class="click-link" (click)="goToVisit(assessment)">
-                                {{assessment.visitDate | date:'shortDate'}}
-                            </a>
-                        </td>
-                    </tr>
-
-                </tbody>
-            </table>
-        </ng-template>
-
-        <ng-template #noAssessmentBlock>
-            <div class="alert alert-info">
-                No assessments found. Please click "Add New" to get started.
-            </div>
-        </ng-template>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/facility-dashboard/facility-dashboard-home/assessments-table/assessments-table.component.spec.ts b/src/app/facility-dashboard/facility-dashboard-home/assessments-table/assessments-table.component.spec.ts
deleted file mode 100644
index eac829fc..00000000
--- a/src/app/facility-dashboard/facility-dashboard-home/assessments-table/assessments-table.component.spec.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AssessmentsTableComponent } from './assessments-table.component';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
-import { BehaviorSubject } from 'rxjs';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
-
-describe('AssessmentsTableComponent', () => {
-  let component: AssessmentsTableComponent;
-  let fixture: ComponentFixture<AssessmentsTableComponent>;
-
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings())),
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([])
-  };
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', ''))
-  };
-  let companyIdbService: Partial<CompanyIdbService> = {};
-  let setupWizardService: Partial<SetupWizardService> = {};
-  let onSiteVisitIdbService: Partial<OnSiteVisitIdbService> = {
-    onSiteVisits: new BehaviorSubject<Array<IdbOnSiteVisit>>([])
-  };
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, HelperPipesModule],
-      declarations: [AssessmentsTableComponent],
-      providers: [
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: SetupWizardService, useValue: setupWizardService },
-        { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService },
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(AssessmentsTableComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/facility-dashboard/facility-dashboard-home/assessments-table/assessments-table.component.ts b/src/app/facility-dashboard/facility-dashboard-home/assessments-table/assessments-table.component.ts
deleted file mode 100644
index bb797d89..00000000
--- a/src/app/facility-dashboard/facility-dashboard-home/assessments-table/assessments-table.component.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-import { IconDefinition, faFileLines, faWandMagicSparkles } from '@fortawesome/free-solid-svg-icons';
-import { Subscription } from 'rxjs';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { IdbFacility } from 'src/app/models/facility';
-import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
-
-@Component({
-  selector: 'app-assessments-table',
-  templateUrl: './assessments-table.component.html',
-  styleUrl: './assessments-table.component.css'
-})
-export class AssessmentsTableComponent {
-  faWandMagicSparkles: IconDefinition = faWandMagicSparkles;
-  faFileLines: IconDefinition = faFileLines;
-
-  facility: IdbFacility;
-  facilitiesSub: Subscription;
-
-  assessments: Array<IdbAssessment>;
-  assessmentsSub: Subscription;
-
-  constructor(
-    private facilityIdbService: FacilityIdbService,
-    private assessmentIdbService: AssessmentIdbService,
-    private sharedDataService: SharedDataService,
-    private companyIdbService: CompanyIdbService,
-    private onSiteVisitIdbService: OnSiteVisitIdbService) {
-  }
-
-  ngOnInit() {
-    this.facilitiesSub = this.facilityIdbService.selectedFacility.subscribe(_facility => {
-      this.facility = _facility;
-    });
-    this.assessmentsSub = this.assessmentIdbService.assessments.subscribe(_assessments => {
-      this.assessments = _assessments;
-    });
-  }
-
-  ngOnDestroy() {
-    this.facilitiesSub.unsubscribe();
-    this.assessmentsSub.unsubscribe();
-  }
-
-  openAddNewModal() {
-    this.companyIdbService.setSelectedFromGUID(this.facility.companyId);
-    this.onSiteVisitIdbService.selectedVisit.next(undefined);
-    this.sharedDataService.createAssessmentModalOpen.next(true);
-  }
-  
-  goToVisit(assessment: IdbAssessment) {
-    this.companyIdbService.setSelectedFromGUID(assessment.companyId);
-    this.facilityIdbService.setSelectedFromGUID(assessment.facilityId);
-    this.onSiteVisitIdbService.setSelectedFromAssessmentGUID(assessment.guid);
-    this.sharedDataService.createAssessmentModalOpen.next(true);
-  }
-}
diff --git a/src/app/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.html b/src/app/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.html
deleted file mode 100644
index 89341c1c..00000000
--- a/src/app/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="row justify-content-center">
-    <div class="col-md-12 col-lg-9 pt-4 pb-2">
-        <nav class="navbar border-bottom">
-            <h4 class="mb-0">{{selectedFacility.generalInformation.name}}</h4>
-            <div class="float-end">
-                <button class="btn btn-secondary btn-sm">Import</button>
-                <button class="btn btn-secondary btn-sm ms-2">Export</button>
-            </div>
-        </nav>
-    </div>
-    <div class="col-md-12 col-lg-9">
-        <app-assessments-table></app-assessments-table>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.spec.ts b/src/app/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.spec.ts
deleted file mode 100644
index f9a95b52..00000000
--- a/src/app/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.spec.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FacilityDashboardHomeComponent } from './facility-dashboard-home.component';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { IdbCompany } from 'src/app/models/company';
-import { FormsModule } from '@angular/forms';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { AssessmentsTableComponent } from './assessments-table/assessments-table.component';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { UserIdbService } from 'src/app/indexed-db/user-idb.service';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-
-describe('FacilityDashboardHomeComponent', () => {
-  let component: FacilityDashboardHomeComponent;
-  let fixture: ComponentFixture<FacilityDashboardHomeComponent>;
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', ''))
-  }
-  let dbChangesService: Partial<DbChangesService> = {}
-  let companyIdbService: Partial<CompanyIdbService> = {
-    companies: new BehaviorSubject<Array<IdbCompany>>([])
-  };
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(undefined),
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([])
-  };
-  let userIdbService: Partial<UserIdbService> = {};
-  let onSiteVisitIdbService: Partial<OnSiteVisitIdbService> = {
-    onSiteVisits: new BehaviorSubject<Array<IdbOnSiteVisit>>([])
-  };
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [RouterTestingModule, HelperPipesModule, FormsModule, FontAwesomeModule],
-      declarations: [FacilityDashboardHomeComponent, AssessmentsTableComponent],
-      providers: [
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: DbChangesService, useValue: dbChangesService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: UserIdbService, useValue: userIdbService },
-        { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService },
-      ]
-    });
-    fixture = TestBed.createComponent(FacilityDashboardHomeComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.ts b/src/app/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.ts
deleted file mode 100644
index a596f5c7..00000000
--- a/src/app/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-import { IconDefinition, faBuilding, faIndustry } from '@fortawesome/free-solid-svg-icons';
-import { Subscription } from 'rxjs';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbCompany } from 'src/app/models/company';
-import { IdbFacility } from 'src/app/models/facility';
-
-@Component({
-  selector: 'app-facility-dashboard-home',
-  templateUrl: './facility-dashboard-home.component.html',
-  styleUrls: ['./facility-dashboard-home.component.css']
-})
-export class FacilityDashboardHomeComponent {
-
-  faBuilding: IconDefinition = faBuilding;
-  faIndustry: IconDefinition = faIndustry;
-  selectedFacility: IdbFacility;
-  selectedFacilitySub: Subscription;
-
-  companies: Array<IdbCompany>;
-  companiesSub: Subscription;
-  constructor(private facilityIdbService: FacilityIdbService,
-    private dbChangesService: DbChangesService,
-    private router: Router,
-    private companyIdbService: CompanyIdbService) {
-  }
-
-  ngOnInit() {
-    this.selectedFacilitySub = this.facilityIdbService.selectedFacility.subscribe(_facility => {
-      this.selectedFacility = _facility;
-    });
-
-    this.companiesSub = this.companyIdbService.companies.subscribe(_companies => {
-      this.companies = _companies;
-    });
-  }
-
-  ngOnDestroy() {
-    this.selectedFacilitySub.unsubscribe();
-    this.companiesSub.unsubscribe();
-  }
-
-
-  async deleteFacility() {
-    this.dbChangesService.deleteFacility(this.selectedFacility);
-    this.router.navigateByUrl('/user/company/' + this.selectedFacility.companyId);
-  }
-}
diff --git a/src/app/facility-dashboard/facility-dashboard-home/facility-production-details/facility-production-details.component.html b/src/app/facility-dashboard/facility-dashboard-home/facility-production-details/facility-production-details.component.html
deleted file mode 100644
index fdc74ff2..00000000
--- a/src/app/facility-dashboard/facility-dashboard-home/facility-production-details/facility-production-details.component.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<div class="accordion" id="facilitiesAccordion">
-    <div class="accordion-item">
-        <h2 class="accordion-header">
-            <button class="accordion-button" type="button" data-bs-toggle="collapse"
-                data-bs-target="#collapseFacilities" aria-expanded="true" aria-controls="collapseFacilities"
-                [ngClass]="{'collapsed': !accordionOpen}" (click)="toggleAccordion()">
-                <fa-icon [icon]="faClipboardList" class="me-2"></fa-icon>
-                Facility Production
-            </button>
-        </h2>
-        <div id="collapseFacilities" class="accordion-collapse collapse" data-bs-parent="#facilitiesAccordion"
-            [ngClass]="{'show': accordionOpen}">
-            <div class="accordion-body">
-
-                <div class="row mt-2">
-                    <div class="col-4">
-                        Annual Sales
-                    </div>
-                    <span class="placeholder col-8"></span>
-                </div>
-                <div class="row mt-2">
-                    <div class="col-4">
-                        Output Levels
-                    </div>
-                    <span class="placeholder col-8"></span>
-                </div>
-                <div class="row mt-2">
-                    <div class="col-4">
-                        Significant Process / Functional Areas
-                    </div>
-                    <span class="placeholder col-8"></span>
-                </div>
-                <div class="row mt-2">
-                    <div class="col-4">
-                        Raw Materials Used
-                    </div>
-                    <span class="placeholder col-8"></span>
-                </div>
-
-            </div>
-        </div>
-    </div>
-</div>
-
diff --git a/src/app/facility-dashboard/facility-dashboard-home/facility-production-details/facility-production-details.component.spec.ts b/src/app/facility-dashboard/facility-dashboard-home/facility-production-details/facility-production-details.component.spec.ts
deleted file mode 100644
index 6951f0aa..00000000
--- a/src/app/facility-dashboard/facility-dashboard-home/facility-production-details/facility-production-details.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FacilityProductionDetailsComponent } from './facility-production-details.component';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-
-describe('FacilityProductionDetailsComponent', () => {
-  let component: FacilityProductionDetailsComponent;
-  let fixture: ComponentFixture<FacilityProductionDetailsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule],
-      declarations: [FacilityProductionDetailsComponent]
-    })
-    .compileComponents();
-    
-    fixture = TestBed.createComponent(FacilityProductionDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/facility-dashboard/facility-dashboard-home/facility-production-details/facility-production-details.component.ts b/src/app/facility-dashboard/facility-dashboard-home/facility-production-details/facility-production-details.component.ts
deleted file mode 100644
index 877dc2bb..00000000
--- a/src/app/facility-dashboard/facility-dashboard-home/facility-production-details/facility-production-details.component.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Component } from '@angular/core';
-import { IconDefinition, faClipboardCheck, faClipboardList } from '@fortawesome/free-solid-svg-icons';
-
-@Component({
-  selector: 'app-facility-production-details',
-  templateUrl: './facility-production-details.component.html',
-  styleUrl: './facility-production-details.component.css'
-})
-export class FacilityProductionDetailsComponent {
-
-  faClipboardList: IconDefinition = faClipboardList;
-  accordionOpen: boolean = false;
-
-
-  constructor(){
-
-  }
-
-  toggleAccordion(){
-    this.accordionOpen = !this.accordionOpen;
-  }
-}
diff --git a/src/app/facility-dashboard/facility-dashboard-tabs/facility-dashboard-tabs.component.html b/src/app/facility-dashboard/facility-dashboard-tabs/facility-dashboard-tabs.component.html
deleted file mode 100644
index 754fe77a..00000000
--- a/src/app/facility-dashboard/facility-dashboard-tabs/facility-dashboard-tabs.component.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<ul class="nav nav-tabs">
-    <li class="nav-item">
-        <a class="nav-link" [routerLink]="'/user'">
-            <fa-icon [icon]="faFolderOpen"></fa-icon>
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" [routerLink]="'/company/'+facility.companyId">
-            <fa-icon [icon]="faBuilding"></fa-icon>
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" routerLink="home" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faIndustry"></fa-icon>
-            {{facility.generalInformation.name}}
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" routerLink="goals" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faBullseye"></fa-icon> 
-            Goals
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" routerLink="reports" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faChartLine"></fa-icon>
-            Reports
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" routerLink="settings" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faGears"></fa-icon>
-            Settings
-        </a>
-    </li>
-</ul>
\ No newline at end of file
diff --git a/src/app/facility-dashboard/facility-dashboard-tabs/facility-dashboard-tabs.component.spec.ts b/src/app/facility-dashboard/facility-dashboard-tabs/facility-dashboard-tabs.component.spec.ts
deleted file mode 100644
index 1d06666e..00000000
--- a/src/app/facility-dashboard/facility-dashboard-tabs/facility-dashboard-tabs.component.spec.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FacilityDashboardTabsComponent } from './facility-dashboard-tabs.component';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-import { BehaviorSubject } from 'rxjs';
-import { RouterTestingModule } from '@angular/router/testing';
-
-describe('FacilityDashboardTabsComponent', () => {
-  let component: FacilityDashboardTabsComponent;
-  let fixture: ComponentFixture<FacilityDashboardTabsComponent>;
-
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    facilities: new BehaviorSubject<Array<IdbFacility>>([]),
-    selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', ''))
-  };
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, RouterTestingModule],
-      declarations: [FacilityDashboardTabsComponent],
-      providers: [
-        { provide: FacilityIdbService, useValue: facilityIdbService }
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(FacilityDashboardTabsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/facility-dashboard/facility-dashboard-tabs/facility-dashboard-tabs.component.ts b/src/app/facility-dashboard/facility-dashboard-tabs/facility-dashboard-tabs.component.ts
deleted file mode 100644
index 2bd555ae..00000000
--- a/src/app/facility-dashboard/facility-dashboard-tabs/facility-dashboard-tabs.component.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Component } from '@angular/core';
-import { IconDefinition, faBuilding, faBullseye, faChartLine, faFolderOpen, faGears, faIndustry } from '@fortawesome/free-solid-svg-icons';
-import { Subscription } from 'rxjs';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility } from 'src/app/models/facility';
-
-@Component({
-  selector: 'app-facility-dashboard-tabs',
-  templateUrl: './facility-dashboard-tabs.component.html',
-  styleUrl: './facility-dashboard-tabs.component.css'
-})
-export class FacilityDashboardTabsComponent {
-
-
-  faBuilding: IconDefinition = faBuilding;
-  faIndustry: IconDefinition = faIndustry;
-  faGears: IconDefinition = faGears;
-  faFolderOpen: IconDefinition = faFolderOpen;
-  faChartLine: IconDefinition = faChartLine
-  faBullseye: IconDefinition = faBullseye;
-
-  facility: IdbFacility;
-  facilitySub: Subscription;
-
-  constructor(private facilityIdbService: FacilityIdbService){
-  }
-
-  ngOnInit(){
-    this.facilitySub = this.facilityIdbService.selectedFacility.subscribe(_facility => {
-      this.facility = _facility;
-    });
-  }
-
-  ngOnDestroy(){
-    this.facilitySub.unsubscribe();
-  }
-}
diff --git a/src/app/facility-dashboard/facility-dashboard.component.html b/src/app/facility-dashboard/facility-dashboard.component.html
deleted file mode 100644
index f535f84f..00000000
--- a/src/app/facility-dashboard/facility-dashboard.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="container-fluid h-100">
-    <app-facility-dashboard-tabs></app-facility-dashboard-tabs>
-    <router-outlet></router-outlet>
-</div>
\ No newline at end of file
diff --git a/src/app/facility-dashboard/facility-dashboard.component.ts b/src/app/facility-dashboard/facility-dashboard.component.ts
deleted file mode 100644
index 063cd260..00000000
--- a/src/app/facility-dashboard/facility-dashboard.component.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { FacilityIdbService } from '../indexed-db/facility-idb.service';
-
-@Component({
-  selector: 'app-facility-dashboard',
-  templateUrl: './facility-dashboard.component.html',
-  styleUrls: ['./facility-dashboard.component.css']
-})
-export class FacilityDashboardComponent {
-
-  constructor(private activatedRoute: ActivatedRoute, private facilityIdbService: FacilityIdbService,
-    private router: Router) {
-  }
-
-  ngOnInit() {
-    this.activatedRoute.params.subscribe(params => {
-      let facilityGUID: string = params['id'];
-      let facilityExists: boolean = this.facilityIdbService.setSelectedFromGUID(facilityGUID);
-      if(!facilityExists){
-        this.router.navigateByUrl('/user');
-      }
-    });
-  }
-}
diff --git a/src/app/facility-dashboard/facility-dashboard.module.ts b/src/app/facility-dashboard/facility-dashboard.module.ts
deleted file mode 100644
index 5b29992b..00000000
--- a/src/app/facility-dashboard/facility-dashboard.module.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FacilityDashboardComponent } from './facility-dashboard.component';
-import { FacilityDashboardHomeComponent } from './facility-dashboard-home/facility-dashboard-home.component';
-import { RouterModule } from '@angular/router';
-import { FormsModule } from '@angular/forms';
-import { HelperPipesModule } from '../shared/helper-pipes/helper-pipes.module';
-import { SharedSettingsFormsModule } from '../shared/shared-settings-forms/shared-settings-forms.module';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { FacilityProductionDetailsComponent } from './facility-dashboard-home/facility-production-details/facility-production-details.component';
-import { FacilityDashboardTabsComponent } from './facility-dashboard-tabs/facility-dashboard-tabs.component';
-import { FacilitySettingsComponent } from './facility-settings/facility-settings.component';
-import { FacilityReportsComponent } from './facility-reports/facility-reports.component';
-import { FacilityGoalsComponent } from './facility-goals/facility-goals.component';
-import { AssessmentsTableComponent } from './facility-dashboard-home/assessments-table/assessments-table.component';
-
-
-
-@NgModule({
-  declarations: [
-    FacilityDashboardComponent,
-    FacilityDashboardHomeComponent,
-    FacilityProductionDetailsComponent,
-    FacilityDashboardTabsComponent,
-    FacilitySettingsComponent,
-    FacilityReportsComponent,
-    FacilityGoalsComponent,
-    AssessmentsTableComponent
-  ],
-  imports: [
-    CommonModule,
-    RouterModule,
-    FormsModule,
-    HelperPipesModule,
-    SharedSettingsFormsModule,
-    FontAwesomeModule
-  ]
-})
-export class FacilityDashboardModule { }
diff --git a/src/app/facility-dashboard/facility-goals/facility-goals.component.html b/src/app/facility-dashboard/facility-goals/facility-goals.component.html
deleted file mode 100644
index c7973645..00000000
--- a/src/app/facility-dashboard/facility-goals/facility-goals.component.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="row pt-4 justify-content-center">
-    <div class="col-md-12 col-lg-9">
-        <div class="accordion" id="facilityGoalsAccordion">
-            <div class="accordion-item">
-                <h2 class="accordion-header">
-                    <button class="accordion-button" type="button" data-bs-toggle="collapse"
-                        data-bs-target="#collapseFacilityGoals" aria-expanded="true" aria-controls="collapseFacilityGoals"
-                        [ngClass]="{'collapsed': !accordionOpen}" (click)="toggleAccordion()">
-                        <fa-icon [icon]="faBullseye" class="me-2"></fa-icon>
-                        Facility Goals
-                    </button>
-                </h2>
-                <div id="collapseFacilityGoals" class="accordion-collapse collapse"
-                    data-bs-parent="#facilityGoalsAccordion" [ngClass]="{'show': accordionOpen}">
-                    <div class="accordion-body">
-
-                        <div class="row mt-2">
-                            <div class="col-4">
-                                Strategic Goals
-                            </div>
-                            <span class="placeholder col-8"></span>
-                        </div>
-                        <div class="row mt-2">
-                            <div class="col-4">
-                                Sustainability Goals
-                            </div>
-                            <span class="placeholder col-8"></span>
-                        </div>
-                        <div class="row mt-2">
-                            <div class="col-4">
-                                Marketing Goals
-                            </div>
-                            <span class="placeholder col-8"></span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/facility-dashboard/facility-goals/facility-goals.component.spec.ts b/src/app/facility-dashboard/facility-goals/facility-goals.component.spec.ts
deleted file mode 100644
index 8ed207d0..00000000
--- a/src/app/facility-dashboard/facility-goals/facility-goals.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FacilityGoalsComponent } from './facility-goals.component';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-import { BehaviorSubject } from 'rxjs';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
-
-describe('FacilityGoalsComponent', () => {
-  let component: FacilityGoalsComponent;
-  let fixture: ComponentFixture<FacilityGoalsComponent>;
-
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    facilities: new BehaviorSubject<Array<IdbFacility>>([]),
-    selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', ''))
-  };
-  let companyIdbService: Partial<CompanyIdbService> = {
-    companies: new BehaviorSubject<Array<IdbCompany>>([]),
-    selectedCompany: new BehaviorSubject<IdbCompany>(getNewIdbCompany(''))
-  };
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule],
-      declarations: [FacilityGoalsComponent],
-      providers: [
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: DbChangesService, useValue: {}}
-      ]
-    })
-    .compileComponents();
-    
-    fixture = TestBed.createComponent(FacilityGoalsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/facility-dashboard/facility-goals/facility-goals.component.ts b/src/app/facility-dashboard/facility-goals/facility-goals.component.ts
deleted file mode 100644
index 4d6359ab..00000000
--- a/src/app/facility-dashboard/facility-goals/facility-goals.component.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Component } from '@angular/core';
-import { IconDefinition, faBullseye } from '@fortawesome/free-solid-svg-icons';
-
-@Component({
-  selector: 'app-facility-goals',
-  templateUrl: './facility-goals.component.html',
-  styleUrl: './facility-goals.component.css'
-})
-export class FacilityGoalsComponent {
-
-  faBullseye: IconDefinition = faBullseye;
-  accordionOpen: boolean = false;
-
-
-  constructor(){
-
-  }
-
-  toggleAccordion(){
-    this.accordionOpen = !this.accordionOpen;
-  }
-}
diff --git a/src/app/facility-dashboard/facility-reports/facility-reports.component.html b/src/app/facility-dashboard/facility-reports/facility-reports.component.html
deleted file mode 100644
index 76301bbb..00000000
--- a/src/app/facility-dashboard/facility-reports/facility-reports.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="row pt-4 justify-content-center">
-    <div class="col-lg-9 col-md-12">
-        <div class="alert alert-dark">
-            Facility reports content goes here..
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/facility-dashboard/facility-settings/facility-settings.component.css b/src/app/facility-dashboard/facility-settings/facility-settings.component.css
deleted file mode 100644
index 2d909ba7..00000000
--- a/src/app/facility-dashboard/facility-settings/facility-settings.component.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.settings-content{
-    height: calc(100% - 3rem);
-    /* background-color: red; */
-    overflow-y: auto;
-}
\ No newline at end of file
diff --git a/src/app/facility-dashboard/facility-settings/facility-settings.component.html b/src/app/facility-dashboard/facility-settings/facility-settings.component.html
deleted file mode 100644
index fc64df77..00000000
--- a/src/app/facility-dashboard/facility-settings/facility-settings.component.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="settings-content">
-    <div class="row g-0 justify-content-center h-100 w-100 overflow-scroll">
-        <div class="col-10 pt-4 pb-4">
-            <div class="form-paper shadow">
-                <h5>
-                    <fa-icon [icon]="faIndustry" class="me-2"></fa-icon>Facility Details
-                </h5>
-                <hr>
-                <form>
-                    <label class="bold" for="facilityName">Facility Name</label>
-                    <input name="facilityName" type="text" class="form-control"
-                        [(ngModel)]="facility.generalInformation.name" (input)="saveChanges()" id="facilityName">
-                </form>
-                <hr>
-                <label class="bold">Location</label>
-                <app-location-form [inCompany]="false"></app-location-form>
-                <hr>
-                <label class="bold">Tracked Utilities</label>
-                <app-units-form></app-units-form>
-                <hr>
-                <label class="bold">Additional Details</label>
-                <app-additional-details-form [inCompany]="false"></app-additional-details-form>
-                <hr>
-                <label class="bold">Manage Facility</label>
-                <div class="d-flex p-2">
-                    <button class="btn btn-danger" (click)="openDeleteModal()">
-                        <fa-icon [icon]="faTrash"></fa-icon> Delete Facility
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/facility-dashboard/facility-settings/facility-settings.component.spec.ts b/src/app/facility-dashboard/facility-settings/facility-settings.component.spec.ts
deleted file mode 100644
index 70e7f4d1..00000000
--- a/src/app/facility-dashboard/facility-settings/facility-settings.component.spec.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FacilitySettingsComponent } from './facility-settings.component';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { SharedSettingsFormsModule } from 'src/app/shared/shared-settings-forms/shared-settings-forms.module';
-import { FormsModule } from '@angular/forms';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
-import { BehaviorSubject } from 'rxjs';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-import { LocalStorageDataService } from 'src/app/shared/shared-services/local-storage-data.service';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { UserIdbService } from 'src/app/indexed-db/user-idb.service';
-import { PreAssessmentSetupService } from 'src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.service';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { EnergyEquipmentIdbService } from 'src/app/indexed-db/energy-equipment-idb.service';
-
-describe('FacilitySettingsComponent', () => {
-  let component: FacilitySettingsComponent;
-  let fixture: ComponentFixture<FacilitySettingsComponent>;
-  let companyIdbService: Partial<CompanyIdbService> = {
-    companies: new BehaviorSubject<Array<IdbCompany>>([]),
-    selectedCompany: new BehaviorSubject<IdbCompany>(getNewIdbCompany(''))
-  };
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    facilities: new BehaviorSubject<Array<IdbFacility>>([]),
-    selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', ''))
-  };
-  let userIdbService: Partial<UserIdbService> = {};
-  let onsiteVisitIdbService: Partial<OnSiteVisitIdbService> = {};
-  let preAassessmentSetupService: Partial<PreAssessmentSetupService> = {};
-  let assessmentIdbService: Partial<AssessmentIdbService> = {};
-  let energyEquipmentIdbService: Partial<EnergyEquipmentIdbService> = {};
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, SharedSettingsFormsModule, FormsModule],
-      declarations: [FacilitySettingsComponent],
-      providers: [
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: LocalStorageDataService, useValue: {}},
-        { provide: DbChangesService, useValue: {}},
-        { provide: UserIdbService, useValue: userIdbService},
-        { provide: OnSiteVisitIdbService, useValue: onsiteVisitIdbService},
-        { provide: PreAssessmentSetupService, useValue: preAassessmentSetupService },
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: EnergyEquipmentIdbService, useValue: energyEquipmentIdbService }
-      ]
-    })
-    .compileComponents();
-    
-    fixture = TestBed.createComponent(FacilitySettingsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/facility-dashboard/facility-settings/facility-settings.component.ts b/src/app/facility-dashboard/facility-settings/facility-settings.component.ts
deleted file mode 100644
index d3c630bc..00000000
--- a/src/app/facility-dashboard/facility-settings/facility-settings.component.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-import { IconDefinition, faIndustry, faTrash } from '@fortawesome/free-solid-svg-icons';
-import { Subscription } from 'rxjs';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility } from 'src/app/models/facility';
-
-@Component({
-  selector: 'app-facility-settings',
-  templateUrl: './facility-settings.component.html',
-  styleUrl: './facility-settings.component.css'
-})
-export class FacilitySettingsComponent {
-
-  faTrash: IconDefinition = faTrash;
-  faIndustry: IconDefinition = faIndustry;
-
-  facility: IdbFacility;
-  facilitySub: Subscription;
-  displayDeleteModal: boolean = false;
-  isFormChange: boolean = false;
-  constructor(private facilityIdbService: FacilityIdbService,
-    private dbChangesService: DbChangesService, private router: Router) {
-  }
-
-  ngOnInit() {
-    this.facilitySub = this.facilityIdbService.selectedFacility.subscribe(_facility => {
-      if (!this.isFormChange) {
-        this.facility = _facility;
-      } else {
-        this.facility = undefined;
-      }
-    });
-  }
-
-  ngOnDestroy() {
-    this.facilitySub.unsubscribe();
-  }
-
-  async saveChanges() {
-    this.isFormChange = true;
-    await this.facilityIdbService.asyncUpdate(this.facility);
-  }
-
-  openDeleteModal() {
-    this.displayDeleteModal = true;
-  }
-
-  closeDeleteModal() {
-    this.displayDeleteModal = false;
-  }
-
-  async confirmDelete() {
-    await this.dbChangesService.deleteFacility(this.facility);
-    this.router.navigateByUrl('/user')
-  }
-}
diff --git a/src/app/models/company.ts b/src/app/models/company.ts
index 801c12e5..15f10083 100644
--- a/src/app/models/company.ts
+++ b/src/app/models/company.ts
@@ -11,7 +11,7 @@ export interface IdbCompany extends IdbEntry {
 
 export function getNewIdbCompany(userId: string): IdbCompany {
     let idbEntry: IdbEntry = getNewIdbEntry();
-    let generalInformation: GeneralInformation = getGeneralInformation('');
+    let generalInformation: GeneralInformation = getGeneralInformation('New Company');
     return {
         ...idbEntry,
         userId: userId,
diff --git a/src/app/models/contact.ts b/src/app/models/contact.ts
index f1978941..5c9a84fa 100644
--- a/src/app/models/contact.ts
+++ b/src/app/models/contact.ts
@@ -23,8 +23,8 @@ export function getNewIdbContact(userId: string, companyId: string): IdbContact
     let idbEntry: IdbEntry = getNewIdbEntry();
     return {
         ...idbEntry,
-        firstName: undefined,
-        lastName: undefined,
+        firstName: 'New',
+        lastName: 'Contact',
         userId: userId,
         companyId: companyId,
         facilityIds: [],
diff --git a/src/app/models/facility.ts b/src/app/models/facility.ts
index c2781034..c816de42 100644
--- a/src/app/models/facility.ts
+++ b/src/app/models/facility.ts
@@ -15,7 +15,7 @@ export interface IdbFacility extends IdbEntry {
 export function getNewIdbFacility(userId: string, companyId: string): IdbFacility {
     let idbEntry: IdbEntry = getNewIdbEntry();
     let defaultSettings: UnitSettings = getDefaultUnitSettings();
-    let generalInformation: GeneralInformation = getGeneralInformation('');
+    let generalInformation: GeneralInformation = getGeneralInformation('New Facility');
     return {
         ...idbEntry,
         userId: userId,
diff --git a/src/app/nebs-database/nebs-database-table/nebs-database-table.component.spec.ts b/src/app/nebs-database/nebs-database-table/nebs-database-table.component.spec.ts
index e9b9b579..e6c140be 100644
--- a/src/app/nebs-database/nebs-database-table/nebs-database-table.component.spec.ts
+++ b/src/app/nebs-database/nebs-database-table/nebs-database-table.component.spec.ts
@@ -3,54 +3,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NebsDatabaseTableComponent } from './nebs-database-table.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { FormsModule } from '@angular/forms';
-import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
-import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
-import { BehaviorSubject } from 'rxjs';
-import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { getNewIdbAssessment, IdbAssessment } from 'src/app/models/assessment';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
-import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
-import { getNewIdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
-import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
 import { NebOptionsFilterPipe } from './neb-options-filter.pipe';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
 
 describe('NebsDatabaseTableComponent', () => {
   let component: NebsDatabaseTableComponent;
   let fixture: ComponentFixture<NebsDatabaseTableComponent>;
-  
-  let keyPerformanceIndicatorIdbService: Partial<KeyPerformanceIndicatorsIdbService> = {
-    keyPerformanceIndicators: new BehaviorSubject<Array<IdbKeyPerformanceIndicator>>([]),
-    getCompanyKeyPerformanceMetrics: () => { return [] }
-  };
-  let nonEnergyBenefitIdbService: Partial<NonEnergyBenefitsIdbService> = {
-    getAssessmentNonEnergyBenefits: () => { return [] }
-  };
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings())),
-    getByGuid: () => { return getNewIdbAssessment('', '', '', getDefaultUnitSettings()) }
-
-  };
-  let energyOpportunityIdbService: Partial<EnergyOpportunityIdbService> = {
-    getByGuid: () => { return getNewIdbEnergyOpportunity('', '', '', '', null) }
 
-  };
-  let keyPerformanceMetricImpactsIdbService: Partial<KeyPerformanceMetricImpactsIdbService> = {};
-  let companyIdbService: Partial<CompanyIdbService> = {}
+  
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [FontAwesomeModule, FormsModule],
       declarations: [NebsDatabaseTableComponent, NebOptionsFilterPipe],
-      providers: [
-        { provide: KeyPerformanceIndicatorsIdbService, useValue: keyPerformanceIndicatorIdbService },
-        { provide: NonEnergyBenefitsIdbService, useValue: nonEnergyBenefitIdbService },
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: EnergyOpportunityIdbService, useValue: energyOpportunityIdbService },
-        { provide: KeyPerformanceMetricImpactsIdbService, useValue: keyPerformanceMetricImpactsIdbService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-      ]
+      providers: stubServiceProviders
     })
     .compileComponents();
 
diff --git a/src/app/nebs-database/nebs-database-table/nebs-database-table.component.ts b/src/app/nebs-database/nebs-database-table/nebs-database-table.component.ts
index f46f8269..2bbda881 100644
--- a/src/app/nebs-database/nebs-database-table/nebs-database-table.component.ts
+++ b/src/app/nebs-database/nebs-database-table/nebs-database-table.component.ts
@@ -9,10 +9,10 @@ import { IdbAssessment } from 'src/app/models/assessment';
 import { IdbCompany } from 'src/app/models/company';
 import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
 import { IdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
-import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
 import { KeyPerformanceIndicatorOption, KeyPerformanceIndicatorOptions, KeyPerformanceIndicatorValue } from 'src/app/shared/constants/keyPerformanceIndicatorOptions';
 import { KeyPerformanceMetric, KeyPerformanceMetricOption, KeyPerformanceMetricOptions, KeyPerformanceMetricValue } from 'src/app/shared/constants/keyPerformanceMetrics';
 import { NebOption, NebOptions } from 'src/app/shared/constants/nonEnergyBenefitOptions';
+import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
 
 @Component({
   selector: 'app-nebs-database-table',
@@ -45,7 +45,7 @@ export class NebsDatabaseTableComponent {
 
   constructor(private cd: ChangeDetectorRef, private keyPerformanceIndicatorIdbService: KeyPerformanceIndicatorsIdbService,
     private companyIdbService: CompanyIdbService,
-    private setupWizardService: SetupWizardService,
+    private sharedDataService: SharedDataService,
     private assessmentIdbService: AssessmentIdbService,
     private nonEnergyBenefitIdbService: NonEnergyBenefitsIdbService
   ) { }
@@ -92,7 +92,7 @@ export class NebsDatabaseTableComponent {
         return option;
       });
     } else {
-      let modalData: { assessmentId: string, energyOpportunityId: string } = this.setupWizardService.displayAddNebsModal.getValue();
+      let modalData: { assessmentId: string, energyOpportunityId: string } = this.sharedDataService.displayAddNebsModal.getValue();
       let assessment: IdbAssessment = this.assessmentIdbService.getByGuid(modalData.assessmentId);
       let selectedNebs: Array<IdbNonEnergyBenefit>;
       if (modalData.energyOpportunityId) {
diff --git a/src/app/routing/app-routing.module.ts b/src/app/routing/app-routing.module.ts
new file mode 100644
index 00000000..c25491f1
--- /dev/null
+++ b/src/app/routing/app-routing.module.ts
@@ -0,0 +1,57 @@
+import { NgModule } from '@angular/core';
+import { ExtraOptions, RouterModule, Routes } from '@angular/router';
+import { WelcomeComponent } from '../core-components/welcome/welcome.component';
+import { PageNotFoundComponent } from '../core-components/page-not-found/page-not-found.component';
+import { SetupWizardRoutes } from './setup-wizard.routes';
+import { PortfolioRoutes } from './portfolio.routes';
+import { NebsDatabaseComponent } from '../nebs-database/nebs-database.component';
+import { AboutComponent } from '../core-components/about/about.component';
+import { FeedbackPageComponent } from '../core-components/feedback-page/feedback-page.component';
+import { AcknowledgmentsComponent } from '../core-components/acknowledgments/acknowledgments.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    pathMatch: 'full',
+    redirectTo: 'welcome'
+  },
+  {
+    path: 'welcome',
+    component: WelcomeComponent
+  },
+  {
+    path: 'nebs-database',
+    component: NebsDatabaseComponent
+  },
+  {
+    path: 'about',
+    component: AboutComponent
+  },
+  {
+    path: 'feedback',
+    component: FeedbackPageComponent
+  },
+  {
+    path: 'acknowledgments',
+    component: AcknowledgmentsComponent
+  },
+  SetupWizardRoutes,
+  PortfolioRoutes,
+  //wildcard/page not found needs to be last route
+  //triggered after entire route tree is checked
+  { path: "**", component: PageNotFoundComponent },
+
+];
+
+const routerOptions: ExtraOptions = {
+  anchorScrolling: 'enabled',
+  scrollPositionRestoration: 'enabled',
+  useHash: true,
+  enableViewTransitions: true
+}
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes, routerOptions)],
+  exports: [RouterModule]
+})
+export class AppRoutingModule { }
diff --git a/src/app/routing/portfolio.routes.ts b/src/app/routing/portfolio.routes.ts
new file mode 100644
index 00000000..e1eaf005
--- /dev/null
+++ b/src/app/routing/portfolio.routes.ts
@@ -0,0 +1,187 @@
+import { Route } from "@angular/router";
+import { UserPortfolioComponent } from "../user-portfolio/user-portfolio.component";
+import { UserPortfolioHomeComponent } from "../user-portfolio/user-portfolio-home/user-portfolio-home.component";
+import { CompanyDashboardComponent } from "../user-portfolio/company-dashboard/company-dashboard.component";
+import { CompanyDashboardHomeComponent } from "../user-portfolio/company-dashboard/company-dashboard-home/company-dashboard-home.component";
+import { FacilityDashboardComponent } from "../user-portfolio/facility-dashboard/facility-dashboard.component";
+import { AssessmentDashboardComponent } from "../user-portfolio/assessment-dashboard/assessment-dashboard.component";
+import { CompanyPerformanceIndicatorsComponent } from "../user-portfolio/company-dashboard/company-performance-indicators/company-performance-indicators.component";
+import { CompanyStakeholdersComponent } from "../user-portfolio/company-dashboard/company-stakeholders/company-stakeholders.component";
+import { CompanyReportsComponent } from "../user-portfolio/company-dashboard/company-reports/company-reports.component";
+import { CompanySettingsComponent } from "../user-portfolio/company-dashboard/company-settings/company-settings.component";
+import { FacilityDashboardHomeComponent } from "../user-portfolio/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component";
+import { IndustrialSystemInventoryComponent } from "../user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory.component";
+import { EndUseInventoryComponent } from "../user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory.component";
+import { FacilityReportsComponent } from "../user-portfolio/facility-dashboard/facility-reports/facility-reports.component";
+import { FacilitySettingsComponent } from "../user-portfolio/facility-dashboard/facility-settings/facility-settings.component";
+import { AssessmentDashboardHomeComponent } from "../user-portfolio/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component";
+import { AssessmentReportsComponent } from "../user-portfolio/assessment-dashboard/assessment-reports/assessment-reports.component";
+import { AssessmentDetailsComponent } from "../user-portfolio/assessment-dashboard/assessment-details/assessment-details.component";
+import { AssessmentEnergyOpportunitiesComponent } from "../user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities.component";
+import { CanDeactivateGuard } from "../guards/can-deactivate.guard";
+import { CompanyKpiSearchFormComponent } from "../shared/shared-company-forms/company-kpi-search-form/company-kpi-search-form.component";
+import { CompanyKpiDetailsFormComponent } from "../shared/shared-company-forms/company-kpi-details-form/company-kpi-details-form.component";
+import { AssessmentEnergyOpportunitiesHomeComponent } from "../user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities-home/assessment-energy-opportunities-home.component";
+import { EnergyOpportunitySetupFormComponent } from "../shared/shared-assessment-forms/energy-opportunity-setup-form/energy-opportunity-setup-form.component";
+import { AssessmentNebsComponent } from "../user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs.component";
+import { AssessmentNebsHomeComponent } from "../user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs-home/assessment-nebs-home.component";
+import { NebSetupFormComponent } from "../shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/neb-setup-form.component";
+import { IndustrialSystemInventoryHomeComponent } from "../user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component";
+import { EnergyEquipmentFormComponent } from "../shared/shared-facility-forms/energy-equipment-form/energy-equipment-form.component";
+import { EndUseInventoryHomeComponent } from "../user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory-home/end-use-inventory-home.component";
+import { ProcessEquipmentFormComponent } from "../shared/shared-facility-forms/process-equipment-form/process-equipment-form.component";
+import { CompanyStakeholdersHomeComponent } from "../user-portfolio/company-dashboard/company-stakeholders/company-stakeholders-home/company-stakeholders-home.component";
+import { CompanyContactsFormComponent } from "../shared/shared-company-forms/company-contacts-form/company-contacts-form.component";
+
+
+export const PortfolioRoutes: Route = {
+    path: 'portfolio',
+    component: UserPortfolioComponent,
+    children: [
+        {
+            path: '',
+            component: UserPortfolioHomeComponent
+        },
+        {
+            path: 'company/:id',
+            component: CompanyDashboardComponent,
+            children: [
+                {
+                    path: '',
+                    component: CompanyDashboardHomeComponent
+                },
+                {
+                    path: 'performance-indicators',
+                    component: CompanyPerformanceIndicatorsComponent,
+                    children: [
+                        {
+                            path: '',
+                            component: CompanyKpiSearchFormComponent
+                        },
+                        {
+                            path: 'details/:id',
+                            component: CompanyKpiDetailsFormComponent
+                        }
+                    ]
+                },
+                {
+                    path: 'stakeholders',
+                    component: CompanyStakeholdersComponent,
+                    children: [
+                        {
+                            path: '',
+                            component: CompanyStakeholdersHomeComponent
+                        },
+                        {
+                            path: ':id',
+                            component: CompanyContactsFormComponent,
+                            canDeactivate: [CanDeactivateGuard]
+                        }
+                    ]
+                },
+                {
+                    path: 'reports',
+                    component: CompanyReportsComponent
+                },
+                {
+                    path: 'manage',
+                    component: CompanySettingsComponent,
+                    canDeactivate: [CanDeactivateGuard]
+                }
+            ]
+        },
+        {
+            path: 'facility/:id',
+            component: FacilityDashboardComponent,
+            children: [
+                {
+                    path: '',
+                    component: FacilityDashboardHomeComponent
+                },
+                {
+                    path: 'system-inventory',
+                    component: IndustrialSystemInventoryComponent,
+                    children: [
+                        {
+                            path: '',
+                            component: IndustrialSystemInventoryHomeComponent
+                        },
+                        {
+                            path: ':id',
+                            component: EnergyEquipmentFormComponent
+                        }
+                    ]
+                },
+                {
+                    path: 'end-use-inventory',
+                    component: EndUseInventoryComponent,
+                    children: [
+                        {
+                            path: '',
+                            component: EndUseInventoryHomeComponent
+                        },
+                        {
+                            path: ':id',
+                            component: ProcessEquipmentFormComponent
+                        }
+                    ]
+                },
+                {
+                    path: 'reports',
+                    component: FacilityReportsComponent
+                },
+                {
+                    path: 'manage',
+                    component: FacilitySettingsComponent,
+                    canDeactivate: [CanDeactivateGuard]
+                },
+            ]
+        },
+        {
+            path: 'assessment/:id',
+            component: AssessmentDashboardComponent,
+            children: [
+                {
+                    path: '',
+                    component: AssessmentDashboardHomeComponent
+                },
+                {
+                    path: 'details',
+                    component: AssessmentDetailsComponent
+                },
+                {
+                    path: 'energy-opportunities',
+                    component: AssessmentEnergyOpportunitiesComponent,
+                    children: [
+                        {
+                            path: '',
+                            component: AssessmentEnergyOpportunitiesHomeComponent
+                        },
+                        {
+                            path: ':id',
+                            component: EnergyOpportunitySetupFormComponent
+                        }
+                    ]
+                },
+                {
+                    path: 'reports',
+                    component: AssessmentReportsComponent
+                },
+                {
+                    path: 'nebs',
+                    component: AssessmentNebsComponent,
+                    children: [
+                        {
+                            path: '',
+                            component: AssessmentNebsHomeComponent
+                        },
+                        {
+                            path: ':id',
+                            component: NebSetupFormComponent
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+};
\ No newline at end of file
diff --git a/src/app/routing/setup-wizard.routes.ts b/src/app/routing/setup-wizard.routes.ts
new file mode 100644
index 00000000..1534855e
--- /dev/null
+++ b/src/app/routing/setup-wizard.routes.ts
@@ -0,0 +1,147 @@
+import { Route } from "@angular/router";
+import { SetupWizardComponent } from "../setup-wizard/setup-wizard.component";
+import { PreVisitComponent } from "../setup-wizard/pre-visit/pre-visit.component";
+import { CompanySetupComponent } from "../setup-wizard/pre-visit/company-setup/company-setup.component";
+import { CanDeactivateGuard } from "../guards/can-deactivate.guard";
+import { CompanyKpiSelectComponent } from "../setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component";
+import { CompanyKpiDetailsComponent } from "../setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component";
+import { CompanyContactsSetupComponent } from "../setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component";
+import { FacilitySetupComponent } from "../setup-wizard/pre-visit/facility-setup/facility-setup.component";
+import { FacilityEnergyEquipmentSetupComponent } from "../setup-wizard/pre-visit/facility-energy-equipment-setup/facility-energy-equipment-setup.component";
+import { FacilityProcessEquipmentSetupComponent } from "../setup-wizard/pre-visit/facility-process-equipment-setup/facility-process-equipment-setup.component";
+import { PreAssessmentSetupComponent } from "../setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component";
+import { ReviewPreVisitSetupComponent } from "../setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component";
+import { DataCollectionComponent } from "../setup-wizard/data-collection/data-collection.component";
+import { DataCollectionManageAssessmentsComponent } from "../setup-wizard/data-collection/data-collection-manage-assessments/data-collection-manage-assessments.component";
+import { OnSiteAssessmentComponent } from "../setup-wizard/data-collection/on-site-assessment/on-site-assessment.component";
+import { AssessmentNebsFormComponent } from "../setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component";
+import { OnSiteAssessmentResultsComponent } from "../setup-wizard/data-collection/on-site-assessment/on-site-assessment-results/on-site-assessment-results.component";
+import { ReviewOnSiteComponent } from "../setup-wizard/data-collection/review-on-site/review-on-site.component";
+import { DataEvaluationComponent } from "../setup-wizard/data-evaluation/data-evaluation.component";
+import { DataFollowUpComponent } from "../setup-wizard/data-evaluation/data-follow-up/data-follow-up.component";
+import { AssessmentEvaluationComponent } from "../setup-wizard/data-evaluation/assessment-evaluation/assessment-evaluation.component";
+import { VisitReportComponent } from "../setup-wizard/data-evaluation/visit-report/visit-report.component";
+import { AssessmentDetailsFormComponent } from "../shared/shared-assessment-forms/assessment-details-form/assessment-details-form.component";
+import { AssessmentEnergyOpportunitiesFormComponent } from "../setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component";
+
+
+export const SetupWizardRoutes: Route = {
+    path: 'setup-wizard',
+    component: SetupWizardComponent,
+    children: [
+        {
+            path: 'pre-visit/:id',
+            component: PreVisitComponent,
+            children: [
+                {
+                    path: '',
+                    pathMatch: 'full',
+                    redirectTo: 'company-setup'
+                },
+                {
+                    path: 'company-setup',
+                    component: CompanySetupComponent,
+                    canDeactivate: [CanDeactivateGuard]
+                },
+                {
+                    path: 'company-kpi-select',
+                    component: CompanyKpiSelectComponent
+                },
+                {
+                    path: 'company-kpi-detail/:id',
+                    component: CompanyKpiDetailsComponent
+                },
+                {
+                    path: 'company-contacts',
+                    component: CompanyContactsSetupComponent,
+                    canDeactivate: [CanDeactivateGuard]
+                },
+                {
+                    path: 'facility-setup',
+                    component: FacilitySetupComponent,
+                    canDeactivate: [CanDeactivateGuard]
+                },
+                {
+                    path: 'energy-equipment',
+                    component: FacilityEnergyEquipmentSetupComponent
+                },
+                {
+                    path: 'end-uses',
+                    component: FacilityProcessEquipmentSetupComponent
+                },
+                {
+                    path: 'pre-assessment',
+                    component: PreAssessmentSetupComponent
+                },
+                {
+                    path: 'review-pre-visit',
+                    component: ReviewPreVisitSetupComponent
+                }
+            ]
+        },
+        {
+            path: 'data-collection/:id',
+            component: DataCollectionComponent,
+            children: [
+                {
+                    path: 'manage-assessments',
+                    component: DataCollectionManageAssessmentsComponent
+                },
+                {
+                    path: 'assessment/:id',
+                    component: OnSiteAssessmentComponent,
+                    children: [
+                        {
+                            path: '',
+                            pathMatch: 'full',
+                            redirectTo: 'details'
+                        },
+                        {
+                            path: 'details',
+                            component: AssessmentDetailsFormComponent
+                        },
+                        {
+                            path: 'energy-opportunities',
+                            component: AssessmentEnergyOpportunitiesFormComponent
+                        },
+                        {
+                            path: 'nebs',
+                            component: AssessmentNebsFormComponent
+                        },
+                        {
+                            path: 'results',
+                            component: OnSiteAssessmentResultsComponent
+                        }
+                    ]
+                },
+                {
+                    path: 'review-data-collection',
+                    component: ReviewOnSiteComponent
+                },
+            ]
+        },
+        {
+            path: 'data-evaluation/:id',
+            component: DataEvaluationComponent,
+            children: [
+                {
+                    path: '',
+                    pathMatch: 'full',
+                    redirectTo: 'follow-up'
+                },
+                {
+                    path: 'follow-up',
+                    component: DataFollowUpComponent
+                },
+                {
+                    path: 'assessment-report/:id',
+                    component: AssessmentEvaluationComponent,
+                },
+                {
+                    path: 'visit-report',
+                    component: VisitReportComponent,
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/app/setup-wizard/data-collection/data-collection-manage-assessments/data-collection-manage-assessments.component.html b/src/app/setup-wizard/data-collection/data-collection-manage-assessments/data-collection-manage-assessments.component.html
index 47ae67c8..37641c5f 100644
--- a/src/app/setup-wizard/data-collection/data-collection-manage-assessments/data-collection-manage-assessments.component.html
+++ b/src/app/setup-wizard/data-collection/data-collection-manage-assessments/data-collection-manage-assessments.component.html
@@ -58,7 +58,7 @@ <h5>
 
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-end">
-        <button class="btn btn-dark btn-sm" (click)="goToNext()" [disabled]="onSiteVisit.assessmentIds.length == 0">
+        <button class="btn nav-btn btn-sm" (click)="goToNext()" [disabled]="onSiteVisit.assessmentIds.length == 0">
             Go to Assessment
             <fa-icon [icon]="faChevronRight"></fa-icon>
         </button>
diff --git a/src/app/setup-wizard/data-collection/data-collection-manage-assessments/data-collection-manage-assessments.component.spec.ts b/src/app/setup-wizard/data-collection/data-collection-manage-assessments/data-collection-manage-assessments.component.spec.ts
index 5bf4998c..a1cc0729 100644
--- a/src/app/setup-wizard/data-collection/data-collection-manage-assessments/data-collection-manage-assessments.component.spec.ts
+++ b/src/app/setup-wizard/data-collection/data-collection-manage-assessments/data-collection-manage-assessments.component.spec.ts
@@ -9,7 +9,7 @@ import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.serv
 import { IdbOnSiteVisit, getNewIdbOnSiteVisit } from 'src/app/models/onSiteVisit';
 import { BehaviorSubject } from 'rxjs';
 import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 
 describe('DataCollectionManageAssessmentsComponent', () => {
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/add-nebs-modal/add-nebs-modal.component.spec.ts b/src/app/setup-wizard/data-collection/on-site-assessment/add-nebs-modal/add-nebs-modal.component.spec.ts
deleted file mode 100644
index 750715dc..00000000
--- a/src/app/setup-wizard/data-collection/on-site-assessment/add-nebs-modal/add-nebs-modal.component.spec.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AddNebsModalComponent } from './add-nebs-modal.component';
-import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
-import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
-import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { FormsModule } from '@angular/forms';
-import { BehaviorSubject } from 'rxjs';
-import { ContactContext, IdbContact } from 'src/app/models/contact';
-import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
-import { getNewIdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
-import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
-import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
-import { NebsDatabaseModule } from 'src/app/nebs-database/nebs-database.module';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { getNewIdbCompany, IdbCompany } from 'src/app/models/company';
-
-describe('AddNebsModalComponent', () => {
-  let component: AddNebsModalComponent;
-  let fixture: ComponentFixture<AddNebsModalComponent>;
-
-
-
-  let setupWizardService: Partial<SetupWizardService> = {
-    sidebarOpen: new BehaviorSubject<boolean>(false),
-    displayAddNebsModal: new BehaviorSubject<{
-      assessmentId: string,
-      energyOpportunityId: string
-    }>({
-      assessmentId: '',
-      energyOpportunityId: ''
-    }),
-
-    displayContactModal: new BehaviorSubject<{
-      context: ContactContext,
-      viewContact: IdbContact,
-      contextGuid: string
-    }>(undefined)
-  };
-  let keyPerformanceIndicatorIdbService: Partial<KeyPerformanceIndicatorsIdbService> = {
-    keyPerformanceIndicators: new BehaviorSubject<Array<IdbKeyPerformanceIndicator>>([]),
-    getCompanyKeyPerformanceMetrics: () => { return [] },
-    getByCompanyGuid: () => { return [] }
-  };
-  let nonEnergyBenefitIdbService: Partial<NonEnergyBenefitsIdbService> = {
-    getAssessmentNonEnergyBenefits: () => { return [] }
-  };
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings())),
-    getByGuid: () => { return getNewIdbAssessment('', '', '', getDefaultUnitSettings()) }
-
-  };
-  let energyOpportunityIdbService: Partial<EnergyOpportunityIdbService> = {
-    getByGuid: () => { return getNewIdbEnergyOpportunity('', '', '', '', null) }
-
-  };
-  let keyPerformanceMetricImpactsIdbService: Partial<KeyPerformanceMetricImpactsIdbService> = {};
-  let companyIdbService: Partial<CompanyIdbService> = {
-    selectedCompany: new BehaviorSubject<IdbCompany>(getNewIdbCompany(''))
-  }
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, FormsModule, NebsDatabaseModule],
-      declarations: [AddNebsModalComponent],
-      providers: [
-        { provide: SetupWizardService, useValue: setupWizardService },
-        { provide: KeyPerformanceIndicatorsIdbService, useValue: keyPerformanceIndicatorIdbService },
-        { provide: NonEnergyBenefitsIdbService, useValue: nonEnergyBenefitIdbService },
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: EnergyOpportunityIdbService, useValue: energyOpportunityIdbService },
-        { provide: KeyPerformanceMetricImpactsIdbService, useValue: keyPerformanceMetricImpactsIdbService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(AddNebsModalComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.html b/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.html
index e0a44a02..634805a7 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.html
+++ b/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.html
@@ -21,7 +21,8 @@ <h2 class="accordion-header">
                 data-bs-parent="#energyOpportunityAccordion">
                 <div class="accordion-body">
                     <app-energy-opportunity-setup-form
-                        [energyOpportunityGuid]="energyOpportunityGuid" (emitInitialized)="childFormInitialized(energyOpportunityGuid)"></app-energy-opportunity-setup-form>
+                        [energyOpportunityGuid]="energyOpportunityGuid" (emitInitialized)="childFormInitialized(energyOpportunityGuid)"
+                        [inWizard]="true"></app-energy-opportunity-setup-form>
                 </div>
             </div>
         </div>
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.spec.ts b/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.spec.ts
index e36ecdaa..7512aa5d 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.spec.ts
+++ b/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.spec.ts
@@ -10,12 +10,12 @@ import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { RouterTestingModule } from '@angular/router/testing';
 import { FormsModule } from '@angular/forms';
-import { EnergyOpportunitySetupFormComponent } from './energy-opportunity-setup-form/energy-opportunity-setup-form.component';
-import { NebFormsAccordionComponent } from '../neb-forms-accordion/neb-forms-accordion.component';
+import { NebFormsAccordionComponent } from '../../../../shared/shared-assessment-forms/neb-forms-accordion/neb-forms-accordion.component';
 import { LocalStorageDataService } from 'src/app/shared/shared-services/local-storage-data.service';
 import { ChangeDetectorRef } from '@angular/core';
 import { BootstrapService } from 'src/app/shared/shared-services/bootstrap.service';
 import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
+import { EnergyOpportunitySetupFormComponent } from 'src/app/shared/shared-assessment-forms/energy-opportunity-setup-form/energy-opportunity-setup-form.component';
 
 describe('AssessmentEnergyOpportunitiesFormComponent', () => {
   let component: AssessmentEnergyOpportunitiesFormComponent;
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component.spec.ts b/src/app/setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component.spec.ts
index a2f55624..869f698f 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component.spec.ts
+++ b/src/app/setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component.spec.ts
@@ -5,13 +5,11 @@ import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
 import { BehaviorSubject } from 'rxjs';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { FormsModule } from '@angular/forms';
-import { NebSetupFormComponent } from '../neb-forms-accordion/neb-setup-form/neb-setup-form.component';
 import { RouterTestingModule } from '@angular/router/testing';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
 import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
 import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
 import { IdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
-import { NebFormsAccordionComponent } from '../neb-forms-accordion/neb-forms-accordion.component';
 import { EnergyOpportunityNebsTableComponent } from './energy-opportunity-nebs-table/energy-opportunity-nebs-table.component';
 import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
 import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
@@ -20,6 +18,8 @@ import { LocalStorageDataService } from 'src/app/shared/shared-services/local-st
 import { ChangeDetectorRef } from '@angular/core';
 import { BootstrapService } from 'src/app/shared/shared-services/bootstrap.service';
 import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
+import { NebSetupFormComponent } from 'src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/neb-setup-form.component';
+import { NebFormsAccordionComponent } from 'src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-forms-accordion.component';
 
 describe('AssessmentNebsFormComponent', () => {
   let component: AssessmentNebsFormComponent;
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component.ts b/src/app/setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component.ts
index fc357fca..c1ef1fa0 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component.ts
+++ b/src/app/setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component.ts
@@ -5,7 +5,7 @@ import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service'
 import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
 import { IdbAssessment } from 'src/app/models/assessment';
 import { getNewIdbNonEnergyBenefit, IdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
-import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
+import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
 
 @Component({
   selector: 'app-assessment-nebs-form',
@@ -25,7 +25,7 @@ export class AssessmentNebsFormComponent {
   displayNebModal: boolean = false;
   showAddNebDropdown: boolean = false;
   constructor(private assessmentIdbService: AssessmentIdbService,
-    private setupWizardService: SetupWizardService,
+    private sharedDataService: SharedDataService,
     private nonEnergyBenefitIdbService: NonEnergyBenefitsIdbService
   ) {
   }
@@ -42,7 +42,7 @@ export class AssessmentNebsFormComponent {
 
   openNebModal() {
     this.showAddNebDropdown = false;
-    this.setupWizardService.displayAddNebsModal.next({ assessmentId: this.assessment.guid, energyOpportunityId: undefined });
+    this.sharedDataService.displayAddNebsModal.next({ assessmentId: this.assessment.guid, energyOpportunityId: undefined });
   }
 
   async addNEB() {
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component.spec.ts b/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component.spec.ts
deleted file mode 100644
index 6645a084..00000000
--- a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component.spec.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NebSetupFormComponent } from './neb-setup-form.component';
-import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
-import { BehaviorSubject } from 'rxjs';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { IdbNonEnergyBenefit, getNewIdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
-import { FormsModule } from '@angular/forms';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
-import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
-import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
-import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-import { IdbContact } from 'src/app/models/contact';
-import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
-import { IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
-import { PerformanceMetricsModalComponent } from './performance-metrics-modal/performance-metrics-modal.component';
-import { PerformanceMetricImpactFormComponent } from './performance-metric-impact-form/performance-metric-impact-form.component';
-
-describe('NebSetupFormComponent', () => {
-  let component: NebSetupFormComponent;
-  let fixture: ComponentFixture<NebSetupFormComponent>;
-
-  let setupWizardService: Partial<SetupWizardService> = {
-    sidebarOpen: new BehaviorSubject<boolean>(false),
-  };
-  let companyIdbService: Partial<CompanyIdbService> = {
-    companies: new BehaviorSubject<Array<IdbCompany>>([]),
-    selectedCompany: new BehaviorSubject<IdbCompany>(getNewIdbCompany(''))
-  };
-  let energyOpportunityIdbService: Partial<EnergyOpportunityIdbService> = {
-    energyOpportunities: new BehaviorSubject<Array<IdbEnergyOpportunity>>([])
-  };
-  let nonEnergyBenefitsIdbService: Partial<NonEnergyBenefitsIdbService> = {
-    nonEnergyBenefits: new BehaviorSubject<Array<IdbNonEnergyBenefit>>([]),
-    getByGuid: () => { return getNewIdbNonEnergyBenefit('', '', '', '', undefined, undefined, false) }
-  };
-  let onSiteVisitIdbService: Partial<OnSiteVisitIdbService> = {};
-  let keyPerformanceIndicatorIdbService: Partial<KeyPerformanceIndicatorsIdbService> = {};
-  let contactsIdbService: Partial<ContactIdbService> = {
-    contacts: new BehaviorSubject<Array<IdbContact>>([])
-  };
-  let keyPerformanceMetricImpactsIdbService: Partial<KeyPerformanceMetricImpactsIdbService> = {
-    keyPerformanceMetricImpacts: new BehaviorSubject<Array<IdbKeyPerformanceMetricImpact>>([])
-  };
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, FormsModule, HelperPipesModule],
-      declarations: [NebSetupFormComponent, PerformanceMetricsModalComponent, PerformanceMetricImpactFormComponent ],
-      providers: [
-        { provide: SetupWizardService, useValue: setupWizardService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: EnergyOpportunityIdbService, useValue: energyOpportunityIdbService },
-        { provide: NonEnergyBenefitsIdbService, useValue: nonEnergyBenefitsIdbService },
-        { provide: DbChangesService, useValue: {} },
-        { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService },
-        { provide: KeyPerformanceIndicatorsIdbService, useValue: keyPerformanceIndicatorIdbService },
-        { provide: ContactIdbService, useValue: contactsIdbService },
-        { provide: KeyPerformanceMetricImpactsIdbService, useValue: keyPerformanceMetricImpactsIdbService },
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(NebSetupFormComponent);
-    component = fixture.componentInstance;
-    component.nonEnergyBenefit = getNewIdbNonEnergyBenefit('', '', '', '', undefined, undefined, false);
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment-results/on-site-assessment-results.component.spec.ts b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment-results/on-site-assessment-results.component.spec.ts
index c55be9c8..cad4f320 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment-results/on-site-assessment-results.component.spec.ts
+++ b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment-results/on-site-assessment-results.component.spec.ts
@@ -20,7 +20,7 @@ import { IdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
 import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
 import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
 import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { ReportsModule } from 'src/app/shared/reports/reports.module';
 import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
 import { IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.html b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.html
index 2c62fda1..bf2d4c3c 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.html
+++ b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.html
@@ -36,7 +36,7 @@ <h5>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-between">
         <div class="col-3">
-            <button class="btn btn-dark btn-sm" (click)="goBack()">
+            <button class="btn nav-btn btn-sm" (click)="goBack()">
                 <fa-icon [icon]="faChevronLeft"></fa-icon>
             </button>
         </div>
@@ -64,7 +64,7 @@ <h5>
         </div> -->
         <div class="col-3">
             <div class="d-flex  justify-content-end">
-                <button class="btn btn-dark btn-sm" (click)="goToNext()">
+                <button class="btn nav-btn btn-sm" (click)="goToNext()">
                     <fa-icon [icon]="faChevronRight"></fa-icon>
                 </button>
             </div>
@@ -72,8 +72,5 @@ <h5>
     </div>
 </nav>
 
-<app-contact-modal *ngIf="displayContactModal" (emitCancelContact)="closeContactModal()"
-    [contextGuid]="displayContactModal.contextGuid" [contactContext]="displayContactModal.context"
-    [selectedContact]="displayContactModal.viewContact" [companyGuid]="assessment.companyId"></app-contact-modal>
 
 <app-add-nebs-modal *ngIf="displayAddNebsModal"></app-add-nebs-modal>
\ No newline at end of file
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.spec.ts b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.spec.ts
index da76a87f..38da8967 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.spec.ts
+++ b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.spec.ts
@@ -4,73 +4,20 @@ import { OnSiteAssessmentComponent } from './on-site-assessment.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { FormsModule } from '@angular/forms';
 import { RouterTestingModule } from '@angular/router/testing';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { ContactContext, IdbContact } from 'src/app/models/contact';
-import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
-import { IdbOnSiteVisit, getNewIdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-import { AssessmentDetailsFormComponent } from './assessment-details-form/assessment-details-form.component';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { AssessmentNebsFormComponent } from './assessment-nebs-form/assessment-nebs-form.component';
-import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-import { IdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
-import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
-import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
-import { AssessmentEnergyOpportunitiesFormComponent } from './assessment-energy-opportunities-form/assessment-energy-opportunities-form.component';
-import { SetupWizardService } from '../../setup-wizard.service';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { SharedAssessmentFormsModule } from 'src/app/shared/shared-assessment-forms/shared-assessment-forms.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
 
 describe('OnSiteAssessmentComponent', () => {
   let component: OnSiteAssessmentComponent;
   let fixture: ComponentFixture<OnSiteAssessmentComponent>;
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings()))
-  };
-  let contactIdbService: Partial<ContactIdbService> = {
-    contacts: new BehaviorSubject<Array<IdbContact>>([])
-  };
-  let onSiteVisitIdbService: Partial<OnSiteVisitIdbService> = {
-    selectedVisit: new BehaviorSubject<IdbOnSiteVisit>(getNewIdbOnSiteVisit('', '', ''))
-  };
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', ''))
-  };
-  let energyOpportunityIdbService: Partial<EnergyOpportunityIdbService> = {
-    energyOpportunities: new BehaviorSubject<Array<IdbEnergyOpportunity>>([])
-  };
-  let nonEnergyBenefitsIdbService: Partial<NonEnergyBenefitsIdbService> = {
-    nonEnergyBenefits: new BehaviorSubject<Array<IdbNonEnergyBenefit>>([])
-  };
-  let setupWizardService: Partial<SetupWizardService> = {
-    sidebarOpen: new BehaviorSubject<boolean>(false),
-    displayAddNebsModal: new BehaviorSubject<{
-      assessmentId: string,
-      energyOpportunityId: string
-    }>(undefined),
 
-    displayContactModal: new BehaviorSubject<{
-      context: ContactContext,
-      viewContact: IdbContact,
-      contextGuid: string
-    }>(undefined)
-  };
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, FormsModule, RouterTestingModule, HelperPipesModule],
-      declarations: [OnSiteAssessmentComponent, AssessmentDetailsFormComponent, AssessmentEnergyOpportunitiesFormComponent, AssessmentNebsFormComponent],
-      providers: [
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: ContactIdbService, useValue: contactIdbService },
-        { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: EnergyOpportunityIdbService, useValue: energyOpportunityIdbService },
-        { provide: NonEnergyBenefitsIdbService, useValue: nonEnergyBenefitsIdbService },
-        { provide: SetupWizardService, useValue: setupWizardService },
-      ]
+      imports: [FontAwesomeModule, FormsModule, RouterTestingModule, HelperPipesModule, SharedAssessmentFormsModule],
+      declarations: [OnSiteAssessmentComponent, AssessmentNebsFormComponent],
+      providers: stubServiceProviders
     })
       .compileComponents();
 
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.ts b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.ts
index ed60550d..3d0a7220 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.ts
+++ b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.ts
@@ -7,7 +7,7 @@ import { ContactContext, IdbContact } from 'src/app/models/contact';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
 import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
 import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-import { SetupWizardService } from '../../setup-wizard.service';
+import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
 
 @Component({
   selector: 'app-on-site-assessment',
@@ -32,12 +32,10 @@ export class OnSiteAssessmentComponent {
   displayAddNebsModal: { energyOpportunityId: string, assessmentId: string };
   displayAddNebsModalSub: Subscription;
 
-  displayContactModal: { context: ContactContext, viewContact: IdbContact, contextGuid: string };
-  displayContactModalSub: Subscription;
   constructor(private router: Router, private assessmentIdbService: AssessmentIdbService,
     private activatedRoute: ActivatedRoute,
     private onSiteVisitIdbService: OnSiteVisitIdbService,
-    private setupWizardService: SetupWizardService
+    private sharedDataService: SharedDataService
   ) { }
 
   ngOnInit() {
@@ -49,13 +47,10 @@ export class OnSiteAssessmentComponent {
       this.assessment = _assessment;
     });
 
-    this.displayAddNebsModalSub = this.setupWizardService.displayAddNebsModal.subscribe(_displayAddNebsModal => {
+    this.displayAddNebsModalSub = this.sharedDataService.displayAddNebsModal.subscribe(_displayAddNebsModal => {
       this.displayAddNebsModal = _displayAddNebsModal;
     });
 
-    this.displayContactModalSub = this.setupWizardService.displayContactModal.subscribe(_displayContactModal => {
-      this.displayContactModal = _displayContactModal;
-    });
 
     this.activatedRoute.params.subscribe(params => {
       let assessmentGUID: string = params['id'];
@@ -79,7 +74,6 @@ export class OnSiteAssessmentComponent {
     this.assessmentSub.unsubscribe();
     this.onSiteVisitSub.unsubscribe();
     this.displayAddNebsModalSub.unsubscribe();
-    this.displayContactModalSub.unsubscribe();
   }
 
   goToNextAssessment() {
@@ -107,11 +101,7 @@ export class OnSiteAssessmentComponent {
   }
 
   showSuggestedNebModal() {
-    this.setupWizardService.displayAddNebsModal.next({ assessmentId: this.assessment.guid, energyOpportunityId: undefined });
-  }
-
-  closeContactModal() {
-    this.setupWizardService.displayContactModal.next(undefined);
+    this.sharedDataService.displayAddNebsModal.next({ assessmentId: this.assessment.guid, energyOpportunityId: undefined });
   }
 
   goToNext() {
diff --git a/src/app/setup-wizard/data-collection/review-on-site/review-on-site.component.html b/src/app/setup-wizard/data-collection/review-on-site/review-on-site.component.html
index 31e2a18f..9ebfdb63 100644
--- a/src/app/setup-wizard/data-collection/review-on-site/review-on-site.component.html
+++ b/src/app/setup-wizard/data-collection/review-on-site/review-on-site.component.html
@@ -20,7 +20,7 @@ <h5>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-between">
         <div class="col-3">
-            <button class="btn btn-dark btn-sm" (click)="goBack()">
+            <button class="btn nav-btn btn-sm" (click)="goBack()">
                 <fa-icon [icon]="faChevronLeft"></fa-icon>
                 <span class="d-md-none">
                     Back
@@ -28,8 +28,8 @@ <h5>
             </button>
         </div>
         <div class="col-3">
-            <div class="d-flex  justify-content-end">
-                <button class="btn btn-dark btn-sm" (click)="continue()">
+            <div class="d-flex justify-content-end">
+                <button class="btn nav-btn btn-sm" (click)="continue()">
                     Data Evaluation
                     <fa-icon [icon]="faChevronRight"></fa-icon>
                 </button>
diff --git a/src/app/setup-wizard/data-evaluation/assessment-evaluation/assessment-evaluation.component.html b/src/app/setup-wizard/data-evaluation/assessment-evaluation/assessment-evaluation.component.html
index b1101ec0..dfc3a097 100644
--- a/src/app/setup-wizard/data-evaluation/assessment-evaluation/assessment-evaluation.component.html
+++ b/src/app/setup-wizard/data-evaluation/assessment-evaluation/assessment-evaluation.component.html
@@ -15,13 +15,13 @@ <h5>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-between">
         <div class="col-3">
-            <button class="btn btn-dark btn-sm" (click)="goBack()">
+            <button class="btn nav-btn btn-sm" (click)="goBack()">
                 <fa-icon [icon]="faChevronLeft"></fa-icon>
             </button>
         </div>
         <div class="col-3">
             <div class="d-flex  justify-content-end">
-                <button class="btn btn-dark btn-sm" (click)="goToNext()">
+                <button class="btn nav-btn btn-sm" (click)="goToNext()">
                     <fa-icon [icon]="faChevronRight"></fa-icon>
                 </button>
             </div>
diff --git a/src/app/setup-wizard/data-evaluation/data-follow-up/data-follow-up.component.html b/src/app/setup-wizard/data-evaluation/data-follow-up/data-follow-up.component.html
index 9686cb4d..a5c0db71 100644
--- a/src/app/setup-wizard/data-evaluation/data-follow-up/data-follow-up.component.html
+++ b/src/app/setup-wizard/data-evaluation/data-follow-up/data-follow-up.component.html
@@ -20,7 +20,7 @@ <h5>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-between">
         <div class="col-3">
-            <button class="btn btn-dark btn-sm" (click)="goBack()">
+            <button class="btn nav-btn btn-sm" (click)="goBack()">
                 <fa-icon [icon]="faChevronLeft"></fa-icon>
                 <span class="d-md-none">
                     Back
@@ -29,7 +29,7 @@ <h5>
         </div>
         <div class="col-3">
             <div class="d-flex  justify-content-end">
-                <button class="btn btn-dark btn-sm" (click)="goNext()"
+                <button class="btn nav-btn btn-sm" (click)="goNext()"
                     [disabled]="onSiteVisit.assessmentIds.length == 0">
                     Assessment Report
                     <fa-icon [icon]="faChevronRight"></fa-icon>
diff --git a/src/app/setup-wizard/data-evaluation/visit-report/visit-report.component.html b/src/app/setup-wizard/data-evaluation/visit-report/visit-report.component.html
index 4aaf9fc5..0fb33974 100644
--- a/src/app/setup-wizard/data-evaluation/visit-report/visit-report.component.html
+++ b/src/app/setup-wizard/data-evaluation/visit-report/visit-report.component.html
@@ -29,7 +29,7 @@ <h5>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-between">
         <div class="col-3">
-            <button class="btn btn-dark btn-sm" (click)="goBack()">
+            <button class="btn nav-btn btn-sm" (click)="goBack()">
                 <fa-icon [icon]="faChevronLeft"></fa-icon>
                 <span class="d-md-none">
                     Back
@@ -38,7 +38,7 @@ <h5>
         </div>
         <div class="col-3">
             <div class="d-flex  justify-content-end">
-                <button class="btn btn-dark btn-sm" (click)="goNext()">
+                <button class="btn nav-btn btn-sm" (click)="goNext()">
                     <fa-icon [icon]="faFolderOpen"></fa-icon>
                     Go To Portfolio
                 </button>
diff --git a/src/app/setup-wizard/data-evaluation/visit-report/visit-report.component.ts b/src/app/setup-wizard/data-evaluation/visit-report/visit-report.component.ts
index 9b25e010..b815672f 100644
--- a/src/app/setup-wizard/data-evaluation/visit-report/visit-report.component.ts
+++ b/src/app/setup-wizard/data-evaluation/visit-report/visit-report.component.ts
@@ -37,7 +37,7 @@ export class VisitReportComponent {
   }
 
   goNext() {
-    this.router.navigateByUrl('/facility/' + this.onSiteVisit.facilityId);
+    this.router.navigateByUrl('/portfolio/facility/' + this.onSiteVisit.facilityId);
   }
 
   goBack() {
diff --git a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.component.html b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.component.html
deleted file mode 100644
index dc8cf334..00000000
--- a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.component.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<h2 class="accordion-header">
-    <button class="accordion-button" type="button" data-bs-toggle="collapse" [attr.data-bs-target]="'#'+contactGuid"
-        aria-expanded="true" [attr.aria-controls]="contactGuid" [ngClass]="{'collapsed': accordionGuid != contactGuid}"
-        (click)="toggleBS()">
-        <fa-icon [icon]="faCircleExclamation" class="pe-1 fa-error"
-            *ngIf="contactForm.touched && 
-            (contactForm.controls['firstname'].touched && contactForm.controls['firstname'].getError('required'))
-            || (contactForm.controls['lastname'].touched && contactForm.controls['lastname'].getError('required')) && contactForm.invalid"></fa-icon>
-        <fa-icon [icon]="faUser" class="pe-1"></fa-icon>
-        {{contact | contactNameDisplay}}
-    </button>
-</h2>
-<div [id]="'#'+contactGuid" class="accordion-collapse collapse" data-bs-parent="#contactAccordion">
-    <div class="accordion-body">
-        <div class="row">
-            <div class="col-12">
-                <form [formGroup]="contactForm">
-                    <div class="row mb-1">
-                        <label class="col-sm-5 col-form-label" for="firstname">First Name <span
-                                class="required-asterisk">*</span></label>
-                        <div class="col-sm-7">
-                            <input name="firstname" type="text" class="form-control" formControlName="firstname"
-                                id="firstname" (input)="saveChanges()">
-                            <div class="alert alert-danger form-error"
-                                *ngIf="contactForm.controls['firstname'].touched && contactForm.controls['firstname'].getError('required')">
-                                First Name Required
-                            </div>
-                        </div>
-                        <label class="col-sm-5 col-form-label" for="lastname">Last Name <span
-                                class="required-asterisk">*</span></label>
-                        <div class="col-sm-7">
-                            <input name="lastname" type="text" class="form-control" formControlName="lastname"
-                                id="lastname" (input)="saveChanges()">
-                            <div class="alert alert-danger form-error"
-                                *ngIf="contactForm.controls['lastname'].touched && contactForm.controls['lastname'].getError('required')">
-                                Last Name Required
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row mb-1">
-                        <label class="col-sm-5 col-form-label" for="phone">Phone Number</label>
-                        <div class="col-sm-7 d-flex">
-                            <input type="text" class="form-control" formControlName="phone" (input)="saveChanges()"
-                                id="phone" name="phone">
-                            <label class="mx-2 col-form-label" for="ext">ext.</label>
-                            <input type="text" class="form-control" style="width: 100px;" formControlName="ext"
-                                (input)="saveChanges()" id="ext" name="ext">
-                        </div>
-                        <div class="col-sm-7 offset-sm-5">
-                            <div class="alert alert-warning form-error" *ngIf="contactForm.controls['phone'].errors && 
-                                (contactForm.controls['phone'].touched || contactForm.controls['ext'].touched)">
-                                Invalid phone number: for US xxx-xxx-xxxx / for international +xxx xxxxxxxxxx
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row mb-1">
-                        <label class="col-sm-5 col-form-label" for="email">Email</label>
-                        <div class="col-sm-7">
-                            <input type="email" class="form-control" formControlName="email" (input)="saveChanges()"
-                                id="email" name="email">
-                            <div
-                                *ngIf="contactForm.controls['email'].errors && (contactForm.controls['email'].touched || contactForm.controls['email'].dirty)">
-                                <div class="alert alert-warning form-error"
-                                    *ngIf="contactForm.controls['email'].errors['email']">Invalid Email</div>
-                                <div class="alert alert-warning form-error"
-                                    *ngIf="contactForm.controls['email'].errors['maxlength']">max length</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row mb-1">
-                        <label class="col-sm-5 col-form-label" for="role">Title</label>
-                        <div class="col-sm-7">
-                            <input type="text" class="form-control" formControlName="role" (input)="saveChanges()"
-                                id="role" name="role">
-                            <div class="alert alert-warning form-error" *ngIf="contactForm.controls['role'].errors">
-                                Invalid title
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row mb-1">
-                        <label class="col-sm-5 col-form-label" for="team">Team</label>
-                        <div class="col-sm-7">
-                            <input type="text" class="form-control" formControlName="team" (input)="saveChanges()"
-                                id="team" name="team">
-                            <div class="alert alert-warning form-error" *ngIf="contactForm.controls['team'].errors">
-                                Invalid team
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row mb-1">
-                        <label class="col-sm-5 col-form-label" for="notes">Notes</label>
-                        <div class="col-sm-7">
-                            <textarea class="form-control" name="notes" formControlName="notes"
-                                (input)="saveChanges()"></textarea>
-                            <div class="alert alert-warning form-error" *ngIf="contactForm.controls['notes'].errors">
-                                Invalid notes
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="col-12">
-                <hr>
-            </div>
-            <div class="col-12 text-end">
-                <button class="btn btn-sm btn-danger" (click)="openDeleteModal()">
-                    <fa-icon [icon]="faTrash"></fa-icon> Delete
-                </button>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-
-
-<div [ngClass]="{'window-overlay': displayDeleteModal}"></div>
-<div class="popup" [ngClass]="{'open': displayDeleteModal }">
-    <div class="popup-header">Delete Contact
-        <button type="button" class="btn-close float-end" aria-label="Close" (click)="closeDeleteModal()"></button>
-    </div>
-    <div class="popup-body">
-        <div class="alert alert-danger">
-            Are you sure you want to delete this contact? Changes will be lost.
-        </div>
-        <hr>
-    </div>
-    <div class="popup-footer d-flex justify-content-end">
-        <button class="btn btn-secondary me-2" (click)="closeDeleteModal()">Cancel</button>
-        <button class="btn btn-danger" (click)="deleteContact()"><fa-icon [icon]="faTrash"></fa-icon> Delete
-            Contact</button>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.component.spec.ts b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.component.spec.ts
deleted file mode 100644
index 31dde4e2..00000000
--- a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.component.spec.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CompanyContactsFormComponent } from './company-contacts-form.component';
-import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { IdbContact, getNewIdbContact } from 'src/app/models/contact';
-import { BehaviorSubject } from 'rxjs';
-import { ReactiveFormsModule } from '@angular/forms';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-import { LocalStorageDataService } from 'src/app/shared/shared-services/local-storage-data.service';
-import { ChangeDetectorRef } from '@angular/core';
-import { BootstrapService } from 'src/app/shared/shared-services/bootstrap.service';
-
-describe('CompanyContactsFormComponent', () => {
-  let component: CompanyContactsFormComponent;
-  let fixture: ComponentFixture<CompanyContactsFormComponent>;
-
-
-  let contactIdbService: Partial<ContactIdbService> = {
-    contacts: new BehaviorSubject<Array<IdbContact>>([]),
-    getContactByGuid: () => {
-      return getNewIdbContact('', '')
-    }
-  };
-  let localStorageDataService: Partial<LocalStorageDataService> = {};
-  let cd: Partial<ChangeDetectorRef> = {};
-  let bootstrapService: Partial<BootstrapService> = {};
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [ReactiveFormsModule, FontAwesomeModule, HelperPipesModule],
-      declarations: [CompanyContactsFormComponent],
-      providers: [
-        { provide: ContactIdbService, useValue: contactIdbService },
-        { provide: LocalStorageDataService, useValue: localStorageDataService },
-        { provide: ChangeDetectorRef, useValue: cd },
-        { provide: BootstrapService, useValue: bootstrapService }
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(CompanyContactsFormComponent);
-    component = fixture.componentInstance;
-    component.contactGuid = '';
-    component.accordionGuid = '';
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.css b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component.css
similarity index 100%
rename from src/app/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.css
rename to src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component.css
diff --git a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component.html b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component.html
new file mode 100644
index 00000000..43089b40
--- /dev/null
+++ b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component.html
@@ -0,0 +1,47 @@
+<h5>
+    <fa-icon [icon]="faAddressBook" class="me-2"></fa-icon>Stakeholder Contacts
+</h5>
+<hr class="my-1">
+<div class="d-flex w-100 justify-content-end pb-2">
+    <div class="p-0">
+        <button class="btn btn-outline-success btn-sm" (click)="addContact()">
+            <fa-icon [icon]="faPlus"></fa-icon>
+            Add Stakeholder
+        </button>
+    </div>
+</div>
+<ng-template [ngIf]="companyContactGuids.length > 0" [ngIfElse]="noContactsBlock">
+    <div class="accordion" id="contactAccordion">
+        <div class="accordion-item"
+            *ngFor="let contactGuid of companyContactGuids; let index = index; let last = last;">
+
+            <h2 class="accordion-header">
+                <button class="accordion-button" type="button" data-bs-toggle="collapse"
+                    [attr.data-bs-target]="'#'+contactGuid" aria-expanded="true" [attr.aria-controls]="contactGuid"
+                    [ngClass]="{'collapsed': accordionGuid != contactGuid}" (click)="toggleBS(contactGuid)">
+                    <!--
+                    TODO: add back in messaging around validation
+                    Updated when using shared form in dashboards
+                    -->
+                    <fa-icon [icon]="faCircleExclamation" class="pe-1 fa-error"
+                        *ngIf="contactGuid | contactInvalid: allContacts"></fa-icon>
+                    <fa-icon [icon]="faUser" class="pe-1"></fa-icon>
+                    {{contactGuid | contactName: allContacts}}
+                </button>
+            </h2>
+            <div [id]="'#'+contactGuid" class="accordion-collapse collapse" data-bs-parent="#contactAccordion">
+                <div class="accordion-body">
+                    <app-company-contacts-form [contactGuid]="contactGuid"
+                        (emitInitialized)="childFormInitialized(contactGuid, last)"></app-company-contacts-form>
+                </div>
+            </div>
+        </div>
+    </div>
+</ng-template>
+<ng-template #noContactsBlock>
+    <div class="alert alert-warning">
+        No stakeholder contacts added for this company. Click "<fa-icon [icon]="faPlus"></fa-icon> Add
+        Stakeholder"
+        to add a contact to this company.
+    </div>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component.spec.ts b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component.spec.ts
new file mode 100644
index 00000000..7e58d5c0
--- /dev/null
+++ b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component.spec.ts
@@ -0,0 +1,29 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompanyContactsSetupFormComponent } from './company-contacts-setup-form.component';
+import { SharedCompanyFormsModule } from 'src/app/shared/shared-company-forms/shared-company-forms.module';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+
+describe('CompanyContactsSetupFormComponent', () => {
+  let component: CompanyContactsSetupFormComponent;
+  let fixture: ComponentFixture<CompanyContactsSetupFormComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SharedCompanyFormsModule, FontAwesomeModule, HelperPipesModule],
+      declarations: [CompanyContactsSetupFormComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(CompanyContactsSetupFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component.ts b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component.ts
new file mode 100644
index 00000000..35701480
--- /dev/null
+++ b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component.ts
@@ -0,0 +1,119 @@
+import { ChangeDetectorRef, Component } from '@angular/core';
+import { firstValueFrom, Subscription } from 'rxjs';
+import { getNewIdbContact, IdbContact } from 'src/app/models/contact';
+import { IdbCompany } from 'src/app/models/company';
+import { faAddressBook, faCircleExclamation, faPlus, faUser, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
+import { LocalStorageDataService } from 'src/app/shared/shared-services/local-storage-data.service';
+import { BootstrapService } from 'src/app/shared/shared-services/bootstrap.service';
+
+@Component({
+  selector: 'app-company-contacts-setup-form',
+  templateUrl: './company-contacts-setup-form.component.html',
+  styleUrl: './company-contacts-setup-form.component.css'
+})
+export class CompanyContactsSetupFormComponent {
+
+  faUser: IconDefinition = faUser;
+  faCircleExclamation: IconDefinition = faCircleExclamation;
+  
+  allContacts: Array<IdbContact>;
+  companyContactGuids: Array<string>;
+  contactsSub: Subscription
+  companyContacts: Array<IdbContact>;
+  routeGuardWarningModal: boolean = false;
+
+  selectedCompany: IdbCompany;
+  selectedCompanySub: Subscription;
+
+  accordionGuid: string;
+  faAddressBook: IconDefinition = faAddressBook;
+  faPlus: IconDefinition = faPlus;
+
+  hasInvalidContacts: boolean;
+  isAddNew: boolean = false;
+  constructor(
+    private companyIdbService: CompanyIdbService,
+    private contactIdbService: ContactIdbService,
+    private localStorageDataService: LocalStorageDataService,
+    private bootstrapService: BootstrapService,
+    private cd: ChangeDetectorRef
+  ) {
+  }
+
+  ngOnInit() {
+    this.selectedCompanySub = this.companyIdbService.selectedCompany.subscribe(_company => {
+      this.selectedCompany = _company;
+      this.setCompanyContacts();
+    });
+
+    this.contactsSub = this.contactIdbService.contacts.subscribe(_contacts => {
+      this.allContacts = _contacts;
+      this.setCompanyContacts();
+    });
+  }
+
+  ngAfterViewInit() {
+    //open the accordion for last viewed neb
+    let lastContactGuid: string = this.localStorageDataService.contactAccordionGuid;
+    if (lastContactGuid && this.companyContactGuids.includes(lastContactGuid)) {
+      this.toggleBS(lastContactGuid);
+      this.cd.detectChanges();
+    }
+  }
+
+  setCompanyContacts() {
+    if (this.selectedCompany && this.allContacts) {
+      let tmpCompanyContacts: Array<IdbContact> = this.allContacts.filter(contact => {
+        return contact.companyId == this.selectedCompany.guid;
+      });
+      let tmpContactIds: Array<string> = tmpCompanyContacts.map(contact => {
+        return contact.guid;
+      });
+
+      if (!this.companyContactGuids) {
+        this.companyContactGuids = tmpContactIds;
+      } else {
+        //check contact added/removed
+        if (this.companyContactGuids.length != tmpContactIds.length) {
+          this.companyContactGuids = tmpContactIds;
+        }
+      }
+    }
+  }
+
+  ngOnDestroy() {
+    if (this.selectedCompanySub) {
+      this.selectedCompanySub.unsubscribe();
+    }
+    if (this.contactsSub) {
+      this.contactsSub.unsubscribe();
+    }
+  }
+
+  async addContact() {
+    let newContact: IdbContact = getNewIdbContact(this.selectedCompany.userId, this.selectedCompany.guid);
+    await firstValueFrom(this.contactIdbService.addWithObservable(newContact))
+    await this.contactIdbService.setContacts();
+    this.isAddNew = true;
+  }
+
+  toggleBS(contactGuid: string) {
+    this.bootstrapService.bsCollapse('#' + contactGuid);
+    if (this.accordionGuid != contactGuid) {
+      this.accordionGuid = contactGuid;
+    } else {
+      this.accordionGuid = undefined;
+    }
+    this.localStorageDataService.setContactAccordionGuid(this.accordionGuid);
+  }
+
+  childFormInitialized(contactGuid: string, isLast: boolean) {
+    if (this.isAddNew == true && isLast) {
+      this.toggleBS(contactGuid);
+      this.isAddNew = false;
+      this.cd.detectChanges();
+    }
+  }
+}
diff --git a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component.html b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component.html
index 06a4e6a3..41ac24a1 100644
--- a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component.html
+++ b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component.html
@@ -2,45 +2,18 @@
     <div class="row g-0 justify-content-center h-100 w-100 overflow-scroll">
         <div class="col-10 pt-4 pb-4">
             <div class="form-paper shadow">
-                <h5>
-                    <fa-icon [icon]="faAddressBook" class="me-2"></fa-icon>Stakeholder Contacts
-                </h5>
-                <hr>
-                <div class="d-flex w-100 justify-content-end pb-2">
-                    <div class="p-0">
-                        <button class="btn btn-outline-success btn-sm" (click)="addContact()">
-                            <fa-icon [icon]="faPlus"></fa-icon>
-                            Add Stakeholder
-                        </button>
-                    </div>
-                </div>
-                <ng-template [ngIf]="companyContactGuids.length > 0" [ngIfElse]="noContactsBlock">
-                    <div class="accordion" id="contactAccordion">
-                        <div class="accordion-item"
-                            *ngFor="let contactGuid of companyContactGuids; let index = index; let last = last;">
-                            <app-company-contacts-form [contactGuid]="contactGuid" [accordionGuid]="accordionGuid"
-                                (emitInitialized)="childFormInitialized(contactGuid, last)"></app-company-contacts-form>
-                        </div>
-                    </div>
-                </ng-template>
-                <ng-template #noContactsBlock>
-                    <div class="alert alert-warning">
-                        No stakeholder contacts added for this company. Click "<fa-icon [icon]="faPlus"></fa-icon> Add
-                        Stakeholder"
-                        to add a contact to this company.
-                    </div>
-                </ng-template>
+                <app-company-contacts-setup-form></app-company-contacts-setup-form>
             </div>
         </div>
     </div>
 </div>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-between">
-        <button class="btn btn-dark btn-sm" (click)="goBack()">
+        <button class="btn nav-btn btn-sm" (click)="goBack()">
             <fa-icon [icon]="faChevronLeft"></fa-icon>
             Go Back
         </button>
-        <button class="btn btn-dark btn-sm" (click)="goToKPIs()" [disabled]="hasInvalidContacts">
+        <button class="btn nav-btn btn-sm" (click)="goToKPIs()" [disabled]="hasInvalidContacts">
             Select KPIs
             <fa-icon [icon]="faChevronRight"></fa-icon>
         </button>
diff --git a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component.spec.ts b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component.spec.ts
index 08e95206..19d85856 100644
--- a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component.spec.ts
@@ -17,6 +17,8 @@ import { IdbContact } from 'src/app/models/contact';
 import { LocalStorageDataService } from 'src/app/shared/shared-services/local-storage-data.service';
 import { ChangeDetectorRef } from '@angular/core';
 import { BootstrapService } from 'src/app/shared/shared-services/bootstrap.service';
+import { SharedCompanyFormsModule } from 'src/app/shared/shared-company-forms/shared-company-forms.module';
+import { CompanyContactsSetupFormComponent } from './company-contacts-setup-form/company-contacts-setup-form.component';
 
 describe('CompanyContactsSetupComponent', () => {
   let component: CompanyContactsSetupComponent;
@@ -46,8 +48,8 @@ describe('CompanyContactsSetupComponent', () => {
   let bootstrapService: Partial<BootstrapService> = {};
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, FormsModule],
-      declarations: [CompanyContactsSetupComponent],
+      imports: [FontAwesomeModule, FormsModule, SharedCompanyFormsModule],
+      declarations: [CompanyContactsSetupComponent, CompanyContactsSetupFormComponent],
       providers: [
         { provide: UserIdbService, useValue: userIdbService },
         { provide: CompanyIdbService, useValue: companyIdbService },
diff --git a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component.ts b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component.ts
index b7351a5e..89b6c4b9 100644
--- a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component.ts
+++ b/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component.ts
@@ -1,19 +1,16 @@
-import { ChangeDetectorRef, Component, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { IconDefinition, faAddressBook, faChevronLeft, faChevronRight, faPlus } from '@fortawesome/free-solid-svg-icons';
-import { IdbContact, getNewIdbContact } from 'src/app/models/contact';
+import { IconDefinition, faAddressBook, faChevronLeft, faChevronRight } from '@fortawesome/free-solid-svg-icons';
+import { IdbContact } from 'src/app/models/contact';
 import { IdbCompany } from 'src/app/models/company';
 import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
 import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { Observable, Subscription, firstValueFrom, of } from 'rxjs';
+import { Observable, Subscription, of } from 'rxjs';
 import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
 import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
 import * as _ from 'lodash';
-import { CompanyContactsFormService } from './company-contacts-form/company-contacts-form.service';
+import { CompanyContactsFormService } from '../../../shared/shared-company-forms/company-contacts-form/company-contacts-form.service';
 import { FormGroup } from '@angular/forms';
-import { CompanyContactsFormComponent } from './company-contacts-form/company-contacts-form.component';
-import { LocalStorageDataService } from 'src/app/shared/shared-services/local-storage-data.service';
-import { BootstrapService } from 'src/app/shared/shared-services/bootstrap.service';
 
 @Component({
   selector: 'app-company-contacts-setup',
@@ -23,86 +20,45 @@ import { BootstrapService } from 'src/app/shared/shared-services/bootstrap.servi
 export class CompanyContactsSetupComponent implements OnInit, OnDestroy {
 
   allContacts: Array<IdbContact>;
-  companyContactGuids: Array<string>;
-  contactsSub: Subscription
-  companyContacts: Array<IdbContact>;
-  @ViewChildren(CompanyContactsFormComponent) contactForms: QueryList<CompanyContactsFormComponent>;
+  contactsSub: Subscription;
   routeGuardWarningModal: boolean = false;
 
   selectedCompany: IdbCompany;
   selectedCompanySub: Subscription;
 
-  accordionGuid: string;
   faChevronRight: IconDefinition = faChevronRight;
   faChevronLeft: IconDefinition = faChevronLeft;
   faAddressBook: IconDefinition = faAddressBook;
-  faPlus: IconDefinition = faPlus;
 
   hasInvalidContacts: boolean;
-  isAddNew: boolean = false;
   constructor(private router: Router,
     private companyIdbService: CompanyIdbService,
     private contactIdbService: ContactIdbService,
     private onSiteVisitIdbService: OnSiteVisitIdbService,
-    private companyContactsFormService: CompanyContactsFormService,
-    private localStorageDataService: LocalStorageDataService,
-    private bootstrapService: BootstrapService,
-    private cd: ChangeDetectorRef
+    private companyContactsFormService: CompanyContactsFormService
   ) {
   }
 
   ngOnInit() {
     this.selectedCompanySub = this.companyIdbService.selectedCompany.subscribe(_company => {
       this.selectedCompany = _company;
-      this.setCompanyContacts();
       this.setHasInvalidContacts();
     });
 
     this.contactsSub = this.contactIdbService.contacts.subscribe(_contacts => {
       this.allContacts = _contacts;
-      this.setCompanyContacts();
       this.setHasInvalidContacts();
     });
   }
 
-  ngAfterViewInit() {
-    //open the accordion for last viewed neb
-    let lastContactGuid: string = this.localStorageDataService.contactAccordionGuid;
-    if (lastContactGuid && this.companyContactGuids.includes(lastContactGuid)) {
-      this.toggleBS(lastContactGuid);
-      this.cd.detectChanges();
-    }
-  }
-
   canDeactivate(): Observable<boolean> {
     if (this.hasInvalidContacts) {
-      this.contactForms.forEach(form => form.setRequiredInvalidControlsTouched());
-      this.dislayWarningModal();
+      this.displayWarningModal();
       return of(false);
     }
     return of(true);
   }
 
-  setCompanyContacts() {
-    if (this.selectedCompany && this.allContacts) {
-      let tmpCompanyContacts: Array<IdbContact> = this.allContacts.filter(contact => {
-        return contact.companyId == this.selectedCompany.guid;
-      });
-      let tmpContactIds: Array<string> = tmpCompanyContacts.map(contact => {
-        return contact.guid;
-      });
-
-      if (!this.companyContactGuids) {
-        this.companyContactGuids = tmpContactIds;
-      } else {
-        //check contact added/removed
-        if (this.companyContactGuids.length != tmpContactIds.length) {
-          this.companyContactGuids = tmpContactIds;
-        }
-      }
-    }
-  }
-
   ngOnDestroy() {
     if (this.selectedCompanySub) {
       this.selectedCompanySub.unsubscribe();
@@ -122,23 +78,14 @@ export class CompanyContactsSetupComponent implements OnInit, OnDestroy {
     this.router.navigateByUrl('setup-wizard/pre-visit/' + onSiteVisit.guid + '/company-kpi-select');
   }
 
-  async addContact() {
-    let newContact: IdbContact = getNewIdbContact(this.selectedCompany.userId, this.selectedCompany.guid);
-    await firstValueFrom(this.contactIdbService.addWithObservable(newContact))
-    await this.contactIdbService.setContacts();
-    this.isAddNew = true;
-  }
-
   setHasInvalidContacts() {
     if (this.selectedCompany && this.allContacts) {
-      this.companyContacts = this.allContacts.filter(contact => {
+      let companyContacts: Array<IdbContact> = this.allContacts.filter(contact => {
         return contact.companyId == this.selectedCompany.guid;
       });
       let hasInvalidContacts: boolean = false;
-      let contactForms: Array<FormGroup> = [];
-      this.companyContacts.forEach(contact => {
+      companyContacts.forEach(contact => {
         let contactForm: FormGroup = this.companyContactsFormService.getFormFromIdbContact(contact);
-        contactForms.push(contactForm);
         if (contactForm.invalid) {
           for (const name of Object.keys(contactForm.controls)) {
             const control = contactForm.get(name);
@@ -152,28 +99,10 @@ export class CompanyContactsSetupComponent implements OnInit, OnDestroy {
       this.hasInvalidContacts = hasInvalidContacts;
     }
   }
-  dislayWarningModal() {
+  displayWarningModal() {
     this.routeGuardWarningModal = true;
   }
   closeWarningModal() {
     this.routeGuardWarningModal = false;
   }
-
-  toggleBS(contactGuid: string) {
-    this.bootstrapService.bsCollapse('#' + contactGuid);
-    if (this.accordionGuid != contactGuid) {
-      this.accordionGuid = contactGuid;
-    } else {
-      this.accordionGuid = undefined;
-    }
-    this.localStorageDataService.setContactAccordionGuid(this.accordionGuid);
-  }
-
-  childFormInitialized(contactGuid: string, isLast: boolean) {
-    if (this.isAddNew == true && isLast) {
-      this.toggleBS(contactGuid);
-      this.isAddNew = false;
-      this.cd.detectChanges();
-    }
-  }
 }
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component.html b/src/app/setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component.html
index 75301bf3..8d528b20 100644
--- a/src/app/setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component.html
+++ b/src/app/setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component.html
@@ -2,219 +2,18 @@
     <div class="row g-0 justify-content-center h-100 w-100 overflow-scroll">
         <div class="col-10 pt-4 pb-4">
             <div class="form-paper shadow" *ngIf="keyPerformanceIndicator">
-                <h5>
-                    <fa-icon [icon]="faBullseye"></fa-icon>
-                    <span class="ps-1" [innerHTML]="keyPerformanceIndicator.htmlLabel"></span>
-                </h5>
-                <hr>
-                <form>
-                    <ng-template [ngIf]="keyPerformanceIndicator.isCustom">
-                        <div class="row">
-                            <label class="col-sm-6 col-form-label" for="{{'kpiName_'+keyPerformanceIndicator.guid}}">
-                                Performance Indicator Name
-                            </label>
-                            <div class="col-6">
-                                <div class="input-group">
-                                    <div class="input-group-text">
-                                        <fa-icon [icon]="faBullseye"></fa-icon>
-                                    </div>
-                                    <input name="{{'kpiName_'+keyPerformanceIndicator.guid}}" type="text"
-                                        class="form-control" [(ngModel)]="keyPerformanceIndicator.label"
-                                        id="{{'kpiName_'+keyPerformanceIndicator.guid}}" (input)="saveChanges()">
-                                </div>
-                            </div>
-                        </div>
-                    </ng-template>
-
-                    <div class="row">
-                        <label class="col-sm-6 col-form-label" for="{{'kpiCategory_'+keyPerformanceIndicator.guid}}">
-                            KPI Category
-                        </label>
-                        <div class="col-6">
-                            <ng-template [ngIf]="keyPerformanceIndicator.isCustom" [ngIfElse]="indicatorCategory">
-                                <select class="form-select" name="kpiCategory"
-                                    id="{{'kpiCategory_'+keyPerformanceIndicator.guid}}"
-                                    [(ngModel)]="keyPerformanceIndicator.primaryKPI" (change)="saveChanges()">
-                                    <option *ngFor="let primaryKPI of primaryKPIs" [ngValue]="primaryKPI">
-                                        {{primaryKPI}}
-                                    </option>
-                                </select>
-                            </ng-template>
-                            <ng-template #indicatorCategory>
-                                <div class="d-flex w-100 justify-content-center">
-                                    <app-primary-kpi-badge class="w-100" [kpiOption]="keyPerformanceIndicator"
-                                        [fullWidth]="true"></app-primary-kpi-badge>
-                                </div>
-                            </ng-template>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <label class="col-sm-6 col-form-label" for="{{'kpiDescription_'+keyPerformanceIndicator.guid}}">
-                            KPI Description
-                        </label>
-                        <div class="col-6">
-                            <ng-template [ngIf]="keyPerformanceIndicator.isCustom" [ngIfElse]="indicatorDescription">
-                                <textarea class="form-control" name="{{'kpiDescription_'+keyPerformanceIndicator.guid}}"
-                                    id="{{'kpiDescription_'+keyPerformanceIndicator.guid}}"
-                                    [(ngModel)]="keyPerformanceIndicator.description"
-                                    (input)="saveChanges()"></textarea>
-                            </ng-template>
-                            <ng-template #indicatorDescription>
-                                <p>
-                                    <span [innerHTML]="keyPerformanceIndicator.optionValue | kpiDescription"></span>
-                                </p>
-                            </ng-template>
-                        </div>
-                    </div>
-
-                    <div class="row pt-2">
-                        <div class="col">
-                            <button class="btn btn-sm btn-primary me-1"
-                                *ngFor="let contact of keyPerformanceIndicator.guid | associatedContacts:'KPI': contacts;"
-                                (click)="openContactModal(contact)">
-                                <fa-icon [icon]="faUser"></fa-icon>
-                                {{contact | contactNameDisplay}}
-                            </button>
-                            <button class="btn btn-sm btn-secondary" (click)="openContactModal(undefined)">
-                                <fa-icon [icon]="faContactBook"></fa-icon>
-                                Stakeholders
-                            </button>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col">
-                            <hr>
-                        </div>
-                    </div>
-
-
-                    <h6>
-                        <div class="d-flex w-100 justify-content-between">
-                            <div class="mt-auto bold">
-                                Associated Key Performance Metrics
-                            </div>
-                            <div>
-                                <ng-template [ngIf]="keyPerformanceIndicator.optionValue != 'other'"
-                                    [ngIfElse]="customAddBlock">
-                                    <div class="dropdown">
-                                        <button class="btn btn-outline-metric btn-sm dropdown-toggle" type="button"
-                                            data-bs-toggle="dropdown" aria-expanded="false"
-                                            (click)="toggleAddMetricDropdown()">
-                                            <fa-icon [icon]="faPlus"></fa-icon> Add Performance Metric
-                                        </button>
-                                        <ul class="dropdown-menu" [ngClass]="{'show': showAddMetricDropdown}">
-                                            <li>
-                                                <a class="dropdown-item" (click)="addPerformanceMetric()">
-                                                    <fa-icon [icon]="faPlus"></fa-icon> Add Custom Performance Metric
-                                                </a>
-                                            </li>
-                                            <li>
-                                                <a class="dropdown-item" (click)="showSuggestedMetrics()">
-                                                    <fa-icon [icon]="faSearchPlus"></fa-icon> Search Performance Metric
-                                                </a>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </ng-template>
-                                <ng-template #customAddBlock>
-                                    <button class="btn btn-outline-metric btn-sm" (click)="addPerformanceMetric()">
-                                        <fa-icon [icon]="faPlus"></fa-icon>
-                                        Add Custom Performance Metric
-                                    </button>
-                                </ng-template>
-                            </div>
-                        </div>
-                    </h6>
-                    <p class="fw-light small">
-                        The below associated key performance metrics (<fa-icon
-                            [icon]="faScaleUnbalancedFlip"></fa-icon>)
-                        will be used later on during an assessment to tie Non-Energy Benefits found back to company Key
-                        Performance Indicators. This information can be added to and modified at a later time if not all
-                        of the details are currently known.
-                    </p>
-                    <div class="row">
-                        <div class="col">
-                            <hr class="metric-hr mt-0">
-                        </div>
-                    </div>
-                    <ng-template [ngIf]="keyPerformanceIndicator.performanceMetrics.length > 0"
-                        [ngIfElse]="noKpmsBlock">
-                        <ng-container *ngFor="let keyPerformanceMetric of keyPerformanceIndicator.performanceMetrics">
-                            <div class="metric-block">
-                                <div class="dropdown">
-                                    <button class="btn btn-outline-metric btn-sm dropdown-toggle" type="button"
-                                        data-bs-toggle="dropdown" aria-expanded="false"
-                                        (click)="setDropdownMenuGuid(keyPerformanceMetric.guid)">
-                                        <fa-icon [icon]="faScaleUnbalancedFlip" class="me-2"></fa-icon>
-                                        <span [innerHTML]="keyPerformanceMetric.htmlLabel"></span>
-                                    </button>
-                                    <ul class="dropdown-menu"
-                                        [ngClass]="{'show': dropdownMenuGuid == keyPerformanceMetric.guid}">
-                                        <li>
-                                            <a class="dropdown-item"
-                                                (click)="openDeleteMetricModal(keyPerformanceMetric)">
-                                                <fa-icon [icon]="faTrash"></fa-icon>
-                                                Remove Metric
-                                            </a>
-                                        </li>
-                                    </ul>
-                                </div>
-                                <ng-template [ngIf]="keyPerformanceMetric.isCustom">
-                                    <div class="row">
-                                        <label class="col-sm-6 col-form-label"
-                                            for="{{'kpmName_'+keyPerformanceMetric.guid}}">
-                                            Performance Metric Name
-                                        </label>
-                                        <div class="col-6">
-                                            <div class="input-group">
-                                                <div class="input-group-text">
-                                                    <fa-icon [icon]="faScaleUnbalancedFlip"></fa-icon>
-                                                </div>
-                                                <input name="{{'kpmName_'+keyPerformanceMetric.guid}}" type="text"
-                                                    class="form-control" [(ngModel)]="keyPerformanceMetric.label"
-                                                    id="{{'kpmName_'+keyPerformanceMetric.guid}}"
-                                                    (input)="saveChanges()">
-                                            </div>
-                                        </div>
-                                    </div>
-                                </ng-template>
-                                <app-kpm-details-form [keyPerformanceMetric]="keyPerformanceMetric"
-                                    (emitSave)="saveChanges()" (emitCalculate)="calculateCost(keyPerformanceMetric)"
-                                    [context]="'preVisit'"></app-kpm-details-form>
-                                <ng-template
-                                    [ngIf]="(keyPerformanceMetricImpacts | keyPerformanceMetricImpactsList: keyPerformanceMetric.guid).length">
-                                    <div class="mt-3">
-                                        <app-kpm-impacts-table
-                                            [kpmGuid]="keyPerformanceMetric.guid"></app-kpm-impacts-table>
-                                    </div>
-                                </ng-template>
-                                <div class="row">
-                                    <div class="col">
-                                        <hr class="metric-hr">
-                                    </div>
-                                </div>
-                            </div>
-                        </ng-container>
-                    </ng-template>
-                    <ng-template #noKpmsBlock>
-                        <div class="alert alert-info text-center">
-                            No perfromance metrics connected to this KPI. Click "<fa-icon [icon]="faPlus"></fa-icon>
-                            Add New Metric" to add a new performance metric.
-                        </div>
-                    </ng-template>
-                </form>
+                <app-company-kpi-details-form></app-company-kpi-details-form>
             </div>
         </div>
     </div>
 </div>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-between">
-        <button class="btn btn-dark btn-sm" (click)="goBack()">
+        <button class="btn nav-btn btn-sm" (click)="goBack()">
             <fa-icon [icon]="faChevronLeft"></fa-icon>
             Go Back
         </button>
-        <button class="btn btn-dark btn-sm" (click)="goNext()">
+        <button class="btn nav-btn btn-sm" (click)="goNext()">
             <ng-template [ngIf]="indicatorIndex != (numCompanyKpis-1)" [ngIfElse]="facilityDetailsBlock">
                 Next KPI
             </ng-template>
@@ -224,52 +23,4 @@ <h6>
             <fa-icon [icon]="faChevronRight"></fa-icon>
         </button>
     </div>
-</nav>
-
-
-
-<app-contact-modal *ngIf="displayContactModal" (emitCancelContact)="closeContactModal()"
-    [contextGuid]="keyPerformanceIndicator.guid" [contactContext]="'KPI'" [selectedContact]="viewContact"
-    [companyGuid]="company.guid"></app-contact-modal>
-
-
-
-<div [ngClass]="{'window-overlay': displayDeleteKpmModal}"></div>
-<div class="popup" [ngClass]="{'open': displayDeleteKpmModal }">
-    <ng-template [ngIf]="kpmToDelete">
-        <div class="popup-header">Delete
-            <span [innerHTML]="kpmToDelete.htmlLabel"></span>
-            <button type="button" class="btn-close float-end" aria-label="Close"
-                (click)="closeDeleteKpmModal()"></button>
-        </div>
-        <div class="popup-body">
-            <ng-template
-                [ngIf]="(keyPerformanceMetricImpacts | keyPerformanceMetricImpactsList: kpmToDelete.guid).length"
-                [ngIfElse]="noImpactsDeleteBlock">
-                <div class="alert alert-danger">
-                    Are you sure you want to untrack the performance metric:
-                    <span class="bold" [innerHTML]="kpmToDelete.htmlLabel"></span>? <br>{{(keyPerformanceMetricImpacts |
-                    keyPerformanceMetricImpactsList:
-                    kpmToDelete.guid).length}} NEB(s) in your system currently impact this metric. Those impacts will be
-                    lost. This cannot be undone.
-                </div>
-            </ng-template>
-            <ng-template #noImpactsDeleteBlock>
-                <div class="alert alert-warning">
-                    Are you sure you want to untrack this performance metric:
-                    <span class="bold" [innerHTML]="kpmToDelete.htmlLabel"></span>?
-                </div>
-            </ng-template>
-            <hr>
-        </div>
-        <div class="popup-footer d-flex justify-content-end">
-            <button class="btn btn-secondary btn-sm me-2" (click)="closeDeleteKpmModal()">Cancel</button>
-            <button class="btn btn-danger btn-sm" (click)="untrackMetric()"><fa-icon [icon]="faTrash"></fa-icon> Untrack
-                KPM</button>
-        </div>
-    </ng-template>
-</div>
-
-
-<app-kpm-database-modal *ngIf="displayAddMetricModal" (emitClose)="closeSuggestedMetrics()"
-    [keyPerformanceIndicator]="keyPerformanceIndicator" (emitAddMetrics)="addMetrics($event)"></app-kpm-database-modal>
\ No newline at end of file
+</nav>
\ No newline at end of file
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component.spec.ts b/src/app/setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component.spec.ts
index 564cd18d..afdd7ed9 100644
--- a/src/app/setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component.spec.ts
@@ -13,7 +13,7 @@ import { IdbContact } from 'src/app/models/contact';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { FormsModule } from '@angular/forms';
 import { RouterTestingModule } from '@angular/router/testing';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
 import { IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
 
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component.ts b/src/app/setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component.ts
index ddf61e4f..6c7bcec9 100644
--- a/src/app/setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component.ts
+++ b/src/app/setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component.ts
@@ -1,20 +1,14 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { IconDefinition, faBullseye, faChartBar, faChevronLeft, faChevronRight, faCircleQuestion, faClose, faContactBook, faPlus, faScaleUnbalancedFlip, faSearchPlus, faTrash, faUser } from '@fortawesome/free-solid-svg-icons';
+import { IconDefinition, faBullseye, faChevronLeft, faChevronRight } from '@fortawesome/free-solid-svg-icons';
 import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
 import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
 import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
 import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
 import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
 import * as _ from 'lodash';
-import { PrimaryKPI, PrimaryKPIs } from 'src/app/shared/constants/keyPerformanceIndicatorOptions';
-import { firstValueFrom, Subscription } from 'rxjs';
+import { Subscription } from 'rxjs';
 import { IdbCompany } from 'src/app/models/company';
-import { IdbContact } from 'src/app/models/contact';
-import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
-import { getCustomKPM, KeyPerformanceMetric } from 'src/app/shared/constants/keyPerformanceMetrics';
-import { IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
 
 @Component({
   selector: 'app-company-kpi-details',
@@ -23,55 +17,23 @@ import { IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetr
 })
 export class CompanyKpiDetailsComponent {
 
-  faChartBar: IconDefinition = faChartBar;
   faChevronRight: IconDefinition = faChevronRight;
   faChevronLeft: IconDefinition = faChevronLeft;
-  faUser: IconDefinition = faUser;
-  faContactBook: IconDefinition = faContactBook;
-  faClose: IconDefinition = faClose;
-  faTrash: IconDefinition = faTrash;
-  faSearchPlus: IconDefinition = faSearchPlus;
 
   keyPerformanceIndicator: IdbKeyPerformanceIndicator;
-  primaryKPIs: Array<PrimaryKPI> = PrimaryKPIs;
-  faCircleQuestion: IconDefinition = faCircleQuestion;
   faBullseye: IconDefinition = faBullseye;
-  faPlus: IconDefinition = faPlus;
-  faScaleUnbalancedFlip: IconDefinition = faScaleUnbalancedFlip;
 
   companySub: Subscription;
   company: IdbCompany;
 
-  keyPerformanceIndicatorSub: Subscription;
-  keyPerformanceIndicators: Array<IdbKeyPerformanceIndicator>;
-
   indicatorIndex: number;
   numCompanyKpis: number;
 
-  displayContactModal: boolean = false;
-  viewContact: IdbContact;
-
-  contacts: Array<IdbContact>;
-  contactsSub: Subscription;
-
-  displayDeleteKpmModal: boolean = false;
-  kpmToDelete: KeyPerformanceMetric;
-
-  keyPerformanceMetricImpacts: Array<IdbKeyPerformanceMetricImpact>;
-  keyPerformanceMetricImpactsSub: Subscription;
-
-  timeOptions: Array<string> = ['day', 'week', 'month', 'year'];
-  dropdownMenuGuid: string;
-
-  displayAddMetricModal: boolean = false;
-  showAddMetricDropdown: boolean = false;
   constructor(private router: Router,
     private onSiteVisitIdbService: OnSiteVisitIdbService,
     private keyPerformanceIndicatorIdbService: KeyPerformanceIndicatorsIdbService,
     private activatedRoute: ActivatedRoute,
     private companyIdbService: CompanyIdbService,
-    private contactIdbService: ContactIdbService,
-    private keyPerformanceMetricImpactIdbService: KeyPerformanceMetricImpactsIdbService
   ) {
   }
 
@@ -79,48 +41,16 @@ export class CompanyKpiDetailsComponent {
     this.companySub = this.companyIdbService.selectedCompany.subscribe(_company => {
       this.company = _company;
     });
-    this.keyPerformanceIndicatorSub = this.keyPerformanceIndicatorIdbService.keyPerformanceIndicators.subscribe(_keyPerformanceIndicators => {
-      this.keyPerformanceIndicators = _keyPerformanceIndicators;
-    });
-    this.contactsSub = this.contactIdbService.contacts.subscribe(_contacts => {
-      this.contacts = _contacts;
-    });
-
-    this.keyPerformanceMetricImpactsSub = this.keyPerformanceMetricImpactIdbService.keyPerformanceMetricImpacts.subscribe(_keyPerformanceMetricImpacts => {
-      this.keyPerformanceMetricImpacts = _keyPerformanceMetricImpacts;
-    });
 
     this.activatedRoute.params.subscribe(params => {
       let kpiGuid: string = params['id'];
       this.keyPerformanceIndicator = this.keyPerformanceIndicatorIdbService.getByGuid(kpiGuid);
       this.setIndexValues();
-      this.showAddMetricDropdown = false;
     });
   }
 
   ngOnDestroy() {
     this.companySub.unsubscribe();
-    this.keyPerformanceIndicatorSub.unsubscribe();
-    this.contactsSub.unsubscribe();
-    this.keyPerformanceMetricImpactsSub.unsubscribe();
-  }
-
-  async saveChanges() {
-    if (this.keyPerformanceIndicator.optionValue == 'other') {
-      this.keyPerformanceIndicator.htmlLabel = this.keyPerformanceIndicator.label;
-    }
-    this.keyPerformanceIndicator.performanceMetrics.forEach(metric => {
-      if (metric.isCustom) {
-        metric.htmlLabel = metric.label;
-      }
-    })
-    await this.keyPerformanceIndicatorIdbService.asyncUpdate(this.keyPerformanceIndicator);
-    await this.keyPerformanceIndicatorIdbService.setKeyPerformanceIndicators();
-  }
-
-  async calculateCost(keyPerformanceMetric: KeyPerformanceMetric) {
-    await this.keyPerformanceMetricImpactIdbService.updatePerformanceMetricBaseline(this.keyPerformanceIndicator, keyPerformanceMetric);
-    await this.saveChanges();
   }
 
   goBack() {
@@ -161,85 +91,9 @@ export class CompanyKpiDetailsComponent {
   }
 
   getCompanyKPIs(): Array<IdbKeyPerformanceIndicator> {
-    return this.keyPerformanceIndicators.filter(kpi => {
+    let kpis: Array<IdbKeyPerformanceIndicator> = this.keyPerformanceIndicatorIdbService.keyPerformanceIndicators.getValue();
+    return kpis.filter(kpi => {
       return kpi.companyId == this.company.guid
     });
   }
-
-  openContactModal(contact: IdbContact) {
-    this.viewContact = contact;
-    this.displayContactModal = true;
-  }
-
-  closeContactModal() {
-    this.displayContactModal = false;
-    this.viewContact = undefined;
-  }
-
-  addPerformanceMetric() {
-    if (this.showAddMetricDropdown) {
-      this.showAddMetricDropdown = false;
-    }
-    let newCustomKPM: KeyPerformanceMetric = getCustomKPM(this.keyPerformanceIndicator.optionValue, this.keyPerformanceIndicator.guid);
-    this.keyPerformanceIndicator.performanceMetrics.unshift(newCustomKPM);
-    this.saveChanges();
-  }
-
-  openDeleteMetricModal(keyPerformanceMetric: KeyPerformanceMetric) {
-    this.kpmToDelete = keyPerformanceMetric;
-    this.displayDeleteKpmModal = true;
-  }
-
-  closeDeleteKpmModal() {
-    this.displayDeleteKpmModal = false;
-    this.kpmToDelete = undefined;
-  }
-
-  async untrackMetric() {
-    this.keyPerformanceIndicator.performanceMetrics = this.keyPerformanceIndicator.performanceMetrics.filter(kpm => {
-      return kpm.guid != this.kpmToDelete.guid
-    });
-    let kpmImpacts: Array<IdbKeyPerformanceMetricImpact> = this.keyPerformanceMetricImpacts.filter(kpmImpact => {
-      return kpmImpact.kpmGuid == this.kpmToDelete.guid;
-    });
-    if (kpmImpacts.length > 0) {
-      for (let index = 0; index < kpmImpacts.length; index++) {
-        await firstValueFrom(this.keyPerformanceMetricImpactIdbService.deleteWithObservable(kpmImpacts[index].id));
-      }
-      await this.keyPerformanceMetricImpactIdbService.setKeyPerformanceMetricImpacts();
-    }
-    await this.saveChanges();
-    this.closeDeleteKpmModal();
-  }
-
-  setDropdownMenuGuid(guid: string) {
-    if (this.dropdownMenuGuid != guid) {
-      this.dropdownMenuGuid = guid;
-    } else {
-      this.dropdownMenuGuid = undefined;
-    }
-  }
-
-  toggleAddMetricDropdown() {
-    this.showAddMetricDropdown = !this.showAddMetricDropdown;
-  }
-
-  showSuggestedMetrics() {
-    if (this.showAddMetricDropdown) {
-      this.showAddMetricDropdown = false;
-    }
-    this.displayAddMetricModal = true;
-  }
-
-  closeSuggestedMetrics() {
-    this.displayAddMetricModal = false;
-  }
-
-  addMetrics(metrics: Array<KeyPerformanceMetric>) {
-    metrics.forEach(metric => {
-      this.keyPerformanceIndicator.performanceMetrics.unshift(metric);
-    })
-    this.saveChanges();
-  }
-
 }
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component.html b/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component.html
index dd3aa555..3187e4fe 100644
--- a/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component.html
+++ b/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component.html
@@ -6,26 +6,24 @@ <h5>
                     <fa-icon [icon]="faChartBar" class="me-2"></fa-icon> Company Key Performance Indicators (KPIs)
                 </h5>
                 <hr>
-                <div class="row">
-                    <div class="col-6">
-                        <app-add-kpi-search></app-add-kpi-search>
-                    </div>
-                    <div class="col-6">
-                        <app-company-kpi-list></app-company-kpi-list>
-                    </div>
-                </div>
+                <app-company-kpi-search-form></app-company-kpi-search-form>
             </div>
         </div>
     </div>
 </div>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-between">
-        <button class="btn btn-dark btn-sm" (click)="goBack()">
+        <button class="btn nav-btn btn-sm" (click)="goBack()">
             <fa-icon [icon]="faChevronLeft"></fa-icon>
             Go Back
         </button>
-        <button class="btn btn-dark btn-sm" (click)="goToKpiDetails()">
-            Detail KPIs
+        <button class="btn nav-btn btn-sm" (click)="goToKpiDetails()">
+            <ng-template [ngIf]="companyKpis.length > 0" [ngIfElse]="noKPIsBlock">
+                Detail KPIs
+            </ng-template>
+            <ng-template #noKPIsBlock>
+                Facility Details
+            </ng-template>
             <fa-icon [icon]="faChevronRight"></fa-icon>
         </button>
     </div>
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component.spec.ts b/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component.spec.ts
index ab0ad1ca..48cba502 100644
--- a/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component.spec.ts
@@ -13,19 +13,20 @@ import { IdbContact } from 'src/app/models/contact';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { FormsModule } from '@angular/forms';
 import { RouterTestingModule } from '@angular/router/testing';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-import { AddKpiSearchComponent } from './add-kpi-search/add-kpi-search.component';
-import { CompanyKpiListComponent } from './company-kpi-list/company-kpi-list.component';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { AddKpiSearchComponent } from '../../../shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component';
+import { CompanyKpiListComponent } from '../../../shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component';
 import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
 import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
 import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
-import { SelectedKpiOptionPipe } from './add-kpi-search/selected-kpi-option.pipe';
+import { SelectedKpiOptionPipe } from '../../../shared/shared-company-forms/company-kpi-search-form/add-kpi-search/selected-kpi-option.pipe';
 import { PrimaryKpiBadgeModule } from 'src/app/shared/primary-kpi-badge/primary-kpi-badge.module';
 import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
 import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
 import { IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
+import { SharedCompanyFormsModule } from 'src/app/shared/shared-company-forms/shared-company-forms.module';
 
 describe('CompanyKpiSelectComponent', () => {
   let component: CompanyKpiSelectComponent;
@@ -57,7 +58,7 @@ describe('CompanyKpiSelectComponent', () => {
   };
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, FormsModule, RouterTestingModule, HelperPipesModule, PrimaryKpiBadgeModule],
+      imports: [FontAwesomeModule, FormsModule, RouterTestingModule, HelperPipesModule, PrimaryKpiBadgeModule, SharedCompanyFormsModule],
       declarations: [CompanyKpiSelectComponent, AddKpiSearchComponent, CompanyKpiListComponent, SelectedKpiOptionPipe],
       providers: [
         { provide: CompanyIdbService, useValue: companyIdbService },
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component.ts b/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component.ts
index c2cbbc49..df5fbe7e 100644
--- a/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component.ts
+++ b/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-select.component.ts
@@ -5,6 +5,7 @@ import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
 import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
 import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
 import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-company-kpi-select',
@@ -15,12 +16,27 @@ export class CompanyKpiSelectComponent {
   faChartBar: IconDefinition = faChartBar;
   faChevronRight: IconDefinition = faChevronRight;
   faChevronLeft: IconDefinition = faChevronLeft;
+
+  companyKpiSub: Subscription;
+  companyKpis: Array<IdbKeyPerformanceIndicator>;
+  onSiteVisit: IdbOnSiteVisit;
   constructor(private router: Router,
     private onSiteVisitIdbService: OnSiteVisitIdbService,
     private keyPerformanceIndicatorIdbService: KeyPerformanceIndicatorsIdbService,
   ) { }
 
   ngOnInit() {
+    this.onSiteVisit = this.onSiteVisitIdbService.selectedVisit.getValue();
+    this.companyKpiSub = this.keyPerformanceIndicatorIdbService.keyPerformanceIndicators.subscribe(kpis => {
+      let keyPerformanceIndicators: Array<IdbKeyPerformanceIndicator> = this.keyPerformanceIndicatorIdbService.keyPerformanceIndicators.getValue();
+      this.companyKpis = keyPerformanceIndicators.filter(kpi => {
+        return kpi.companyId == this.onSiteVisit.companyId
+      });
+    });
+  }
+
+  ngOnDestroy(){
+    this.companyKpiSub.unsubscribe();
   }
 
   goBack() {
@@ -29,11 +45,10 @@ export class CompanyKpiSelectComponent {
   }
 
   goToKpiDetails() {
-    let onSiteVisit: IdbOnSiteVisit = this.onSiteVisitIdbService.selectedVisit.getValue();
-    let keyPerformanceIndicators: Array<IdbKeyPerformanceIndicator> = this.keyPerformanceIndicatorIdbService.keyPerformanceIndicators.getValue();
-    let companyKpis: Array<IdbKeyPerformanceIndicator> = keyPerformanceIndicators.filter(kpi => {
-      return kpi.companyId == onSiteVisit.companyId
-    });
-    this.router.navigateByUrl('setup-wizard/pre-visit/' + onSiteVisit.guid + '/company-kpi-detail/' + companyKpis[0].guid);
+    if (this.companyKpis.length > 0) {
+      this.router.navigateByUrl('setup-wizard/pre-visit/' + this.onSiteVisit.guid + '/company-kpi-detail/' + this.companyKpis[0].guid);
+    } else {
+      this.router.navigateByUrl('setup-wizard/pre-visit/' + this.onSiteVisit.guid + '/facility-setup');
+    }
   }
 }
diff --git a/src/app/setup-wizard/pre-visit/company-setup/company-setup.component.html b/src/app/setup-wizard/pre-visit/company-setup/company-setup.component.html
index 62d78a4d..763624bf 100644
--- a/src/app/setup-wizard/pre-visit/company-setup/company-setup.component.html
+++ b/src/app/setup-wizard/pre-visit/company-setup/company-setup.component.html
@@ -9,34 +9,7 @@ <h5>
                 </h5>
                 <hr>
                 <ng-template [ngIf]="selectedCompany">
-                    <form>
-                        <!-- <label class="bold" for="companyName">Company Name <span
-                                class="required-asterisk">*</span></label> -->
-                        <app-label-with-tooltip [field]="'companyName'" [label]="'Company Name'" [isRequired]="true"
-                            [labelId]="'companyName'" [isFloatRight]="true"></app-label-with-tooltip>
-                        <input name="companyName" type="text" class="form-control" [formControl]="name"
-                            (input)="saveChanges()" minlength="1" maxlength="100" id="companyName">
-                        <div class="alert alert-danger form-error" *ngIf="name.touched && name.getError('required')">
-                            Company Name Required
-                        </div>
-                        <!-- Set Energy Unit Field -->
-                        <app-label-with-tooltip [field]="'energyUnit'" [label]="'Energy Results Unit'" [isRequired]="false"
-                            [labelId]="'energyUnit'" [isFloatRight]="true"></app-label-with-tooltip>
-                        <select name="energyUnit" class="form-select" [formControl]="energyUnit"
-                            (change)="saveUnitChanges()">
-                            <option value="kWh">kWh</option>
-                            <option value="MMBtu">MMBtu</option>
-                        </select>
-                        <div class="alert alert-warning small p-1" *ngIf="hasAssessments && energyUnitChange">
-                            Warning: The energy uses of all the assessments associated with this company are updated.
-                        </div>
-                    </form>
-                    <hr>
-                    <label class="bold">Location</label>
-                    <app-location-form [inCompany]="true"></app-location-form>
-                    <hr>
-                    <label class="bold">Additional Details</label>
-                    <app-additional-details-form [inCompany]="true"></app-additional-details-form>
+                    <app-company-setup-form></app-company-setup-form>
                 </ng-template>
             </div>
         </div>
@@ -44,7 +17,7 @@ <h5>
 </div>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-end">
-        <button class="btn btn-dark btn-sm" (click)="goToContacts()" [disabled]="name?.invalid">
+        <button class="btn nav-btn btn-sm" (click)="goToContacts()" [disabled]="name?.invalid">
             Enter Stakeholder Contacts
             <fa-icon [icon]="faChevronRight"></fa-icon>
         </button>
diff --git a/src/app/setup-wizard/pre-visit/company-setup/company-setup.component.spec.ts b/src/app/setup-wizard/pre-visit/company-setup/company-setup.component.spec.ts
index 13a9040d..7b4429ee 100644
--- a/src/app/setup-wizard/pre-visit/company-setup/company-setup.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/company-setup/company-setup.component.spec.ts
@@ -19,6 +19,7 @@ import { PreAssessmentSetupService } from '../pre-assessment-setup/pre-assessmen
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
 import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
 import { EnergyEquipmentIdbService } from 'src/app/indexed-db/energy-equipment-idb.service';
+import { SharedCompanyFormsModule } from 'src/app/shared/shared-company-forms/shared-company-forms.module';
 
 describe('CompanySetupComponent', () => {
   let component: CompanySetupComponent;
@@ -55,7 +56,7 @@ describe('CompanySetupComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, SharedSettingsFormsModule, FormsModule, ReactiveFormsModule, LabelWithTooltipModule],
+      imports: [FontAwesomeModule, SharedSettingsFormsModule, FormsModule, ReactiveFormsModule, LabelWithTooltipModule, SharedCompanyFormsModule],
       declarations: [CompanySetupComponent],
       providers: [
         { provide: UserIdbService, useValue: userIdbService },
diff --git a/src/app/setup-wizard/pre-visit/company-setup/company-setup.component.ts b/src/app/setup-wizard/pre-visit/company-setup/company-setup.component.ts
index d6d3e76a..48d58e3f 100644
--- a/src/app/setup-wizard/pre-visit/company-setup/company-setup.component.ts
+++ b/src/app/setup-wizard/pre-visit/company-setup/company-setup.component.ts
@@ -1,27 +1,12 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { IdbCompany } from 'src/app/models/company';
-import { IconDefinition, faBuilding, faChevronRight, faContactCard, faFilePen, faGear, faLocationDot, faCircleExclamation } from '@fortawesome/free-solid-svg-icons';
+import { IconDefinition, faBuilding, faChevronRight, faCircleExclamation } from '@fortawesome/free-solid-svg-icons';
 import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
 import { Observable, Subscription, filter, of } from 'rxjs';
 import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
 import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
 import { FormControl, Validators } from '@angular/forms';
-import { CompanySetupService } from './company-setup.service';
-import { PreAssessmentSetupService } from '../pre-assessment-setup/pre-assessment-setup.service';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { IdbFacility } from 'src/app/models/facility';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { FacilitySetupService } from '../facility-setup/facility-setup.service';
-import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
-import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
-import { EnergyOpportunitySetupFormComponent } from '../../data-collection/on-site-assessment/assessment-energy-opportunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component';
-import { AssessmentEnergyOpportunitiesFormService } from '../../data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.service';
-import { FacilityEnergyEquipmentSetupComponent } from '../facility-energy-equipment-setup/facility-energy-equipment-setup.component';
-import { FacilityEnergyEquipmentSetupService } from '../facility-energy-equipment-setup/facility-energy-equipment-setup.service';
-import { EnergyEquipmentIdbService } from 'src/app/indexed-db/energy-equipment-idb.service';
-import { IdbEnergyEquipment } from 'src/app/models/energyEquipment';
 
 @Component({
   selector: 'app-company-setup',
@@ -30,10 +15,6 @@ import { IdbEnergyEquipment } from 'src/app/models/energyEquipment';
 })
 export class CompanySetupComponent implements OnInit, OnDestroy {
 
-  faFilePen: IconDefinition = faFilePen;
-  faGear: IconDefinition = faGear;
-  faContactCard: IconDefinition = faContactCard;
-  faLocationDot: IconDefinition = faLocationDot;
   faBuilding: IconDefinition = faBuilding;
   faChevronRight: IconDefinition = faChevronRight;
   faCircleExclamation: IconDefinition = faCircleExclamation;
@@ -41,29 +22,12 @@ export class CompanySetupComponent implements OnInit, OnDestroy {
   selectedCompany: IdbCompany;
   selectedCompanySub: Subscription;
   name: FormControl;
-  energyUnit: FormControl;
   routeGuardWarningModal: boolean = false;
 
   hasAssessments: boolean = false;
-  energyUnitChange: boolean = false;
-
-  companyAssessments: Array<IdbAssessment> = [];
-  companyFacilities: Array<IdbFacility> = [];
-  companyEnergyOpportunities: Array<IdbEnergyOpportunity> = [];
-  companyEnergyEquipments: Array<IdbEnergyEquipment> = [];
-
   constructor(private router: Router,
     private companyIdbService: CompanyIdbService,
     private onSiteVisitIdbService: OnSiteVisitIdbService,
-    private companySetupService: CompanySetupService,
-    private preAassessmentSetupService: PreAssessmentSetupService,
-    private assessmentIdbService: AssessmentIdbService,
-    private facilityIdbService: FacilityIdbService,
-    private facilitySetupService: FacilitySetupService,
-    private energyOpportunityIdbService: EnergyOpportunityIdbService,
-    private assessmentEnergyOpportunitiesFormService: AssessmentEnergyOpportunitiesFormService,
-    private facilityEnergyEquipmentSetupService: FacilityEnergyEquipmentSetupService,
-    private energyEquipmentIdbService: EnergyEquipmentIdbService,
   ) {
 
   }
@@ -71,21 +35,10 @@ export class CompanySetupComponent implements OnInit, OnDestroy {
   ngOnInit() {
     this.selectedCompanySub = this.companyIdbService.selectedCompany.subscribe(_company => {
       this.selectedCompany = _company;
-    });
-    if (this.selectedCompany) {
-      this.name = new FormControl(this.selectedCompany.generalInformation.name, [Validators.required]);
-      this.energyUnit = new FormControl(this.selectedCompany.companyEnergyUnit, []); // Default value
-      this.companySetupService.setControl(this.name);
-
-      this.companyAssessments = this.assessmentIdbService.getByOtherGuid(this.selectedCompany.guid, 'company');
-      if (this.companyAssessments.length > 0) {
-        this.hasAssessments = true;
+      if (this.selectedCompany) {
+        this.name = new FormControl(this.selectedCompany.generalInformation.name, [Validators.required]);
       }
-
-      this.companyFacilities = this.facilityIdbService.getByOtherGuid(this.selectedCompany.guid, 'company');
-      this.companyEnergyOpportunities = this.energyOpportunityIdbService.getByOtherGuid(this.selectedCompany.guid, 'company');
-      this.companyEnergyEquipments = this.energyEquipmentIdbService.getByOtherGuid(this.selectedCompany.guid, 'company');
-    }
+    });
   }
 
   canDeactivate(): Observable<boolean> {
@@ -106,26 +59,6 @@ export class CompanySetupComponent implements OnInit, OnDestroy {
     this.router.navigateByUrl('setup-wizard/pre-visit/' + onSiteVisit.guid + '/company-contacts');
   }
 
-  async saveUnitChanges() {
-    this.energyUnitChange = true;
-    await this.saveChanges();
-    await this.preAassessmentSetupService.updateAssessmentEnergyUse(
-      this.companyAssessments, this.energyUnit.value);
-    await this.facilitySetupService.updateFacilityEnergyUse(
-      this.companyFacilities, this.energyUnit.value);
-    await this.assessmentEnergyOpportunitiesFormService.updateEnergyOpportunityEnergyUseFromCompany(
-      this.companyEnergyOpportunities, this.energyUnit.value);
-    await this.facilityEnergyEquipmentSetupService.updateEnergyEquipmentEnergyUse(
-      this.companyEnergyEquipments, this.energyUnit.value);
-  }
-
-  async saveChanges() {
-    this.selectedCompany = this.companyIdbService.selectedCompany.getValue();
-    this.selectedCompany.generalInformation.name = this.name.value;
-    this.selectedCompany.companyEnergyUnit = this.energyUnit.value;
-    await this.companyIdbService.asyncUpdate(this.selectedCompany);
-  }
-
   displayWarningModal() {
     this.routeGuardWarningModal = true;
   }
diff --git a/src/app/setup-wizard/pre-visit/company-setup/company-setup.service.spec.ts b/src/app/setup-wizard/pre-visit/company-setup/company-setup.service.spec.ts
deleted file mode 100644
index 92380d69..00000000
--- a/src/app/setup-wizard/pre-visit/company-setup/company-setup.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { CompanySetupService } from './company-setup.service';
-
-describe('CompanySetupService', () => {
-  let service: CompanySetupService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(CompanySetupService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/setup-wizard/pre-visit/company-setup/company-setup.service.ts b/src/app/setup-wizard/pre-visit/company-setup/company-setup.service.ts
deleted file mode 100644
index 625bdce8..00000000
--- a/src/app/setup-wizard/pre-visit/company-setup/company-setup.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { FormControl } from '@angular/forms';
-import { BehaviorSubject } from 'rxjs';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class CompanySetupService {
-  companyNameFormControl = new BehaviorSubject<FormControl | null>(null);
-
-  constructor() { }
-
-  setControl(control: FormControl) {
-    this.companyNameFormControl.next(control);
-  }
-}
diff --git a/src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/energy-equipment-form/energy-equipment-form.component.spec.ts b/src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/energy-equipment-form/energy-equipment-form.component.spec.ts
deleted file mode 100644
index e8ddbac1..00000000
--- a/src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/energy-equipment-form/energy-equipment-form.component.spec.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { EnergyEquipmentFormComponent } from './energy-equipment-form.component';
-import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { IdbContact } from 'src/app/models/contact';
-import { EnergyEquipmentIdbService } from 'src/app/indexed-db/energy-equipment-idb.service';
-import { getNewIdbEnergyEquipment, IdbEnergyEquipment } from 'src/app/models/energyEquipment';
-import { BehaviorSubject } from 'rxjs';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-import { FormsModule } from '@angular/forms';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { IdbCompany } from 'src/app/models/company';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility } from 'src/app/models/facility';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
-
-describe('EnergyEquipmentFormComponent', () => {
-  let component: EnergyEquipmentFormComponent;
-  let fixture: ComponentFixture<EnergyEquipmentFormComponent>;
-
-  let contactIdbService: Partial<ContactIdbService> = {
-    contacts: new BehaviorSubject<Array<IdbContact>>([])
-  };
-  let energyEquipmentIdbService: Partial<EnergyEquipmentIdbService> = {
-    energyEquipments: new BehaviorSubject<Array<IdbEnergyEquipment>>([]),
-    getByGuid: () => { return getNewIdbEnergyEquipment('', '', '', getDefaultUnitSettings()) }
-  };
-  let dbChangesService: Partial<DbChangesService> = {};
-  let companyIdbService: Partial<CompanyIdbService> = {
-    selectedCompany: new BehaviorSubject<IdbCompany>(null)
-  };
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    selectedFacility: new BehaviorSubject<IdbFacility>(null)
-  };
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, HelperPipesModule, FormsModule],
-      declarations: [EnergyEquipmentFormComponent],
-      providers: [
-        { provide: DbChangesService, useValue: dbChangesService },
-        { provide: ContactIdbService, useValue: contactIdbService },
-        { provide: EnergyEquipmentIdbService, useValue: energyEquipmentIdbService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(EnergyEquipmentFormComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/facility-energy-equipment-setup.component.html b/src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/facility-energy-equipment-setup.component.html
index 5aaf2996..2dc56802 100644
--- a/src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/facility-energy-equipment-setup.component.html
+++ b/src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/facility-energy-equipment-setup.component.html
@@ -51,11 +51,11 @@ <h2 class="accordion-header">
 </div>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-between">
-        <button class="btn btn-dark btn-sm" (click)="goBack()">
+        <button class="btn nav-btn btn-sm" (click)="goBack()">
             <fa-icon [icon]="faChevronLeft"></fa-icon>
             Go Back
         </button>
-        <button class="btn btn-dark btn-sm" (click)="goToNext()">
+        <button class="btn nav-btn btn-sm" (click)="goToNext()">
             End Use Inventory
             <fa-icon [icon]="faChevronRight"></fa-icon>
         </button>
diff --git a/src/app/setup-wizard/pre-visit/facility-process-equipment-setup/facility-process-equipment-setup.component.html b/src/app/setup-wizard/pre-visit/facility-process-equipment-setup/facility-process-equipment-setup.component.html
index 8ebd7bba..c1232543 100644
--- a/src/app/setup-wizard/pre-visit/facility-process-equipment-setup/facility-process-equipment-setup.component.html
+++ b/src/app/setup-wizard/pre-visit/facility-process-equipment-setup/facility-process-equipment-setup.component.html
@@ -50,11 +50,11 @@ <h2 class="accordion-header">
 </div>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-between">
-        <button class="btn btn-dark btn-sm" (click)="goBack()">
+        <button class="btn nav-btn btn-sm" (click)="goBack()">
             <fa-icon [icon]="faChevronLeft"></fa-icon>
             Go Back
         </button>
-        <button class="btn btn-dark btn-sm" (click)="goToNext()">
+        <button class="btn nav-btn btn-sm" (click)="goToNext()">
             Pre-Assessment
             <fa-icon [icon]="faChevronRight"></fa-icon>
         </button>
diff --git a/src/app/setup-wizard/pre-visit/facility-process-equipment-setup/process-equipment-form/process-equipment-form.component.spec.ts b/src/app/setup-wizard/pre-visit/facility-process-equipment-setup/process-equipment-form/process-equipment-form.component.spec.ts
deleted file mode 100644
index c16da539..00000000
--- a/src/app/setup-wizard/pre-visit/facility-process-equipment-setup/process-equipment-form/process-equipment-form.component.spec.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ProcessEquipmentFormComponent } from './process-equipment-form.component';
-import { ProcessEquipmentIdbService } from 'src/app/indexed-db/process-equipment-idb.service';
-import { getNewIdbProcessEquipment, IdbProcessEquipment } from 'src/app/models/processEquipment';
-import { BehaviorSubject } from 'rxjs';
-import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { IdbContact } from 'src/app/models/contact';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { FormsModule } from '@angular/forms';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-
-describe('ProcessEquipmentFormComponent', () => {
-  let component: ProcessEquipmentFormComponent;
-  let fixture: ComponentFixture<ProcessEquipmentFormComponent>;
-
-  let contactIdbService: Partial<ContactIdbService> = {
-    contacts: new BehaviorSubject<Array<IdbContact>>([])
-  };
-  let processEquipmentIdbService: Partial<ProcessEquipmentIdbService> = {
-    processEquipments: new BehaviorSubject<Array<IdbProcessEquipment>>([]),
-    getByGuid: () => { return getNewIdbProcessEquipment('', '', '') }
-  };
-  let dbChangesService: Partial<DbChangesService> = {}
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, HelperPipesModule, FormsModule],
-      declarations: [ProcessEquipmentFormComponent],
-      providers: [
-        { provide: DbChangesService, useValue: dbChangesService },
-        { provide: ContactIdbService, useValue: contactIdbService },
-        { provide: ProcessEquipmentIdbService, useValue: processEquipmentIdbService }
-      ]
-    })
-    .compileComponents();
-    
-    fixture = TestBed.createComponent(ProcessEquipmentFormComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/setup-wizard/pre-visit/facility-setup/facility-setup.component.html b/src/app/setup-wizard/pre-visit/facility-setup/facility-setup.component.html
index a7daba6b..f27b0832 100644
--- a/src/app/setup-wizard/pre-visit/facility-setup/facility-setup.component.html
+++ b/src/app/setup-wizard/pre-visit/facility-setup/facility-setup.component.html
@@ -7,34 +7,18 @@ <h5>
                     <fa-icon [icon]="faIndustry" class="me-2"></fa-icon>Facility Details
                 </h5>
                 <hr>
-                <form>
-                    <label class="bold" for="facilityName">Facility Name <span class="required-asterisk">*</span></label>
-                    <input name="facilityName" type="text" class="form-control" [formControl]="name"
-                        (input)="saveChanges()" id="facilityName">
-                    <div class="form-error alert alert-danger" *ngIf="name.touched && name.errors?.['required']">
-                        Facility name required.
-                    </div>
-                </form>
-                <hr>
-                <label class="bold">Location</label>
-                <app-location-form [inCompany]="false"></app-location-form>
-                <hr>
-                <label class="bold">Tracked Utilities</label>
-                <app-units-form></app-units-form>
-                <hr>
-                <label class="bold">Additional Details</label>
-                <app-additional-details-form [inCompany]="false"></app-additional-details-form>
+                <app-facility-setup-form></app-facility-setup-form>
             </div>
         </div>
     </div>
 </div>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-between">
-        <button class="btn btn-dark btn-sm" (click)="goBack()">
+        <button class="btn nav-btn btn-sm" (click)="goBack()">
             <fa-icon [icon]="faChevronLeft"></fa-icon>
             Go Back
         </button>
-        <button class="btn btn-dark" (click)="goToEnergyEquipment()" [disabled]="name?.invalid">
+        <button class="btn nav-btn btn-sm" (click)="goToEnergyEquipment()" [disabled]="name?.invalid">
             Industrial System Inventory
             <fa-icon [icon]="faChevronRight"></fa-icon>
         </button>
diff --git a/src/app/setup-wizard/pre-visit/facility-setup/facility-setup.component.spec.ts b/src/app/setup-wizard/pre-visit/facility-setup/facility-setup.component.spec.ts
index e537970a..cef50c03 100644
--- a/src/app/setup-wizard/pre-visit/facility-setup/facility-setup.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/facility-setup/facility-setup.component.spec.ts
@@ -16,8 +16,8 @@ import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.serv
 import { IdbOnSiteVisit, getNewIdbOnSiteVisit } from 'src/app/models/onSiteVisit';
 import { PreAssessmentSetupService } from '../pre-assessment-setup/pre-assessment-setup.service';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { EnergyEquipmentDisplayPipe } from 'src/app/shared/helper-pipes/energy-equipment-display.pipe';
 import { EnergyEquipmentIdbService } from 'src/app/indexed-db/energy-equipment-idb.service';
+import { SharedFacilityFormsModule } from 'src/app/shared/shared-facility-forms/shared-facility-forms.module';
 
 describe('FacilitySetupComponent', () => {
   let component: FacilitySetupComponent;
@@ -50,7 +50,7 @@ describe('FacilitySetupComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, SharedSettingsFormsModule, FormsModule, ReactiveFormsModule],
+      imports: [FontAwesomeModule, SharedSettingsFormsModule, FormsModule, ReactiveFormsModule, SharedFacilityFormsModule],
       declarations: [FacilitySetupComponent],
       providers: [
         { provide: UserIdbService, useValue: userIdbService },
diff --git a/src/app/setup-wizard/pre-visit/facility-setup/facility-setup.component.ts b/src/app/setup-wizard/pre-visit/facility-setup/facility-setup.component.ts
index 47f81153..69d49cfe 100644
--- a/src/app/setup-wizard/pre-visit/facility-setup/facility-setup.component.ts
+++ b/src/app/setup-wizard/pre-visit/facility-setup/facility-setup.component.ts
@@ -1,13 +1,12 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { IdbFacility } from 'src/app/models/facility';
-import { IconDefinition, faChevronLeft, faChevronRight, faContactCard, faFilePen, faGear, faIndustry, faLocationDot, faCircleExclamation } from '@fortawesome/free-solid-svg-icons';
+import { IconDefinition, faChevronLeft, faChevronRight, faIndustry, faCircleExclamation } from '@fortawesome/free-solid-svg-icons';
 import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
 import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
 import { FormControl, Validators } from '@angular/forms';
-import { Observable, of } from 'rxjs';
-import { Icon } from '@fortawesome/fontawesome-svg-core';
+import { Observable, of, Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-facility-setup',
@@ -21,13 +20,10 @@ export class FacilitySetupComponent implements OnInit {
 
   faChevronRight: IconDefinition = faChevronRight;
   faChevronLeft: IconDefinition = faChevronLeft;
-  faFilePen: IconDefinition = faFilePen;
-  faGear: IconDefinition = faGear;
-  faContactCard: IconDefinition = faContactCard;
-  faLocationDot: IconDefinition = faLocationDot;
   faIndustry: IconDefinition = faIndustry;
   faCircleExclamation: IconDefinition = faCircleExclamation;
 
+  facilitySub: Subscription;
   facility: IdbFacility;
   routeGuardWarningModal: boolean = false;
 
@@ -38,13 +34,18 @@ export class FacilitySetupComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.facility = this.facilityIdbService.selectedFacility.getValue();
+    this.facilitySub = this.facilityIdbService.selectedFacility.subscribe(facility => {
+      this.facility = facility;
+      if(this.facility){
+        this.name = new FormControl(this.facility.generalInformation.name, [Validators.required]);
+      }else{
+        this.name = new FormControl('', [Validators.required]);
+      }
+    });
+  }
 
-    if (this.facility) {
-      this.name = new FormControl(this.facility.generalInformation.name, [Validators.required]);
-    } else {
-      this.router.navigateByUrl('/welcome');
-    }
+  ngOnDestroy(){
+    this.facilitySub.unsubscribe();
   }
 
   async saveChanges() {
@@ -66,13 +67,13 @@ export class FacilitySetupComponent implements OnInit {
   canDeactivate(): Observable<boolean> {
     if (this.name && this.name.getError('required')) {
       this.name.markAsTouched();
-      this.dislayWarningModal();
+      this.displayWarningModal();
       return of(false);
     }
     return of(true);
   }
 
-  dislayWarningModal() {
+  displayWarningModal() {
     this.routeGuardWarningModal = true;
   }
   closeWarningModal() {
diff --git a/src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component.html b/src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component.html
index 3a6c9883..a9198688 100644
--- a/src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component.html
+++ b/src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component.html
@@ -200,12 +200,12 @@ <h6>Utility Types</h6>
                                                     <div class="col-6">
                                                         <button class="btn btn-sm btn-primary me-1"
                                                             *ngFor="let contact of assessment.guid | associatedContacts:'assessment': contacts;"
-                                                            (click)="openContactModal(assessmentIndex, contact)">
+                                                            (click)="openContactModal(assessment, contact)">
                                                             <fa-icon [icon]="faUser"></fa-icon>
                                                             {{contact | contactNameDisplay}}
                                                         </button>
                                                         <button class="btn btn-sm btn-secondary"
-                                                            (click)="openContactModal(assessmentIndex, undefined)">
+                                                            (click)="openContactModal(assessment, undefined)">
                                                             <fa-icon [icon]="faContactBook"></fa-icon>
                                                             Stakeholders
                                                         </button>
@@ -236,11 +236,11 @@ <h6>Utility Types</h6>
 </div>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-between">
-        <button class="btn btn-dark btn-sm" (click)="goBack()">
+        <button class="btn nav-btn btn-sm" (click)="goBack()">
             <fa-icon [icon]="faChevronLeft"></fa-icon>
             Go Back
         </button>
-        <button class="btn btn-dark btn-sm" (click)="goToNext()">
+        <button class="btn nav-btn btn-sm" (click)="goToNext()">
             Review Pre-Visit
             <fa-icon [icon]="faChevronRight"></fa-icon>
         </button>
@@ -264,9 +264,4 @@ <h6>Utility Types</h6>
         <button class="btn btn-danger" (click)="removeAssessment()"><fa-icon [icon]="faTrash"></fa-icon> Delete
             Assessment</button>
     </div>
-</div>
-
-
-<app-contact-modal *ngIf="displayContactModal" (emitCancelContact)="closeContactModal()"
-    [contextGuid]="assessments[contactAssessmentIndex].guid" [contactContext]="'assessment'"
-    [selectedContact]="viewContact" [companyGuid]="assessments[contactAssessmentIndex].companyId"></app-contact-modal>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component.spec.ts b/src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component.spec.ts
index f8cb680a..94e14071 100644
--- a/src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component.spec.ts
@@ -16,7 +16,7 @@ import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.serv
 import { IdbOnSiteVisit, getNewIdbOnSiteVisit } from 'src/app/models/onSiteVisit';
 import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
 import { IdbContact } from 'src/app/models/contact';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
 import { EnergyEquipmentIdbService } from 'src/app/indexed-db/energy-equipment-idb.service';
 import { IdbEnergyEquipment } from 'src/app/models/energyEquipment';
diff --git a/src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component.ts b/src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component.ts
index 81d81aab..fcc23cc8 100644
--- a/src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component.ts
+++ b/src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component.ts
@@ -17,13 +17,11 @@ import { UtilityOption, UtilityOptions } from 'src/app/shared/constants/utilityT
 import { BootstrapService } from 'src/app/shared/shared-services/bootstrap.service';
 import { LocalStorageDataService } from 'src/app/shared/shared-services/local-storage-data.service';
 import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { IdbCompany } from 'src/app/models/company';
 import { ConvertValue } from 'src/app/shared/conversions/convertValue';
 import { UtilityEnergyUse } from 'src/app/models/utilityEnergyUses';
-import { SharedSettingsFormsService } from 'src/app/shared/shared-settings-forms/shared-settings-forms.service';
-import { FormGroup } from '@angular/forms';
 import { UnitSettings } from 'src/app/models/unitSettings';
 import { EnergyUnitOptions, UnitOption } from 'src/app/shared/constants/unitOptions';
+import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
 
 @Component({
   selector: 'app-pre-assessment-setup',
@@ -54,12 +52,9 @@ export class PreAssessmentSetupComponent {
 
   assessmentTypes: Array<AssessmentType> = AssessmentTypes;
   utilityOptions: Array<UtilityOption> = UtilityOptions;
-  
+
   displayDeleteModal: boolean = false;
   assessmentToDelete: IdbAssessment;
-  displayContactModal: boolean = false;
-  contactAssessmentIndex: number;
-  viewContact: IdbContact;
 
   onSiteVisit: IdbOnSiteVisit;
   onSiteVisitSub: Subscription;
@@ -83,6 +78,7 @@ export class PreAssessmentSetupComponent {
     private bootstrapService: BootstrapService,
     private localStorageDataService: LocalStorageDataService,
     private cd: ChangeDetectorRef,
+    private sharedDataService: SharedDataService
   ) {
   }
 
@@ -125,7 +121,7 @@ export class PreAssessmentSetupComponent {
     this.companySub.unsubscribe();
     this.facilitySub.unsubscribe();
   }
-  
+
   ngAfterViewInit() {
     //open the accordion for last viewed neb
     let lastAssessmentGuid: string = this.localStorageDataService.assessmentAccordionGuid;
@@ -156,7 +152,7 @@ export class PreAssessmentSetupComponent {
         let selectedUnitOption = selectedUtilityOption.energyUnitOptions.find(
           _unitOption => _unitOption.value == utilityEnergyUse.energyUnit);
         // calculate use
-        if (selectedUtilityOption.isStandardEnergyUnit 
+        if (selectedUtilityOption.isStandardEnergyUnit
           && selectedUnitOption.isStandard !== false) {
           convertedUse = this.convertValue.convertValue(
             utilityEnergyUse.energyUse,
@@ -223,16 +219,12 @@ export class PreAssessmentSetupComponent {
     this.closeDeleteModal();
   }
 
-  openContactModal(assessmentIndex: number, viewContact: IdbContact) {
-    this.contactAssessmentIndex = assessmentIndex;
-    this.viewContact = viewContact;
-    this.displayContactModal = true;
+  openContactModal(assessment: IdbAssessment, viewContact: IdbContact) {
+    this.sharedDataService.displayContactModal.next({ context: 'assessment', viewContact: viewContact, contextGuid: assessment.guid, companyId: assessment.companyId })
   }
 
   closeContactModal() {
-    this.displayContactModal = false;
-    this.contactAssessmentIndex = undefined;
-    this.viewContact = undefined;
+    this.sharedDataService.displayContactModal.next(undefined);
   }
 
   async setVisitDate() {
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-details-summary/company-details-summary.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-details-summary/company-details-summary.component.spec.ts
index fc4c8319..625e1565 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-details-summary/company-details-summary.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-details-summary/company-details-summary.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CompanyDetailsSummaryComponent } from './company-details-summary.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
 import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
 import { BehaviorSubject } from 'rxjs';
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-kpis-summary/company-kpis-summary.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-kpis-summary/company-kpis-summary.component.spec.ts
index b9edd12d..7f6e9722 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-kpis-summary/company-kpis-summary.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-kpis-summary/company-kpis-summary.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CompanyKpisSummaryComponent } from './company-kpis-summary.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
 import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
 import { BehaviorSubject } from 'rxjs';
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/facility-details-summary/facility-details-summary.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/facility-details-summary/facility-details-summary.component.spec.ts
index c0fd8aed..4c9ad200 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/facility-details-summary/facility-details-summary.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/facility-details-summary/facility-details-summary.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { FacilityDetailsSummaryComponent } from './facility-details-summary.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
 import { BehaviorSubject } from 'rxjs';
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.spec.ts
index 0c005498..a76bcec6 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { PreAssessmentSummaryComponent } from './pre-assessment-summary.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';
 import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.spec.ts
index 32214f6f..f09916c6 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ProcessEquipmentSummaryComponent } from './process-equipment-summary.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { BehaviorSubject } from 'rxjs';
 import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.html b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.html
index c2429821..0f8757d9 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.html
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.html
@@ -25,7 +25,7 @@ <h5>
 </div>
 <nav class="setup-wizard-footer navbar shadow">
     <div class="container-fluid justify-content-between">
-        <button class="btn btn-dark btn-sm" (click)="goBack()">
+        <button class="btn nav-btn btn-sm" (click)="goBack()">
             <fa-icon [icon]="faChevronLeft"></fa-icon>
             Go Back
         </button>
@@ -33,7 +33,7 @@ <h5>
             <fa-icon [icon]="faFilePdf"></fa-icon>
             Generate PDF
         </button>
-        <button class="btn btn-dark btn-sm" (click)="continue()">Data Collection
+        <button class="btn nav-btn btn-sm" (click)="continue()">Data Collection
             <fa-icon [icon]="faChevronRight"></fa-icon></button>
     </div>
 </nav>
\ No newline at end of file
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.spec.ts
index c208ddec..7fcf35d6 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.spec.ts
@@ -9,7 +9,7 @@ import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
 import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
 import { TeamDetailsSummaryComponent } from './team-details-summary/team-details-summary.component';
 import { ProcessEquipmentSummaryComponent } from './process-equipment-summary/process-equipment-summary.component';
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.spec.ts
index ed15e244..f8a45108 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.spec.ts
@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ContactSummaryCardComponent } from './contact-summary-card.component';
 import { getNewIdbContact } from 'src/app/models/contact';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';
 import { BehaviorSubject } from 'rxjs';
 import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/team-details-summary.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/team-details-summary.component.spec.ts
index 11bc7183..f98ce771 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/team-details-summary.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/team-details-summary.component.spec.ts
@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TeamDetailsSummaryComponent } from './team-details-summary.component';
 import { ContactSummaryCardComponent } from './contact-summary-card/contact-summary-card.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
 import { IdbContact } from 'src/app/models/contact';
 import { BehaviorSubject } from 'rxjs';
diff --git a/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.ts b/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.ts
index a097227e..4cf1167d 100644
--- a/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.ts
+++ b/src/app/setup-wizard/setup-wizard-help-panel/setup-wizard-help-panel.component.ts
@@ -3,6 +3,7 @@ import { NavigationEnd, Router } from '@angular/router';
 import { faCircleQuestion, IconDefinition } from '@fortawesome/free-solid-svg-icons';
 import { HelpContext } from './HelpContext';
 import { LocalStorageDataService } from 'src/app/shared/shared-services/local-storage-data.service';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-setup-wizard-help-panel',
@@ -17,20 +18,25 @@ export class SetupWizardHelpPanelComponent {
 
   helpContext: HelpContext;
   helpLabel: string;
-
+  routerSub: Subscription;
   constructor(private router: Router, private localStorageDataService: LocalStorageDataService) {
-    this.router.events.subscribe(event => {
+
+  }
+
+  ngOnInit() {
+    this.routerSub = this.router.events.subscribe(event => {
       if (event instanceof NavigationEnd) {
         this.setHelpContext(event.urlAfterRedirects);
       }
     });
-  }
-
-  ngOnInit() {
     this.collapseHelpPanel = this.localStorageDataService.setupHelpPanelCollapsed;
     this.setHelpContext(this.router.url);
   }
 
+  ngOnDestroy(){
+    this.routerSub.unsubscribe();
+  }
+
   toggleCollapseHelpPanel() {
     this.collapseHelpPanel = !this.collapseHelpPanel;
     this.localStorageDataService.setSetupPanelCollapsed(this.collapseHelpPanel);
diff --git a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.css b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.css
index 9b2ffc03..ea0f755b 100644
--- a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.css
+++ b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.css
@@ -33,7 +33,7 @@
 }
 
 .nav-link.active{
-    background-color: #0079c2;
+    background-color: var(--portfolio-nav-color);
     color: white;
 }
 
diff --git a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.spec.ts b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.spec.ts
index a85403a1..acebebff 100644
--- a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.spec.ts
+++ b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.spec.ts
@@ -13,7 +13,7 @@ import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
 import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
 import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
 import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 
 describe('SetupWizardSidebarComponent', () => {
   let component: SetupWizardSidebarComponent;
diff --git a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.ts b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.ts
index cb438fa5..a8483f5a 100644
--- a/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.ts
+++ b/src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.ts
@@ -11,7 +11,6 @@ import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
 import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
 import { IdbCompany } from 'src/app/models/company';
 import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
-import { CompanySetupService } from '../pre-visit/company-setup/company-setup.service';
 import { FormControl } from '@angular/forms';
 
 @Component({
@@ -43,25 +42,23 @@ export class SetupWizardSidebarComponent implements OnInit, OnDestroy {
   company: IdbCompany;
   keyPerformanceIndicators: Array<IdbKeyPerformanceIndicator>;
   keyPerformanceIndicatorsSub: Subscription;
-  companyNameFormControl: FormControl;
-  companyNameFormControlSub: Subscription;
 
   collapsePreVisit: boolean = true;
   collapseDataCollection: boolean = true;
   collapseDataEvaluation: boolean = true;
 
+  routerSub: Subscription;
   constructor(private router: Router, private setupWizardService: SetupWizardService,
     private onSiteVisitIdbService: OnSiteVisitIdbService,
     private assessmentIdbService: AssessmentIdbService,
     private companyIdbService: CompanyIdbService,
-    private keyPerformanceIndicatorIdbService: KeyPerformanceIndicatorsIdbService,
-    private companySetupService: CompanySetupService
+    private keyPerformanceIndicatorIdbService: KeyPerformanceIndicatorsIdbService
   ) {
 
   }
 
   ngOnInit() {
-    this.router.events.subscribe(event => {
+    this.routerSub = this.router.events.subscribe(event => {
       if (event instanceof NavigationEnd) {
         this.setDisplaySidebar();
       }
@@ -91,10 +88,6 @@ export class SetupWizardSidebarComponent implements OnInit, OnDestroy {
     this.keyPerformanceIndicatorsSub = this.keyPerformanceIndicatorIdbService.keyPerformanceIndicators.subscribe(_keyPerformanceIndicators => {
       this.keyPerformanceIndicators = _keyPerformanceIndicators;
     });
-
-    this.companyNameFormControlSub = this.companySetupService.companyNameFormControl.subscribe(_companyNameFormControl => {
-      this.companyNameFormControl = _companyNameFormControl;
-    });
   }
 
   ngOnDestroy() {
@@ -103,7 +96,7 @@ export class SetupWizardSidebarComponent implements OnInit, OnDestroy {
     this.onSiteVisitSub.unsubscribe();
     this.companySub.unsubscribe();
     this.keyPerformanceIndicatorsSub.unsubscribe();
-    this.companyNameFormControlSub.unsubscribe();
+    this.routerSub.unsubscribe();
   }
 
   setDisplaySidebar() {
diff --git a/src/app/setup-wizard/setup-wizard.component.html b/src/app/setup-wizard/setup-wizard.component.html
index 8b8ef9b1..4c3ee648 100644
--- a/src/app/setup-wizard/setup-wizard.component.html
+++ b/src/app/setup-wizard/setup-wizard.component.html
@@ -4,4 +4,10 @@
         <router-outlet></router-outlet>
     </div>
     <app-setup-wizard-help-panel></app-setup-wizard-help-panel>
-</div>
\ No newline at end of file
+</div>
+
+
+
+<app-contact-modal *ngIf="displayContactModal" (emitCancelContact)="closeContactModal()"
+    [contextGuid]="displayContactModal.contextGuid" [contactContext]="displayContactModal.context"
+    [selectedContact]="displayContactModal.viewContact" [companyGuid]="displayContactModal.companyId"></app-contact-modal>
\ No newline at end of file
diff --git a/src/app/setup-wizard/setup-wizard.component.spec.ts b/src/app/setup-wizard/setup-wizard.component.spec.ts
index d9ca9ce9..a6f47a7f 100644
--- a/src/app/setup-wizard/setup-wizard.component.spec.ts
+++ b/src/app/setup-wizard/setup-wizard.component.spec.ts
@@ -2,27 +2,23 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { SetupWizardComponent } from './setup-wizard.component';
 import { RouterTestingModule } from '@angular/router/testing';
+import { ContactModalModule } from '../shared/contact-modal/contact-modal.module';
+import { stubServiceProviders } from '../spec-helpers/spec-test-service-stub';
 import { SetupWizardSidebarComponent } from './setup-wizard-sidebar/setup-wizard-sidebar.component';
-import { UserIdbService } from '../indexed-db/user-idb.service';
-import { IdbUser, getNewIdbUser } from '../models/user';
-import { BehaviorSubject } from 'rxjs';
+import { SetupWizardHelpPanelComponent } from './setup-wizard-help-panel/setup-wizard-help-panel.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { HelperPipesModule } from '../shared/helper-pipes/_helper-pipes.module';
 
 describe('SetupWizardComponent', () => {
   let component: SetupWizardComponent;
   let fixture: ComponentFixture<SetupWizardComponent>;
-
-  let userIdbService: Partial<UserIdbService> = {
-    user: new BehaviorSubject<IdbUser>(getNewIdbUser())
-  };
   beforeEach(async () => {
 
 
     await TestBed.configureTestingModule({
-      imports: [RouterTestingModule],
-      declarations: [SetupWizardSidebarComponent],
-      providers: [
-        { provide: UserIdbService, useValue: userIdbService }
-      ]
+      imports: [RouterTestingModule, ContactModalModule, FontAwesomeModule, HelperPipesModule],
+      declarations: [SetupWizardComponent, SetupWizardSidebarComponent, SetupWizardHelpPanelComponent],
+      providers: stubServiceProviders
     })
       .compileComponents();
 
diff --git a/src/app/setup-wizard/setup-wizard.component.ts b/src/app/setup-wizard/setup-wizard.component.ts
index f6081a8a..79b02630 100644
--- a/src/app/setup-wizard/setup-wizard.component.ts
+++ b/src/app/setup-wizard/setup-wizard.component.ts
@@ -1,4 +1,7 @@
 import { Component } from '@angular/core';
+import { SharedDataService } from '../shared/shared-services/shared-data.service';
+import { Subscription } from 'rxjs';
+import { ContactContext, IdbContact } from '../models/contact';
 
 @Component({
   selector: 'app-setup-wizard',
@@ -7,4 +10,24 @@ import { Component } from '@angular/core';
 })
 export class SetupWizardComponent {
 
+
+  displayContactModal: { context: ContactContext, viewContact: IdbContact, contextGuid: string, companyId: string };
+  displayContactModalSub: Subscription;
+  constructor(private sharedDataService: SharedDataService) {
+
+  }
+
+  ngOnInit() {
+    this.displayContactModalSub = this.sharedDataService.displayContactModal.subscribe(_displayContactModal => {
+      this.displayContactModal = _displayContactModal;
+    });
+  }
+
+  ngOnDestroy() {
+    this.displayContactModalSub.unsubscribe();
+  }
+
+  closeContactModal() {
+    this.sharedDataService.displayContactModal.next(undefined);
+  }
 }
diff --git a/src/app/setup-wizard/setup-wizard.module.ts b/src/app/setup-wizard/setup-wizard.module.ts
index 8601d3c7..be4a9676 100644
--- a/src/app/setup-wizard/setup-wizard.module.ts
+++ b/src/app/setup-wizard/setup-wizard.module.ts
@@ -7,13 +7,12 @@ import { CompanySetupComponent } from './pre-visit/company-setup/company-setup.c
 import { FacilitySetupComponent } from './pre-visit/facility-setup/facility-setup.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { SharedSettingsFormsModule } from '../shared/shared-settings-forms/shared-settings-forms.module';
-import { HelperPipesModule } from '../shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from '../shared/helper-pipes/_helper-pipes.module';
 import { SetupWizardSidebarComponent } from './setup-wizard-sidebar/setup-wizard-sidebar.component';
 import { CompanyContactsSetupComponent } from './pre-visit/company-contacts-setup/company-contacts-setup.component';
 import { FacilityProcessEquipmentSetupComponent } from './pre-visit/facility-process-equipment-setup/facility-process-equipment-setup.component';
 import { PreAssessmentSetupComponent } from './pre-visit/pre-assessment-setup/pre-assessment-setup.component';
 import { ReviewPreVisitSetupComponent } from './pre-visit/review-pre-visit-setup/review-pre-visit-setup.component';
-import { CompanyKpiListComponent } from './pre-visit/company-kpi-select/company-kpi-list/company-kpi-list.component';
 import { ContactModalModule } from '../shared/contact-modal/contact-modal.module';
 import { ReviewOnSiteComponent } from './data-collection/review-on-site/review-on-site.component';
 import { CompanyDetailsSummaryComponent } from './pre-visit/review-pre-visit-setup/company-details-summary/company-details-summary.component';
@@ -25,44 +24,30 @@ import { ProcessEquipmentSummaryComponent } from './pre-visit/review-pre-visit-s
 import { PreAssessmentSummaryComponent } from './pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component';
 import { TableEntriesModule } from '../shared/table-entries/table-entries.module';
 import { OnSiteAssessmentComponent } from './data-collection/on-site-assessment/on-site-assessment.component';
-import { AssessmentDetailsFormComponent } from './data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component';
 import { AssessmentNebsFormComponent } from './data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component';
-import { NebSetupFormComponent } from './data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component';
 import { PreVisitComponent } from './pre-visit/pre-visit.component';
 import { DataCollectionComponent } from './data-collection/data-collection.component';
-import { CompanyContactsFormComponent } from './pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.component';
 import { CompanyKpiSelectComponent } from './pre-visit/company-kpi-select/company-kpi-select.component';
 import { CompanyKpiDetailsComponent } from './pre-visit/company-kpi-details/company-kpi-details.component';
 import { DataCollectionManageAssessmentsComponent } from './data-collection/data-collection-manage-assessments/data-collection-manage-assessments.component';
-import { AssessmentEnergyOpportunitiesFormComponent } from './data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component';
-import { EnergyOpportunitySetupFormComponent } from './data-collection/on-site-assessment/assessment-energy-opportunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component';
-import { AddKpiSearchComponent } from './pre-visit/company-kpi-select/add-kpi-search/add-kpi-search.component';
-import { SelectedKpiOptionPipe } from './pre-visit/company-kpi-select/add-kpi-search/selected-kpi-option.pipe';
-import { AddNebsModalComponent } from './data-collection/on-site-assessment/add-nebs-modal/add-nebs-modal.component';
-import { PerformanceMetricImpactFormComponent } from './data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component';
-import { NebFormsAccordionComponent } from './data-collection/on-site-assessment/neb-forms-accordion/neb-forms-accordion.component';
 import { DataEvaluationComponent } from './data-evaluation/data-evaluation.component';
 import { DataFollowUpComponent } from './data-evaluation/data-follow-up/data-follow-up.component';
 import { VisitReportComponent } from './data-evaluation/visit-report/visit-report.component';
 import { ReportsModule } from '../shared/reports/reports.module';
 import { AssessmentEvaluationComponent } from './data-evaluation/assessment-evaluation/assessment-evaluation.component';
 import { OnSiteAssessmentResultsComponent } from './data-collection/on-site-assessment/on-site-assessment-results/on-site-assessment-results.component';
-import { ProcessEquipmentFormComponent } from './pre-visit/facility-process-equipment-setup/process-equipment-form/process-equipment-form.component';
 import { FacilityEnergyEquipmentSetupComponent } from './pre-visit/facility-energy-equipment-setup/facility-energy-equipment-setup.component';
-import { EnergyEquipmentFormComponent } from './pre-visit/facility-energy-equipment-setup/energy-equipment-form/energy-equipment-form.component';
 import { PrimaryKpiBadgeModule } from "../shared/primary-kpi-badge/primary-kpi-badge.module";
-import { PerformanceMetricsModalComponent } from './data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component';
-import { MetricOptionsModalListPipe } from './data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/metric-options-modal-list.pipe';
-import { AssociatedMetricIndicatorPipe } from './data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/associated-metric-indicator.pipe';
-import { KpmImpactsTableComponent } from './pre-visit/company-kpi-details/kpm-impacts-table/kpm-impacts-table.component';
 import { EnergyOpportunityNebsTableComponent } from './data-collection/on-site-assessment/assessment-nebs-form/energy-opportunity-nebs-table/energy-opportunity-nebs-table.component';
 import { EnergyOpportunityNebsListPipe } from './data-collection/on-site-assessment/assessment-nebs-form/energy-opportunity-nebs-table/energy-opportunity-nebs-list.pipe';
 import { SetupWizardHelpPanelModule } from './setup-wizard-help-panel/setup-wizard-help-panel.module';
 import { LabelWithTooltipModule } from '../shared/label-with-tooltip/label-with-tooltip.module';
 import { KpmDetailsFormModule } from '../shared/kpm-details-form/kpm-details-form.module';
-import { KpiDescriptionPipe } from './pre-visit/company-kpi-details/kpi-description.pipe';
-import { NebsDatabaseModule } from "../nebs-database/nebs-database.module";
-import { KpmDatabaseModalComponent } from './pre-visit/company-kpi-details/kpm-database-modal/kpm-database-modal.component';
+import { SharedAssessmentFormsModule } from '../shared/shared-assessment-forms/shared-assessment-forms.module';
+import { SharedCompanyFormsModule } from "../shared/shared-company-forms/shared-company-forms.module";
+import { SharedFacilityFormsModule } from '../shared/shared-facility-forms/shared-facility-forms.module';
+import { AssessmentEnergyOpportunitiesFormComponent } from './data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component';
+import { CompanyContactsSetupFormComponent } from './pre-visit/company-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component';
 
 @NgModule({
   declarations: [
@@ -74,8 +59,6 @@ import { KpmDatabaseModalComponent } from './pre-visit/company-kpi-details/kpm-d
     FacilityProcessEquipmentSetupComponent,
     PreAssessmentSetupComponent,
     ReviewPreVisitSetupComponent,
-    AddKpiSearchComponent,
-    CompanyKpiListComponent,
     ReviewOnSiteComponent,
     CompanyDetailsSummaryComponent,
     TeamDetailsSummaryComponent,
@@ -85,37 +68,22 @@ import { KpmDatabaseModalComponent } from './pre-visit/company-kpi-details/kpm-d
     ProcessEquipmentSummaryComponent,
     PreAssessmentSummaryComponent,
     OnSiteAssessmentComponent,
-    AssessmentDetailsFormComponent,
     AssessmentNebsFormComponent,
-    NebSetupFormComponent,
     PreVisitComponent,
     DataCollectionComponent,
-    CompanyContactsFormComponent,
     CompanyKpiSelectComponent,
     CompanyKpiDetailsComponent,
-    SelectedKpiOptionPipe,
     DataCollectionManageAssessmentsComponent,
-    AssessmentEnergyOpportunitiesFormComponent,
-    EnergyOpportunitySetupFormComponent,
-    AddNebsModalComponent,
-    PerformanceMetricImpactFormComponent,
-    NebFormsAccordionComponent,
     DataEvaluationComponent,
     DataFollowUpComponent,
     VisitReportComponent,
     AssessmentEvaluationComponent,
     OnSiteAssessmentResultsComponent,
-    ProcessEquipmentFormComponent,
     FacilityEnergyEquipmentSetupComponent,
-    EnergyEquipmentFormComponent,
-    PerformanceMetricsModalComponent,
-    MetricOptionsModalListPipe,
-    AssociatedMetricIndicatorPipe,
-    KpmImpactsTableComponent,
     EnergyOpportunityNebsTableComponent,
     EnergyOpportunityNebsListPipe,
-    KpiDescriptionPipe,
-    KpmDatabaseModalComponent
+    AssessmentEnergyOpportunitiesFormComponent,
+    CompanyContactsSetupFormComponent
   ],
   imports: [
     CommonModule,
@@ -133,7 +101,9 @@ import { KpmDatabaseModalComponent } from './pre-visit/company-kpi-details/kpm-d
     SetupWizardHelpPanelModule,
     LabelWithTooltipModule,
     KpmDetailsFormModule,
-    NebsDatabaseModule
+    SharedAssessmentFormsModule,
+    SharedCompanyFormsModule,
+    SharedFacilityFormsModule
 ]
 })
 export class SetupWizardModule { }
diff --git a/src/app/setup-wizard/setup-wizard.service.ts b/src/app/setup-wizard/setup-wizard.service.ts
index 750f4df0..3fec30a6 100644
--- a/src/app/setup-wizard/setup-wizard.service.ts
+++ b/src/app/setup-wizard/setup-wizard.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
-import { ContactContext, IdbContact } from '../models/contact';
 
 @Injectable({
   providedIn: 'root'
@@ -8,19 +7,7 @@ import { ContactContext, IdbContact } from '../models/contact';
 export class SetupWizardService {
 
   sidebarOpen: BehaviorSubject<boolean>;
-  displayAddNebsModal: BehaviorSubject<{
-    assessmentId: string,
-    energyOpportunityId: string
-  }>;
-
-  displayContactModal: BehaviorSubject<{
-    context: ContactContext,
-    viewContact: IdbContact,
-    contextGuid: string
-  }>;
   constructor(  ) {
     this.sidebarOpen = new BehaviorSubject<boolean>(true);
-    this.displayAddNebsModal = new BehaviorSubject<{ assessmentId: string, energyOpportunityId: string }>(undefined);
-    this.displayContactModal = new BehaviorSubject<{ context: ContactContext, viewContact: IdbContact, contextGuid: string }>(undefined);
   }
 }
\ No newline at end of file
diff --git a/src/app/shared/contact-modal/contact-modal.module.ts b/src/app/shared/contact-modal/contact-modal.module.ts
index 560550e4..772b9f94 100644
--- a/src/app/shared/contact-modal/contact-modal.module.ts
+++ b/src/app/shared/contact-modal/contact-modal.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
 import { ContactModalComponent } from './contact-modal.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { FormsModule } from '@angular/forms';
-import { HelperPipesModule } from '../helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from '../helper-pipes/_helper-pipes.module';
 
 
 
diff --git a/src/app/shared/helper-pipes/helper-pipes.module.ts b/src/app/shared/helper-pipes/_helper-pipes.module.ts
similarity index 88%
rename from src/app/shared/helper-pipes/helper-pipes.module.ts
rename to src/app/shared/helper-pipes/_helper-pipes.module.ts
index 39be708b..72c97814 100644
--- a/src/app/shared/helper-pipes/helper-pipes.module.ts
+++ b/src/app/shared/helper-pipes/_helper-pipes.module.ts
@@ -32,6 +32,10 @@ import { LinkedUnitOptionsPipe } from './linked-unit-options.pipe';
 import { LinkedUtilityOptionsPipe } from './linked-utility-options.pipe';
 import { IsStandardUnitPipe } from './is-standard-unit.pipe';
 import { UtilityHhvDisplayPipe } from './utility-hhv-display.pipe';
+import { ContactInvalidPipe } from './contact-invalid.pipe';
+import { AssociatedPerformanceMetricImpactsPipe } from './associated-performance-metric-impacts.pipe';
+import { KpmLabelPipe } from './kpm-label.pipe';
+import { NebTotalSavingsPipe } from './neb-total-savings.pipe';
 
 @NgModule({
   declarations: [
@@ -67,6 +71,10 @@ import { UtilityHhvDisplayPipe } from './utility-hhv-display.pipe';
     LinkedUtilityOptionsPipe,
     IsStandardUnitPipe,
     UtilityHhvDisplayPipe,
+    ContactInvalidPipe,
+    AssociatedPerformanceMetricImpactsPipe,
+    KpmLabelPipe,
+    NebTotalSavingsPipe
   ],
   imports: [
     CommonModule
@@ -104,6 +112,10 @@ import { UtilityHhvDisplayPipe } from './utility-hhv-display.pipe';
     LinkedUtilityOptionsPipe,
     IsStandardUnitPipe,
     UtilityHhvDisplayPipe,
+    ContactInvalidPipe,
+    AssociatedPerformanceMetricImpactsPipe,
+    KpmLabelPipe,
+    NebTotalSavingsPipe
   ]
 })
 export class HelperPipesModule { }
diff --git a/src/app/shared/helper-pipes/associated-performance-metric-impacts.pipe.spec.ts b/src/app/shared/helper-pipes/associated-performance-metric-impacts.pipe.spec.ts
new file mode 100644
index 00000000..13b1ce1b
--- /dev/null
+++ b/src/app/shared/helper-pipes/associated-performance-metric-impacts.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { AssociatedPerformanceMetricImpactsPipe } from './associated-performance-metric-impacts.pipe';
+
+describe('AssociatedPerformanceMetricImpactsPipe', () => {
+  it('create an instance', () => {
+    const pipe = new AssociatedPerformanceMetricImpactsPipe();
+    expect(pipe).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/helper-pipes/associated-performance-metric-impacts.pipe.ts b/src/app/shared/helper-pipes/associated-performance-metric-impacts.pipe.ts
new file mode 100644
index 00000000..0ae6b573
--- /dev/null
+++ b/src/app/shared/helper-pipes/associated-performance-metric-impacts.pipe.ts
@@ -0,0 +1,15 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
+
+@Pipe({
+  name: 'associatedPerformanceMetricImpacts'
+})
+export class AssociatedPerformanceMetricImpactsPipe implements PipeTransform {
+
+  transform(guid: string, keyPerformanceMetricImpacts: Array<IdbKeyPerformanceMetricImpact>): Array<IdbKeyPerformanceMetricImpact> {
+    return keyPerformanceMetricImpacts.filter(kpmImpact => {
+      return kpmImpact.nebId == guid;
+    });
+  }
+
+}
diff --git a/src/app/shared/helper-pipes/contact-invalid.pipe.spec.ts b/src/app/shared/helper-pipes/contact-invalid.pipe.spec.ts
new file mode 100644
index 00000000..421d89c9
--- /dev/null
+++ b/src/app/shared/helper-pipes/contact-invalid.pipe.spec.ts
@@ -0,0 +1,11 @@
+import { FormBuilder } from '@angular/forms';
+import { CompanyContactsFormService } from '../shared-company-forms/company-contacts-form/company-contacts-form.service';
+import { ContactInvalidPipe } from './contact-invalid.pipe';
+
+describe('ContactInvalidPipe', () => {
+  let formService: CompanyContactsFormService = new CompanyContactsFormService(new FormBuilder());
+  it('create an instance', () => {
+    const pipe = new ContactInvalidPipe(formService);
+    expect(pipe).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/helper-pipes/contact-invalid.pipe.ts b/src/app/shared/helper-pipes/contact-invalid.pipe.ts
new file mode 100644
index 00000000..a1700a41
--- /dev/null
+++ b/src/app/shared/helper-pipes/contact-invalid.pipe.ts
@@ -0,0 +1,19 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { CompanyContactsFormService } from '../shared-company-forms/company-contacts-form/company-contacts-form.service';
+import { IdbContact } from 'src/app/models/contact';
+import { FormGroup } from '@angular/forms';
+
+@Pipe({
+  name: 'contactInvalid'
+})
+export class ContactInvalidPipe implements PipeTransform {
+
+  constructor(private companyContactsFormService: CompanyContactsFormService) { }
+
+  transform(contactGuid: string, contacts: Array<IdbContact>): boolean {
+    let contact: IdbContact = contacts.find(c => { return c.guid == contactGuid });
+    let form: FormGroup = this.companyContactsFormService.getFormFromIdbContact(contact);
+    return form.invalid;
+  }
+
+}
diff --git a/src/app/shared/helper-pipes/contact-name.pipe.spec.ts b/src/app/shared/helper-pipes/contact-name.pipe.spec.ts
index d127cc0c..e57c2144 100644
--- a/src/app/shared/helper-pipes/contact-name.pipe.spec.ts
+++ b/src/app/shared/helper-pipes/contact-name.pipe.spec.ts
@@ -1,19 +1,10 @@
-import { TestBed } from '@angular/core/testing';
-import { ContactNameDisplayPipe } from './contact-name-display.pipe';
 import { ContactNamePipe } from './contact-name.pipe';
 
 describe('ContactNamePipe', () => {
   let pipe: ContactNamePipe;
-  let contactNameDisplayPipe: ContactNameDisplayPipe;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [ContactNameDisplayPipe]
-    });
-    contactNameDisplayPipe = TestBed.inject(ContactNameDisplayPipe);
-  })
   it('create an instance', () => {
-    pipe = new ContactNamePipe(contactNameDisplayPipe);
+    pipe = new ContactNamePipe();
     expect(pipe).toBeTruthy();
   });
 });
diff --git a/src/app/shared/helper-pipes/contact-name.pipe.ts b/src/app/shared/helper-pipes/contact-name.pipe.ts
index bd8d4d37..0433ed3c 100644
--- a/src/app/shared/helper-pipes/contact-name.pipe.ts
+++ b/src/app/shared/helper-pipes/contact-name.pipe.ts
@@ -8,13 +8,12 @@ import { ContactNameDisplayPipe } from './contact-name-display.pipe';
 })
 export class ContactNamePipe implements PipeTransform {
 
-  constructor(private contactDisplayPipe: ContactNameDisplayPipe) {}
 
   transform(contactGuid: string, contacts: Array<IdbContact>): string {
     let contact: IdbContact = contacts.find(contact => {
       return contact.guid == contactGuid;
     });
-    return this.contactDisplayPipe.transform(contact);
+    let contactNameDisplayPipe = new ContactNameDisplayPipe();
+    return contactNameDisplayPipe.transform(contact);
   }
-
 }
diff --git a/src/app/shared/helper-pipes/kpm-label.pipe.spec.ts b/src/app/shared/helper-pipes/kpm-label.pipe.spec.ts
new file mode 100644
index 00000000..1f411ea1
--- /dev/null
+++ b/src/app/shared/helper-pipes/kpm-label.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { KpmLabelPipe } from './kpm-label.pipe';
+
+describe('KpmLabelPipe', () => {
+  it('create an instance', () => {
+    const pipe = new KpmLabelPipe();
+    expect(pipe).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/helper-pipes/kpm-label.pipe.ts b/src/app/shared/helper-pipes/kpm-label.pipe.ts
new file mode 100644
index 00000000..d40ea5e9
--- /dev/null
+++ b/src/app/shared/helper-pipes/kpm-label.pipe.ts
@@ -0,0 +1,19 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { KeyPerformanceMetric } from '../constants/keyPerformanceMetrics';
+
+@Pipe({
+  name: 'kpmLabel'
+})
+export class KpmLabelPipe implements PipeTransform {
+
+  transform(guid: string, keyPerformanceMetrics: Array<KeyPerformanceMetric>): string {
+    let kpm: KeyPerformanceMetric = keyPerformanceMetrics.find(kpm => {
+      return kpm.guid == guid
+    });
+    if (kpm) {
+      return kpm.htmlLabel;
+    }
+    return '';
+  }
+
+}
diff --git a/src/app/shared/helper-pipes/neb-total-savings.pipe.spec.ts b/src/app/shared/helper-pipes/neb-total-savings.pipe.spec.ts
new file mode 100644
index 00000000..1549c197
--- /dev/null
+++ b/src/app/shared/helper-pipes/neb-total-savings.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { NebTotalSavingsPipe } from './neb-total-savings.pipe';
+
+describe('NebTotalSavingsPipe', () => {
+  it('create an instance', () => {
+    const pipe = new NebTotalSavingsPipe();
+    expect(pipe).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/helper-pipes/neb-total-savings.pipe.ts b/src/app/shared/helper-pipes/neb-total-savings.pipe.ts
new file mode 100644
index 00000000..e9d8d830
--- /dev/null
+++ b/src/app/shared/helper-pipes/neb-total-savings.pipe.ts
@@ -0,0 +1,22 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
+
+@Pipe({
+  name: 'nebTotalSavings'
+})
+export class NebTotalSavingsPipe implements PipeTransform {
+
+  transform(nebGuid: string, performanceMetricImpacts: Array<IdbKeyPerformanceMetricImpact>): number {
+    let associatedImpacts: Array<IdbKeyPerformanceMetricImpact> = performanceMetricImpacts.filter(kpmImpact => {
+      return kpmImpact.nebId == nebGuid;
+    });
+    let totalSavings: number = 0;
+    associatedImpacts.forEach(impact => {
+      if (isNaN(impact.costAdjustment) == false) {
+        totalSavings += impact.costAdjustment;
+      }
+    })
+    return totalSavings;
+  }
+
+}
diff --git a/src/app/shared/kpm-details-form/kpm-details-form.component.spec.ts b/src/app/shared/kpm-details-form/kpm-details-form.component.spec.ts
index 3aa5cbe2..c855647f 100644
--- a/src/app/shared/kpm-details-form/kpm-details-form.component.spec.ts
+++ b/src/app/shared/kpm-details-form/kpm-details-form.component.spec.ts
@@ -4,7 +4,7 @@ import { KpmDetailsFormComponent } from './kpm-details-form.component';
 import { getCustomKPM } from '../constants/keyPerformanceMetrics';
 import { LabelWithTooltipModule } from '../label-with-tooltip/label-with-tooltip.module';
 import { FormsModule } from '@angular/forms';
-import { HelperPipesModule } from '../helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from '../helper-pipes/_helper-pipes.module';
 
 describe('KpmDetailsFormComponent', () => {
   let component: KpmDetailsFormComponent;
diff --git a/src/app/shared/kpm-details-form/kpm-details-form.module.ts b/src/app/shared/kpm-details-form/kpm-details-form.module.ts
index fe1445e1..05d25bf2 100644
--- a/src/app/shared/kpm-details-form/kpm-details-form.module.ts
+++ b/src/app/shared/kpm-details-form/kpm-details-form.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
 import { KpmDetailsFormComponent } from './kpm-details-form.component';
 import { FormsModule } from '@angular/forms';
 import { LabelWithTooltipModule } from '../label-with-tooltip/label-with-tooltip.module';
-import { HelperPipesModule } from '../helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from '../helper-pipes/_helper-pipes.module';
 
 
 
diff --git a/src/app/shared/reports/assessment-report/assessment-report.component.spec.ts b/src/app/shared/reports/assessment-report/assessment-report.component.spec.ts
index 18d62214..25cfd11f 100644
--- a/src/app/shared/reports/assessment-report/assessment-report.component.spec.ts
+++ b/src/app/shared/reports/assessment-report/assessment-report.component.spec.ts
@@ -20,7 +20,7 @@ import { IdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
 import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
 import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
 import { TableEntriesModule } from '../../table-entries/table-entries.module';
-import { HelperPipesModule } from '../../helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from '../../helper-pipes/_helper-pipes.module';
 import { AssessmentSavingsTableComponent } from './assessment-savings-table/assessment-savings-table.component';
 import { PaybackTableComponent } from './payback-table/payback-table.component';
 import { EnergyEquipmentIdbService } from 'src/app/indexed-db/energy-equipment-idb.service';
diff --git a/src/app/shared/reports/calculations/nebReport.ts b/src/app/shared/reports/calculations/nebReport.ts
index d6e1aaf8..89afd0cc 100644
--- a/src/app/shared/reports/calculations/nebReport.ts
+++ b/src/app/shared/reports/calculations/nebReport.ts
@@ -15,10 +15,12 @@ export function getNebReport(nonEnergyBenefit: IdbNonEnergyBenefit, companyPerfo
                     return companyKPM.guid == performanceMetricImpact.kpmGuid
                 }
             });
-            reportPerformanceMetrics.push({
-                performanceMetricImpact: performanceMetricImpact,
-                keyPerformanceMetric: keyPerformanceMetric
-            })
+            if (keyPerformanceMetric) {
+                reportPerformanceMetrics.push({
+                    performanceMetricImpact: performanceMetricImpact,
+                    keyPerformanceMetric: keyPerformanceMetric
+                })
+            }
         }
     });
     let costSavings: number = nonEnergyBenefit.costImpact || 0;
diff --git a/src/app/shared/reports/on-site-visit-report/on-site-visit-report.component.spec.ts b/src/app/shared/reports/on-site-visit-report/on-site-visit-report.component.spec.ts
index 45cd440f..19b51962 100644
--- a/src/app/shared/reports/on-site-visit-report/on-site-visit-report.component.spec.ts
+++ b/src/app/shared/reports/on-site-visit-report/on-site-visit-report.component.spec.ts
@@ -23,7 +23,7 @@ import { IdbEnergyEquipment } from 'src/app/models/energyEquipment';
 import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
 import { IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from '../../helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from '../../helper-pipes/_helper-pipes.module';
 import { PaybackTableComponent } from '../assessment-report/payback-table/payback-table.component';
 import { AssessmentSavingsTableComponent } from '../assessment-report/assessment-savings-table/assessment-savings-table.component';
 import { TableEntriesModule } from '../../table-entries/table-entries.module';
diff --git a/src/app/shared/reports/reports.module.ts b/src/app/shared/reports/reports.module.ts
index 9cd0bb11..121a5afe 100644
--- a/src/app/shared/reports/reports.module.ts
+++ b/src/app/shared/reports/reports.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { AssessmentReportComponent } from './assessment-report/assessment-report.component';
-import { HelperPipesModule } from '../helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from '../helper-pipes/_helper-pipes.module';
 import { TableEntriesModule } from '../table-entries/table-entries.module';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { AssessmentSavingsTableComponent } from './assessment-report/assessment-savings-table/assessment-savings-table.component';
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/add-nebs-modal/add-nebs-modal.component.css b/src/app/shared/shared-assessment-forms/add-nebs-modal/add-nebs-modal.component.css
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/add-nebs-modal/add-nebs-modal.component.css
rename to src/app/shared/shared-assessment-forms/add-nebs-modal/add-nebs-modal.component.css
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/add-nebs-modal/add-nebs-modal.component.html b/src/app/shared/shared-assessment-forms/add-nebs-modal/add-nebs-modal.component.html
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/add-nebs-modal/add-nebs-modal.component.html
rename to src/app/shared/shared-assessment-forms/add-nebs-modal/add-nebs-modal.component.html
diff --git a/src/app/shared/shared-assessment-forms/add-nebs-modal/add-nebs-modal.component.spec.ts b/src/app/shared/shared-assessment-forms/add-nebs-modal/add-nebs-modal.component.spec.ts
new file mode 100644
index 00000000..7eeeac20
--- /dev/null
+++ b/src/app/shared/shared-assessment-forms/add-nebs-modal/add-nebs-modal.component.spec.ts
@@ -0,0 +1,59 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AddNebsModalComponent } from './add-nebs-modal.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { FormsModule } from '@angular/forms';
+import { BehaviorSubject } from 'rxjs';
+import { NebsDatabaseModule } from 'src/app/nebs-database/nebs-database.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { SharedDataService } from '../../shared-services/shared-data.service';
+import { ContactContext, IdbContact } from 'src/app/models/contact';
+
+describe('AddNebsModalComponent', () => {
+  let component: AddNebsModalComponent;
+  let fixture: ComponentFixture<AddNebsModalComponent>;
+
+
+  let sharedDataService: Partial<SharedDataService> = {
+    createAssessmentModalOpen: new BehaviorSubject<boolean>(false),
+    sidebarOpen: new BehaviorSubject<boolean>(false),
+    displayAddNebsModal: new BehaviorSubject<{ assessmentId: string, energyOpportunityId: string }>({
+      assessmentId: '123',
+      energyOpportunityId: '123'
+    }),
+    displayContactModal: new BehaviorSubject<{ context: ContactContext, viewContact: IdbContact, contextGuid: string, companyId: string }>({
+      context: 'assessment',
+      viewContact: undefined,
+      contextGuid: '123',
+      companyId: '123'
+    })
+  }
+  let tmpStubServiceProviders: Array<{ provide: any, useValue: any }> = new Array();
+  stubServiceProviders.forEach(serviceProvider => {
+    if (serviceProvider.provide == SharedDataService) {
+      tmpStubServiceProviders.push({
+        provide: SharedDataService,
+        useValue: sharedDataService
+      });
+    } else {
+      tmpStubServiceProviders.push(serviceProvider);
+    }
+  });
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, FormsModule, NebsDatabaseModule],
+      declarations: [AddNebsModalComponent],
+      providers: tmpStubServiceProviders
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AddNebsModalComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/add-nebs-modal/add-nebs-modal.component.ts b/src/app/shared/shared-assessment-forms/add-nebs-modal/add-nebs-modal.component.ts
similarity index 93%
rename from src/app/setup-wizard/data-collection/on-site-assessment/add-nebs-modal/add-nebs-modal.component.ts
rename to src/app/shared/shared-assessment-forms/add-nebs-modal/add-nebs-modal.component.ts
index 47edeb4b..a587b04f 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/add-nebs-modal/add-nebs-modal.component.ts
+++ b/src/app/shared/shared-assessment-forms/add-nebs-modal/add-nebs-modal.component.ts
@@ -10,9 +10,9 @@ import { IdbAssessment } from 'src/app/models/assessment';
 import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
 import { getNewIdbKeyPerformanceMetricImpact, IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
 import { IdbNonEnergyBenefit, getNewIdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
-import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
 import { KeyPerformanceMetric } from 'src/app/shared/constants/keyPerformanceMetrics';
 import { NebOption, NebOptions } from 'src/app/shared/constants/nonEnergyBenefitOptions';
+import { SharedDataService } from '../../shared-services/shared-data.service';
 
 @Component({
   selector: 'app-add-nebs-modal',
@@ -30,7 +30,7 @@ export class AddNebsModalComponent {
 
   selectedNebs: Array<NebOption> =[];
 
-  constructor(private setupWizardService: SetupWizardService, private keyPerformanceIndicatorIdbService: KeyPerformanceIndicatorsIdbService,
+  constructor(private sharedDataService: SharedDataService, private keyPerformanceIndicatorIdbService: KeyPerformanceIndicatorsIdbService,
     private nonEnergyBenefitIdbService: NonEnergyBenefitsIdbService,
     private assessmentIdbService: AssessmentIdbService,
     private energyOpportunityIdbService: EnergyOpportunityIdbService,
@@ -39,7 +39,7 @@ export class AddNebsModalComponent {
   }
 
   ngOnInit() {
-    let modalData: { assessmentId: string, energyOpportunityId: string } = this.setupWizardService.displayAddNebsModal.getValue();
+    let modalData: { assessmentId: string, energyOpportunityId: string } = this.sharedDataService.displayAddNebsModal.getValue();
     this.assessment = this.assessmentIdbService.getByGuid(modalData.assessmentId);
     if (modalData.energyOpportunityId) {
       this.energyOpportunity = this.energyOpportunityIdbService.getByGuid(modalData.energyOpportunityId);
@@ -87,7 +87,7 @@ export class AddNebsModalComponent {
     NebOptions.forEach(option => {
       option.selected = false;
     });
-    this.setupWizardService.displayAddNebsModal.next(undefined);
+    this.sharedDataService.displayAddNebsModal.next(undefined);
   }
 
   setSelectedNebs(selectedNebs: Array<NebOption>) {
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component.css b/src/app/shared/shared-assessment-forms/assessment-details-form/assessment-details-form.component.css
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component.css
rename to src/app/shared/shared-assessment-forms/assessment-details-form/assessment-details-form.component.css
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component.html b/src/app/shared/shared-assessment-forms/assessment-details-form/assessment-details-form.component.html
similarity index 74%
rename from src/app/setup-wizard/data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component.html
rename to src/app/shared/shared-assessment-forms/assessment-details-form/assessment-details-form.component.html
index 9c19c70e..ad8e0b2a 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component.html
+++ b/src/app/shared/shared-assessment-forms/assessment-details-form/assessment-details-form.component.html
@@ -3,22 +3,19 @@
         <label class="col-sm-5 col-form-label" for="assessmentName">Assessment Name</label>
         <div class="col-sm-7">
             <input name="assessmentName" type="text" class="form-control" [(ngModel)]="assessment.name"
-                (input)="saveChanges()" minlength="1" maxlength="42" id="assessmentName">
+                (input)="saveChanges()" minlength="1" maxlength="42" id="assessmentName" [disabled]="isDisabled">
         </div>
     </div>
 
     <div class="row">
         <label class="col-sm-5 col-form-label" for="assessmentType">Assessment Type</label>
         <div class="col-sm-7">
-                <select name="assessmentType" class="form-select" id="assessmentType"
-                    [(ngModel)]="assessment.assessmentType"
-                    (change)="assessmentTypeChange()">
-                    <option
-                        *ngFor="let assessmentType of assessmentTypes"
-                        [ngValue]="assessmentType">
-                        {{assessmentType}}
-                    </option>
-                </select>
+            <select name="assessmentType" class="form-select" id="assessmentType"
+                [(ngModel)]="assessment.assessmentType" (change)="assessmentTypeChange()" [disabled]="isDisabled">
+                <option *ngFor="let assessmentType of assessmentTypes" [ngValue]="assessmentType">
+                    {{assessmentType}}
+                </option>
+            </select>
         </div>
     </div>
 
@@ -28,41 +25,34 @@ <h6>Utility Types</h6>
         applicable to this assessment and enter the annual energy
         use for each type.</p>
     <ng-container *ngFor="let use of assessment.utilityEnergyUses">
-        <div class="row mb-1 utility-row"
-            *ngIf="assessment.utilityTypes.includes(use.utilityType)">
-            <div class="col-4">
+        <div class="row mb-1 utility-row" *ngIf="assessment.utilityTypes.includes(use.utilityType)">
+            <div class="col-5">
                 <div class="input-group">
                     <div class="input-group-text">
                         <input class="form-check-input" type="checkbox"
                             name="{{'include_utilityType_' + use.utilityType + assessment.guid}}"
                             id="{{'include_utilityType_' + use.utilityType + assessment.guid}}"
-                            [(ngModel)]="use.include"
-                            (change)="calculateEnergyUseCost()">
+                            [(ngModel)]="use.include" (change)="calculateEnergyUseCost()" [disabled]="isDisabled">
                     </div>
-                    <input type="text"
-                        class="form-control disabled-input-label"
-                        [value]="use.utilityType" [disabled]="true">
+                    <input type="text" class="form-control disabled-input-label" [value]="use.utilityType"
+                        [disabled]="true">
                 </div>
             </div>
             <ng-container *ngIf="use.include">
-                <div class="col-8">
+                <div class="col-7">
                     <div class="form-group row align-items-center">
                         <div class="input-group">
                             <input type="number" class="form-control"
                                 name="{{'energyUse_' + use.utilityType + assessment.guid}}"
-                                id="{{'energyUse_' + use.utilityType + assessment.guid}}"
-                                [(ngModel)]="use.energyUse"
-                                (input)="calculateEnergyUseCost()">
+                                id="{{'energyUse_' + use.utilityType + assessment.guid}}" [(ngModel)]="use.energyUse"
+                                (input)="calculateEnergyUseCost()" [disabled]="isDisabled">
                             <select class="input-group-text"
                                 name="{{'energyUnit_' + use.utilityType + assessment.guid}}"
-                                id="{{'energyUnit_' + use.utilityType + assessment.guid}}"
-                                [(ngModel)]="use.energyUnit"
-                                (change)="calculateEnergyUseCost()">
-                                <option
-                                    *ngFor="let unitOption of (use.utilityType | linkedUnitOptions: 'Energy')"
+                                id="{{'energyUnit_' + use.utilityType + assessment.guid}}" [(ngModel)]="use.energyUnit"
+                                (change)="calculateEnergyUseCost()" [disabled]="isDisabled">
+                                <option *ngFor="let unitOption of (use.utilityType | linkedUnitOptions: 'Energy')"
                                     [ngValue]="unitOption.value">
-                                    <span
-                                        [innerHTML]="unitOption.value | unitsDisplay"></span>
+                                    <span [innerHTML]="unitOption.value | unitsDisplay"></span>
                                 </option>
                             </select>
                         </div>
@@ -72,24 +62,23 @@ <h6>Utility Types</h6>
             <ng-container *ngIf="use.include
                 &&  use.utilityType !== 'Water' && use.utilityType !== 'Waste Water'
                 && !(use.utilityType | isStandardUnit :use.energyUnit : 'Energy')">
-                <div class="col-4">
+                <div class="col-5">
                     <div class="input-group">
                         <input type="text" class="form-control disabled-input-label-secondary" [disabled]="true"
-                        value="{{use.utilityType | utilityHhvDisplay}}">
+                            value="{{use.utilityType | utilityHhvDisplay}}" [disabled]="isDisabled">
                     </div>
                 </div>
-                <div class="col-8">
+                <div class="col-7">
                     <div class="input-group">
                         <input class="form-control" type="number" step="any" min="0"
                             name="{{'energyHHV_' + use.utilityType + assessment.guid}}"
-                            id="{{'energyHHV_' + use.utilityType + assessment.guid}}"
-                            [(ngModel)]="use.energyHHV"
-                            (change)="calculateEnergyUseCost()">
-                        <select class="input-group-text" 
+                            id="{{'energyHHV_' + use.utilityType + assessment.guid}}" [(ngModel)]="use.energyHHV"
+                            (change)="calculateEnergyUseCost()" [disabled]="isDisabled">
+                        <select class="input-group-text"
                             name="{{'energyUnitStandard_' + use.utilityType + assessment.guid}}"
                             id="{{'energyUnitStandard_' + use.utilityType + assessment.guid}}"
-                            [(ngModel)]="use.energyUnitStandard"
-                            (change)="calculateEnergyUseCost()">
+                            [(ngModel)]="use.energyUnitStandard" (change)="calculateEnergyUseCost()"
+                            [disabled]="isDisabled">
                             <option *ngFor="let energyUnitOption of energyUnitOptions"
                                 [ngValue]="energyUnitOption.value">
                                 <span [innerHTML]="energyUnitOption.value | unitsDisplay">
@@ -119,8 +108,7 @@ <h6>Utility Types</h6>
     </div>
 
     <div class="row">
-        <label class="col-sm-5 col-form-label"
-            for="{{'cost_'+assessment.guid}}">Annual
+        <label class="col-sm-5 col-form-label" for="{{'cost_'+assessment.guid}}">Annual
             Utility
             Costs</label>
         <div class="col-sm-7" id="{{'cost_'+assessment.guid}}">
@@ -141,7 +129,8 @@ <h6>Utility Types</h6>
         <div class="col-sm-7">
             <div class="input-group">
                 <input name="implementationCost" type="number" class="form-control"
-                    [(ngModel)]="assessment.implementationCost" (input)="saveChanges()" id="implementationCost">
+                    [(ngModel)]="assessment.implementationCost" (input)="saveChanges()" id="implementationCost"
+                    [disabled]="isDisabled">
                 <span class="input-group-text">&dollar;</span>
             </div>
         </div>
@@ -151,9 +140,8 @@ <h6>Utility Types</h6>
         <div class="col-sm-7">
             <div class="input-group">
                 <input name="energySavings" type="number" class="form-control" [(ngModel)]="assessment.energySavings"
-                    (input)="saveChanges()" id="energySavings">
-                <span *ngIf="numberOfTrackedUtilities !== 1" 
-                    class="input-group-text" [innerHTML]="numberOfTrackedUtilities === 1?
+                    (input)="saveChanges()" id="energySavings" [disabled]="isDisabled">
+                <span *ngIf="numberOfTrackedUtilities !== 1" class="input-group-text" [innerHTML]="numberOfTrackedUtilities === 1?
                      (trackedEnergyUnit | unitsDisplay) + '/yr': (companyEnergyUnit | unitsDisplay) + '/yr'"></span>
             </div>
         </div>
@@ -163,7 +151,7 @@ <h6>Utility Types</h6>
         <div class="col-sm-7">
             <div class="input-group">
                 <input name="costSavings" type="number" class="form-control" [(ngModel)]="assessment.costSavings"
-                    (input)="saveChanges()" id="costSavings">
+                    (input)="saveChanges()" id="costSavings" [disabled]="isDisabled">
                 <span class="input-group-text">&dollar;</span>
             </div>
         </div>
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component.spec.ts b/src/app/shared/shared-assessment-forms/assessment-details-form/assessment-details-form.component.spec.ts
similarity index 89%
rename from src/app/setup-wizard/data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component.spec.ts
rename to src/app/shared/shared-assessment-forms/assessment-details-form/assessment-details-form.component.spec.ts
index 4804c8ee..32c6491f 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component.spec.ts
+++ b/src/app/shared/shared-assessment-forms/assessment-details-form/assessment-details-form.component.spec.ts
@@ -12,7 +12,7 @@ import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
 import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
 import { ContactContext, IdbContact } from 'src/app/models/contact';
 import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { EnergyEquipmentIdbService } from 'src/app/indexed-db/energy-equipment-idb.service';
 import { IdbEnergyEquipment } from 'src/app/models/energyEquipment';
 import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
@@ -31,17 +31,7 @@ describe('AssessmentDetailsFormComponent', () => {
     selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings()))
   };
   let setupWizardService: Partial<SetupWizardService> = {
-    sidebarOpen: new BehaviorSubject<boolean>(false),
-    displayAddNebsModal: new BehaviorSubject<{
-      assessmentId: string,
-      energyOpportunityId: string
-    }>(undefined),
-
-    displayContactModal: new BehaviorSubject<{
-      context: ContactContext,
-      viewContact: IdbContact,
-      contextGuid: string
-    }>(undefined)
+    sidebarOpen: new BehaviorSubject<boolean>(false)
   };
   let contactIdbService: Partial<ContactIdbService> = {
     contacts: new BehaviorSubject<Array<IdbContact>>([])
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component.ts b/src/app/shared/shared-assessment-forms/assessment-details-form/assessment-details-form.component.ts
similarity index 91%
rename from src/app/setup-wizard/data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component.ts
rename to src/app/shared/shared-assessment-forms/assessment-details-form/assessment-details-form.component.ts
index e88a3f36..e0ed1aec 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component.ts
+++ b/src/app/shared/shared-assessment-forms/assessment-details-form/assessment-details-form.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { IdbAssessment } from 'src/app/models/assessment';
 import { Subscription } from 'rxjs';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
@@ -18,7 +18,8 @@ import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { ConvertValue } from 'src/app/shared/conversions/convertValue';
 import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
 import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
-import { AssessmentEnergyOpportunitiesFormService } from '../assessment-energy-opportunities-form/assessment-energy-opportunities-form.service';
+import { AssessmentEnergyOpportunitiesFormService } from '../../../setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.service';
+import { SharedDataService } from '../../shared-services/shared-data.service';
 
 @Component({
   selector: 'app-assessment-details-form',
@@ -26,6 +27,8 @@ import { AssessmentEnergyOpportunitiesFormService } from '../assessment-energy-o
   styleUrl: './assessment-details-form.component.css'
 })
 export class AssessmentDetailsFormComponent {
+  @Input()
+  isDisabled: boolean;
 
   faPeopleGroup: IconDefinition = faPeopleGroup;
   faUser: IconDefinition = faUser;
@@ -58,13 +61,13 @@ export class AssessmentDetailsFormComponent {
   constructor(
     private assessmentIdbService: AssessmentIdbService,
     private contactIdbService: ContactIdbService,
-    private setupWizardService: SetupWizardService,
+    private sharedDataService: SharedDataService,
     private energyEquipmentIdbService: EnergyEquipmentIdbService,
     private companyIdbService: CompanyIdbService,
     private facilityIdbService: FacilityIdbService,
     private energyOpportunityIdbService: EnergyOpportunityIdbService,
     private assessmentEnergyOpportunitiesFormService: AssessmentEnergyOpportunitiesFormService,
-    
+
   ) { }
 
   ngOnInit() {
@@ -132,7 +135,7 @@ export class AssessmentDetailsFormComponent {
         let selectedUnitOption = selectedUtilityOption.energyUnitOptions.find(
           _unitOption => _unitOption.value == utilityEnergyUse.energyUnit);
         // calculate use
-        if (selectedUtilityOption.isStandardEnergyUnit 
+        if (selectedUtilityOption.isStandardEnergyUnit
           && selectedUnitOption.isStandard !== false) {
           convertedUse = this.convertValue.convertValue(
             utilityEnergyUse.energyUse,
@@ -166,8 +169,10 @@ export class AssessmentDetailsFormComponent {
   }
 
   openContactModal(viewContact: IdbContact) {
-    this.setupWizardService.displayContactModal.next(
-      { context: 'assessment', viewContact: viewContact, contextGuid: this.assessment.guid });
+    this.sharedDataService.displayContactModal.next(
+      {
+        context: 'assessment', viewContact: viewContact, contextGuid: this.assessment.guid, companyId: this.assessment.companyId
+      });
 
   }
 }
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.css b/src/app/shared/shared-assessment-forms/energy-opportunity-setup-form/energy-opportunity-setup-form.component.css
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.css
rename to src/app/shared/shared-assessment-forms/energy-opportunity-setup-form/energy-opportunity-setup-form.component.css
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.html b/src/app/shared/shared-assessment-forms/energy-opportunity-setup-form/energy-opportunity-setup-form.component.html
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.html
rename to src/app/shared/shared-assessment-forms/energy-opportunity-setup-form/energy-opportunity-setup-form.component.html
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.spec.ts b/src/app/shared/shared-assessment-forms/energy-opportunity-setup-form/energy-opportunity-setup-form.component.spec.ts
similarity index 97%
rename from src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.spec.ts
rename to src/app/shared/shared-assessment-forms/energy-opportunity-setup-form/energy-opportunity-setup-form.component.spec.ts
index fba22ca4..c6b20822 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.spec.ts
+++ b/src/app/shared/shared-assessment-forms/energy-opportunity-setup-form/energy-opportunity-setup-form.component.spec.ts
@@ -11,7 +11,6 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { FormsModule } from '@angular/forms';
 import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
 import { IdbEnergyOpportunity, getNewIdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
-import { NebFormsAccordionComponent } from '../../neb-forms-accordion/neb-forms-accordion.component';
 import { LocalStorageDataService } from 'src/app/shared/shared-services/local-storage-data.service';
 import { ChangeDetectorRef } from '@angular/core';
 import { BootstrapService } from 'src/app/shared/shared-services/bootstrap.service';
@@ -21,6 +20,7 @@ import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service'
 import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { IdbAssessment } from 'src/app/models/assessment';
 import { IdbFacility } from 'src/app/models/facility';
+import { NebFormsAccordionComponent } from '../neb-forms-accordion/neb-forms-accordion.component';
 
 describe('EnergyOpportunitySetupFormComponent', () => {
   let component: EnergyOpportunitySetupFormComponent;
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.ts b/src/app/shared/shared-assessment-forms/energy-opportunity-setup-form/energy-opportunity-setup-form.component.ts
similarity index 79%
rename from src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.ts
rename to src/app/shared/shared-assessment-forms/energy-opportunity-setup-form/energy-opportunity-setup-form.component.ts
index 30006f3d..35e6c4a6 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.ts
+++ b/src/app/shared/shared-assessment-forms/energy-opportunity-setup-form/energy-opportunity-setup-form.component.ts
@@ -15,6 +15,9 @@ import { UtilityOptions } from 'src/app/shared/constants/utilityTypes';
 import { UnitSettings } from 'src/app/models/unitSettings';
 import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { ConvertValue } from 'src/app/shared/conversions/convertValue';
+import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
 
 @Component({
   selector: 'app-energy-opportunity-setup-form',
@@ -26,6 +29,8 @@ export class EnergyOpportunitySetupFormComponent {
   energyOpportunityGuid: string;
   @Output('emitInitialized')
   emitInitialized = new EventEmitter<boolean>();
+  @Input()
+  inWizard: boolean;
 
 
   energyOpportunity: IdbEnergyOpportunity;
@@ -55,16 +60,27 @@ export class EnergyOpportunitySetupFormComponent {
   constructor(
     private energyOpportunityIdbService: EnergyOpportunityIdbService,
     private dbChangesService: DbChangesService,
-    private setupWizardService: SetupWizardService,
+    private sharedDataService: SharedDataService,
     private nonEnergyBenefitsIdbService: NonEnergyBenefitsIdbService,
     private companyIdbService: CompanyIdbService,
     private assessmentIdbService: AssessmentIdbService,
     private facilityIdbService: FacilityIdbService,
+    private activatedRoute: ActivatedRoute,
+    private router: Router,
+    private toastNotificationService: ToastNotificationsService
   ) {
   }
 
   ngOnInit() {
-    this.energyOpportunity = this.energyOpportunityIdbService.getByGuid(this.energyOpportunityGuid);
+    if (!this.inWizard) {
+      this.activatedRoute.params.subscribe(params => {
+        this.energyOpportunityGuid = params['id'];
+        this.energyOpportunity = this.energyOpportunityIdbService.getByGuid(this.energyOpportunityGuid);
+      });
+    } else {
+      this.energyOpportunity = this.energyOpportunityIdbService.getByGuid(this.energyOpportunityGuid);
+    }
+
     this.companySub = this.companyIdbService.selectedCompany.subscribe(company => {
       this.companyEnergyUnit = company.companyEnergyUnit;
     });
@@ -89,10 +105,14 @@ export class EnergyOpportunitySetupFormComponent {
   async deleteEnergyOpportunity() {
     await this.dbChangesService.deleteEnergyOpportunity(this.energyOpportunity)
     this.closeDeleteModal();
+    this.toastNotificationService.showToast('Opportunity Deleted!', 'Energy efficiency opportunity removed from assessment.', 'bg-success', true, false);
+    if (this.router.url.includes('portfolio')) {
+      this.router.navigateByUrl('portfolio/assessment/' + this.energyOpportunity.assessmentId + '/energy-opportunities')
+    }
   }
 
   async changeUtilityType() {
-    let energyUse = this.assessmentEnergyUses.find(use => 
+    let energyUse = this.assessmentEnergyUses.find(use =>
       use.utilityType === this.energyOpportunity.utilityType);
     this.energyOpportunity.energyUnit = energyUse.energyUnit;
     await this.saveEnergyOpportunity();
@@ -103,7 +123,7 @@ export class EnergyOpportunitySetupFormComponent {
     let camelCaseType = trimmedType.charAt(0).toLowerCase() + trimmedType.slice(1);
     if (this.facilityUnitSettings[`include${trimmedType}`]) {
       this.energyOpportunity.costSavings = this.convertValue.convertValue(
-        this.energyOpportunity.energySavings *this.facilityUnitSettings[`${camelCaseType}Price`],
+        this.energyOpportunity.energySavings * this.facilityUnitSettings[`${camelCaseType}Price`],
         this.energyOpportunity.energyUnit,
         this.facilityUnitSettings[`${camelCaseType}Unit`]).convertedValue;
     }
@@ -124,7 +144,7 @@ export class EnergyOpportunitySetupFormComponent {
 
   showSuggestedNEBs() {
     this.showAddNebDropdown = false;
-    this.setupWizardService.displayAddNebsModal.next({
+    this.sharedDataService.displayAddNebsModal.next({
       assessmentId: this.energyOpportunity.assessmentId,
       energyOpportunityId: this.energyOpportunity.guid
     });
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-forms-accordion.component.css b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-forms-accordion.component.css
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-forms-accordion.component.css
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-forms-accordion.component.css
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-forms-accordion.component.html b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-forms-accordion.component.html
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-forms-accordion.component.html
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-forms-accordion.component.html
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-forms-accordion.component.spec.ts b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-forms-accordion.component.spec.ts
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-forms-accordion.component.spec.ts
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-forms-accordion.component.spec.ts
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-forms-accordion.component.ts b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-forms-accordion.component.ts
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-forms-accordion.component.ts
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-forms-accordion.component.ts
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component.css b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/neb-setup-form.component.css
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component.css
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/neb-setup-form.component.css
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component.html b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/neb-setup-form.component.html
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component.html
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/neb-setup-form.component.html
diff --git a/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/neb-setup-form.component.spec.ts b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/neb-setup-form.component.spec.ts
new file mode 100644
index 00000000..786c2bb9
--- /dev/null
+++ b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/neb-setup-form.component.spec.ts
@@ -0,0 +1,33 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NebSetupFormComponent } from './neb-setup-form.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { getNewIdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
+import { FormsModule } from '@angular/forms';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { PerformanceMetricsModalComponent } from './performance-metrics-modal/performance-metrics-modal.component';
+import { PerformanceMetricImpactFormComponent } from './performance-metric-impact-form/performance-metric-impact-form.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('NebSetupFormComponent', () => {
+  let component: NebSetupFormComponent;
+  let fixture: ComponentFixture<NebSetupFormComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, FormsModule, HelperPipesModule],
+      declarations: [NebSetupFormComponent, PerformanceMetricsModalComponent, PerformanceMetricImpactFormComponent ],
+      providers: stubServiceProviders
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(NebSetupFormComponent);
+    component = fixture.componentInstance;
+    component.nonEnergyBenefit = getNewIdbNonEnergyBenefit('', '', '', '', undefined, undefined, false);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component.ts b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/neb-setup-form.component.ts
similarity index 75%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component.ts
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/neb-setup-form.component.ts
index 06143d90..4b583f60 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component.ts
+++ b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/neb-setup-form.component.ts
@@ -1,20 +1,19 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { IconDefinition, faChevronDown, faChevronRight, faContactBook, faPlus, faScaleUnbalancedFlip, faSearchPlus, faTrash, faUser, faWeightHanging } from '@fortawesome/free-solid-svg-icons';
 import { Subscription } from 'rxjs';
 import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
 import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
-import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
 import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
 import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
 import { IdbContact } from 'src/app/models/contact';
 import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
 import { IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
 import { IdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
-import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
 import { KeyPerformanceMetric } from 'src/app/shared/constants/keyPerformanceMetrics';
 import * as _ from 'lodash';
+import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
 @Component({
   selector: 'app-neb-setup-form',
   templateUrl: './neb-setup-form.component.html',
@@ -58,12 +57,23 @@ export class NebSetupFormComponent {
     private nonEnergyBenefitsIdbService: NonEnergyBenefitsIdbService,
     private dbChangesService: DbChangesService,
     private contactIdbService: ContactIdbService,
-    private setupWizardService: SetupWizardService,
-    private keyPerformanceMetricImpactsIdbService: KeyPerformanceMetricImpactsIdbService) {
+    private sharedDataService: SharedDataService,
+    private keyPerformanceMetricImpactsIdbService: KeyPerformanceMetricImpactsIdbService,
+    private activatedRoute: ActivatedRoute,
+    private router: Router,
+    private toastNotificationService: ToastNotificationsService) {
   }
 
   ngOnInit() {
-    this.nonEnergyBenefit = this.nonEnergyBenefitsIdbService.getByGuid(this.nebGuid);
+    if (!this.nebGuid) {
+      this.activatedRoute.params.subscribe(params => {
+        this.nebGuid = params['id'];
+        this.nonEnergyBenefit = this.nonEnergyBenefitsIdbService.getByGuid(this.nebGuid);
+        this.setMetricGuids();
+      });
+    } else {
+      this.nonEnergyBenefit = this.nonEnergyBenefitsIdbService.getByGuid(this.nebGuid);
+    }
 
     this.contactsSub = this.contactIdbService.contacts.subscribe(_contacts => {
       this.contacts = _contacts;
@@ -92,6 +102,15 @@ export class NebSetupFormComponent {
 
   async deleteNonEnergyBenefit() {
     await this.dbChangesService.deleteNonEnergyBenefit(this.nonEnergyBenefit);
+    this.closeDeleteModal();
+    if (this.nonEnergyBenefit.energyOpportunityId) {
+      this.toastNotificationService.showToast('NEB Deleted!', 'Non-energy Benefit has been removed from the energy opportunity.', 'bg-success', true, false)
+    } else {
+      this.toastNotificationService.showToast('NEB Deleted!', 'Non-energy Benefit has been removed from the assessment.', 'bg-success', true, false)
+    }
+    if (this.router.url.includes('portfolio') && !this.nonEnergyBenefit.energyOpportunityId) {
+      this.router.navigateByUrl('/portfolio/assessment/' + this.nonEnergyBenefit.assessmentId + '/nebs');
+    }
   }
 
   showDeleteModal() {
@@ -133,7 +152,7 @@ export class NebSetupFormComponent {
   }
 
   openContactModal(viewContact: IdbContact) {
-    this.setupWizardService.displayContactModal.next({ context: 'nonEnergyBenefit', viewContact: viewContact, contextGuid: this.nonEnergyBenefit.guid });
+    this.sharedDataService.displayContactModal.next({ context: 'nonEnergyBenefit', viewContact: viewContact, contextGuid: this.nonEnergyBenefit.guid, companyId: this.nonEnergyBenefit.companyId });
   }
 
   toggleUntrackedNebs() {
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.css b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.css
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.css
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.css
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.html b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.html
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.html
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.html
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.spec.ts b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.spec.ts
similarity index 97%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.spec.ts
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.spec.ts
index 54cbcce4..ed3ca808 100644
--- a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.spec.ts
+++ b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.spec.ts
@@ -10,7 +10,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
 import { getNewIdbKeyPerformanceMetricImpact, IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
 import { PrimaryKpiBadgeModule } from 'src/app/shared/primary-kpi-badge/primary-kpi-badge.module';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { FormsModule } from '@angular/forms';
 import { KpmDetailsFormModule } from 'src/app/shared/kpm-details-form/kpm-details-form.module';
 
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.ts b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.ts
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.ts
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component.ts
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/associated-metric-indicator.pipe.spec.ts b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/associated-metric-indicator.pipe.spec.ts
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/associated-metric-indicator.pipe.spec.ts
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/associated-metric-indicator.pipe.spec.ts
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/associated-metric-indicator.pipe.ts b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/associated-metric-indicator.pipe.ts
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/associated-metric-indicator.pipe.ts
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/associated-metric-indicator.pipe.ts
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/metric-options-modal-list.pipe.spec.ts b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/metric-options-modal-list.pipe.spec.ts
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/metric-options-modal-list.pipe.spec.ts
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/metric-options-modal-list.pipe.spec.ts
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/metric-options-modal-list.pipe.ts b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/metric-options-modal-list.pipe.ts
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/metric-options-modal-list.pipe.ts
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/metric-options-modal-list.pipe.ts
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.css b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.css
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.css
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.css
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.html b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.html
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.html
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.html
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.spec.ts b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.spec.ts
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.spec.ts
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.spec.ts
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.ts b/src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.ts
similarity index 100%
rename from src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.ts
rename to src/app/shared/shared-assessment-forms/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.ts
diff --git a/src/app/shared/shared-assessment-forms/shared-assessment-forms.module.ts b/src/app/shared/shared-assessment-forms/shared-assessment-forms.module.ts
new file mode 100644
index 00000000..20039244
--- /dev/null
+++ b/src/app/shared/shared-assessment-forms/shared-assessment-forms.module.ts
@@ -0,0 +1,49 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { AssessmentDetailsFormComponent } from './assessment-details-form/assessment-details-form.component';
+import { FormsModule } from '@angular/forms';
+import { HelperPipesModule } from '../helper-pipes/_helper-pipes.module';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { NebFormsAccordionComponent } from './neb-forms-accordion/neb-forms-accordion.component';
+import { NebSetupFormComponent } from './neb-forms-accordion/neb-setup-form/neb-setup-form.component';
+import { PerformanceMetricsModalComponent } from './neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component';
+import { AssociatedMetricIndicatorPipe } from './neb-forms-accordion/neb-setup-form/performance-metrics-modal/associated-metric-indicator.pipe';
+import { MetricOptionsModalListPipe } from './neb-forms-accordion/neb-setup-form/performance-metrics-modal/metric-options-modal-list.pipe';
+import { PerformanceMetricImpactFormComponent } from './neb-forms-accordion/neb-setup-form/performance-metric-impact-form/performance-metric-impact-form.component';
+import { PrimaryKpiBadgeModule } from '../primary-kpi-badge/primary-kpi-badge.module';
+import { KpmDetailsFormModule } from '../kpm-details-form/kpm-details-form.module';
+import { AddNebsModalComponent } from './add-nebs-modal/add-nebs-modal.component';
+import { NebsDatabaseModule } from 'src/app/nebs-database/nebs-database.module';
+import { EnergyOpportunitySetupFormComponent } from './energy-opportunity-setup-form/energy-opportunity-setup-form.component';
+
+
+
+@NgModule({
+  declarations: [
+    AssessmentDetailsFormComponent,
+    NebFormsAccordionComponent,
+    NebSetupFormComponent,
+    PerformanceMetricsModalComponent,
+    AssociatedMetricIndicatorPipe,
+    MetricOptionsModalListPipe,
+    PerformanceMetricImpactFormComponent,
+    AddNebsModalComponent,
+    EnergyOpportunitySetupFormComponent
+  ],
+  imports: [
+    CommonModule,
+    FormsModule,
+    HelperPipesModule,
+    FontAwesomeModule,
+    PrimaryKpiBadgeModule,
+    KpmDetailsFormModule,
+    NebsDatabaseModule
+  ],
+  exports: [
+    AssessmentDetailsFormComponent,
+    NebFormsAccordionComponent,
+    AddNebsModalComponent,
+    EnergyOpportunitySetupFormComponent
+  ]
+})
+export class SharedAssessmentFormsModule { }
diff --git a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.component.css b/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.css
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.component.css
rename to src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.css
diff --git a/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.html b/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.html
new file mode 100644
index 00000000..cdb1502b
--- /dev/null
+++ b/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.html
@@ -0,0 +1,125 @@
+<div class="row">
+    <div class="col-12">
+        <form [formGroup]="contactForm">
+            <div class="row mb-1">
+                <label class="col-sm-5 col-form-label" for="firstname">First Name <span
+                        class="required-asterisk">*</span></label>
+                <div class="col-sm-7">
+                    <input name="firstname" type="text" class="form-control" formControlName="firstname" id="firstname"
+                        (input)="saveChanges()">
+                    <div class="alert alert-danger form-error"
+                        *ngIf="contactForm.controls['firstname'].touched && contactForm.controls['firstname'].getError('required')">
+                        First Name Required
+                    </div>
+                </div>
+                <label class="col-sm-5 col-form-label" for="lastname">Last Name <span
+                        class="required-asterisk">*</span></label>
+                <div class="col-sm-7">
+                    <input name="lastname" type="text" class="form-control" formControlName="lastname" id="lastname"
+                        (input)="saveChanges()">
+                    <div class="alert alert-danger form-error"
+                        *ngIf="contactForm.controls['lastname'].touched && contactForm.controls['lastname'].getError('required')">
+                        Last Name Required
+                    </div>
+                </div>
+            </div>
+            <div class="row mb-1">
+                <label class="col-sm-5 col-form-label" for="phone">Phone Number</label>
+                <div class="col-sm-7 d-flex">
+                    <input type="text" class="form-control" formControlName="phone" (input)="saveChanges()" id="phone"
+                        name="phone">
+                    <label class="mx-2 col-form-label" for="ext">ext.</label>
+                    <input type="text" class="form-control" style="width: 100px;" formControlName="ext"
+                        (input)="saveChanges()" id="ext" name="ext">
+                </div>
+                <div class="col-sm-7 offset-sm-5">
+                    <div class="alert alert-warning form-error" *ngIf="contactForm.controls['phone'].errors && 
+                                (contactForm.controls['phone'].touched || contactForm.controls['ext'].touched)">
+                        Invalid phone number: for US xxx-xxx-xxxx / for international +xxx xxxxxxxxxx
+                    </div>
+                </div>
+            </div>
+            <div class="row mb-1">
+                <label class="col-sm-5 col-form-label" for="email">Email</label>
+                <div class="col-sm-7">
+                    <input type="email" class="form-control" formControlName="email" (input)="saveChanges()" id="email"
+                        name="email">
+                    <div
+                        *ngIf="contactForm.controls['email'].errors && (contactForm.controls['email'].touched || contactForm.controls['email'].dirty)">
+                        <div class="alert alert-warning form-error"
+                            *ngIf="contactForm.controls['email'].errors['email']">Invalid Email</div>
+                        <div class="alert alert-warning form-error"
+                            *ngIf="contactForm.controls['email'].errors['maxlength']">max length</div>
+                    </div>
+                </div>
+            </div>
+            <div class="row mb-1">
+                <label class="col-sm-5 col-form-label" for="role">Title</label>
+                <div class="col-sm-7">
+                    <input type="text" class="form-control" formControlName="role" (input)="saveChanges()" id="role"
+                        name="role">
+                    <div class="alert alert-warning form-error" *ngIf="contactForm.controls['role'].errors">
+                        Invalid title
+                    </div>
+                </div>
+            </div>
+            <div class="row mb-1">
+                <label class="col-sm-5 col-form-label" for="team">Team</label>
+                <div class="col-sm-7">
+                    <input type="text" class="form-control" formControlName="team" (input)="saveChanges()" id="team"
+                        name="team">
+                    <div class="alert alert-warning form-error" *ngIf="contactForm.controls['team'].errors">
+                        Invalid team
+                    </div>
+                </div>
+            </div>
+            <div class="row mb-1">
+                <label class="col-sm-5 col-form-label" for="notes">Notes</label>
+                <div class="col-sm-7">
+                    <textarea class="form-control" name="notes" formControlName="notes"
+                        (input)="saveChanges()"></textarea>
+                    <div class="alert alert-warning form-error" *ngIf="contactForm.controls['notes'].errors">
+                        Invalid notes
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="col-12">
+        <hr>
+    </div>
+    <div class="col-12 text-end">
+        <button class="btn btn-sm btn-danger" (click)="openDeleteModal()">
+            <fa-icon [icon]="faTrash"></fa-icon> Delete
+        </button>
+    </div>
+</div>
+
+<div [ngClass]="{'window-overlay': displayDeleteModal || routeGuardWarningModal}"></div>
+<div class="popup" [ngClass]="{'open': displayDeleteModal }">
+    <div class="popup-header">Delete Contact
+        <button type="button" class="btn-close float-end" aria-label="Close" (click)="closeDeleteModal()"></button>
+    </div>
+    <div class="popup-body">
+        <div class="alert alert-danger">
+            Are you sure you want to delete this contact? Changes will be lost.
+        </div>
+        <hr>
+    </div>
+    <div class="popup-footer d-flex justify-content-end">
+        <button class="btn btn-secondary btn-sm me-2" (click)="closeDeleteModal()">Cancel</button>
+        <button class="btn btn-sm btn-danger" (click)="deleteContact()"><fa-icon [icon]="faTrash"></fa-icon> Delete
+            Contact</button>
+    </div>
+</div>
+
+<div class="popup" [ngClass]="{'open': routeGuardWarningModal }">
+    <div class="popup-body">
+        <div class="alert alert-danger">
+            Please fill the required fields.
+        </div>
+    </div>
+    <div class="popup-footer d-flex justify-content-end">
+        <button class="btn btn-secondary me-2" (click)="closeWarningModal()">OK</button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.spec.ts b/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.spec.ts
new file mode 100644
index 00000000..922b1448
--- /dev/null
+++ b/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.spec.ts
@@ -0,0 +1,30 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompanyContactsFormComponent } from './company-contacts-form.component';
+import { ReactiveFormsModule } from '@angular/forms';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('CompanyContactsFormComponent', () => {
+  let component: CompanyContactsFormComponent;
+  let fixture: ComponentFixture<CompanyContactsFormComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ReactiveFormsModule, FontAwesomeModule, HelperPipesModule],
+      declarations: [CompanyContactsFormComponent],
+      providers: stubServiceProviders
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(CompanyContactsFormComponent);
+    component = fixture.componentInstance;
+    component.contactGuid = '';
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.component.ts b/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.ts
similarity index 53%
rename from src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.component.ts
rename to src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.ts
index 0870d52c..185d5342 100644
--- a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.component.ts
+++ b/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.component.ts
@@ -4,9 +4,9 @@ import { CompanyContactsFormService } from './company-contacts-form.service';
 import { IdbContact } from 'src/app/models/contact';
 import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
 import { IconDefinition, faCircleExclamation, faTrash, faUser } from '@fortawesome/free-solid-svg-icons';
-import { firstValueFrom } from 'rxjs';
-import { BootstrapService } from 'src/app/shared/shared-services/bootstrap.service';
-import { LocalStorageDataService } from 'src/app/shared/shared-services/local-storage-data.service';
+import { firstValueFrom, Observable, of } from 'rxjs';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
 
 @Component({
   selector: 'app-company-contacts-form',
@@ -16,8 +16,6 @@ import { LocalStorageDataService } from 'src/app/shared/shared-services/local-st
 export class CompanyContactsFormComponent {
   @Input({ required: true })
   contactGuid: string;
-  @Input({ required: true })
-  accordionGuid: string;
   @Output('emitInitialized')
   emitInitialized = new EventEmitter<boolean>();
 
@@ -29,15 +27,26 @@ export class CompanyContactsFormComponent {
   contact: IdbContact;
   contactForm: FormGroup;
   displayDeleteModal: boolean = false;
+  routeGuardWarningModal: boolean = false;
   constructor(private contactIdbService: ContactIdbService, private companyContactsFormService: CompanyContactsFormService,
-    private bootstrapService: BootstrapService,
-    private localStorageDataService: LocalStorageDataService
+    private activatedRoute: ActivatedRoute,
+    private router: Router,
+    private toastNotificationService: ToastNotificationsService
   ) {
   }
 
   ngOnInit() {
-    this.contact = this.contactIdbService.getContactByGuid(this.contactGuid);
-    this.contactForm = this.companyContactsFormService.getFormFromIdbContact(this.contact);
+    if (!this.contactGuid) {
+      this.activatedRoute.params.subscribe(params => {
+        this.contactGuid = params['id'];
+        this.contact = this.contactIdbService.getContactByGuid(this.contactGuid);
+        this.contactForm = this.companyContactsFormService.getFormFromIdbContact(this.contact);
+      });
+    } else {
+      this.contact = this.contactIdbService.getContactByGuid(this.contactGuid);
+      this.contactForm = this.companyContactsFormService.getFormFromIdbContact(this.contact);
+    }
+
   }
   ngAfterViewInit() {
     //emit after intialized. 
@@ -62,24 +71,28 @@ export class CompanyContactsFormComponent {
     await firstValueFrom(this.contactIdbService.deleteWithObservable(this.contact.id));
     await this.contactIdbService.setContacts();
     this.closeDeleteModal();
+    this.toastNotificationService.showToast('Stakeholder Deleted!', 'Stakeholder has been removed from this company.', 'bg-success', true, false);
+    if (this.router.url.includes('portfolio')) {
+      this.router.navigateByUrl('/portfolio/company/' + this.contact.companyId + '/stakeholders');
+    }
   }
 
-  setRequiredInvalidControlsTouched() {
-    Object.keys(this.contactForm.controls).forEach(key => {
-      const control = this.contactForm.get(key);
-      if (control.errors && control.errors['required']) {
-        control.markAsTouched();
-      }
-    });
+  canDeactivate(): Observable<boolean> {
+    if (this.contactForm.controls['firstname'].invalid ||
+      this.contactForm.controls['lastname'].invalid
+    ) {
+      this.contactForm.markAllAsTouched();
+      this.displayWarningModal();
+      return of(false);
+    }
+    return of(true);
   }
 
-  toggleBS() {
-    this.bootstrapService.bsCollapse('#' + this.contactGuid);
-    if (this.accordionGuid != this.contactGuid) {
-      this.accordionGuid = this.contactGuid;
-    } else {
-      this.accordionGuid = undefined;
-    }
-    this.localStorageDataService.setContactAccordionGuid(this.accordionGuid);
+  displayWarningModal() {
+    this.routeGuardWarningModal = true;
+  }
+
+  closeWarningModal() {
+    this.routeGuardWarningModal = false;
   }
 }
diff --git a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.service.spec.ts b/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.service.spec.ts
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.service.spec.ts
rename to src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.service.spec.ts
diff --git a/src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.service.ts b/src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.service.ts
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.service.ts
rename to src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.service.ts
diff --git a/src/app/assessment-dashboard/assessment-dashboard-tabs/assessment-dashboard-tabs.component.css b/src/app/shared/shared-company-forms/company-kpi-details-form/company-kpi-details-form.component.css
similarity index 100%
rename from src/app/assessment-dashboard/assessment-dashboard-tabs/assessment-dashboard-tabs.component.css
rename to src/app/shared/shared-company-forms/company-kpi-details-form/company-kpi-details-form.component.css
diff --git a/src/app/shared/shared-company-forms/company-kpi-details-form/company-kpi-details-form.component.html b/src/app/shared/shared-company-forms/company-kpi-details-form/company-kpi-details-form.component.html
new file mode 100644
index 00000000..e717a7d4
--- /dev/null
+++ b/src/app/shared/shared-company-forms/company-kpi-details-form/company-kpi-details-form.component.html
@@ -0,0 +1,242 @@
+<h5>
+    <fa-icon [icon]="faBullseye"></fa-icon>
+    <span class="ps-1" [innerHTML]="keyPerformanceIndicator.htmlLabel"></span>
+</h5>
+<hr class="my-1">
+<form>
+    <ng-template [ngIf]="keyPerformanceIndicator.isCustom">
+        <div class="row">
+            <label class="col-sm-6 col-form-label" for="{{'kpiName_'+keyPerformanceIndicator.guid}}">
+                Performance Indicator Name
+            </label>
+            <div class="col-6">
+                <div class="input-group">
+                    <div class="input-group-text">
+                        <fa-icon [icon]="faBullseye"></fa-icon>
+                    </div>
+                    <input name="{{'kpiName_'+keyPerformanceIndicator.guid}}" type="text"
+                        class="form-control" [(ngModel)]="keyPerformanceIndicator.label"
+                        id="{{'kpiName_'+keyPerformanceIndicator.guid}}" (input)="saveChanges()">
+                </div>
+            </div>
+        </div>
+    </ng-template>
+
+    <div class="row">
+        <label class="col-sm-6 col-form-label" for="{{'kpiCategory_'+keyPerformanceIndicator.guid}}">
+            KPI Category
+        </label>
+        <div class="col-6">
+            <ng-template [ngIf]="keyPerformanceIndicator.isCustom" [ngIfElse]="indicatorCategory">
+                <select class="form-select" name="kpiCategory"
+                    id="{{'kpiCategory_'+keyPerformanceIndicator.guid}}"
+                    [(ngModel)]="keyPerformanceIndicator.primaryKPI" (change)="saveChanges()">
+                    <option *ngFor="let primaryKPI of primaryKPIs" [ngValue]="primaryKPI">
+                        {{primaryKPI}}
+                    </option>
+                </select>
+            </ng-template>
+            <ng-template #indicatorCategory>
+                <div class="d-flex w-100 justify-content-center">
+                    <app-primary-kpi-badge class="w-100" [kpiOption]="keyPerformanceIndicator"
+                        [fullWidth]="true"></app-primary-kpi-badge>
+                </div>
+            </ng-template>
+        </div>
+    </div>
+
+    <div class="row">
+        <label class="col-sm-6 col-form-label" for="{{'kpiDescription_'+keyPerformanceIndicator.guid}}">
+            KPI Description
+        </label>
+        <div class="col-6">
+            <ng-template [ngIf]="keyPerformanceIndicator.isCustom" [ngIfElse]="indicatorDescription">
+                <textarea class="form-control" name="{{'kpiDescription_'+keyPerformanceIndicator.guid}}"
+                    id="{{'kpiDescription_'+keyPerformanceIndicator.guid}}"
+                    [(ngModel)]="keyPerformanceIndicator.description"
+                    (input)="saveChanges()"></textarea>
+            </ng-template>
+            <ng-template #indicatorDescription>
+                <p class="fw-light small">
+                    <span [innerHTML]="keyPerformanceIndicator.optionValue | kpiDescription"></span>
+                </p>
+            </ng-template>
+        </div>
+    </div>
+
+    <div class="row pt-2">
+        <div class="col">
+            <button class="btn btn-sm btn-primary me-1"
+                *ngFor="let contact of keyPerformanceIndicator.guid | associatedContacts:'KPI': contacts;"
+                (click)="openContactModal(contact)">
+                <fa-icon [icon]="faUser"></fa-icon>
+                {{contact | contactNameDisplay}}
+            </button>
+            <button class="btn btn-sm btn-secondary" (click)="openContactModal(undefined)">
+                <fa-icon [icon]="faContactBook"></fa-icon>
+                Stakeholders
+            </button>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col">
+            <hr>
+        </div>
+    </div>
+
+
+    <h6>
+        <div class="d-flex w-100 justify-content-between">
+            <div class="mt-auto bold">
+                Associated Key Performance Metrics
+            </div>
+            <div>
+                <ng-template [ngIf]="keyPerformanceIndicator.optionValue != 'other'"
+                    [ngIfElse]="customAddBlock">
+                    <div class="dropdown">
+                        <button class="btn btn-outline-metric btn-sm dropdown-toggle" type="button"
+                            data-bs-toggle="dropdown" aria-expanded="false"
+                            (click)="toggleAddMetricDropdown()">
+                            <fa-icon [icon]="faPlus"></fa-icon> Add Performance Metric
+                        </button>
+                        <ul class="dropdown-menu" [ngClass]="{'show': showAddMetricDropdown}">
+                            <li>
+                                <a class="dropdown-item" (click)="addPerformanceMetric()">
+                                    <fa-icon [icon]="faPlus"></fa-icon> Add Custom Performance Metric
+                                </a>
+                            </li>
+                            <li>
+                                <a class="dropdown-item" (click)="showSuggestedMetrics()">
+                                    <fa-icon [icon]="faSearchPlus"></fa-icon> Search Performance Metric
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
+                </ng-template>
+                <ng-template #customAddBlock>
+                    <button class="btn btn-outline-metric btn-sm" (click)="addPerformanceMetric()">
+                        <fa-icon [icon]="faPlus"></fa-icon>
+                        Add Custom Performance Metric
+                    </button>
+                </ng-template>
+            </div>
+        </div>
+    </h6>
+    <p class="fw-light small">
+        The below associated key performance metrics (<fa-icon
+            [icon]="faScaleUnbalancedFlip"></fa-icon>)
+        will be used later on during an assessment to tie Non-Energy Benefits found back to company Key
+        Performance Indicators. This information can be added to and modified at a later time if not all
+        of the details are currently known.
+    </p>
+    <div class="row">
+        <div class="col">
+            <hr class="metric-hr mt-0">
+        </div>
+    </div>
+    <ng-template [ngIf]="keyPerformanceIndicator.performanceMetrics.length > 0"
+        [ngIfElse]="noKpmsBlock">
+        <ng-container *ngFor="let keyPerformanceMetric of keyPerformanceIndicator.performanceMetrics">
+            <div class="metric-block">
+                <div class="dropdown">
+                    <button class="btn btn-outline-metric btn-sm dropdown-toggle" type="button"
+                        data-bs-toggle="dropdown" aria-expanded="false"
+                        (click)="setDropdownMenuGuid(keyPerformanceMetric.guid)">
+                        <fa-icon [icon]="faScaleUnbalancedFlip" class="me-2"></fa-icon>
+                        <span [innerHTML]="keyPerformanceMetric.htmlLabel"></span>
+                    </button>
+                    <ul class="dropdown-menu"
+                        [ngClass]="{'show': dropdownMenuGuid == keyPerformanceMetric.guid}">
+                        <li>
+                            <a class="dropdown-item"
+                                (click)="openDeleteMetricModal(keyPerformanceMetric)">
+                                <fa-icon [icon]="faTrash"></fa-icon>
+                                Remove Metric
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+                <ng-template [ngIf]="keyPerformanceMetric.isCustom">
+                    <div class="row">
+                        <label class="col-sm-6 col-form-label"
+                            for="{{'kpmName_'+keyPerformanceMetric.guid}}">
+                            Performance Metric Name
+                        </label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <div class="input-group-text">
+                                    <fa-icon [icon]="faScaleUnbalancedFlip"></fa-icon>
+                                </div>
+                                <input name="{{'kpmName_'+keyPerformanceMetric.guid}}" type="text"
+                                    class="form-control" [(ngModel)]="keyPerformanceMetric.label"
+                                    id="{{'kpmName_'+keyPerformanceMetric.guid}}"
+                                    (input)="saveChanges()">
+                            </div>
+                        </div>
+                    </div>
+                </ng-template>
+                <app-kpm-details-form [keyPerformanceMetric]="keyPerformanceMetric"
+                    (emitSave)="saveChanges()" (emitCalculate)="calculateCost(keyPerformanceMetric)"
+                    [context]="'preVisit'"></app-kpm-details-form>
+                <ng-template
+                    [ngIf]="(keyPerformanceMetricImpacts | keyPerformanceMetricImpactsList: keyPerformanceMetric.guid).length">
+                    <div class="mt-3">
+                        <app-kpm-impacts-table
+                            [kpmGuid]="keyPerformanceMetric.guid"></app-kpm-impacts-table>
+                    </div>
+                </ng-template>
+                <div class="row">
+                    <div class="col">
+                        <hr class="metric-hr">
+                    </div>
+                </div>
+            </div>
+        </ng-container>
+    </ng-template>
+    <ng-template #noKpmsBlock>
+        <div class="alert alert-info text-center">
+            No perfromance metrics connected to this KPI. Click "<fa-icon [icon]="faPlus"></fa-icon>
+            Add New Metric" to add a new performance metric.
+        </div>
+    </ng-template>
+</form>
+
+<div [ngClass]="{'window-overlay': displayDeleteKpmModal}"></div>
+<div class="popup" [ngClass]="{'open': displayDeleteKpmModal }">
+    <ng-template [ngIf]="kpmToDelete">
+        <div class="popup-header">Delete
+            <span [innerHTML]="kpmToDelete.htmlLabel"></span>
+            <button type="button" class="btn-close float-end" aria-label="Close"
+                (click)="closeDeleteKpmModal()"></button>
+        </div>
+        <div class="popup-body">
+            <ng-template
+                [ngIf]="(keyPerformanceMetricImpacts | keyPerformanceMetricImpactsList: kpmToDelete.guid).length"
+                [ngIfElse]="noImpactsDeleteBlock">
+                <div class="alert alert-danger">
+                    Are you sure you want to untrack the performance metric:
+                    <span class="bold" [innerHTML]="kpmToDelete.htmlLabel"></span>? <br>{{(keyPerformanceMetricImpacts |
+                    keyPerformanceMetricImpactsList:
+                    kpmToDelete.guid).length}} NEB(s) in your system currently impact this metric. Those impacts will be
+                    lost. This cannot be undone.
+                </div>
+            </ng-template>
+            <ng-template #noImpactsDeleteBlock>
+                <div class="alert alert-warning">
+                    Are you sure you want to untrack this performance metric:
+                    <span class="bold" [innerHTML]="kpmToDelete.htmlLabel"></span>?
+                </div>
+            </ng-template>
+            <hr>
+        </div>
+        <div class="popup-footer d-flex justify-content-end">
+            <button class="btn btn-secondary btn-sm me-2" (click)="closeDeleteKpmModal()">Cancel</button>
+            <button class="btn btn-danger btn-sm" (click)="untrackMetric()"><fa-icon [icon]="faTrash"></fa-icon> Untrack
+                KPM</button>
+        </div>
+    </ng-template>
+</div>
+
+
+<app-kpm-database-modal *ngIf="displayAddMetricModal" (emitClose)="closeSuggestedMetrics()"
+    [keyPerformanceIndicator]="keyPerformanceIndicator" (emitAddMetrics)="addMetrics($event)"></app-kpm-database-modal>
\ No newline at end of file
diff --git a/src/app/shared/shared-company-forms/company-kpi-details-form/company-kpi-details-form.component.spec.ts b/src/app/shared/shared-company-forms/company-kpi-details-form/company-kpi-details-form.component.spec.ts
new file mode 100644
index 00000000..b9df83c9
--- /dev/null
+++ b/src/app/shared/shared-company-forms/company-kpi-details-form/company-kpi-details-form.component.spec.ts
@@ -0,0 +1,33 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompanyKpiDetailsFormComponent } from './company-kpi-details-form.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { KpmDatabaseModalComponent } from './kpm-database-modal/kpm-database-modal.component';
+import { KpmImpactsTableComponent } from './kpm-impacts-table/kpm-impacts-table.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { HelperPipesModule } from '../../helper-pipes/_helper-pipes.module';
+import { PrimaryKpiBadgeModule } from '../../primary-kpi-badge/primary-kpi-badge.module';
+import { KpiDescriptionPipe } from './kpi-description.pipe';
+import { KpmDetailsFormModule } from '../../kpm-details-form/kpm-details-form.module';
+
+describe('CompanyKpiDetailsFormComponent', () => {
+  let component: CompanyKpiDetailsFormComponent;
+  let fixture: ComponentFixture<CompanyKpiDetailsFormComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, HelperPipesModule, PrimaryKpiBadgeModule, KpmDetailsFormModule],
+      declarations: [CompanyKpiDetailsFormComponent, KpmDatabaseModalComponent, KpmImpactsTableComponent, KpiDescriptionPipe],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(CompanyKpiDetailsFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/shared-company-forms/company-kpi-details-form/company-kpi-details-form.component.ts b/src/app/shared/shared-company-forms/company-kpi-details-form/company-kpi-details-form.component.ts
new file mode 100644
index 00000000..d1883356
--- /dev/null
+++ b/src/app/shared/shared-company-forms/company-kpi-details-form/company-kpi-details-form.component.ts
@@ -0,0 +1,183 @@
+import { Component, Input, SimpleChanges } from '@angular/core';
+import { faBullseye, faChartBar, faChevronRight, faCircleQuestion, faClose, faContactBook, faPlus, faScaleUnbalancedFlip, faSearchPlus, faTrash, faUser, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
+import { PrimaryKPI, PrimaryKPIs } from '../../constants/keyPerformanceIndicatorOptions';
+import { firstValueFrom, Subscription } from 'rxjs';
+import { IdbCompany } from 'src/app/models/company';
+import { IdbContact } from 'src/app/models/contact';
+import { getCustomKPM, KeyPerformanceMetric } from '../../constants/keyPerformanceMetrics';
+import { IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
+import { ActivatedRoute } from '@angular/router';
+import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
+import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
+import { SharedDataService } from '../../shared-services/shared-data.service';
+
+@Component({
+  selector: 'app-company-kpi-details-form',
+  templateUrl: './company-kpi-details-form.component.html',
+  styleUrl: './company-kpi-details-form.component.css'
+})
+export class CompanyKpiDetailsFormComponent {
+  // @Input({ required: true })
+
+
+  keyPerformanceIndicator: IdbKeyPerformanceIndicator;
+
+  faUser: IconDefinition = faUser;
+  faContactBook: IconDefinition = faContactBook;
+  faTrash: IconDefinition = faTrash;
+  faSearchPlus: IconDefinition = faSearchPlus;
+
+  primaryKPIs: Array<PrimaryKPI> = PrimaryKPIs;
+  faCircleQuestion: IconDefinition = faCircleQuestion;
+  faBullseye: IconDefinition = faBullseye;
+  faPlus: IconDefinition = faPlus;
+  faScaleUnbalancedFlip: IconDefinition = faScaleUnbalancedFlip;
+
+  companySub: Subscription;
+  company: IdbCompany;
+
+  contacts: Array<IdbContact>;
+  contactsSub: Subscription;
+
+  displayDeleteKpmModal: boolean = false;
+  kpmToDelete: KeyPerformanceMetric;
+
+  keyPerformanceMetricImpacts: Array<IdbKeyPerformanceMetricImpact>;
+  keyPerformanceMetricImpactsSub: Subscription;
+
+  timeOptions: Array<string> = ['day', 'week', 'month', 'year'];
+  dropdownMenuGuid: string;
+
+  displayAddMetricModal: boolean = false;
+  showAddMetricDropdown: boolean = false;
+  constructor(
+    private keyPerformanceIndicatorIdbService: KeyPerformanceIndicatorsIdbService,
+    private activatedRoute: ActivatedRoute,
+    private companyIdbService: CompanyIdbService,
+    private contactIdbService: ContactIdbService,
+    private keyPerformanceMetricImpactIdbService: KeyPerformanceMetricImpactsIdbService,
+    private sharedDataService: SharedDataService
+  ) {
+  }
+
+  ngOnInit() {
+    this.companySub = this.companyIdbService.selectedCompany.subscribe(_company => {
+      this.company = _company;
+    });
+    this.contactsSub = this.contactIdbService.contacts.subscribe(_contacts => {
+      this.contacts = _contacts;
+    });
+
+    this.keyPerformanceMetricImpactsSub = this.keyPerformanceMetricImpactIdbService.keyPerformanceMetricImpacts.subscribe(_keyPerformanceMetricImpacts => {
+      this.keyPerformanceMetricImpacts = _keyPerformanceMetricImpacts;
+    });
+
+    this.activatedRoute.params.subscribe(params => {
+      let kpiGuid: string = params['id'];
+      this.keyPerformanceIndicator = this.keyPerformanceIndicatorIdbService.getByGuid(kpiGuid);
+      this.showAddMetricDropdown = false;
+    });
+  }
+
+  ngOnDestroy() {
+    this.companySub.unsubscribe();
+    this.contactsSub.unsubscribe();
+    this.keyPerformanceMetricImpactsSub.unsubscribe();
+  }
+
+  ngOnChanges() {
+    this.showAddMetricDropdown = false;
+  }
+
+  async saveChanges() {
+    if (this.keyPerformanceIndicator.optionValue == 'other') {
+      this.keyPerformanceIndicator.htmlLabel = this.keyPerformanceIndicator.label;
+    }
+    this.keyPerformanceIndicator.performanceMetrics.forEach(metric => {
+      if (metric.isCustom) {
+        metric.htmlLabel = metric.label;
+      }
+    })
+    await this.keyPerformanceIndicatorIdbService.asyncUpdate(this.keyPerformanceIndicator);
+    await this.keyPerformanceIndicatorIdbService.setKeyPerformanceIndicators();
+  }
+
+  async calculateCost(keyPerformanceMetric: KeyPerformanceMetric) {
+    await this.keyPerformanceMetricImpactIdbService.updatePerformanceMetricBaseline(this.keyPerformanceIndicator, keyPerformanceMetric);
+    await this.saveChanges();
+  }
+
+  openContactModal(contact: IdbContact) {
+    this.sharedDataService.displayContactModal.next({context: 'KPI', viewContact: contact, contextGuid: this.keyPerformanceIndicator.guid, companyId: this.keyPerformanceIndicator.companyId});
+  }
+
+  addPerformanceMetric() {
+    if (this.showAddMetricDropdown) {
+      this.showAddMetricDropdown = false;
+    }
+    let newCustomKPM: KeyPerformanceMetric = getCustomKPM(this.keyPerformanceIndicator.optionValue, this.keyPerformanceIndicator.guid);
+    this.keyPerformanceIndicator.performanceMetrics.unshift(newCustomKPM);
+    this.saveChanges();
+  }
+
+  openDeleteMetricModal(keyPerformanceMetric: KeyPerformanceMetric) {
+    this.kpmToDelete = keyPerformanceMetric;
+    this.displayDeleteKpmModal = true;
+  }
+
+  closeDeleteKpmModal() {
+    this.displayDeleteKpmModal = false;
+    this.kpmToDelete = undefined;
+  }
+
+  async untrackMetric() {
+    this.keyPerformanceIndicator.performanceMetrics = this.keyPerformanceIndicator.performanceMetrics.filter(kpm => {
+      return kpm.guid != this.kpmToDelete.guid
+    });
+    let kpmImpacts: Array<IdbKeyPerformanceMetricImpact> = this.keyPerformanceMetricImpacts.filter(kpmImpact => {
+      return kpmImpact.kpmGuid == this.kpmToDelete.guid;
+    });
+    if (kpmImpacts.length > 0) {
+      for (let index = 0; index < kpmImpacts.length; index++) {
+        await firstValueFrom(this.keyPerformanceMetricImpactIdbService.deleteWithObservable(kpmImpacts[index].id));
+      }
+      await this.keyPerformanceMetricImpactIdbService.setKeyPerformanceMetricImpacts();
+    }
+    await this.saveChanges();
+    this.closeDeleteKpmModal();
+  }
+
+  setDropdownMenuGuid(guid: string) {
+    if (this.dropdownMenuGuid != guid) {
+      this.dropdownMenuGuid = guid;
+    } else {
+      this.dropdownMenuGuid = undefined;
+    }
+  }
+
+  toggleAddMetricDropdown() {
+    this.showAddMetricDropdown = !this.showAddMetricDropdown;
+  }
+
+  showSuggestedMetrics() {
+    if (this.showAddMetricDropdown) {
+      this.showAddMetricDropdown = false;
+    }
+    this.displayAddMetricModal = true;
+  }
+
+  closeSuggestedMetrics() {
+    this.displayAddMetricModal = false;
+  }
+
+  addMetrics(metrics: Array<KeyPerformanceMetric>) {
+    metrics.forEach(metric => {
+      this.keyPerformanceIndicator.performanceMetrics.unshift(metric);
+    })
+    this.saveChanges();
+  }
+
+}
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-details/kpi-description.pipe.spec.ts b/src/app/shared/shared-company-forms/company-kpi-details-form/kpi-description.pipe.spec.ts
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-details/kpi-description.pipe.spec.ts
rename to src/app/shared/shared-company-forms/company-kpi-details-form/kpi-description.pipe.spec.ts
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-details/kpi-description.pipe.ts b/src/app/shared/shared-company-forms/company-kpi-details-form/kpi-description.pipe.ts
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-details/kpi-description.pipe.ts
rename to src/app/shared/shared-company-forms/company-kpi-details-form/kpi-description.pipe.ts
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-details/kpm-database-modal/kpm-database-modal.component.css b/src/app/shared/shared-company-forms/company-kpi-details-form/kpm-database-modal/kpm-database-modal.component.css
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-details/kpm-database-modal/kpm-database-modal.component.css
rename to src/app/shared/shared-company-forms/company-kpi-details-form/kpm-database-modal/kpm-database-modal.component.css
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-details/kpm-database-modal/kpm-database-modal.component.html b/src/app/shared/shared-company-forms/company-kpi-details-form/kpm-database-modal/kpm-database-modal.component.html
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-details/kpm-database-modal/kpm-database-modal.component.html
rename to src/app/shared/shared-company-forms/company-kpi-details-form/kpm-database-modal/kpm-database-modal.component.html
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-details/kpm-database-modal/kpm-database-modal.component.spec.ts b/src/app/shared/shared-company-forms/company-kpi-details-form/kpm-database-modal/kpm-database-modal.component.spec.ts
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-details/kpm-database-modal/kpm-database-modal.component.spec.ts
rename to src/app/shared/shared-company-forms/company-kpi-details-form/kpm-database-modal/kpm-database-modal.component.spec.ts
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-details/kpm-database-modal/kpm-database-modal.component.ts b/src/app/shared/shared-company-forms/company-kpi-details-form/kpm-database-modal/kpm-database-modal.component.ts
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-details/kpm-database-modal/kpm-database-modal.component.ts
rename to src/app/shared/shared-company-forms/company-kpi-details-form/kpm-database-modal/kpm-database-modal.component.ts
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-details/kpm-impacts-table/kpm-impacts-table.component.css b/src/app/shared/shared-company-forms/company-kpi-details-form/kpm-impacts-table/kpm-impacts-table.component.css
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-details/kpm-impacts-table/kpm-impacts-table.component.css
rename to src/app/shared/shared-company-forms/company-kpi-details-form/kpm-impacts-table/kpm-impacts-table.component.css
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-details/kpm-impacts-table/kpm-impacts-table.component.html b/src/app/shared/shared-company-forms/company-kpi-details-form/kpm-impacts-table/kpm-impacts-table.component.html
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-details/kpm-impacts-table/kpm-impacts-table.component.html
rename to src/app/shared/shared-company-forms/company-kpi-details-form/kpm-impacts-table/kpm-impacts-table.component.html
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-details/kpm-impacts-table/kpm-impacts-table.component.spec.ts b/src/app/shared/shared-company-forms/company-kpi-details-form/kpm-impacts-table/kpm-impacts-table.component.spec.ts
similarity index 96%
rename from src/app/setup-wizard/pre-visit/company-kpi-details/kpm-impacts-table/kpm-impacts-table.component.spec.ts
rename to src/app/shared/shared-company-forms/company-kpi-details-form/kpm-impacts-table/kpm-impacts-table.component.spec.ts
index 0cd87125..b16ccc1e 100644
--- a/src/app/setup-wizard/pre-visit/company-kpi-details/kpm-impacts-table/kpm-impacts-table.component.spec.ts
+++ b/src/app/shared/shared-company-forms/company-kpi-details-form/kpm-impacts-table/kpm-impacts-table.component.spec.ts
@@ -11,7 +11,7 @@ import { IdbAssessment } from 'src/app/models/assessment';
 import { IdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
 import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 
 describe('KpmImpactsTableComponent', () => {
   let component: KpmImpactsTableComponent;
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-details/kpm-impacts-table/kpm-impacts-table.component.ts b/src/app/shared/shared-company-forms/company-kpi-details-form/kpm-impacts-table/kpm-impacts-table.component.ts
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-details/kpm-impacts-table/kpm-impacts-table.component.ts
rename to src/app/shared/shared-company-forms/company-kpi-details-form/kpm-impacts-table/kpm-impacts-table.component.ts
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/add-kpi-search.component.css b/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.css
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/add-kpi-search.component.css
rename to src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.css
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/add-kpi-search.component.html b/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.html
similarity index 91%
rename from src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/add-kpi-search.component.html
rename to src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.html
index f6bd9f00..a428a45b 100644
--- a/src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/add-kpi-search.component.html
+++ b/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.html
@@ -1,11 +1,11 @@
 <div class="row">
-    <div class="col-4">
-        <h6>
+    <div class="col-12">
+        <h5>
             <fa-icon [icon]="faMagnifyingGlassPlus" class="me-2"></fa-icon>
             Find Potential KPIs
-        </h6>
+        </h5>
     </div>
-    <div class="col-4">
+    <div class="col-12 mb-1">
         <div class="input-group" role="search">
             <span class="input-group-text">
                 <fa-icon [icon]="faMagnifyingGlass"></fa-icon>
@@ -14,7 +14,7 @@ <h6>
                 [(ngModel)]="kpiSearchStr">
         </div>
     </div>
-    <div class="col-4">
+    <div class="col-12">
         <select name="kpiCategorySearch" class="form-select" id="kpiCategorySearch" [(ngModel)]="kpiCategorySearch">
             <option [ngValue]="undefined">All Categories</option>
             <option *ngFor="let category of primaryKPIs" [ngValue]="category">
@@ -35,7 +35,7 @@ <h6>
             <div>
                 <span class="ps-1" [innerHTML]="option.label"></span>
             </div>
-            <div>
+            <div class="d-sm-none d-md-none d-lg-block">
                 <app-primary-kpi-badge [kpiOption]="option"></app-primary-kpi-badge>
             </div>
         </div>
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/add-kpi-search.component.spec.ts b/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.spec.ts
similarity index 96%
rename from src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/add-kpi-search.component.spec.ts
rename to src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.spec.ts
index 0ea85894..71716581 100644
--- a/src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/add-kpi-search.component.spec.ts
+++ b/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.spec.ts
@@ -9,7 +9,7 @@ import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
 import { SelectedKpiOptionPipe } from './selected-kpi-option.pipe';
 import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
 import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
 import { PrimaryKpiBadgeModule } from 'src/app/shared/primary-kpi-badge/primary-kpi-badge.module';
 
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/add-kpi-search.component.ts b/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.ts
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/add-kpi-search.component.ts
rename to src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/add-kpi-search.component.ts
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/selected-kpi-option.pipe.spec.ts b/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/selected-kpi-option.pipe.spec.ts
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/selected-kpi-option.pipe.spec.ts
rename to src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/selected-kpi-option.pipe.spec.ts
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/selected-kpi-option.pipe.ts b/src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/selected-kpi-option.pipe.ts
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/selected-kpi-option.pipe.ts
rename to src/app/shared/shared-company-forms/company-kpi-search-form/add-kpi-search/selected-kpi-option.pipe.ts
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-list/company-kpi-list.component.css b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.css
similarity index 100%
rename from src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-list/company-kpi-list.component.css
rename to src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.css
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-list/company-kpi-list.component.html b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.html
similarity index 94%
rename from src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-list/company-kpi-list.component.html
rename to src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.html
index 93dbbebf..bda2b278 100644
--- a/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-list/company-kpi-list.component.html
+++ b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.html
@@ -1,12 +1,12 @@
-<div class="d-flex">
-    <div class="col-8">
-        <h6>
+<div class="row">
+    <div class="col-12">
+        <h5>
             <fa-icon [icon]="faBullseye" class="me-2"></fa-icon>
-            Selected Company KPIs
-        </h6>
+            Selected {{company.generalInformation.name}} KPIs
+        </h5>
     </div>
-    <div class="col-4">
-        <button class="btn btn-secondary btn-sm w-100" (click)="openAddCustomModal()">
+    <div class="col-12">
+        <button class="btn btn-outline-success btn-sm w-100" (click)="openAddCustomModal()">
             <fa-icon [icon]="faPlus"></fa-icon>
             Add Custom KPI
         </button>
@@ -25,7 +25,7 @@ <h6>
                         <span class="ps-1" [innerHTML]="kpi.label"></span>
                     </a>
                 </div>
-                <div>
+                <div class="d-sm-none d-md-none d-lg-block">
                     <app-primary-kpi-badge [kpiOption]="kpi"></app-primary-kpi-badge>
                 </div>
             </div>
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-list/company-kpi-list.component.spec.ts b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.spec.ts
similarity index 98%
rename from src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-list/company-kpi-list.component.spec.ts
rename to src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.spec.ts
index c8f4b98c..84e400b1 100644
--- a/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-list/company-kpi-list.component.spec.ts
+++ b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.spec.ts
@@ -16,7 +16,7 @@ import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service'
 import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
 import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
 import { IdbOnSiteVisit, getNewIdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { FormsModule } from '@angular/forms';
 import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
 import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
diff --git a/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-list/company-kpi-list.component.ts b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.ts
similarity index 89%
rename from src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-list/company-kpi-list.component.ts
rename to src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.ts
index 9d28c96f..c8266f73 100644
--- a/src/app/setup-wizard/pre-visit/company-kpi-select/company-kpi-list/company-kpi-list.component.ts
+++ b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-list/company-kpi-list.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { Router } from '@angular/router';
 import { IconDefinition, faBullseye, faCircleQuestion, faPlus, faTrash, faUser } from '@fortawesome/free-solid-svg-icons';
 import { Subscription, firstValueFrom } from 'rxjs';
@@ -107,9 +107,13 @@ export class CompanyKpiListComponent {
     this.closeCustomKPIModal();
   }
 
-  goToKpiDetails(kpi: IdbKeyPerformanceIndicator){
-    let onSiteVisit: IdbOnSiteVisit = this.onSiteVisitIdbService.selectedVisit.getValue();
-    this.router.navigateByUrl('setup-wizard/pre-visit/' + onSiteVisit.guid + '/company-kpi-detail/' + kpi.guid);
+  goToKpiDetails(kpi: IdbKeyPerformanceIndicator) {
+    if (this.router.url.includes('portfolio')) {
+      this.router.navigateByUrl('portfolio/company/' + kpi.companyId + '/performance-indicators/details/' + kpi.guid);
+    } else {
+      let onSiteVisit: IdbOnSiteVisit = this.onSiteVisitIdbService.selectedVisit.getValue();
+      this.router.navigateByUrl('setup-wizard/pre-visit/' + onSiteVisit.guid + '/company-kpi-detail/' + kpi.guid);
+    }
   }
 
 }
diff --git a/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-search-form.component.css b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-search-form.component.css
new file mode 100644
index 00000000..ba040f53
--- /dev/null
+++ b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-search-form.component.css
@@ -0,0 +1,3 @@
+.border-right {
+    border-right: solid 1px gray;
+}
\ No newline at end of file
diff --git a/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-search-form.component.html b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-search-form.component.html
new file mode 100644
index 00000000..37dffce1
--- /dev/null
+++ b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-search-form.component.html
@@ -0,0 +1,8 @@
+<div class="row">
+    <div class="col-6 border-right">
+        <app-add-kpi-search></app-add-kpi-search>
+    </div>
+    <div class="col-6">
+        <app-company-kpi-list></app-company-kpi-list>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-search-form.component.spec.ts b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-search-form.component.spec.ts
new file mode 100644
index 00000000..6632b4e2
--- /dev/null
+++ b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-search-form.component.spec.ts
@@ -0,0 +1,33 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompanyKpiSearchFormComponent } from './company-kpi-search-form.component';
+import { CompanyKpiListComponent } from './company-kpi-list/company-kpi-list.component';
+import { AddKpiSearchComponent } from './add-kpi-search/add-kpi-search.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { FormsModule } from '@angular/forms';
+import { HelperPipesModule } from '../../helper-pipes/_helper-pipes.module';
+import { SelectedKpiOptionPipe } from './add-kpi-search/selected-kpi-option.pipe';
+import { PrimaryKpiBadgeModule } from '../../primary-kpi-badge/primary-kpi-badge.module';
+
+describe('CompanyKpiSearchFormComponent', () => {
+  let component: CompanyKpiSearchFormComponent;
+  let fixture: ComponentFixture<CompanyKpiSearchFormComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, FormsModule, HelperPipesModule, PrimaryKpiBadgeModule],
+      declarations: [CompanyKpiSearchFormComponent, CompanyKpiListComponent, AddKpiSearchComponent, SelectedKpiOptionPipe],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(CompanyKpiSearchFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-search-form.component.ts b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-search-form.component.ts
new file mode 100644
index 00000000..e839e1ab
--- /dev/null
+++ b/src/app/shared/shared-company-forms/company-kpi-search-form/company-kpi-search-form.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-company-kpi-search-form',
+  templateUrl: './company-kpi-search-form.component.html',
+  styleUrl: './company-kpi-search-form.component.css'
+})
+export class CompanyKpiSearchFormComponent {
+
+}
diff --git a/src/app/assessment-dashboard/assessment-dashboard.component.css b/src/app/shared/shared-company-forms/company-setup-form/company-setup-form.component.css
similarity index 100%
rename from src/app/assessment-dashboard/assessment-dashboard.component.css
rename to src/app/shared/shared-company-forms/company-setup-form/company-setup-form.component.css
diff --git a/src/app/shared/shared-company-forms/company-setup-form/company-setup-form.component.html b/src/app/shared/shared-company-forms/company-setup-form/company-setup-form.component.html
new file mode 100644
index 00000000..745e2d42
--- /dev/null
+++ b/src/app/shared/shared-company-forms/company-setup-form/company-setup-form.component.html
@@ -0,0 +1,27 @@
+<form>
+    <!-- <label class="bold" for="companyName">Company Name <span
+            class="required-asterisk">*</span></label> -->
+    <app-label-with-tooltip [field]="'companyName'" [label]="'Company Name'" [isRequired]="true"
+        [labelId]="'companyName'" [isFloatRight]="true"></app-label-with-tooltip>
+    <input name="companyName" type="text" class="form-control" [formControl]="name" (input)="saveChanges()"
+        minlength="1" maxlength="100" id="companyName">
+    <div class="alert alert-danger form-error" *ngIf="name.touched && name.getError('required')">
+        Company Name Required
+    </div>
+    <!-- Set Energy Unit Field -->
+    <app-label-with-tooltip [field]="'energyUnit'" [label]="'Energy Results Unit'" [isRequired]="false"
+        [labelId]="'energyUnit'" [isFloatRight]="true"></app-label-with-tooltip>
+    <select name="energyUnit" class="form-select" [formControl]="energyUnit" (change)="saveUnitChanges()">
+        <option value="kWh">kWh</option>
+        <option value="MMBtu">MMBtu</option>
+    </select>
+    <div class="alert alert-warning small p-1" *ngIf="hasAssessments && energyUnitChange">
+        Warning: The energy uses of all the assessments associated with this company are updated.
+    </div>
+</form>
+<hr>
+<label class="bold">Location</label>
+<app-location-form [inCompany]="true"></app-location-form>
+<hr>
+<label class="bold">Additional Details</label>
+<app-additional-details-form [inCompany]="true"></app-additional-details-form>
\ No newline at end of file
diff --git a/src/app/shared/shared-company-forms/company-setup-form/company-setup-form.component.spec.ts b/src/app/shared/shared-company-forms/company-setup-form/company-setup-form.component.spec.ts
new file mode 100644
index 00000000..0fe07ef4
--- /dev/null
+++ b/src/app/shared/shared-company-forms/company-setup-form/company-setup-form.component.spec.ts
@@ -0,0 +1,29 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompanySetupFormComponent } from './company-setup-form.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { SharedSettingsFormsModule } from '../../shared-settings-forms/shared-settings-forms.module';
+import { LabelWithTooltipModule } from '../../label-with-tooltip/label-with-tooltip.module';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+
+describe('CompanySetupFormComponent', () => {
+  let component: CompanySetupFormComponent;
+  let fixture: ComponentFixture<CompanySetupFormComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SharedSettingsFormsModule, LabelWithTooltipModule, FormsModule, ReactiveFormsModule],
+      declarations: [CompanySetupFormComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(CompanySetupFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/shared-company-forms/company-setup-form/company-setup-form.component.ts b/src/app/shared/shared-company-forms/company-setup-form/company-setup-form.component.ts
new file mode 100644
index 00000000..743455b8
--- /dev/null
+++ b/src/app/shared/shared-company-forms/company-setup-form/company-setup-form.component.ts
@@ -0,0 +1,97 @@
+import { Component } from '@angular/core';
+import { FormControl, Validators } from '@angular/forms';
+import { Observable, of, Subscription } from 'rxjs';
+import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { IdbAssessment } from 'src/app/models/assessment';
+import { IdbCompany } from 'src/app/models/company';
+import { IdbEnergyEquipment } from 'src/app/models/energyEquipment';
+import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
+import { IdbFacility } from 'src/app/models/facility';
+import { FacilitySetupService } from 'src/app/setup-wizard/pre-visit/facility-setup/facility-setup.service';
+import { PreAssessmentSetupService } from 'src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.service';
+import { AssessmentEnergyOpportunitiesFormService } from '../../../setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.service';
+import { FacilityEnergyEquipmentSetupService } from 'src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/facility-energy-equipment-setup.service';
+import { EnergyEquipmentIdbService } from 'src/app/indexed-db/energy-equipment-idb.service';
+
+@Component({
+  selector: 'app-company-setup-form',
+  templateUrl: './company-setup-form.component.html',
+  styleUrl: './company-setup-form.component.css'
+})
+export class CompanySetupFormComponent {
+  
+
+  selectedCompany: IdbCompany;
+  selectedCompanySub: Subscription;
+  name: FormControl;
+  energyUnit: FormControl;
+
+  hasAssessments: boolean = false;
+  energyUnitChange: boolean = false;
+
+  companyAssessments: Array<IdbAssessment> = [];
+  companyFacilities: Array<IdbFacility> = [];
+  companyEnergyOpportunities: Array<IdbEnergyOpportunity> = [];
+  companyEnergyEquipments: Array<IdbEnergyEquipment> = [];
+
+  constructor(
+    private companyIdbService: CompanyIdbService,
+    private preAassessmentSetupService: PreAssessmentSetupService,
+    private assessmentIdbService: AssessmentIdbService,
+    private facilityIdbService: FacilityIdbService,
+    private facilitySetupService: FacilitySetupService,
+    private energyOpportunityIdbService: EnergyOpportunityIdbService,
+    private assessmentEnergyOpportunitiesFormService: AssessmentEnergyOpportunitiesFormService,
+    private facilityEnergyEquipmentSetupService: FacilityEnergyEquipmentSetupService,
+    private energyEquipmentIdbService: EnergyEquipmentIdbService
+  ) {
+
+  }
+
+  ngOnInit() {
+    this.selectedCompanySub = this.companyIdbService.selectedCompany.subscribe(_company => {
+      this.selectedCompany = _company;
+    });
+    if (this.selectedCompany) {
+      this.name = new FormControl(this.selectedCompany.generalInformation.name, [Validators.required]);
+      this.energyUnit = new FormControl(this.selectedCompany.companyEnergyUnit, []); // Default value
+
+      this.companyAssessments = this.assessmentIdbService.getByOtherGuid(this.selectedCompany.guid, 'company');
+      if (this.companyAssessments.length > 0) {
+        this.hasAssessments = true;
+      }
+
+      this.companyFacilities = this.facilityIdbService.getByOtherGuid(this.selectedCompany.guid, 'company');
+      this.companyEnergyOpportunities = this.energyOpportunityIdbService.getByOtherGuid(this.selectedCompany.guid, 'company');
+      this.companyEnergyEquipments = this.energyEquipmentIdbService.getByOtherGuid(this.selectedCompany.guid, 'company');
+    }
+  }
+
+
+  ngOnDestroy() {
+    this.selectedCompanySub.unsubscribe();
+  }
+
+  async saveUnitChanges() {
+    this.energyUnitChange = true;
+    await this.saveChanges();
+    await this.preAassessmentSetupService.updateAssessmentEnergyUse(
+      this.companyAssessments, this.energyUnit.value);
+    await this.facilitySetupService.updateFacilityEnergyUse(
+      this.companyFacilities, this.energyUnit.value);
+    await this.assessmentEnergyOpportunitiesFormService.updateEnergyOpportunityEnergyUseFromCompany(
+      this.companyEnergyOpportunities, this.energyUnit.value);
+    await this.facilityEnergyEquipmentSetupService.updateEnergyEquipmentEnergyUse(
+      this.companyEnergyEquipments, this.energyUnit.value);
+  }
+
+  async saveChanges() {
+    this.selectedCompany = this.companyIdbService.selectedCompany.getValue();
+    this.selectedCompany.generalInformation.name = this.name.value;
+    this.selectedCompany.companyEnergyUnit = this.energyUnit.value;
+    await this.companyIdbService.asyncUpdate(this.selectedCompany);
+  }
+}
diff --git a/src/app/shared/shared-company-forms/shared-company-forms.module.ts b/src/app/shared/shared-company-forms/shared-company-forms.module.ts
new file mode 100644
index 00000000..5554bc5c
--- /dev/null
+++ b/src/app/shared/shared-company-forms/shared-company-forms.module.ts
@@ -0,0 +1,56 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { LabelWithTooltipModule } from '../label-with-tooltip/label-with-tooltip.module';
+import { SharedSettingsFormsModule } from '../shared-settings-forms/shared-settings-forms.module';
+import { CompanySetupFormComponent } from './company-setup-form/company-setup-form.component';
+import { CompanyKpiDetailsFormComponent } from './company-kpi-details-form/company-kpi-details-form.component';
+import { PrimaryKpiBadgeModule } from '../primary-kpi-badge/primary-kpi-badge.module';
+import { HelperPipesModule } from '../helper-pipes/_helper-pipes.module';
+import { KpiDescriptionPipe } from './company-kpi-details-form/kpi-description.pipe';
+import { KpmDetailsFormModule } from '../kpm-details-form/kpm-details-form.module';
+import { KpmDatabaseModalComponent } from './company-kpi-details-form/kpm-database-modal/kpm-database-modal.component';
+import { KpmImpactsTableComponent } from './company-kpi-details-form/kpm-impacts-table/kpm-impacts-table.component';
+import { ContactModalModule } from '../contact-modal/contact-modal.module';
+import { CompanyKpiSearchFormComponent } from './company-kpi-search-form/company-kpi-search-form.component';
+import { AddKpiSearchComponent } from './company-kpi-search-form/add-kpi-search/add-kpi-search.component';
+import { CompanyKpiListComponent } from './company-kpi-search-form/company-kpi-list/company-kpi-list.component';
+import { SelectedKpiOptionPipe } from './company-kpi-search-form/add-kpi-search/selected-kpi-option.pipe';
+import { CompanyContactsFormComponent } from './company-contacts-form/company-contacts-form.component';
+
+
+
+@NgModule({
+  declarations: [
+    CompanySetupFormComponent,
+    CompanyKpiDetailsFormComponent,
+    KpiDescriptionPipe,
+    KpmDatabaseModalComponent,
+    KpmImpactsTableComponent,
+    CompanyKpiSearchFormComponent,
+    AddKpiSearchComponent,
+    CompanyKpiListComponent,
+    SelectedKpiOptionPipe,
+    CompanyContactsFormComponent
+  ],
+  imports: [
+    CommonModule,
+    FontAwesomeModule,
+    ReactiveFormsModule,
+    LabelWithTooltipModule,
+    SharedSettingsFormsModule,
+    FormsModule,
+    PrimaryKpiBadgeModule,
+    HelperPipesModule,
+    KpmDetailsFormModule,
+    ContactModalModule
+  ],
+  exports: [
+    CompanySetupFormComponent,
+    CompanyKpiDetailsFormComponent,
+    CompanyKpiSearchFormComponent,
+    CompanyContactsFormComponent
+  ]
+})
+export class SharedCompanyFormsModule { }
diff --git a/src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/energy-equipment-form/energy-equipment-form.component.css b/src/app/shared/shared-facility-forms/energy-equipment-form/energy-equipment-form.component.css
similarity index 100%
rename from src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/energy-equipment-form/energy-equipment-form.component.css
rename to src/app/shared/shared-facility-forms/energy-equipment-form/energy-equipment-form.component.css
diff --git a/src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/energy-equipment-form/energy-equipment-form.component.html b/src/app/shared/shared-facility-forms/energy-equipment-form/energy-equipment-form.component.html
similarity index 96%
rename from src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/energy-equipment-form/energy-equipment-form.component.html
rename to src/app/shared/shared-facility-forms/energy-equipment-form/energy-equipment-form.component.html
index 0ba82153..c947ba70 100644
--- a/src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/energy-equipment-form/energy-equipment-form.component.html
+++ b/src/app/shared/shared-facility-forms/energy-equipment-form/energy-equipment-form.component.html
@@ -233,12 +233,8 @@
         <hr>
     </div>
     <div class="popup-footer d-flex justify-content-end">
-        <button class="btn btn-secondary me-2" (click)="closeDeleteModal()">Cancel</button>
-        <button class="btn btn-danger" (click)="deleteEquipment()"><fa-icon [icon]="faTrash"></fa-icon> Delete
+        <button class="btn btn-secondary me-2 btn-sm" (click)="closeDeleteModal()">Cancel</button>
+        <button class="btn btn-danger btn-sm" (click)="deleteEquipment()"><fa-icon [icon]="faTrash"></fa-icon> Delete
             Equipment</button>
     </div>
-</div>
-
-<app-contact-modal *ngIf="displayContactModal" (emitCancelContact)="closeContactModal()"
-    [contextGuid]="energyEquipment.guid" [contactContext]="'energyEquipment'"
-    [selectedContact]="viewContact" [companyGuid]="energyEquipment.companyId"></app-contact-modal>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/app/shared/shared-facility-forms/energy-equipment-form/energy-equipment-form.component.spec.ts b/src/app/shared/shared-facility-forms/energy-equipment-form/energy-equipment-form.component.spec.ts
new file mode 100644
index 00000000..60cadaf3
--- /dev/null
+++ b/src/app/shared/shared-facility-forms/energy-equipment-form/energy-equipment-form.component.spec.ts
@@ -0,0 +1,29 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EnergyEquipmentFormComponent } from './energy-equipment-form.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { FormsModule } from '@angular/forms';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('EnergyEquipmentFormComponent', () => {
+  let component: EnergyEquipmentFormComponent;
+  let fixture: ComponentFixture<EnergyEquipmentFormComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, HelperPipesModule, FormsModule],
+      declarations: [EnergyEquipmentFormComponent],
+      providers: stubServiceProviders
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(EnergyEquipmentFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/energy-equipment-form/energy-equipment-form.component.ts b/src/app/shared/shared-facility-forms/energy-equipment-form/energy-equipment-form.component.ts
similarity index 79%
rename from src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/energy-equipment-form/energy-equipment-form.component.ts
rename to src/app/shared/shared-facility-forms/energy-equipment-form/energy-equipment-form.component.ts
index 29758615..f158da47 100644
--- a/src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/energy-equipment-form/energy-equipment-form.component.ts
+++ b/src/app/shared/shared-facility-forms/energy-equipment-form/energy-equipment-form.component.ts
@@ -1,4 +1,5 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
 import { faContactBook, faTrash, faUser, IconDefinition } from '@fortawesome/free-solid-svg-icons';
 import { Subscription } from 'rxjs';
 import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
@@ -13,6 +14,8 @@ import { EquipmentType, EquipmentTypeOptions, EquipmentTypes } from 'src/app/sha
 import { EnergyUnitOptions, ProcessCoolingUnitOptions, UnitOption, VolumeGasOptions, VolumeLiquidOptions } from 'src/app/shared/constants/unitOptions';
 import { UtilityOption, UtilityOptions, UtilityType, UtilityTypes } from 'src/app/shared/constants/utilityTypes';
 import { ConvertValue } from 'src/app/shared/conversions/convertValue';
+import { SharedDataService } from '../../shared-services/shared-data.service';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
 
 @Component({
   selector: 'app-energy-equipment-form',
@@ -30,12 +33,14 @@ export class EnergyEquipmentFormComponent {
   faContactBook: IconDefinition = faContactBook;
 
   equipmentTypes: Array<EquipmentType> = EquipmentTypes;
-  equipmentTypeOptions: Array<{ equipmentType: EquipmentType, 
-      utilityTypes: Array<UtilityType>,
-      defaultUnit: string }> = EquipmentTypeOptions;
+  equipmentTypeOptions: Array<{
+    equipmentType: EquipmentType,
+    utilityTypes: Array<UtilityType>,
+    defaultUnit: string
+  }> = EquipmentTypeOptions;
   utilityOptions: Array<UtilityOption> = UtilityOptions;
 
-  fuelVolumeUnitOptions:Array<UnitOption> = [...VolumeLiquidOptions, ...VolumeGasOptions];
+  fuelVolumeUnitOptions: Array<UnitOption> = [...VolumeLiquidOptions, ...VolumeGasOptions];
   fuelEnergyUnitOptions: Array<UnitOption> = EnergyUnitOptions;
 
   processCoolingUnitOptions: Array<UnitOption> = ProcessCoolingUnitOptions
@@ -46,8 +51,6 @@ export class EnergyEquipmentFormComponent {
   displayDeleteModal: boolean = false;
   contacts: Array<IdbContact>;
   contactSub: Subscription;
-  viewContact: IdbContact;
-  displayContactModal: boolean = false;
 
   companySub: Subscription;
   companyEnergyUnit: string;
@@ -59,10 +62,22 @@ export class EnergyEquipmentFormComponent {
     private contactIdbService: ContactIdbService,
     private companyIdbService: CompanyIdbService,
     private facilityIdbService: FacilityIdbService,
+    private activatedRoute: ActivatedRoute,
+    private sharedDataService: SharedDataService,
+    private toastNotificationService: ToastNotificationsService,
+    private router: Router
   ) { }
 
   ngOnInit() {
-    this.energyEquipment = this.energyEquipmentIdbService.getByGuid(this.energyEquipmentGuid);
+    if (!this.energyEquipmentGuid) {
+      this.activatedRoute.params.subscribe(params => {
+        this.energyEquipmentGuid = params['id'];
+        this.energyEquipment = this.energyEquipmentIdbService.getByGuid(this.energyEquipmentGuid);
+      });
+    } else {
+      this.energyEquipment = this.energyEquipmentIdbService.getByGuid(this.energyEquipmentGuid);
+    }
+
     this.contactSub = this.contactIdbService.contacts.subscribe(_contacts => {
       this.contacts = _contacts;
     });
@@ -109,8 +124,8 @@ export class EnergyEquipmentFormComponent {
   autoCalculateFuelPower() {
     if (this.energyEquipment.utilityType === 'Other Fuels' && this.energyEquipment.autoCalculate) {
       let result = this.energyEquipment.fuelConsumption * this.energyEquipment.fuelHHV;
-      let unitConv = this.convertValue.convertValue(1, this.energyEquipment.fuelEnergyUnit).convertedValue/
-        this.convertValue.convertValue(1, this.energyEquipment.sizeUnit).convertedValue /3600; // J/hr to W
+      let unitConv = this.convertValue.convertValue(1, this.energyEquipment.fuelEnergyUnit).convertedValue /
+        this.convertValue.convertValue(1, this.energyEquipment.sizeUnit).convertedValue / 3600; // J/hr to W
       result = result * unitConv;
       this.energyEquipment.size = Number(result.toFixed(3)); // Round to 3 decimal places
     }
@@ -136,13 +151,13 @@ export class EnergyEquipmentFormComponent {
   updateFacilityUtilityUnit() {
     const utilityType = this.energyEquipment.utilityType.replace(/\s+/g, '');
     const camelCaseType = utilityType.charAt(0).toLowerCase()
-              + utilityType.slice(1); // Lowercase first letter
+      + utilityType.slice(1); // Lowercase first letter
     if (this.facilityUnitSettings[`include${camelCaseType}`]) {
       let selectedUtilityOption = this.utilityOptions.find(
         _option => _option.utilityType == utilityType);
       let selectedUnitOption = selectedUtilityOption.energyUnitOptions.find(
         _unitOption => _unitOption.value == this.energyEquipment.facilityUtilityUnit);
-      if (selectedUtilityOption.isStandardEnergyUnit 
+      if (selectedUtilityOption.isStandardEnergyUnit
         && selectedUnitOption.isStandard !== false) { // Standard unit
         this.energyEquipment.facilityUtilityUnit = this.facilityUnitSettings[`${camelCaseType}Unit`];
       } else { // Non-standard unit
@@ -159,12 +174,12 @@ export class EnergyEquipmentFormComponent {
       this.companyEnergyUnit,
       this.energyEquipment.facilityUtilityUnit
     ).convertedValue;
-    if (!this.energyEquipment.annualEnergyUseByUtility || 
+    if (!this.energyEquipment.annualEnergyUseByUtility ||
       this.energyEquipment.annualEnergyUseByUtility === Infinity) {
       this.energyEquipment.annualEnergyUseByUtility = 0;
     }
   }
-  
+
   ngAfterViewInit() {
     //emit after initialized. 
     //When adding new energy equipment this will trigger the form to open
@@ -185,15 +200,18 @@ export class EnergyEquipmentFormComponent {
 
   async deleteEquipment() {
     await this.dbChangesService.deleteEnergyEquipment(this.energyEquipment);
+    this.toastNotificationService.showToast("Equipment Deleted!", "Equipment item has been removed from the facility inventory.", 'bg-success', true, false);
+    if (this.router.url.includes('portfolio')) {
+      this.router.navigateByUrl('/portfolio/facility/' + this.energyEquipment.facilityId + '/system-inventory');
+    }
+    this.closeDeleteModal();
   }
 
   openContactModal(viewContact: IdbContact) {
-    this.viewContact = viewContact;
-    this.displayContactModal = true;
+    this.sharedDataService.displayContactModal.next({ context: 'energyEquipment', viewContact: viewContact, contextGuid: this.energyEquipment.guid, companyId: this.energyEquipment.companyId });
   }
 
   closeContactModal() {
-    this.displayContactModal = false;
-    this.viewContact = undefined;
+    this.sharedDataService.displayContactModal.next(undefined);
   }
 }
\ No newline at end of file
diff --git a/src/app/assessment-dashboard/assessment-settings/assessment-settings.component.css b/src/app/shared/shared-facility-forms/facility-setup-form/facility-setup-form.component.css
similarity index 100%
rename from src/app/assessment-dashboard/assessment-settings/assessment-settings.component.css
rename to src/app/shared/shared-facility-forms/facility-setup-form/facility-setup-form.component.css
diff --git a/src/app/shared/shared-facility-forms/facility-setup-form/facility-setup-form.component.html b/src/app/shared/shared-facility-forms/facility-setup-form/facility-setup-form.component.html
new file mode 100644
index 00000000..09df0469
--- /dev/null
+++ b/src/app/shared/shared-facility-forms/facility-setup-form/facility-setup-form.component.html
@@ -0,0 +1,18 @@
+
+<form>
+    <label class="bold" for="facilityName">Facility Name <span class="required-asterisk">*</span></label>
+    <input name="facilityName" type="text" class="form-control" [formControl]="name"
+        (input)="saveChanges()" id="facilityName">
+    <div class="form-error alert alert-danger" *ngIf="name.touched && name.errors?.['required']">
+        Facility name required.
+    </div>
+</form>
+<hr>
+<label class="bold">Location</label>
+<app-location-form [inCompany]="false"></app-location-form>
+<hr>
+<label class="bold">Tracked Utilities</label>
+<app-units-form></app-units-form>
+<hr>
+<label class="bold">Additional Details</label>
+<app-additional-details-form [inCompany]="false"></app-additional-details-form>
\ No newline at end of file
diff --git a/src/app/shared/shared-facility-forms/facility-setup-form/facility-setup-form.component.spec.ts b/src/app/shared/shared-facility-forms/facility-setup-form/facility-setup-form.component.spec.ts
new file mode 100644
index 00000000..d690d00b
--- /dev/null
+++ b/src/app/shared/shared-facility-forms/facility-setup-form/facility-setup-form.component.spec.ts
@@ -0,0 +1,29 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FacilitySetupFormComponent } from './facility-setup-form.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { SharedSettingsFormsModule } from '../../shared-settings-forms/shared-settings-forms.module';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { LabelWithTooltipModule } from '../../label-with-tooltip/label-with-tooltip.module';
+
+describe('FacilitySetupFormComponent', () => {
+  let component: FacilitySetupFormComponent;
+  let fixture: ComponentFixture<FacilitySetupFormComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SharedSettingsFormsModule, LabelWithTooltipModule, FormsModule, ReactiveFormsModule],
+      declarations: [FacilitySetupFormComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(FacilitySetupFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/shared-facility-forms/facility-setup-form/facility-setup-form.component.ts b/src/app/shared/shared-facility-forms/facility-setup-form/facility-setup-form.component.ts
new file mode 100644
index 00000000..1e9d87dd
--- /dev/null
+++ b/src/app/shared/shared-facility-forms/facility-setup-form/facility-setup-form.component.ts
@@ -0,0 +1,35 @@
+import { Component } from '@angular/core';
+import { FormControl, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { IdbFacility } from 'src/app/models/facility';
+
+@Component({
+  selector: 'app-facility-setup-form',
+  templateUrl: './facility-setup-form.component.html',
+  styleUrl: './facility-setup-form.component.css'
+})
+export class FacilitySetupFormComponent {
+
+  name: FormControl;
+  facilityName: string;
+  facility: IdbFacility;
+  constructor(private facilityIdbService: FacilityIdbService, private router: Router
+  ) {
+  }
+
+  ngOnInit() {
+    this.facility = this.facilityIdbService.selectedFacility.getValue();
+    if (this.facility) {
+      this.name = new FormControl(this.facility.generalInformation.name, [Validators.required]);
+    } else {
+      this.name = new FormControl('', [Validators.required]);
+    }
+  }
+
+  async saveChanges() {
+    let facility: IdbFacility = this.facilityIdbService.selectedFacility.getValue();
+    facility.generalInformation.name = this.name.value;
+    await this.facilityIdbService.asyncUpdate(facility);
+  }
+}
diff --git a/src/app/setup-wizard/pre-visit/facility-process-equipment-setup/process-equipment-form/process-equipment-form.component.css b/src/app/shared/shared-facility-forms/process-equipment-form/process-equipment-form.component.css
similarity index 100%
rename from src/app/setup-wizard/pre-visit/facility-process-equipment-setup/process-equipment-form/process-equipment-form.component.css
rename to src/app/shared/shared-facility-forms/process-equipment-form/process-equipment-form.component.css
diff --git a/src/app/setup-wizard/pre-visit/facility-process-equipment-setup/process-equipment-form/process-equipment-form.component.html b/src/app/shared/shared-facility-forms/process-equipment-form/process-equipment-form.component.html
similarity index 67%
rename from src/app/setup-wizard/pre-visit/facility-process-equipment-setup/process-equipment-form/process-equipment-form.component.html
rename to src/app/shared/shared-facility-forms/process-equipment-form/process-equipment-form.component.html
index 3c5eb9dd..1e9aa38f 100644
--- a/src/app/setup-wizard/pre-visit/facility-process-equipment-setup/process-equipment-form/process-equipment-form.component.html
+++ b/src/app/shared/shared-facility-forms/process-equipment-form/process-equipment-form.component.html
@@ -5,18 +5,15 @@
                 <label class="col-sm-5 col-form-label" for="equipmentName">End Use Name</label>
                 <div class="col-sm-7">
                     <input name="equipmentName" type="text" class="form-control"
-                        [(ngModel)]="processEquipment.equipmentName"
-                        id="equipmentName" (input)="saveChanges()">
+                        [(ngModel)]="processEquipment.equipmentName" id="equipmentName" (input)="saveChanges()">
                 </div>
             </div>
-           
+
             <div class="row">
                 <label class="col-sm-5 col-form-label" for="notes">Notes</label>
                 <div class="col-sm-7">
-                    <textarea class="form-control" name="notes"
-                        [(ngModel)]="processEquipment.notes"
-                        (input)="saveChanges()"
-                        rows="4"></textarea>
+                    <textarea class="form-control" name="notes" [(ngModel)]="processEquipment.notes"
+                        (input)="saveChanges()" rows="4"></textarea>
                 </div>
             </div>
         </form>
@@ -33,15 +30,13 @@
                     <fa-icon [icon]="faUser"></fa-icon>
                     {{contact | contactNameDisplay}}
                 </button>
-                <button class="btn btn-sm btn-secondary"
-                    (click)="openContactModal(undefined)">
+                <button class="btn btn-sm btn-secondary" (click)="openContactModal(undefined)">
                     <fa-icon [icon]="faContactBook"></fa-icon>
                     Stakeholders
                 </button>
             </div>
             <div>
-                <button class="btn btn-sm btn-danger"
-                    (click)="openDeleteModal()">
+                <button class="btn btn-sm btn-danger" (click)="openDeleteModal()">
                     <fa-icon [icon]="faTrash"></fa-icon> Delete
                 </button>
             </div>
@@ -62,12 +57,8 @@
         <hr>
     </div>
     <div class="popup-footer d-flex justify-content-end">
-        <button class="btn btn-secondary me-2" (click)="closeDeleteModal()">Cancel</button>
-        <button class="btn btn-danger" (click)="deleteEquipment()"><fa-icon [icon]="faTrash"></fa-icon> Delete
+        <button class="btn btn-secondary btn-sm me-2" (click)="closeDeleteModal()">Cancel</button>
+        <button class="btn btn-danger btn-sm" (click)="deleteEquipment()"><fa-icon [icon]="faTrash"></fa-icon> Delete
             End Use</button>
     </div>
-</div>
-
-<app-contact-modal *ngIf="displayContactModal" (emitCancelContact)="closeContactModal()"
-    [contextGuid]="processEquipment.guid" [contactContext]="'processEquipment'"
-    [selectedContact]="viewContact" [companyGuid]="processEquipment.companyId"></app-contact-modal>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/app/shared/shared-facility-forms/process-equipment-form/process-equipment-form.component.spec.ts b/src/app/shared/shared-facility-forms/process-equipment-form/process-equipment-form.component.spec.ts
new file mode 100644
index 00000000..92c52ae1
--- /dev/null
+++ b/src/app/shared/shared-facility-forms/process-equipment-form/process-equipment-form.component.spec.ts
@@ -0,0 +1,29 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProcessEquipmentFormComponent } from './process-equipment-form.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { FormsModule } from '@angular/forms';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('ProcessEquipmentFormComponent', () => {
+  let component: ProcessEquipmentFormComponent;
+  let fixture: ComponentFixture<ProcessEquipmentFormComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, HelperPipesModule, FormsModule],
+      declarations: [ProcessEquipmentFormComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(ProcessEquipmentFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/setup-wizard/pre-visit/facility-process-equipment-setup/process-equipment-form/process-equipment-form.component.ts b/src/app/shared/shared-facility-forms/process-equipment-form/process-equipment-form.component.ts
similarity index 58%
rename from src/app/setup-wizard/pre-visit/facility-process-equipment-setup/process-equipment-form/process-equipment-form.component.ts
rename to src/app/shared/shared-facility-forms/process-equipment-form/process-equipment-form.component.ts
index 7a4013f7..ecbd3d4c 100644
--- a/src/app/setup-wizard/pre-visit/facility-process-equipment-setup/process-equipment-form/process-equipment-form.component.ts
+++ b/src/app/shared/shared-facility-forms/process-equipment-form/process-equipment-form.component.ts
@@ -1,13 +1,14 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
 import { faContactBook, faTrash, faUser, IconDefinition } from '@fortawesome/free-solid-svg-icons';
 import { Subscription } from 'rxjs';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
 import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
 import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
 import { ProcessEquipmentIdbService } from 'src/app/indexed-db/process-equipment-idb.service';
 import { IdbContact } from 'src/app/models/contact';
 import { IdbProcessEquipment } from 'src/app/models/processEquipment';
-import { EquipmentType, EquipmentTypes } from 'src/app/shared/constants/equipmentTypes';
-import { UtilityType, UtilityTypes } from 'src/app/shared/constants/utilityTypes';
+import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
 
 @Component({
   selector: 'app-process-equipment-form',
@@ -15,7 +16,7 @@ import { UtilityType, UtilityTypes } from 'src/app/shared/constants/utilityTypes
   styleUrl: './process-equipment-form.component.css'
 })
 export class ProcessEquipmentFormComponent {
-  @Input({required: true})
+  @Input({ required: true })
   processEquipmentGuid: string;
   @Output('emitInitialized')
   emitInitialized = new EventEmitter<boolean>();
@@ -28,15 +29,24 @@ export class ProcessEquipmentFormComponent {
   displayDeleteModal: boolean = false;
   contacts: Array<IdbContact>;
   contactSub: Subscription;
-  viewContact: IdbContact;
-  displayContactModal: boolean = false;
   constructor(private processEquipmentIdbService: ProcessEquipmentIdbService,
     private dbChangesService: DbChangesService,
-    private contactIdbService: ContactIdbService
+    private contactIdbService: ContactIdbService,
+    private sharedDataService: SharedDataService,
+    private activatedRoute: ActivatedRoute,
+    private router: Router,
+    private toastNotificationService: ToastNotificationsService
   ) { }
 
   ngOnInit() {
-    this.processEquipment = this.processEquipmentIdbService.getByGuid(this.processEquipmentGuid);
+    if (!this.processEquipmentGuid) {
+      this.activatedRoute.params.subscribe(params => {
+        this.processEquipmentGuid = params['id'];
+        this.processEquipment = this.processEquipmentIdbService.getByGuid(this.processEquipmentGuid);
+      });
+    } else {
+      this.processEquipment = this.processEquipmentIdbService.getByGuid(this.processEquipmentGuid);
+    }
     this.contactSub = this.contactIdbService.contacts.subscribe(_contacts => {
       this.contacts = _contacts;
     });
@@ -66,15 +76,18 @@ export class ProcessEquipmentFormComponent {
 
   async deleteEquipment() {
     await this.dbChangesService.deleteProcessEquipment(this.processEquipment);
+    this.toastNotificationService.showToast("End Use Deleted!", "End use item has been removed from the facility inventory.", 'bg-success', true, false);
+    if (this.router.url.includes('portfolio')) {
+      this.router.navigateByUrl('/portfolio/facility/' + this.processEquipment.facilityId + '/end-use-inventory');
+    }
+    this.closeDeleteModal();
   }
 
   openContactModal(viewContact: IdbContact) {
-    this.viewContact = viewContact;
-    this.displayContactModal = true;
+    this.sharedDataService.displayContactModal.next({ context: 'processEquipment', viewContact: viewContact, contextGuid: this.processEquipment.guid, companyId: this.processEquipment.companyId });
   }
 
   closeContactModal() {
-    this.displayContactModal = false;
-    this.viewContact = undefined;
+    this.sharedDataService.displayContactModal.next(undefined)
   }
 }
diff --git a/src/app/shared/shared-facility-forms/shared-facility-forms.module.ts b/src/app/shared/shared-facility-forms/shared-facility-forms.module.ts
new file mode 100644
index 00000000..1ad8d9b7
--- /dev/null
+++ b/src/app/shared/shared-facility-forms/shared-facility-forms.module.ts
@@ -0,0 +1,33 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FacilitySetupFormComponent } from './facility-setup-form/facility-setup-form.component';
+import { SharedSettingsFormsModule } from '../shared-settings-forms/shared-settings-forms.module';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { EnergyEquipmentFormComponent } from './energy-equipment-form/energy-equipment-form.component';
+import { HelperPipesModule } from '../helper-pipes/_helper-pipes.module';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { ProcessEquipmentFormComponent } from './process-equipment-form/process-equipment-form.component';
+
+
+
+@NgModule({
+  declarations: [
+    FacilitySetupFormComponent,
+    EnergyEquipmentFormComponent,
+    ProcessEquipmentFormComponent
+  ],
+  imports: [
+    CommonModule,
+    SharedSettingsFormsModule,
+    FormsModule,
+    ReactiveFormsModule,
+    HelperPipesModule,
+    FontAwesomeModule
+  ],
+  exports: [
+    FacilitySetupFormComponent,
+    EnergyEquipmentFormComponent,
+    ProcessEquipmentFormComponent
+  ]
+})
+export class SharedFacilityFormsModule { }
diff --git a/src/app/shared/shared-services/shared-data.service.ts b/src/app/shared/shared-services/shared-data.service.ts
index b199baca..64aa6aef 100644
--- a/src/app/shared/shared-services/shared-data.service.ts
+++ b/src/app/shared/shared-services/shared-data.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
+import { ContactContext, IdbContact } from 'src/app/models/contact';
 
 @Injectable({
   providedIn: 'root'
@@ -8,8 +9,22 @@ export class SharedDataService {
 
   sidebarOpen: BehaviorSubject<boolean>;
   createAssessmentModalOpen: BehaviorSubject<boolean>;
+
+  displayAddNebsModal: BehaviorSubject<{
+    assessmentId: string,
+    energyOpportunityId: string
+  }>;
+
+  displayContactModal: BehaviorSubject<{
+    context: ContactContext,
+    viewContact: IdbContact,
+    contextGuid: string,
+    companyId: string
+  }>;
   constructor() {
     this.createAssessmentModalOpen = new BehaviorSubject<boolean>(false);
     this.sidebarOpen = new BehaviorSubject<boolean>(false);
+    this.displayAddNebsModal = new BehaviorSubject<{ assessmentId: string, energyOpportunityId: string }>(undefined);
+    this.displayContactModal = new BehaviorSubject<{ context: ContactContext, viewContact: IdbContact, contextGuid: string, companyId: string }>(undefined);
   }
 }
diff --git a/src/app/shared/shared-settings-forms/shared-settings-forms.module.ts b/src/app/shared/shared-settings-forms/shared-settings-forms.module.ts
index 6524a3ac..dc7e488e 100644
--- a/src/app/shared/shared-settings-forms/shared-settings-forms.module.ts
+++ b/src/app/shared/shared-settings-forms/shared-settings-forms.module.ts
@@ -6,7 +6,7 @@ import { NaicsListPipe } from './additional-details-form/naics-list.pipe';
 import { LocationFormComponent } from './location-form/location-form.component';
 import { AdditionalDetailsFormComponent } from './additional-details-form/additional-details-form.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from '../helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from '../helper-pipes/_helper-pipes.module';
 
 @NgModule({
   declarations: [
diff --git a/src/app/shared/shared-settings-forms/units-form/units-form.component.spec.ts b/src/app/shared/shared-settings-forms/units-form/units-form.component.spec.ts
index 1438605e..6713da3d 100644
--- a/src/app/shared/shared-settings-forms/units-form/units-form.component.spec.ts
+++ b/src/app/shared/shared-settings-forms/units-form/units-form.component.spec.ts
@@ -9,7 +9,7 @@ import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
 import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
 import { ReactiveFormsModule } from '@angular/forms';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from '../../helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from '../../helper-pipes/_helper-pipes.module';
 import { PreAssessmentSetupService } from 'src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.service';
 import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
diff --git a/src/app/shared/shared-settings-forms/units-form/units-form.component.ts b/src/app/shared/shared-settings-forms/units-form/units-form.component.ts
index 8c4f21b7..057018ca 100644
--- a/src/app/shared/shared-settings-forms/units-form/units-form.component.ts
+++ b/src/app/shared/shared-settings-forms/units-form/units-form.component.ts
@@ -1,27 +1,20 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { EnergyUnitOptions, MassUnitOptions, UnitOption, VolumeGasOptions, VolumeLiquidOptions } from '../../constants/unitOptions';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+import { EnergyUnitOptions, UnitOption } from '../../constants/unitOptions';
 import { Subscription } from 'rxjs';
-import { UnitSettings } from 'src/app/models/unitSettings';
 import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { IdbFacility } from 'src/app/models/facility';
 import { IconDefinition, faGear } from '@fortawesome/free-solid-svg-icons';
 import { SharedSettingsFormsService } from '../shared-settings-forms.service';
 import { PreAssessmentSetupService } from 'src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.service';
-import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
 import { IdbAssessment } from 'src/app/models/assessment';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbCompany } from 'src/app/models/company';
 import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
 import { UtilityOptions } from '../../constants/utilityTypes';
 import { ConvertValue } from '../../conversions/convertValue';
 import { IdbEnergyEquipment } from 'src/app/models/energyEquipment';
 import { EnergyEquipmentIdbService } from 'src/app/indexed-db/energy-equipment-idb.service';
 import { FacilityEnergyEquipmentSetupService } from 'src/app/setup-wizard/pre-visit/facility-energy-equipment-setup/facility-energy-equipment-setup.service';
-import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
-import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
-import { AssessmentEnergyOpportunitiesFormService } from 'src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.service';
 
 @Component({
   selector: 'app-units-form',
diff --git a/src/app/shared/table-entries/single-cell-item/single-cell-item.component.html b/src/app/shared/table-entries/single-cell-item/single-cell-item.component.html
index e5959c91..fe91538a 100644
--- a/src/app/shared/table-entries/single-cell-item/single-cell-item.component.html
+++ b/src/app/shared/table-entries/single-cell-item/single-cell-item.component.html
@@ -12,7 +12,7 @@
 
     <ng-template #numValueBlock>
         <ng-template [ngIf]="!isCurrency" [ngIfElse]="currencyBlock">
-            {{numValue | number:'1.0-2'}}
+            {{numValue | number:numValueDigits}}
         </ng-template>
         <ng-template #currencyBlock>
             {{numValue | currency : 'USD' : 'symbol' : '1.0-0'}}
diff --git a/src/app/shared/table-entries/single-cell-item/single-cell-item.component.ts b/src/app/shared/table-entries/single-cell-item/single-cell-item.component.ts
index d1ea7787..9e361105 100644
--- a/src/app/shared/table-entries/single-cell-item/single-cell-item.component.ts
+++ b/src/app/shared/table-entries/single-cell-item/single-cell-item.component.ts
@@ -16,4 +16,6 @@ export class SingleCellItemComponent {
   per: string;
   @Input()
   isCurrency: boolean;
+  @Input()
+  numValueDigits: string = '1.0-2';
 }
diff --git a/src/app/shared/table-entries/table-entries.module.ts b/src/app/shared/table-entries/table-entries.module.ts
index 8d4f1ae0..88839ba8 100644
--- a/src/app/shared/table-entries/table-entries.module.ts
+++ b/src/app/shared/table-entries/table-entries.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { SingleCellItemComponent } from './single-cell-item/single-cell-item.component';
-import { HelperPipesModule } from '../helper-pipes/helper-pipes.module';
+import { HelperPipesModule } from '../helper-pipes/_helper-pipes.module';
 
 
 
diff --git a/src/app/shared/table-pagination/table-pagination.component.css b/src/app/shared/table-pagination/table-pagination.component.css
new file mode 100644
index 00000000..52851ef9
--- /dev/null
+++ b/src/app/shared/table-pagination/table-pagination.component.css
@@ -0,0 +1,7 @@
+/* .page-link{
+    padding: .35rem !important;
+} */
+
+.page-link:hover{
+    cursor: pointer;
+}
\ No newline at end of file
diff --git a/src/app/shared/table-pagination/table-pagination.component.html b/src/app/shared/table-pagination/table-pagination.component.html
new file mode 100644
index 00000000..f38ebc50
--- /dev/null
+++ b/src/app/shared/table-pagination/table-pagination.component.html
@@ -0,0 +1,22 @@
+<ng-container *ngIf="numberOfPages > 1">
+    <div class="d-flex">
+        <nav>
+            <ul class="pagination mb-0">
+                <li class="page-item" [ngClass]="{'disabled': pageNumber == 1}">
+                    <a class="page-link" aria-label="Previous" (click)="setPageNumber(pageNumber-1)">
+                        <span aria-hidden="true">&laquo;</span>
+                    </a>
+                </li>
+                <li *ngFor="let pageNumberOption of pageNumberOptions" class="page-item"
+                    [ngClass]="{'active': pageNumber == pageNumberOption}">
+                    <a class="page-link" (click)="setPageNumber(pageNumberOption)">{{pageNumberOption}}</a>
+                </li>
+                <li class="page-item" [ngClass]="{'disabled': pageNumber == numberOfPages}">
+                    <a class="page-link" aria-label="Next" (click)="setPageNumber(pageNumber+1)">
+                        <span aria-hidden="true">&raquo;</span>
+                    </a>
+                </li>
+            </ul>
+        </nav>
+    </div>
+</ng-container>
\ No newline at end of file
diff --git a/src/app/shared/table-pagination/table-pagination.component.spec.ts b/src/app/shared/table-pagination/table-pagination.component.spec.ts
new file mode 100644
index 00000000..f1ee64c8
--- /dev/null
+++ b/src/app/shared/table-pagination/table-pagination.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TablePaginationComponent } from './table-pagination.component';
+
+describe('TablePaginationComponent', () => {
+  let component: TablePaginationComponent;
+  let fixture: ComponentFixture<TablePaginationComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [TablePaginationComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(TablePaginationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/table-pagination/table-pagination.component.ts b/src/app/shared/table-pagination/table-pagination.component.ts
new file mode 100644
index 00000000..243bb8f5
--- /dev/null
+++ b/src/app/shared/table-pagination/table-pagination.component.ts
@@ -0,0 +1,44 @@
+import { Component, EventEmitter, Input, Output, SimpleChanges } from '@angular/core';
+
+@Component({
+  selector: 'app-table-pagination',
+  templateUrl: './table-pagination.component.html',
+  styleUrl: './table-pagination.component.css'
+})
+export class TablePaginationComponent {
+  @Input({ required: true })
+  pageNumber: number;
+  @Input({ required: true })
+  collectionSize: number;
+  @Input({ required: true })
+  itemsPerPage: number;
+  @Output('emitPageNumber')
+  emitPageNumber: EventEmitter<number> = new EventEmitter<number>();
+
+  pageNumberOptions: Array<number>;
+  numberOfPages: number;
+
+  ngOnInit() {
+    this.setValues();
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    //update values on collection size change or items per page change
+    if ((changes['collectionSize'] && !changes['collectionSize'].firstChange) || (changes['itemsPerPage'] && !changes['itemsPerPage'].firstChange)) {
+      this.setValues();
+    }
+  }
+
+  setValues() {
+    this.numberOfPages = Math.ceil(this.collectionSize / this.itemsPerPage);
+    this.pageNumberOptions = new Array();
+    for (let i = 1; i <= this.numberOfPages; i++) {
+      this.pageNumberOptions.push(i);
+    }
+  }
+
+  setPageNumber(pageNumber: number) {
+    this.pageNumber = pageNumber;
+    this.emitPageNumber.emit(this.pageNumber);
+  }
+}
diff --git a/src/app/shared/table-pagination/table-pagination.module.ts b/src/app/shared/table-pagination/table-pagination.module.ts
new file mode 100644
index 00000000..19d0d986
--- /dev/null
+++ b/src/app/shared/table-pagination/table-pagination.module.ts
@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { TablePaginationComponent } from './table-pagination.component';
+
+
+
+@NgModule({
+  declarations: [
+    TablePaginationComponent
+  ],
+  imports: [
+    CommonModule
+  ],
+  exports: [
+    TablePaginationComponent
+  ]
+})
+export class TablePaginationModule { }
diff --git a/src/app/spec-helpers/spec-test-service-stub.ts b/src/app/spec-helpers/spec-test-service-stub.ts
new file mode 100644
index 00000000..24619775
--- /dev/null
+++ b/src/app/spec-helpers/spec-test-service-stub.ts
@@ -0,0 +1,185 @@
+import { BehaviorSubject } from "rxjs";
+import { UserIdbService } from "../indexed-db/user-idb.service"
+import { CompanyIdbService } from "../indexed-db/company-idb.service";
+import { getNewIdbCompany, IdbCompany } from "../models/company";
+import { FacilityIdbService } from "../indexed-db/facility-idb.service";
+import { getNewIdbFacility, IdbFacility } from "../models/facility";
+import { getNewIdbUser, IdbUser } from "../models/user";
+import { EnergyOpportunityIdbService } from "../indexed-db/energy-opportunity-idb.service";
+import { getNewIdbEnergyOpportunity, IdbEnergyOpportunity } from "../models/energyOpportunity";
+import { AssessmentIdbService } from "../indexed-db/assessment-idb.service";
+import { getNewIdbAssessment, IdbAssessment } from "../models/assessment";
+import { ContactIdbService } from "../indexed-db/contact-idb.service";
+import { ContactContext, getNewIdbContact, IdbContact } from "../models/contact";
+import { NonEnergyBenefitsIdbService } from "../indexed-db/non-energy-benefits-idb.service";
+import { getNewIdbNonEnergyBenefit, IdbNonEnergyBenefit } from "../models/nonEnergyBenefit";
+import { OnSiteVisitIdbService } from "../indexed-db/on-site-visit-idb.service";
+import { getNewIdbOnSiteVisit, IdbOnSiteVisit } from "../models/onSiteVisit";
+import { SetupWizardService } from "../setup-wizard/setup-wizard.service";
+import { KeyPerformanceIndicatorsIdbService } from "../indexed-db/key-performance-indicators-idb.service";
+import { getNewKeyPerformanceIndicator, IdbKeyPerformanceIndicator } from "../models/keyPerformanceIndicator";
+import { EnergyEquipmentIdbService } from "../indexed-db/energy-equipment-idb.service";
+import { getNewIdbEnergyEquipment, IdbEnergyEquipment } from "../models/energyEquipment";
+import { ProcessEquipmentIdbService } from "../indexed-db/process-equipment-idb.service";
+import { getNewIdbProcessEquipment, IdbProcessEquipment } from "../models/processEquipment";
+import { KeyPerformanceMetricImpactsIdbService } from "../indexed-db/key-performance-metric-impacts-idb.service";
+import { getNewIdbKeyPerformanceMetricImpact, IdbKeyPerformanceMetricImpact } from "../models/keyPerformanceMetricImpact";
+import { LocalStorageDataService } from "../shared/shared-services/local-storage-data.service";
+import { ActivatedRoute } from "@angular/router";
+import { getDefaultUnitSettings } from "../models/unitSettings";
+import { KeyPerformanceIndicatorOption } from "../shared/constants/keyPerformanceIndicatorOptions";
+import { SharedDataService } from "../shared/shared-services/shared-data.service";
+import { CompanyContactsFormService } from "../shared/shared-company-forms/company-contacts-form/company-contacts-form.service";
+import { FormControl, FormGroup } from "@angular/forms";
+
+let stubCompany: IdbCompany = getNewIdbCompany('123');
+stubCompany.guid = '123';
+
+let companyIdbService: Partial<CompanyIdbService> = {
+    companies: new BehaviorSubject<Array<IdbCompany>>([stubCompany]),
+    selectedCompany: new BehaviorSubject<IdbCompany>(stubCompany),
+    getByGUID: () => { return stubCompany }
+};
+
+let stubFacility: IdbFacility = getNewIdbFacility('123', '123');
+stubFacility.guid = '123';
+
+let facilityIdbService: Partial<FacilityIdbService> = {
+    facilities: new BehaviorSubject<Array<IdbFacility>>([stubFacility]),
+    selectedFacility: new BehaviorSubject<IdbFacility>(stubFacility),
+    getByGUID: () => { return stubFacility },
+    getByOtherGuid: () => { return [stubFacility] }
+};
+
+let stubUser: IdbUser = getNewIdbUser();
+stubUser.guid = '123';
+let userIdbService: Partial<UserIdbService> = {
+    user: new BehaviorSubject<IdbUser>(stubUser)
+};
+
+
+let stubEnergyOpp: IdbEnergyOpportunity = getNewIdbEnergyOpportunity('123', '123', '123', '123', []);
+stubEnergyOpp.guid = '123';
+let energyOpportunityIdbService: Partial<EnergyOpportunityIdbService> = {
+    energyOpportunities: new BehaviorSubject<Array<IdbEnergyOpportunity>>([stubEnergyOpp]),
+    getByGuid: () => { return stubEnergyOpp },
+    getByOtherGuid: () => { return [stubEnergyOpp] }
+};
+
+let stubAssessment: IdbAssessment = getNewIdbAssessment('123', '123', '123', getDefaultUnitSettings());
+stubAssessment.guid = '123';
+let assessmentIdbService: Partial<AssessmentIdbService> = {
+    assessments: new BehaviorSubject<Array<IdbAssessment>>([stubAssessment]),
+    selectedAssessment: new BehaviorSubject<IdbAssessment>(stubAssessment),
+    getByGuid: () => { return stubAssessment },
+    getByOtherGuid: () => { return [stubAssessment] }
+};
+
+let stubContact: IdbContact = getNewIdbContact('123', '123');
+stubContact.guid = '123';
+let contactIdbService: Partial<ContactIdbService> = {
+    contacts: new BehaviorSubject<Array<IdbContact>>([stubContact]),
+    getContactByGuid: () => { return stubContact }
+};
+
+let stubNeb: IdbNonEnergyBenefit = getNewIdbNonEnergyBenefit('123', '123', '123', '123', '123', undefined, false);
+stubNeb.guid = '123';
+let nonEnergyBenefitsIdbService: Partial<NonEnergyBenefitsIdbService> = {
+    nonEnergyBenefits: new BehaviorSubject<Array<IdbNonEnergyBenefit>>([stubNeb]),
+    getEnergyOpportunityNonEnergyBenefits: () => { return [stubNeb] }
+};
+
+let stubOnSiteVisit: IdbOnSiteVisit = getNewIdbOnSiteVisit('123', '123', '123');
+stubOnSiteVisit.guid = '123';
+let onSiteVisitIdbService: Partial<OnSiteVisitIdbService> = {
+    onSiteVisits: new BehaviorSubject<Array<IdbOnSiteVisit>>([stubOnSiteVisit]),
+    selectedVisit: new BehaviorSubject<IdbOnSiteVisit>(stubOnSiteVisit)
+};
+
+let setupWizardService: Partial<SetupWizardService> = {
+    sidebarOpen: new BehaviorSubject<boolean>(true)
+};
+
+let option: KeyPerformanceIndicatorOption =
+{
+    primaryKPI: 'Operations',
+    label: 'Expense Cost',
+    htmlLabel: 'Expense Cost',
+    optionValue: 'reduceExpenseCost'
+}
+let stubKpi: IdbKeyPerformanceIndicator = getNewKeyPerformanceIndicator('123', '123', option, false);
+stubKpi.guid = '123';
+let keyPerformanceIndicatorService: Partial<KeyPerformanceIndicatorsIdbService> = {
+    keyPerformanceIndicators: new BehaviorSubject<Array<IdbKeyPerformanceIndicator>>([stubKpi]),
+    getByCompanyGuid: () => { return [stubKpi] },
+    getByGuid: () => { return stubKpi },
+    getCompanyKeyPerformanceMetrics: () => { return [] }
+}
+
+let stubEnergyEquipment: IdbEnergyEquipment = getNewIdbEnergyEquipment('123', '123', '123', getDefaultUnitSettings());
+stubEnergyEquipment.guid = '123';
+let energyEquipmentIdbService: Partial<EnergyEquipmentIdbService> = {
+    energyEquipments: new BehaviorSubject<Array<IdbEnergyEquipment>>([stubEnergyEquipment]),
+    getByOtherGuid: () => { return [stubEnergyEquipment] },
+    getByGuid: () => { return stubEnergyEquipment }
+};
+
+let stubProcessEquipment: IdbProcessEquipment = getNewIdbProcessEquipment('123', '123', '123');
+stubProcessEquipment.guid = '123';
+let processEquipmentIdbService: Partial<ProcessEquipmentIdbService> = {
+    processEquipments: new BehaviorSubject<Array<IdbProcessEquipment>>([stubProcessEquipment]),
+    getByGuid: () => { return stubProcessEquipment }
+}
+
+let stubKpiImpact: IdbKeyPerformanceMetricImpact = getNewIdbKeyPerformanceMetricImpact('123', '123', '123', '123', '123', 'TRIR', '123', '123', '123');
+stubKpiImpact.guid = '123';
+let keyPerformanceMetricImpactIdbService: Partial<KeyPerformanceMetricImpactsIdbService> = {
+    keyPerformanceMetricImpacts: new BehaviorSubject<Array<IdbKeyPerformanceMetricImpact>>([stubKpiImpact])
+}
+
+let sharedDataService: Partial<SharedDataService> = {
+    createAssessmentModalOpen: new BehaviorSubject<boolean>(false),
+    sidebarOpen: new BehaviorSubject<boolean>(false),
+    displayAddNebsModal: new BehaviorSubject<{ assessmentId: string, energyOpportunityId: string }>(undefined),
+    displayContactModal: new BehaviorSubject<{ context: ContactContext, viewContact: IdbContact, contextGuid: string, companyId: string }>(undefined)
+}
+
+let companyContactsFormService: Partial<CompanyContactsFormService> = {
+    getFormFromIdbContact: () => {
+        return new FormGroup({
+            'firstname': new FormControl(),
+            'lastname': new FormControl(),
+            'phone': new FormControl(),
+            'ext': new FormControl(),
+            'email': new FormControl(),
+            'role': new FormControl(),
+            'team': new FormControl(),
+            'notes': new FormControl()
+        })
+    }
+}
+
+export const stubServiceProviders: Array<{ provide: any, useValue: any }> = [
+    { provide: CompanyIdbService, useValue: companyIdbService },
+    { provide: FacilityIdbService, useValue: facilityIdbService },
+    { provide: UserIdbService, useValue: userIdbService },
+    { provide: EnergyOpportunityIdbService, useValue: energyOpportunityIdbService },
+    { provide: AssessmentIdbService, useValue: assessmentIdbService },
+    { provide: ContactIdbService, useValue: contactIdbService },
+    { provide: NonEnergyBenefitsIdbService, useValue: nonEnergyBenefitsIdbService },
+    { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService },
+    { provide: SetupWizardService, useValue: setupWizardService },
+    { provide: KeyPerformanceIndicatorsIdbService, useValue: keyPerformanceIndicatorService },
+    { provide: EnergyEquipmentIdbService, useValue: energyEquipmentIdbService },
+    { provide: ProcessEquipmentIdbService, useValue: processEquipmentIdbService },
+    { provide: KeyPerformanceMetricImpactsIdbService, useValue: keyPerformanceMetricImpactIdbService },
+    { provide: LocalStorageDataService, useValue: {} },
+    { provide: SharedDataService, useValue: sharedDataService },
+    { provide: CompanyContactsFormService, useValue: companyContactsFormService },
+    {
+        provide: ActivatedRoute,
+        useValue: {
+            params: new BehaviorSubject({ 'id': '123' })
+        }
+    }
+]
\ No newline at end of file
diff --git a/src/app/user-dashboard/explore-nebs/explore-nebs.component.css b/src/app/user-dashboard/explore-nebs/explore-nebs.component.css
deleted file mode 100644
index 6b5baf4b..00000000
--- a/src/app/user-dashboard/explore-nebs/explore-nebs.component.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.card-header, .card-footer{
-    background-color: white;
-}
\ No newline at end of file
diff --git a/src/app/user-dashboard/explore-nebs/explore-nebs.component.html b/src/app/user-dashboard/explore-nebs/explore-nebs.component.html
deleted file mode 100644
index a9fdc1d4..00000000
--- a/src/app/user-dashboard/explore-nebs/explore-nebs.component.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="row justify-content-center mt-3 mb-3">
-    <div class="col-4">
-        <select name="kpiCategorySearch" class="form-select" id="kpiCategorySearch" [(ngModel)]="kpiCategorySearch">
-            <option [ngValue]="undefined">All Categories</option>
-            <option *ngFor="let category of primaryKPIs" [ngValue]="category">
-                {{category}}
-            </option>
-        </select>
-    </div>
-</div>
-<div class="row mt-3 mb-3">
-    <div class="col-12"
-        *ngFor="let keyPerformanceIndicatorOption of keyPerformanceIndicatorOptions | kpiListFilter: kpiSearchStr: kpiCategorySearch">
-        <div class="card">
-            <div class="card-header">
-                <div class="d-flex w-100 justify-content-between">
-                    <div>
-                        <fa-icon [icon]="faBullseye"></fa-icon>
-                        <span class="ps-1" [innerHTML]="keyPerformanceIndicatorOption.htmlLabel"></span>
-                    </div>
-                </div>
-            </div>
-            <div class="card-body">
-                <div class="d-flex flex-column"
-                    *ngFor="let keyPerformanceMetricOption of (keyPerformanceIndicatorOption.optionValue | kpiMetricsList)">
-                    <div class="d-flex">
-                        <fa-icon [icon]="faScaleUnbalancedFlip" class="me-2"></fa-icon>
-                        <span [innerHTML]="keyPerformanceMetricOption.htmlLabel"></span>
-                    </div>
-                    <div class="d-flex ps-4" *ngFor="let nebOption of (keyPerformanceMetricOption.value| nebOptionsList)">
-                        <fa-icon [icon]="faWeightHanging" class="me-2"></fa-icon>
-                        <span [innerHTML]="nebOption.htmlLabel"></span>
-                    </div>
-                </div>
-            </div>
-            <div class="card-footer">
-                <div class="d-flex w-100 justify-content-end">
-                    <div>
-                        <app-primary-kpi-badge [kpiOption]="keyPerformanceIndicatorOption"></app-primary-kpi-badge>
-                    </div>
-
-                </div>
-            </div>
-        </div>
-        <hr>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/user-dashboard/explore-nebs/explore-nebs.component.spec.ts b/src/app/user-dashboard/explore-nebs/explore-nebs.component.spec.ts
deleted file mode 100644
index df857f7f..00000000
--- a/src/app/user-dashboard/explore-nebs/explore-nebs.component.spec.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ExploreNEBsComponent } from './explore-nebs.component';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { FormsModule } from '@angular/forms';
-import { PrimaryKpiBadgeModule } from 'src/app/shared/primary-kpi-badge/primary-kpi-badge.module';
-import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
-
-describe('ExploreNEBsComponent', () => {
-  let component: ExploreNEBsComponent;
-  let fixture: ComponentFixture<ExploreNEBsComponent>;
-  let keyPerformanceIndicatorIdbService: Partial<KeyPerformanceIndicatorsIdbService> = {};
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [HelperPipesModule, FontAwesomeModule, FormsModule, PrimaryKpiBadgeModule],
-      declarations: [ExploreNEBsComponent],
-      providers: [
-        { provide: KeyPerformanceIndicatorsIdbService, useValue: keyPerformanceIndicatorIdbService },
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(ExploreNEBsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/user-dashboard/explore-nebs/explore-nebs.component.ts b/src/app/user-dashboard/explore-nebs/explore-nebs.component.ts
deleted file mode 100644
index 5a67993d..00000000
--- a/src/app/user-dashboard/explore-nebs/explore-nebs.component.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Component } from '@angular/core';
-import { IconDefinition, faBullseye, faMagnifyingGlass, faMagnifyingGlassPlus, faScaleUnbalancedFlip, faWeightHanging } from '@fortawesome/free-solid-svg-icons';
-import { KeyPerformanceIndicatorOption, KeyPerformanceIndicatorOptions, PrimaryKPI, PrimaryKPIs } from 'src/app/shared/constants/keyPerformanceIndicatorOptions';
-import { KeyPerformanceMetricOption, KeyPerformanceMetricOptions } from 'src/app/shared/constants/keyPerformanceMetrics';
-
-@Component({
-  selector: 'app-explore-nebs',
-  templateUrl: './explore-nebs.component.html',
-  styleUrl: './explore-nebs.component.css'
-})
-export class ExploreNEBsComponent {
-
-  keyPerformanceIndicatorOptions: Array<KeyPerformanceIndicatorOption> = KeyPerformanceIndicatorOptions;
-  keyPerformanceMetrics: Array<KeyPerformanceMetricOption> = KeyPerformanceMetricOptions;
-  faBullseye: IconDefinition = faBullseye;
-  faScaleUnbalancedFlip: IconDefinition = faScaleUnbalancedFlip;
-  faWeightHanging: IconDefinition = faWeightHanging;
-  faMagnifyingGlassPlus: IconDefinition = faMagnifyingGlassPlus;
-  faMagnifyingGlass: IconDefinition = faMagnifyingGlass;
-  kpiSearchStr: string = '';
-  kpiCategorySearch: PrimaryKPI | undefined = undefined;
-
-  primaryKPIs: Array<PrimaryKPI> = PrimaryKPIs;
-}
diff --git a/src/app/user-dashboard/user-dashboard-help/user-dashboard-help.component.html b/src/app/user-dashboard/user-dashboard-help/user-dashboard-help.component.html
deleted file mode 100644
index bcb3a061..00000000
--- a/src/app/user-dashboard/user-dashboard-help/user-dashboard-help.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="row pt-4 justify-content-center">
-    <div class="col-lg-9 col-md-12">
-        <div class="alert alert-dark">
-            Tutorials and other help here..?
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/user-dashboard/user-dashboard-help/user-dashboard-help.component.spec.ts b/src/app/user-dashboard/user-dashboard-help/user-dashboard-help.component.spec.ts
deleted file mode 100644
index 184634c0..00000000
--- a/src/app/user-dashboard/user-dashboard-help/user-dashboard-help.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { UserDashboardHelpComponent } from './user-dashboard-help.component';
-
-describe('UserDashboardHelpComponent', () => {
-  let component: UserDashboardHelpComponent;
-  let fixture: ComponentFixture<UserDashboardHelpComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [UserDashboardHelpComponent]
-    })
-    .compileComponents();
-    
-    fixture = TestBed.createComponent(UserDashboardHelpComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/user-dashboard/user-dashboard-help/user-dashboard-help.component.ts b/src/app/user-dashboard/user-dashboard-help/user-dashboard-help.component.ts
deleted file mode 100644
index f40f455a..00000000
--- a/src/app/user-dashboard/user-dashboard-help/user-dashboard-help.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-user-dashboard-help',
-  templateUrl: './user-dashboard-help.component.html',
-  styleUrl: './user-dashboard-help.component.css'
-})
-export class UserDashboardHelpComponent {
-
-}
diff --git a/src/app/user-dashboard/user-dashboard-home/assessments-table/assessments-table.component.html b/src/app/user-dashboard/user-dashboard-home/assessments-table/assessments-table.component.html
deleted file mode 100644
index d379eb00..00000000
--- a/src/app/user-dashboard/user-dashboard-home/assessments-table/assessments-table.component.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<div class="card">
-    <div class="card-header">
-        <span class="h4">
-            <fa-icon [icon]="faFileLines"></fa-icon>
-            Assessments
-        </span>
-        <button class="btn btn-sm btn-success float-end" (click)="openAddNewModal()">
-            <fa-icon [icon]="faWandMagicSparkles"></fa-icon> Setup Wizard
-        </button>
-    </div>
-    <div class="card-body">
-
-        <ng-template [ngIf]="assessments.length > 0" [ngIfElse]="noAssessmentBlock">
-            <table class="table table-bordered table-hover">
-                <thead>
-                    <tr>
-                        <th class="w-25">
-                            Name
-                        </th>
-                        <th class="w-25">
-                            Company
-                        </th>
-                        <th class="w-25">
-                            Facility
-                        </th>
-                        <th class="w-25">
-                            Visit Date
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr *ngFor="let assessment of assessments">
-                        <td>
-                            <a [routerLink]="'/assessment/'+assessment.guid">
-                                {{assessment.name}}
-                            </a>
-                        </td>
-                        <td>
-                            {{assessment.companyId | companyName:companies}}
-                        </td>
-                        <td>
-                            {{assessment.facilityId | facilityName:facilities}}
-                        </td>
-                        <td>
-                            <a class="click-link" (click)="goToVisit(assessment)">
-                                {{assessment.visitDate | date:'shortDate'}}
-                            </a>
-                        </td>
-                    </tr>
-
-                </tbody>
-            </table>
-        </ng-template>
-
-        <ng-template #noAssessmentBlock>
-            <div class="alert alert-info">
-                No assessments found. Please use the "Setup Wizard" to get started.
-            </div>
-        </ng-template>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/user-dashboard/user-dashboard-home/assessments-table/assessments-table.component.spec.ts b/src/app/user-dashboard/user-dashboard-home/assessments-table/assessments-table.component.spec.ts
deleted file mode 100644
index 77b6d701..00000000
--- a/src/app/user-dashboard/user-dashboard-home/assessments-table/assessments-table.component.spec.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AssessmentsTableComponent } from './assessments-table.component';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
-import { BehaviorSubject } from 'rxjs';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/helper-pipes.module';
-import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
-
-describe('AssessmentsTableComponent', () => {
-  let component: AssessmentsTableComponent;
-  let fixture: ComponentFixture<AssessmentsTableComponent>;
-
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings())),
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([])
-  };
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', '')),
-    facilities: new BehaviorSubject<Array<IdbFacility>>([])
-  };
-  let companyIdbService: Partial<CompanyIdbService> = {
-    selectedCompany: new BehaviorSubject<IdbCompany>(getNewIdbCompany('')),
-    companies: new BehaviorSubject<Array<IdbCompany>>([])
-  };
-  let setupWizardService: Partial<SetupWizardService> = {};
-  let onSiteVisitIdbService: Partial<OnSiteVisitIdbService> = {
-    onSiteVisits: new BehaviorSubject<Array<IdbOnSiteVisit>>([])
-  };
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, HelperPipesModule],
-      declarations: [AssessmentsTableComponent],
-      providers: [
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: SetupWizardService, useValue: setupWizardService },
-        { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService },
-      ]
-    })
-    .compileComponents();
-    
-    fixture = TestBed.createComponent(AssessmentsTableComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/user-dashboard/user-dashboard-home/assessments-table/assessments-table.component.ts b/src/app/user-dashboard/user-dashboard-home/assessments-table/assessments-table.component.ts
deleted file mode 100644
index 44c717cd..00000000
--- a/src/app/user-dashboard/user-dashboard-home/assessments-table/assessments-table.component.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-import { IconDefinition, faFileLines, faWandMagicSparkles } from '@fortawesome/free-solid-svg-icons';
-import { Subscription } from 'rxjs';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { IdbCompany } from 'src/app/models/company';
-import { IdbFacility } from 'src/app/models/facility';
-import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
-
-@Component({
-  selector: 'app-assessments-table',
-  templateUrl: './assessments-table.component.html',
-  styleUrl: './assessments-table.component.css'
-})
-export class AssessmentsTableComponent {
-
-  faWandMagicSparkles: IconDefinition = faWandMagicSparkles;
-  faFileLines: IconDefinition = faFileLines;
-
-  companies: Array<IdbCompany>;
-  companiesSub: Subscription;
-
-  facilities: Array<IdbFacility>;
-  facilitiesSub: Subscription;
-
-  assessments: Array<IdbAssessment>;
-  assessmentsSub: Subscription;
-
-  constructor(private companyIdbService: CompanyIdbService,
-    private facilityIdbService: FacilityIdbService,
-    private assessmentIdbService: AssessmentIdbService,
-    private sharedDataService: SharedDataService,
-    private onSiteVisitIdbService: OnSiteVisitIdbService) {
-  }
-
-  ngOnInit() {
-    this.companiesSub = this.companyIdbService.companies.subscribe(_companies => {
-      this.companies = _companies;
-    });
-
-    this.facilitiesSub = this.facilityIdbService.facilities.subscribe(_facilities => {
-      this.facilities = _facilities;
-    });
-    this.assessmentsSub = this.assessmentIdbService.assessments.subscribe(_assessments => {
-      this.assessments = _assessments;
-    })
-  }
-
-  ngOnDestroy() {
-    this.companiesSub.unsubscribe();
-    this.facilitiesSub.unsubscribe();
-    this.assessmentsSub.unsubscribe();
-  }
-
-  openAddNewModal() {
-    this.companyIdbService.selectedCompany.next(undefined);
-    this.facilityIdbService.selectedFacility.next(undefined);
-    this.onSiteVisitIdbService.selectedVisit.next(undefined);
-    this.sharedDataService.createAssessmentModalOpen.next(true);
-  }
-
-  goToVisit(assessment: IdbAssessment) {
-    this.companyIdbService.setSelectedFromGUID(assessment.companyId);
-    this.facilityIdbService.setSelectedFromGUID(assessment.facilityId);
-    this.onSiteVisitIdbService.setSelectedFromAssessmentGUID(assessment.guid);
-    this.sharedDataService.createAssessmentModalOpen.next(true);
-  }
-}
diff --git a/src/app/user-dashboard/user-dashboard-home/companies-table/companies-table.component.html b/src/app/user-dashboard/user-dashboard-home/companies-table/companies-table.component.html
deleted file mode 100644
index 88ad56ca..00000000
--- a/src/app/user-dashboard/user-dashboard-home/companies-table/companies-table.component.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<div class="card">
-    <div class="card-header">
-        <span class="h4">
-            <fa-icon [icon]="faBuilding"></fa-icon>
-            Companies
-        </span>
-        <button class="btn btn-sm btn-success float-end" (click)="openAddNewModal()">
-            <fa-icon [icon]="faPlus" title="Add Company"></fa-icon> Add New
-        </button>
-    </div>
-    <div class="card-body">
-        <ng-template [ngIf]="companies.length > 0" [ngIfElse]="noCompaniesBlock">
-            <table class="table table-bordered table-hover">
-                <thead>
-                    <tr>
-                        <th class="w-25">
-                            Name
-                        </th>
-                        <th class="w-25">
-                            Location
-                        </th>
-                        <th>
-                            Assessments
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr *ngFor="let company of companies">
-                        <td>
-                            <a [routerLink]="'/company/'+company.guid">
-                                {{company.generalInformation.name}}
-                            </a>
-                        </td>
-                        <td>
-                            {{company.generalInformation | addressDisplay}}
-                        </td>
-                        <td>
-                            {{(company.guid | assessmentsList: assessments :true).length}}
-                        </td>
-                    </tr>
-
-                </tbody>
-            </table>
-        </ng-template>
-
-        <ng-template #noCompaniesBlock>
-            <div class="alert alert-info">
-                No companies found. Please click "Add New" to get started.
-            </div>
-        </ng-template>
-    </div>
-</div>
-
-<div [ngClass]="{'window-overlay': displayAddNewModal}"></div>
-<div class="popup" [ngClass]="{'open': displayAddNewModal }">
-    <div class="popup-header">Create New Company?
-        <button type="button" class="btn-close float-end" aria-label="Close"
-            (click)="closeAddNewModal()"></button>
-    </div>
-    <div class="popup-body">
-        <div class="alert alert-info">
-            Would you like to create a new company for your portfolio?
-        </div>
-        <hr>
-    </div>
-    <div class="popup-footer d-flex justify-content-end">
-        <button class="btn btn-secondary me-2" (click)="closeAddNewModal()">Cancel</button>
-        <button class="btn btn-success" (click)="confirmCreate()">Create Company</button>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/user-dashboard/user-dashboard-home/companies-table/companies-table.component.spec.ts b/src/app/user-dashboard/user-dashboard-home/companies-table/companies-table.component.spec.ts
deleted file mode 100644
index 60b164af..00000000
--- a/src/app/user-dashboard/user-dashboard-home/companies-table/companies-table.component.spec.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CompaniesTableComponent } from './companies-table.component';
-import { UserIdbService } from 'src/app/indexed-db/user-idb.service';
-import { IdbUser, getNewIdbUser } from 'src/app/models/user';
-import { BehaviorSubject } from 'rxjs';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { IdbCompany } from 'src/app/models/company';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility } from 'src/app/models/facility';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
-
-describe('CompaniesTableComponent', () => {
-  let component: CompaniesTableComponent;
-  let fixture: ComponentFixture<CompaniesTableComponent>;
-  let userIdbService: Partial<UserIdbService> = {
-    user: new BehaviorSubject<IdbUser>(getNewIdbUser())
-  }
-  let companyIdbService: Partial<CompanyIdbService> = {
-    companies: new BehaviorSubject<Array<IdbCompany>>([])
-  };
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    facilities: new BehaviorSubject<Array<IdbFacility>>([])
-  };
-
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings())),
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([])
-  };
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [RouterTestingModule, FontAwesomeModule],
-      declarations: [CompaniesTableComponent],
-      providers: [
-        { provide: UserIdbService, useValue: userIdbService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(CompaniesTableComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/user-dashboard/user-dashboard-home/companies-table/companies-table.component.ts b/src/app/user-dashboard/user-dashboard-home/companies-table/companies-table.component.ts
deleted file mode 100644
index b6d8e18f..00000000
--- a/src/app/user-dashboard/user-dashboard-home/companies-table/companies-table.component.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-import { IconDefinition, faBuilding, faPlus } from '@fortawesome/free-solid-svg-icons';
-import { Subscription, firstValueFrom } from 'rxjs';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { UserIdbService } from 'src/app/indexed-db/user-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
-import { IdbFacility } from 'src/app/models/facility';
-import { IdbUser } from 'src/app/models/user';
-
-@Component({
-  selector: 'app-companies-table',
-  templateUrl: './companies-table.component.html',
-  styleUrl: './companies-table.component.css'
-})
-export class CompaniesTableComponent {
-
-  faPlus: IconDefinition = faPlus;
-  faBuilding: IconDefinition = faBuilding;
-
-  companies: Array<IdbCompany>;
-  companiesSub: Subscription;
-
-  facilities: Array<IdbFacility>;
-  facilitiesSub: Subscription;
-
-  assessments: Array<IdbAssessment>;
-  assessmentsSub: Subscription;
-
-  displayAddNewModal: boolean;
-  constructor(private companyIdbService: CompanyIdbService,
-    private facilityIdbService: FacilityIdbService,
-    private assessmentIdbService: AssessmentIdbService,
-    private router: Router,
-    private userIdbService: UserIdbService) {
-  }
-
-  ngOnInit() {
-    this.companiesSub = this.companyIdbService.companies.subscribe(_companies => {
-      this.companies = _companies;
-    });
-
-    this.facilitiesSub = this.facilityIdbService.facilities.subscribe(_facilities => {
-      this.facilities = _facilities;
-    });
-    this.assessmentsSub = this.assessmentIdbService.assessments.subscribe(_assessments => {
-      this.assessments = _assessments;
-    });
-  }
-
-  ngOnDestroy() {
-    this.companiesSub.unsubscribe();
-    this.facilitiesSub.unsubscribe();
-    this.assessmentsSub.unsubscribe();
-  }
-
-  openAddNewModal() {
-    this.displayAddNewModal = true;
-  }
-
-  closeAddNewModal() {
-    this.displayAddNewModal = false;
-  }
-
-  async confirmCreate() {
-    let user: IdbUser = this.userIdbService.user.getValue();
-    let newCompany: IdbCompany = getNewIdbCompany(user.guid);
-    newCompany = await firstValueFrom(this.companyIdbService.addWithObservable(newCompany));
-    await this.companyIdbService.setCompanies();
-    this.router.navigateByUrl('/company/' + newCompany.guid + '/settings');
-  }
-}
diff --git a/src/app/user-dashboard/user-dashboard-home/facilities-table/facilities-table.component.html b/src/app/user-dashboard/user-dashboard-home/facilities-table/facilities-table.component.html
deleted file mode 100644
index fec981bc..00000000
--- a/src/app/user-dashboard/user-dashboard-home/facilities-table/facilities-table.component.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<div class="card">
-    <div class="card-header">
-        <span class="h4">
-            <fa-icon [icon]="faIndustry"></fa-icon>
-            Facilities
-        </span>
-        <button class="btn btn-sm btn-success float-end" (click)="openAddNewModal()">
-            <fa-icon [icon]="faPlus" title="Add Company"></fa-icon> Add New
-        </button>
-    </div>
-    <div class="card-body">
-        <ng-template [ngIf]="facilities.length > 0" [ngIfElse]="noFacilitiesBlock">
-            <table class="table table-bordered table-hover">
-                <thead>
-                    <tr>
-                        <th class="w-25">
-                            Name
-                        </th>
-                        <th class="w-25">
-                            Location
-                        </th>
-                        <th class="w-25">
-                            Contact
-                        </th>
-                        <th>
-                            Assessments
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr *ngFor="let facility of facilities">
-                        <td>
-                            <a [routerLink]="'/facility/'+facility.guid">
-                                {{facility.generalInformation.name}}
-                            </a>
-                        </td>
-                        <td>
-                            {{facility.generalInformation | addressDisplay}}
-                        </td>
-                        <td>
-
-                        </td>
-                        <td>
-                            {{(facility.guid | assessmentsList: assessments).length}}
-                        </td>
-                    </tr>
-
-                </tbody>
-            </table>
-        </ng-template>
-
-        <ng-template #noFacilitiesBlock>
-            <div class="alert alert-info">
-                No facilities found. Please click "Add New" to get started.
-            </div>
-        </ng-template>
-    </div>
-</div>
-
-<div [ngClass]="{'window-overlay': displayAddNewModal}"></div>
-<div class="popup" [ngClass]="{'open': displayAddNewModal }">
-    <div class="popup-header">Create New Facility?
-        <button type="button" class="btn-close float-end" aria-label="Close" (click)="closeAddNewModal()"></button>
-    </div>
-    <div class="popup-body">
-        <form>
-            <label for="selectedCompany" class="form-label">Select New Facility Company</label>
-            <select id="selectedCompany" name="selectedCompany" class="form-select"
-                [(ngModel)]="selectedNewCompanyGuid">
-                <option *ngFor="let company of companies" [ngValue]="company.guid">
-                    {{company.generalInformation.name}}</option>
-            </select>
-            <div class="mt-1 alert alert-danger small" *ngIf="!selectedNewCompanyGuid">
-                Company selection required.
-            </div>
-        </form>
-        <hr>
-    </div>
-    <div class="popup-footer d-flex justify-content-end">
-        <button class="btn btn-secondary me-2" (click)="closeAddNewModal()">Cancel</button>
-        <button class="btn btn-success" (click)="confirmCreate()" [disabled]="!selectedNewCompanyGuid">Create
-            Facility</button>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/user-dashboard/user-dashboard-home/facilities-table/facilities-table.component.spec.ts b/src/app/user-dashboard/user-dashboard-home/facilities-table/facilities-table.component.spec.ts
deleted file mode 100644
index 2575368c..00000000
--- a/src/app/user-dashboard/user-dashboard-home/facilities-table/facilities-table.component.spec.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FacilitiesTableComponent } from './facilities-table.component';
-import { UserIdbService } from 'src/app/indexed-db/user-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbUser, getNewIdbUser } from 'src/app/models/user';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { IdbCompany } from 'src/app/models/company';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility } from 'src/app/models/facility';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { FormsModule } from '@angular/forms';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbAssessment, getNewIdbAssessment } from 'src/app/models/assessment';
-import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
-
-describe('FacilitiesTableComponent', () => {
-  let component: FacilitiesTableComponent;
-  let fixture: ComponentFixture<FacilitiesTableComponent>;
-  let userIdbService: Partial<UserIdbService> = {
-    user: new BehaviorSubject<IdbUser>(getNewIdbUser())
-  }
-  let companyIdbService: Partial<CompanyIdbService> = {
-    companies: new BehaviorSubject<Array<IdbCompany>>([])
-  };
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    facilities: new BehaviorSubject<Array<IdbFacility>>([])
-  };
-
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings())),
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([])
-  };
-
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [RouterTestingModule, FontAwesomeModule, FormsModule],
-      declarations: [FacilitiesTableComponent],    
-        providers: [
-        { provide: UserIdbService, useValue: userIdbService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-      ]
-    })
-    .compileComponents();
-    
-    fixture = TestBed.createComponent(FacilitiesTableComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/user-dashboard/user-dashboard-home/facilities-table/facilities-table.component.ts b/src/app/user-dashboard/user-dashboard-home/facilities-table/facilities-table.component.ts
deleted file mode 100644
index 9dc6aeb7..00000000
--- a/src/app/user-dashboard/user-dashboard-home/facilities-table/facilities-table.component.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-import { IconDefinition, faIndustry, faPlus } from '@fortawesome/free-solid-svg-icons';
-import { Subscription, firstValueFrom } from 'rxjs';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { UserIdbService } from 'src/app/indexed-db/user-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { IdbCompany } from 'src/app/models/company';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-import { IdbUser } from 'src/app/models/user';
-
-@Component({
-  selector: 'app-facilities-table',
-  templateUrl: './facilities-table.component.html',
-  styleUrl: './facilities-table.component.css'
-})
-export class FacilitiesTableComponent {
-
-  faPlus: IconDefinition = faPlus;
-  faIndustry: IconDefinition = faIndustry;
-
-  companies: Array<IdbCompany>;
-  companiesSub: Subscription;
-
-  facilities: Array<IdbFacility>;
-  facilitiesSub: Subscription;
-
-  assessments: Array<IdbAssessment>;
-  assessmentsSub: Subscription;
-
-  displayAddNewModal: boolean = false;
-  selectedNewCompanyGuid: string;
-  constructor(private companyIdbService: CompanyIdbService,
-    private facilityIdbService: FacilityIdbService,
-    private assessmentIdbService: AssessmentIdbService,
-    private router: Router,
-    private userIdbService: UserIdbService) {
-  }
-
-  ngOnInit() {
-    this.companiesSub = this.companyIdbService.companies.subscribe(_companies => {
-      this.companies = _companies;
-    });
-
-    this.facilitiesSub = this.facilityIdbService.facilities.subscribe(_facilities => {
-      this.facilities = _facilities;
-    });
-    this.assessmentsSub = this.assessmentIdbService.assessments.subscribe(_assessments => {
-      this.assessments = _assessments;
-    });
-  }
-
-  ngOnDestroy() {
-    this.companiesSub.unsubscribe();
-    this.facilitiesSub.unsubscribe();
-    this.assessmentsSub.unsubscribe();
-  }
-
-
-  openAddNewModal() {
-    this.displayAddNewModal = true;
-  }
-
-  closeAddNewModal() {
-    this.displayAddNewModal = false;
-  }
-
-  async confirmCreate() {
-    let user: IdbUser = this.userIdbService.user.getValue();
-    let newFacility: IdbFacility = getNewIdbFacility(user.guid, this.selectedNewCompanyGuid);
-    newFacility = await firstValueFrom(this.facilityIdbService.addWithObservable(newFacility));
-    await this.facilityIdbService.setFacilities();
-    this.router.navigateByUrl('/facility/' + newFacility.guid + '/settings');
-  }
-}
diff --git a/src/app/user-dashboard/user-dashboard-home/user-dashboard-home.component.html b/src/app/user-dashboard/user-dashboard-home/user-dashboard-home.component.html
deleted file mode 100644
index 8da60ca4..00000000
--- a/src/app/user-dashboard/user-dashboard-home/user-dashboard-home.component.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="row">
-    <div class="col-12 pb-2 pt-4">
-        <app-assessments-table></app-assessments-table>
-    </div>
-    <div class="col-6">
-        <app-companies-table></app-companies-table>
-    </div>
-    <div class="col-6">
-        <app-facilities-table></app-facilities-table>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/user-dashboard/user-dashboard-home/user-dashboard-home.component.spec.ts b/src/app/user-dashboard/user-dashboard-home/user-dashboard-home.component.spec.ts
deleted file mode 100644
index 660681b9..00000000
--- a/src/app/user-dashboard/user-dashboard-home/user-dashboard-home.component.spec.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { UserDashboardHomeComponent } from './user-dashboard-home.component';
-import { RouterTestingModule } from '@angular/router/testing';
-import { UserIdbService } from 'src/app/indexed-db/user-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbUser, getNewIdbUser } from 'src/app/models/user';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility } from 'src/app/models/facility';
-import { FormsModule } from '@angular/forms';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { IdbCompany } from 'src/app/models/company';
-import { CompaniesTableComponent } from './companies-table/companies-table.component';
-import { FacilitiesTableComponent } from './facilities-table/facilities-table.component';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { AssessmentsTableComponent } from './assessments-table/assessments-table.component';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-
-describe('UserDashboardHomeComponent', () => {
-  let component: UserDashboardHomeComponent;
-  let fixture: ComponentFixture<UserDashboardHomeComponent>;
-  let userIdbService: Partial<UserIdbService> = {
-    user: new BehaviorSubject<IdbUser>(getNewIdbUser())
-  }
-  let companyIdbService: Partial<CompanyIdbService> = {
-    companies: new BehaviorSubject<Array<IdbCompany>>([])
-  };
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    facilities: new BehaviorSubject<Array<IdbFacility>>([])
-  };
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(undefined),
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([])
-  };
-  let onSiteVisitIdbService: Partial<OnSiteVisitIdbService> = {
-    onSiteVisits: new BehaviorSubject<Array<IdbOnSiteVisit>>([])
-  };
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [RouterTestingModule, FormsModule, FontAwesomeModule],
-      declarations: [UserDashboardHomeComponent, CompaniesTableComponent, FacilitiesTableComponent, AssessmentsTableComponent],
-      providers: [
-        { provide: UserIdbService, useValue: userIdbService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService },
-      ]
-    });
-    fixture = TestBed.createComponent(UserDashboardHomeComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/user-dashboard/user-dashboard-home/user-dashboard-home.component.ts b/src/app/user-dashboard/user-dashboard-home/user-dashboard-home.component.ts
deleted file mode 100644
index 12b4a998..00000000
--- a/src/app/user-dashboard/user-dashboard-home/user-dashboard-home.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-user-dashboard-home',
-  templateUrl: './user-dashboard-home.component.html',
-  styleUrls: ['./user-dashboard-home.component.css']
-})
-export class UserDashboardHomeComponent {
-
-}
diff --git a/src/app/user-dashboard/user-dashboard-tabs/user-dashboard-tabs.component.html b/src/app/user-dashboard/user-dashboard-tabs/user-dashboard-tabs.component.html
deleted file mode 100644
index 3164e754..00000000
--- a/src/app/user-dashboard/user-dashboard-tabs/user-dashboard-tabs.component.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<ul class="nav nav-tabs">
-    <li class="nav-item">
-        <a class="nav-link" routerLink="home" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faFolderOpen"></fa-icon> 
-            My Portfolio
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" routerLink="nebs-database" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faDatabase"></fa-icon> 
-            Explore NEBs
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" routerLink="help" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faQuestion"></fa-icon> 
-            Help
-        </a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" routerLink="settings" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faGears"></fa-icon> 
-            Settings
-        </a>
-    </li>
-    
-    
-</ul>
\ No newline at end of file
diff --git a/src/app/user-dashboard/user-dashboard-tabs/user-dashboard-tabs.component.ts b/src/app/user-dashboard/user-dashboard-tabs/user-dashboard-tabs.component.ts
deleted file mode 100644
index 8b61c73a..00000000
--- a/src/app/user-dashboard/user-dashboard-tabs/user-dashboard-tabs.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component } from '@angular/core';
-import { IconDefinition, faDatabase, faFolderOpen, faGears, faQuestion } from '@fortawesome/free-solid-svg-icons';
-
-@Component({
-  selector: 'app-user-dashboard-tabs',
-  templateUrl: './user-dashboard-tabs.component.html',
-  styleUrl: './user-dashboard-tabs.component.css'
-})
-export class UserDashboardTabsComponent {
-
-  faFolderOpen: IconDefinition = faFolderOpen;
-  faGears: IconDefinition = faGears;
-  faDatabase: IconDefinition = faDatabase;
-  faQuestion: IconDefinition = faQuestion;
-}
diff --git a/src/app/user-dashboard/user-dashboard.component.html b/src/app/user-dashboard/user-dashboard.component.html
deleted file mode 100644
index 4cc37cb0..00000000
--- a/src/app/user-dashboard/user-dashboard.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="container-fluid h-100">
-    <app-user-dashboard-tabs></app-user-dashboard-tabs>
-    <router-outlet></router-outlet>
-</div>
\ No newline at end of file
diff --git a/src/app/user-dashboard/user-dashboard.component.spec.ts b/src/app/user-dashboard/user-dashboard.component.spec.ts
deleted file mode 100644
index 63b6b2b9..00000000
--- a/src/app/user-dashboard/user-dashboard.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { UserDashboardComponent } from './user-dashboard.component';
-import { RouterTestingModule } from '@angular/router/testing';
-import { UserDashboardTabsComponent } from './user-dashboard-tabs/user-dashboard-tabs.component';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-
-describe('UserDashboardComponent', () => {
-  let component: UserDashboardComponent;
-  let fixture: ComponentFixture<UserDashboardComponent>;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [RouterTestingModule, FontAwesomeModule],
-      declarations: [UserDashboardComponent, UserDashboardTabsComponent]
-    });
-    fixture = TestBed.createComponent(UserDashboardComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/user-dashboard/user-dashboard.component.ts b/src/app/user-dashboard/user-dashboard.component.ts
deleted file mode 100644
index 695ece4d..00000000
--- a/src/app/user-dashboard/user-dashboard.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-user-dashboard',
-  templateUrl: './user-dashboard.component.html',
-  styleUrls: ['./user-dashboard.component.css']
-})
-export class UserDashboardComponent {
-
-}
diff --git a/src/app/user-dashboard/user-dashboard.module.ts b/src/app/user-dashboard/user-dashboard.module.ts
deleted file mode 100644
index 8af907df..00000000
--- a/src/app/user-dashboard/user-dashboard.module.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { UserDashboardComponent } from './user-dashboard.component';
-import { UserDashboardHomeComponent } from './user-dashboard-home/user-dashboard-home.component';
-import { RouterModule } from '@angular/router';
-import { FormsModule } from '@angular/forms';
-import { HelperPipesModule } from '../shared/helper-pipes/helper-pipes.module';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { CompaniesTableComponent } from './user-dashboard-home/companies-table/companies-table.component';
-import { FacilitiesTableComponent } from './user-dashboard-home/facilities-table/facilities-table.component';
-import { UserDashboardTabsComponent } from './user-dashboard-tabs/user-dashboard-tabs.component';
-import { UserSettingsComponent } from './user-settings/user-settings.component';
-import { UserDashboardHelpComponent } from './user-dashboard-help/user-dashboard-help.component';
-import { ExploreNEBsComponent } from './explore-nebs/explore-nebs.component';
-import { AssessmentsTableComponent } from './user-dashboard-home/assessments-table/assessments-table.component';
-import { PrimaryKpiBadgeModule } from '../shared/primary-kpi-badge/primary-kpi-badge.module';
-
-@NgModule({
-  declarations: [
-    UserDashboardComponent,
-    UserDashboardHomeComponent,
-    CompaniesTableComponent,
-    FacilitiesTableComponent,
-    UserDashboardTabsComponent,
-    UserSettingsComponent,
-    UserDashboardHelpComponent,
-    ExploreNEBsComponent,
-    AssessmentsTableComponent
-  ],
-  imports: [
-    CommonModule,
-    RouterModule,
-    FormsModule,
-    HelperPipesModule,
-    FontAwesomeModule,
-    PrimaryKpiBadgeModule
-  ]
-})
-export class UserDashboardModule { }
diff --git a/src/app/user-dashboard/user-settings/user-settings.component.html b/src/app/user-dashboard/user-settings/user-settings.component.html
deleted file mode 100644
index 9b838ccb..00000000
--- a/src/app/user-dashboard/user-settings/user-settings.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="row pt-4 justify-content-center">
-    <div class="col-lg-9 col-md-12">
-        <div class="alert alert-dark">
-            App wide settings here..?
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/user-dashboard/user-settings/user-settings.component.spec.ts b/src/app/user-dashboard/user-settings/user-settings.component.spec.ts
deleted file mode 100644
index 48b61f41..00000000
--- a/src/app/user-dashboard/user-settings/user-settings.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { UserSettingsComponent } from './user-settings.component';
-
-describe('UserSettingsComponent', () => {
-  let component: UserSettingsComponent;
-  let fixture: ComponentFixture<UserSettingsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [UserSettingsComponent]
-    })
-    .compileComponents();
-    
-    fixture = TestBed.createComponent(UserSettingsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/user-dashboard/user-settings/user-settings.component.ts b/src/app/user-dashboard/user-settings/user-settings.component.ts
deleted file mode 100644
index 10901714..00000000
--- a/src/app/user-dashboard/user-settings/user-settings.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-user-settings',
-  templateUrl: './user-settings.component.html',
-  styleUrl: './user-settings.component.css'
-})
-export class UserSettingsComponent {
-
-}
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.css b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.css
new file mode 100644
index 00000000..8d89b424
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.css
@@ -0,0 +1,3 @@
+th{
+    width: 30%;
+}
\ No newline at end of file
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.html b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.html
new file mode 100644
index 00000000..6aa0372a
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.html
@@ -0,0 +1,18 @@
+<div class="card portfolio">
+    <div class="card-body">
+        <div class="card-title secondary d-flex justify-content-between">
+            <div>
+                <fa-icon class="pe-2" [icon]="faFileLines"></fa-icon>
+                {{assessment.name}}
+            </div>
+            <div>
+                <button class="btn btn-outline-success me-1 btn-sm" (click)="goToVisit()">
+                    <fa-icon [icon]="faWandMagicSparkles"></fa-icon>
+                    Open {{assessment.name}} In Wizard
+                </button>
+            </div>
+        </div>
+        <hr class="my-2">
+        <app-assessment-list-item [assessment]="assessment" [inAssessmentDashboard]="true"></app-assessment-list-item>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.spec.ts b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.spec.ts
new file mode 100644
index 00000000..7027b8af
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.spec.ts
@@ -0,0 +1,29 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AssessmentDashboardHomeComponent } from './assessment-dashboard-home.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { AssessmentListItemComponent } from '../../portfolio-items-list/assessment-list-item/assessment-list-item.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+
+describe('AssessmentDashboardHomeComponent', () => {
+  let component: AssessmentDashboardHomeComponent;
+  let fixture: ComponentFixture<AssessmentDashboardHomeComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, HelperPipesModule],
+      declarations: [AssessmentDashboardHomeComponent, AssessmentListItemComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AssessmentDashboardHomeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.ts b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.ts
new file mode 100644
index 00000000..8f908305
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.ts
@@ -0,0 +1,58 @@
+import { Component } from '@angular/core';
+import { faFileLines, faWandMagicSparkles, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
+import { IdbAssessment } from 'src/app/models/assessment';
+import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
+import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
+
+@Component({
+  selector: 'app-assessment-dashboard-home',
+  templateUrl: './assessment-dashboard-home.component.html',
+  styleUrl: './assessment-dashboard-home.component.css'
+})
+export class AssessmentDashboardHomeComponent {
+
+  faFileLines: IconDefinition = faFileLines;
+  faWandMagicSparkles: IconDefinition = faWandMagicSparkles;
+
+  assessment: IdbAssessment;
+  assessmentSub: Subscription;
+  energyOpportunitiesSub: Subscription;
+  energyOpportunities: Array<IdbEnergyOpportunity>;
+  constructor(private assessmentIdbService: AssessmentIdbService,
+    private companyIdbService: CompanyIdbService,
+    private facilityIdbService: FacilityIdbService,
+    private onSiteVisitIdbService: OnSiteVisitIdbService,
+    private sharedDataService: SharedDataService,
+    private energyOpportunityIdbService: EnergyOpportunityIdbService
+  ) { }
+
+  ngOnInit() {
+    this.assessmentSub = this.assessmentIdbService.selectedAssessment.subscribe(assessment => {
+      this.assessment = assessment;
+    });
+    this.energyOpportunitiesSub = this.energyOpportunityIdbService.energyOpportunities.subscribe(opportunities => {
+      this.energyOpportunities = opportunities.filter(opp => {
+        return opp.assessmentId == this.assessment.guid
+      });
+    });
+  }
+
+  ngOnDestroy() {
+    this.assessmentSub.unsubscribe();
+    this.energyOpportunitiesSub.unsubscribe();
+  }
+
+  goToVisit() {
+    this.companyIdbService.setSelectedFromGUID(this.assessment.companyId);
+    this.facilityIdbService.setSelectedFromGUID(this.assessment.facilityId);
+    this.onSiteVisitIdbService.setSelectedFromAssessmentGUID(this.assessment.guid);
+    this.sharedDataService.createAssessmentModalOpen.next(true);
+  }
+
+}
diff --git a/src/app/assessment-dashboard/assessment-settings/manage-assessment/manage-assessment.component.css b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-nav/assessment-dashboard-nav.component.css
similarity index 100%
rename from src/app/assessment-dashboard/assessment-settings/manage-assessment/manage-assessment.component.css
rename to src/app/user-portfolio/assessment-dashboard/assessment-dashboard-nav/assessment-dashboard-nav.component.css
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-nav/assessment-dashboard-nav.component.html b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-nav/assessment-dashboard-nav.component.html
new file mode 100644
index 00000000..8afbc2dd
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-nav/assessment-dashboard-nav.component.html
@@ -0,0 +1,36 @@
+
+<ul class="nav nav-tabs">
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/assessment/'+assessment.guid" [routerLinkActive]="'active'"
+            [routerLinkActiveOptions]="{exact: true}">Assessment
+            Dashboard</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/assessment/'+assessment.guid+'/details'"
+            [routerLinkActive]="'active'">
+            <fa-icon [icon]="faGears"></fa-icon>
+            Details
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/assessment/'+assessment.guid+'/energy-opportunities'"
+            [routerLinkActive]="'active'">
+            <fa-icon [icon]="faFileLines"></fa-icon>
+            Energy Efficiency Opportunities
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/assessment/'+assessment.guid+'/nebs'"
+            [routerLinkActive]="'active'">
+            <fa-icon [icon]="faWeightHanging"></fa-icon>
+            NEBs
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/assessment/'+assessment.guid + '/reports'"
+            [routerLinkActive]="'active'">
+            <fa-icon [icon]="faFile"></fa-icon>
+            Report
+        </a>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-nav/assessment-dashboard-nav.component.spec.ts b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-nav/assessment-dashboard-nav.component.spec.ts
new file mode 100644
index 00000000..846f8002
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-nav/assessment-dashboard-nav.component.spec.ts
@@ -0,0 +1,28 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AssessmentDashboardNavComponent } from './assessment-dashboard-nav.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { RouterTestingModule } from '@angular/router/testing';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('AssessmentDashboardNavComponent', () => {
+  let component: AssessmentDashboardNavComponent;
+  let fixture: ComponentFixture<AssessmentDashboardNavComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, RouterTestingModule],
+      declarations: [AssessmentDashboardNavComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AssessmentDashboardNavComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-nav/assessment-dashboard-nav.component.ts b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-nav/assessment-dashboard-nav.component.ts
new file mode 100644
index 00000000..db787a3c
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard-nav/assessment-dashboard-nav.component.ts
@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+import { faFile, faFileLines, faGears, faWeightHanging, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
+import { IdbAssessment } from 'src/app/models/assessment';
+
+@Component({
+  selector: 'app-assessment-dashboard-nav',
+  templateUrl: './assessment-dashboard-nav.component.html',
+  styleUrl: './assessment-dashboard-nav.component.css'
+})
+export class AssessmentDashboardNavComponent {
+
+  faGears: IconDefinition = faGears;
+  faFile: IconDefinition = faFile;
+  faWeightHanging: IconDefinition = faWeightHanging;
+  faFileLines: IconDefinition = faFileLines;
+  
+  assessment: IdbAssessment;
+  assessmentSub: Subscription;
+  constructor(private assessmentIdbService: AssessmentIdbService) { }
+
+  ngOnInit() {
+    this.assessmentSub = this.assessmentIdbService.selectedAssessment.subscribe(assessment => {
+      this.assessment = assessment;
+    });
+  }
+
+  ngOnDestroy() {
+    this.assessmentSub.unsubscribe();
+  }
+}
diff --git a/src/app/company-dashboard/company-dashboard-home/assessments-table/assessments-table.component.css b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard.component.css
similarity index 100%
rename from src/app/company-dashboard/company-dashboard-home/assessments-table/assessments-table.component.css
rename to src/app/user-portfolio/assessment-dashboard/assessment-dashboard.component.css
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-dashboard.component.html b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard.component.html
new file mode 100644
index 00000000..a528b642
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard.component.html
@@ -0,0 +1,6 @@
+<div class="pt-2">
+    <app-assessment-dashboard-nav></app-assessment-dashboard-nav>
+</div>
+<div class="pt-2 pb-2">
+    <router-outlet></router-outlet>
+</div>
\ No newline at end of file
diff --git a/src/app/assessment-dashboard/assessment-dashboard.component.spec.ts b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard.component.spec.ts
similarity index 54%
rename from src/app/assessment-dashboard/assessment-dashboard.component.spec.ts
rename to src/app/user-portfolio/assessment-dashboard/assessment-dashboard.component.spec.ts
index fafb4006..62b54e1d 100644
--- a/src/app/assessment-dashboard/assessment-dashboard.component.spec.ts
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard.component.spec.ts
@@ -1,31 +1,22 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AssessmentDashboardComponent } from './assessment-dashboard.component';
-import { AssessmentDashboardTabsComponent } from './assessment-dashboard-tabs/assessment-dashboard-tabs.component';
+import { AssessmentDashboardNavComponent } from './assessment-dashboard-nav/assessment-dashboard-nav.component';
 import { RouterTestingModule } from '@angular/router/testing';
-import { AssessmentIdbService } from '../indexed-db/assessment-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbAssessment, getNewIdbAssessment } from '../models/assessment';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { getDefaultUnitSettings } from '../models/unitSettings';
 
 describe('AssessmentDashboardComponent', () => {
   let component: AssessmentDashboardComponent;
   let fixture: ComponentFixture<AssessmentDashboardComponent>;
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    selectedAssessment: new BehaviorSubject<IdbAssessment>(getNewIdbAssessment('', '', '', getDefaultUnitSettings()))
-  }
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [RouterTestingModule, FontAwesomeModule],
-      declarations: [AssessmentDashboardComponent, AssessmentDashboardTabsComponent],
-      providers:[
-        {
-          provide: AssessmentIdbService, useValue: assessmentIdbService
-        }
-      ]
+      declarations: [AssessmentDashboardComponent, AssessmentDashboardNavComponent],
+      providers: stubServiceProviders
     })
-      .compileComponents();
+    .compileComponents();
 
     fixture = TestBed.createComponent(AssessmentDashboardComponent);
     component = fixture.componentInstance;
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-dashboard.component.ts b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard.component.ts
new file mode 100644
index 00000000..36f4de1d
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-dashboard.component.ts
@@ -0,0 +1,36 @@
+import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { IdbAssessment } from 'src/app/models/assessment';
+import { IdbCompany } from 'src/app/models/company';
+import { IdbFacility } from 'src/app/models/facility';
+
+@Component({
+  selector: 'app-assessment-dashboard',
+  templateUrl: './assessment-dashboard.component.html',
+  styleUrl: './assessment-dashboard.component.css'
+})
+export class AssessmentDashboardComponent {
+
+  constructor(private activatedRoute: ActivatedRoute,
+    private companyIdbService: CompanyIdbService,
+    private facilityIdbService: FacilityIdbService,
+    private assessmentIdbService: AssessmentIdbService
+  ) {
+  }
+
+  ngOnInit() {
+    this.activatedRoute.params.subscribe(params => {
+      let guid: string = params['id'];
+      let assessment: IdbAssessment = this.assessmentIdbService.getByGuid(guid);
+      this.assessmentIdbService.selectedAssessment.next(assessment);
+      let facility: IdbFacility = this.facilityIdbService.getByGUID(assessment.facilityId);
+      this.facilityIdbService.selectedFacility.next(facility);
+      let company: IdbCompany = this.companyIdbService.getByGUID(assessment.companyId);
+      this.companyIdbService.selectedCompany.next(company);
+    });
+  }
+
+}
diff --git a/src/app/company-dashboard/company-dashboard-home/company-dashboard-home.component.css b/src/app/user-portfolio/assessment-dashboard/assessment-details/assessment-details.component.css
similarity index 100%
rename from src/app/company-dashboard/company-dashboard-home/company-dashboard-home.component.css
rename to src/app/user-portfolio/assessment-dashboard/assessment-details/assessment-details.component.css
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-details/assessment-details.component.html b/src/app/user-portfolio/assessment-dashboard/assessment-details/assessment-details.component.html
new file mode 100644
index 00000000..3f4bd6ec
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-details/assessment-details.component.html
@@ -0,0 +1,56 @@
+<div class="card portfolio">
+    <div class="card-body">
+        <div class="card-title secondary d-flex justify-content-between mb-2">
+            <div>
+                <!-- <fa-icon class="pe-2" [icon]="faFileLines"></fa-icon> -->
+                {{assessment.name}} Details
+            </div>
+            <div>
+                <button class="btn btn-outline-success me-1 btn-sm" (click)="goToVisit()">
+                    <fa-icon [icon]="faWandMagicSparkles"></fa-icon>
+                    <span class="d-none">
+                        Open {{assessment.name}} In Wizard
+                    </span>
+                </button>
+                <ng-template [ngIf]="isDisabled" [ngIfElse]="unlockedBlock">
+                    <button class="btn btn-dark btn-sm" (click)="openUnlockModal()">
+                        <fa-icon [icon]="faLock"></fa-icon>
+                        <span class="d-none">
+                            Unlock {{assessment.name}} Details
+                        </span>
+                    </button>
+                </ng-template>
+                <ng-template #unlockedBlock>
+                    <button class="btn btn-dark btn-sm" (click)="toggleDisabled()">
+                        <fa-icon [icon]="faUnlock"></fa-icon>
+                        <span class="d-none">
+                            Lock {{assessment.name}} Details
+                        </span>
+                    </button>
+                </ng-template>
+            </div>
+        </div>
+        <app-assessment-details-form [isDisabled]="isDisabled"></app-assessment-details-form>
+    </div>
+</div>
+
+<div [ngClass]="{'window-overlay': displayUnlockModal}"></div>
+<div class="popup" [ngClass]="{'open': displayUnlockModal }">
+    <div class="popup-header">Edit Assessment Details
+        <button type="button" class="btn-close float-end" aria-label="Close" (click)="closeUnlockModal()"></button>
+    </div>
+    <div class="popup-body">
+        <div class="alert alert-info p-2">
+            Are you sure you would like to modify the details of this assessment? Changes will be saved automatically
+            and may effect reports for the company and facility this assessment is in.
+        </div>
+        <hr>
+    </div>
+    <div class="popup-footer d-flex justify-content-end">
+        <button class="btn btn-secondary me-2 btn-sm" (click)="closeUnlockModal()">Cancel</button>
+        <button class="btn btn-success btn-sm" (click)="toggleDisabled()">
+            <fa-icon [icon]="faUnlock"></fa-icon>
+            Unlock Assessment Details
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-details/assessment-details.component.spec.ts b/src/app/user-portfolio/assessment-dashboard/assessment-details/assessment-details.component.spec.ts
new file mode 100644
index 00000000..4a09bf8e
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-details/assessment-details.component.spec.ts
@@ -0,0 +1,28 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AssessmentDetailsComponent } from './assessment-details.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { SharedAssessmentFormsModule } from 'src/app/shared/shared-assessment-forms/shared-assessment-forms.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('AssessmentDetailsComponent', () => {
+  let component: AssessmentDetailsComponent;
+  let fixture: ComponentFixture<AssessmentDetailsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, SharedAssessmentFormsModule],
+      declarations: [AssessmentDetailsComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AssessmentDetailsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.ts b/src/app/user-portfolio/assessment-dashboard/assessment-details/assessment-details.component.ts
similarity index 65%
rename from src/app/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.ts
rename to src/app/user-portfolio/assessment-dashboard/assessment-details/assessment-details.component.ts
index 50ad99f4..6420d602 100644
--- a/src/app/assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component.ts
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-details/assessment-details.component.ts
@@ -1,38 +1,40 @@
 import { Component } from '@angular/core';
-import { IconDefinition, faWandMagicSparkles } from '@fortawesome/free-solid-svg-icons';
+import { faLock, faUnlock, faWandMagicSparkles, IconDefinition } from '@fortawesome/free-solid-svg-icons';
 import { Subscription } from 'rxjs';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
 import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
 import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
 import { IdbAssessment } from 'src/app/models/assessment';
-import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
 import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
 
 @Component({
-  selector: 'app-assessment-dashboard-home',
-  templateUrl: './assessment-dashboard-home.component.html',
-  styleUrl: './assessment-dashboard-home.component.css'
+  selector: 'app-assessment-details',
+  templateUrl: './assessment-details.component.html',
+  styleUrl: './assessment-details.component.css'
 })
-export class AssessmentDashboardHomeComponent {
+export class AssessmentDetailsComponent {
 
+  faLock: IconDefinition = faLock;
+  faUnlock: IconDefinition = faUnlock;
   faWandMagicSparkles: IconDefinition = faWandMagicSparkles;
 
+  isDisabled: boolean = true;
+
+  displayUnlockModal: boolean = false;
+
   assessment: IdbAssessment;
   assessmentSub: Subscription;
-
   constructor(private assessmentIdbService: AssessmentIdbService,
-    private facilityIdbService: FacilityIdbService,
     private companyIdbService: CompanyIdbService,
+    private facilityIdbService: FacilityIdbService,
     private onSiteVisitIdbService: OnSiteVisitIdbService,
     private sharedDataService: SharedDataService
-  ) {
-
-  }
+  ) { }
 
   ngOnInit() {
-    this.assessmentSub = this.assessmentIdbService.selectedAssessment.subscribe(_selectedAssessment => {
-      this.assessment = _selectedAssessment;
+    this.assessmentSub = this.assessmentIdbService.selectedAssessment.subscribe(assessment => {
+      this.assessment = assessment;
     });
   }
 
@@ -40,10 +42,25 @@ export class AssessmentDashboardHomeComponent {
     this.assessmentSub.unsubscribe();
   }
 
-  openEditModal() {
-    this.facilityIdbService.setSelectedFromGUID(this.assessment.facilityId);
+  goToVisit() {
     this.companyIdbService.setSelectedFromGUID(this.assessment.companyId);
+    this.facilityIdbService.setSelectedFromGUID(this.assessment.facilityId);
     this.onSiteVisitIdbService.setSelectedFromAssessmentGUID(this.assessment.guid);
     this.sharedDataService.createAssessmentModalOpen.next(true);
   }
+
+  openUnlockModal() {
+    this.displayUnlockModal = true;
+  }
+
+  closeUnlockModal() {
+    this.displayUnlockModal = false;
+  }
+
+  toggleDisabled() {
+    this.isDisabled = !this.isDisabled;
+    this.closeUnlockModal();
+  }
+
+
 }
diff --git a/src/app/company-dashboard/company-dashboard-home/facilities-table/facilities-table.component.css b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities-home/assessment-energy-opportunities-home.component.css
similarity index 100%
rename from src/app/company-dashboard/company-dashboard-home/facilities-table/facilities-table.component.css
rename to src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities-home/assessment-energy-opportunities-home.component.css
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities-home/assessment-energy-opportunities-home.component.html b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities-home/assessment-energy-opportunities-home.component.html
new file mode 100644
index 00000000..cdbe4c14
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities-home/assessment-energy-opportunities-home.component.html
@@ -0,0 +1,64 @@
+<div class="d-flex w-100 justify-content-end">
+    <div>
+        <button class="btn btn-outline-success btn-sm" (click)="addEnergyOpportunity()">
+            <fa-icon [icon]="faPlus"></fa-icon>
+            Add Energy Efficiency Opportunity
+        </button>
+    </div>
+</div>
+<hr class="my-2">
+
+<ng-template [ngIf]="energyOpportunities.length > 0" [ngIfElse]="noOpportunitiesBlock">
+    <table class="table table-bordered table-hover table-sm">
+        <thead>
+            <tr>
+                <th class="w-25">
+                    Opportunity Name
+                </th>
+                <th class="w-25">
+                    NEBs
+                </th>
+                <th class="w-25">
+                    Implementation Cost
+                </th>
+                <th class="w-25">
+                    Savings
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr *ngFor="let energyOpportunity of energyOpportunities">
+                <td>
+                    {{energyOpportunity.name}}
+                </td>
+                <td>
+                    @let associatedNebs = energyOpportunity.guid | nebList:'energyOpportunity': nonEnergyBenefits;
+                    <ng-template [ngIf]="associatedNebs.length > 0" [ngIfElse]="noNebsBlock">
+                        <span *ngFor="let neb of associatedNebs">
+                            <fa-icon [icon]="faWeightHanging"></fa-icon>
+                            {{neb.name}} <br>
+                        </span>
+                    </ng-template>
+                    <ng-template #noNebsBlock>
+                        &mdash;
+                    </ng-template>
+                </td>
+                <td>
+                    <app-single-cell-item [numValue]="energyOpportunity.implementationCost"
+                        [isCurrency]="true"></app-single-cell-item>
+                </td>
+                <td>
+                    <app-single-cell-item [numValue]="energyOpportunity.costSavings"
+                        [isCurrency]="true"></app-single-cell-item><br>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</ng-template>
+
+<ng-template #noOpportunitiesBlock>
+    <div class="alert alert-info p-2 text-center">
+        No energy efficiency opportunities found for this assessment. Use the "<fa-icon [icon]="faPlus"></fa-icon>
+        Add Energy Efficiency Opportunity" button to add an opportunity this assessment.
+    </div>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities-home/assessment-energy-opportunities-home.component.spec.ts b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities-home/assessment-energy-opportunities-home.component.spec.ts
new file mode 100644
index 00000000..4a49e03b
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities-home/assessment-energy-opportunities-home.component.spec.ts
@@ -0,0 +1,30 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AssessmentEnergyOpportunitiesHomeComponent } from './assessment-energy-opportunities-home.component';
+import { RouterTestingModule } from '@angular/router/testing';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';
+
+describe('AssessmentEnergyOpportunitiesHomeComponent', () => {
+  let component: AssessmentEnergyOpportunitiesHomeComponent;
+  let fixture: ComponentFixture<AssessmentEnergyOpportunitiesHomeComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [RouterTestingModule, FontAwesomeModule, HelperPipesModule, TableEntriesModule],
+      declarations: [AssessmentEnergyOpportunitiesHomeComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AssessmentEnergyOpportunitiesHomeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities-home/assessment-energy-opportunities-home.component.ts b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities-home/assessment-energy-opportunities-home.component.ts
new file mode 100644
index 00000000..400a4ff1
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities-home/assessment-energy-opportunities-home.component.ts
@@ -0,0 +1,74 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+import { faPlus, faWeightHanging, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { firstValueFrom, Subscription } from 'rxjs';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
+import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
+import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
+import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
+import { IdbAssessment } from 'src/app/models/assessment';
+import { getNewIdbEnergyOpportunity, IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
+import { IdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
+
+@Component({
+  selector: 'app-assessment-energy-opportunities-home',
+  templateUrl: './assessment-energy-opportunities-home.component.html',
+  styleUrl: './assessment-energy-opportunities-home.component.css'
+})
+export class AssessmentEnergyOpportunitiesHomeComponent {
+
+  faPlus: IconDefinition = faPlus;
+  faWeightHanging: IconDefinition = faWeightHanging;
+
+  assessment: IdbAssessment;
+  assessmentSub: Subscription;
+
+  energyOpportunities: Array<IdbEnergyOpportunity>;
+  energyOpportunitiesSub: Subscription;
+
+  nonEnergyBenefits: Array<IdbNonEnergyBenefit>;
+  nonEnergyBenefitsSub: Subscription;
+
+  constructor(private assessmentIdbService: AssessmentIdbService,
+    private energyOpportunityIdbService: EnergyOpportunityIdbService,
+    private nonEnergyBenefitsIdbService: NonEnergyBenefitsIdbService,
+    private router: Router,
+    private toastNotificationsService: ToastNotificationsService
+  ) { }
+
+  ngOnInit() {
+    this.assessmentSub = this.assessmentIdbService.selectedAssessment.subscribe(assessment => {
+      this.assessment = assessment;
+    });
+
+    this.energyOpportunitiesSub = this.energyOpportunityIdbService.energyOpportunities.subscribe(energyOpportunities => {
+      this.energyOpportunities = energyOpportunities.filter(opp => {
+        return opp.assessmentId == this.assessment.guid;
+      });
+    });
+
+    this.nonEnergyBenefitsSub = this.nonEnergyBenefitsIdbService.nonEnergyBenefits.subscribe(nebs => {
+      this.nonEnergyBenefits = nebs;
+    });
+  }
+
+  ngOnDestroy() {
+    this.assessmentSub.unsubscribe();
+    this.energyOpportunitiesSub.unsubscribe();
+    this.nonEnergyBenefitsSub.unsubscribe();
+  }
+
+
+  async addEnergyOpportunity() {
+    let newOpportunity: IdbEnergyOpportunity = getNewIdbEnergyOpportunity(this.assessment.userId, this.assessment.companyId,
+      this.assessment.facilityId, this.assessment.guid, this.assessment.utilityEnergyUses);
+    let assessmentEnergyOpportunities: Array<IdbEnergyOpportunity> = this.energyOpportunities.filter(prj => {
+      return prj.assessmentId == this.assessment.guid;
+    });
+    newOpportunity.name = 'Opportunity #' + (assessmentEnergyOpportunities.length + 1);
+    await firstValueFrom(this.energyOpportunityIdbService.addWithObservable(newOpportunity));
+    await this.energyOpportunityIdbService.setEnergyOpportunities();
+    this.toastNotificationsService.showToast('Opportunity Added!', 'A new energy efficiency opportunity was added to the assessment.', 'bg-success', true, false);
+    this.router.navigateByUrl('/portfolio/assessment/' + newOpportunity.assessmentId + '/energy-opportunities/' + newOpportunity.guid)
+  }
+}
diff --git a/src/app/company-dashboard/company-dashboard-tabs/company-dashboard-tabs.component.css b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities.component.css
similarity index 100%
rename from src/app/company-dashboard/company-dashboard-tabs/company-dashboard-tabs.component.css
rename to src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities.component.css
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities.component.html b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities.component.html
new file mode 100644
index 00000000..03bad81e
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities.component.html
@@ -0,0 +1,42 @@
+<div class="d-flex">
+    <div class="d-flex nav-flex pe-3" *ngIf="energyOpportunities.length > 0">
+        <nav class="nav navbar nav-tabs flex-column pt-0">
+
+            <div class="nav-item">
+                <a class="nav-link" [routerLink]="'/portfolio/assessment/'+assessment.guid + '/energy-opportunities'"
+                    [routerLinkActive]="'active'" [routerLinkActiveOptions]="{exact: true}">
+                    <div class="d-flex w-100 justify-content-between">
+                        <div class="d-block">
+                            Summary
+                        </div>
+                        <div>
+                            <fa-icon class="chevron float-right" [icon]="faChevronRight"></fa-icon>
+                        </div>
+                    </div>
+                </a>
+            </div>
+            <div class="w-100">
+                <hr class="my-2">
+            </div>
+            <div class="nav-item" *ngFor="let energyOpportunity of energyOpportunities">
+                <a class="nav-link"
+                    [routerLink]="'/portfolio/assessment/'+energyOpportunity.assessmentId + '/energy-opportunities/'+energyOpportunity.guid"
+                    [routerLinkActive]="'active'">
+                    <div class="d-flex w-100 justify-content-between">
+                        <div class="d-block">
+                            {{energyOpportunity.name}}
+                        </div>
+                        <div>
+                            <fa-icon class="chevron float-right" [icon]="faChevronRight"></fa-icon>
+                        </div>
+                    </div>
+                </a>
+            </div>
+        </nav>
+    </div>
+    <div class="card portfolio w-100">
+        <div class="card-body">
+            <router-outlet></router-outlet>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities.component.spec.ts b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities.component.spec.ts
new file mode 100644
index 00000000..4f89c8c0
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities.component.spec.ts
@@ -0,0 +1,28 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AssessmentEnergyOpportunitiesComponent } from './assessment-energy-opportunities.component';
+import { RouterTestingModule } from '@angular/router/testing';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('AssessmentEnergyOpportunitiesComponent', () => {
+  let component: AssessmentEnergyOpportunitiesComponent;
+  let fixture: ComponentFixture<AssessmentEnergyOpportunitiesComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [RouterTestingModule, FontAwesomeModule],
+      declarations: [AssessmentEnergyOpportunitiesComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AssessmentEnergyOpportunitiesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities.component.ts b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities.component.ts
new file mode 100644
index 00000000..0f4e55e8
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities.component.ts
@@ -0,0 +1,44 @@
+import { Component } from '@angular/core';
+import { faChevronRight, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
+import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
+import { IdbAssessment } from 'src/app/models/assessment';
+import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
+
+@Component({
+  selector: 'app-assessment-energy-opportunities',
+  templateUrl: './assessment-energy-opportunities.component.html',
+  styleUrl: './assessment-energy-opportunities.component.css'
+})
+export class AssessmentEnergyOpportunitiesComponent {
+
+  faChevronRight: IconDefinition = faChevronRight;
+
+  assessment: IdbAssessment;
+  assessmentSub: Subscription;
+
+  energyOpportunities: Array<IdbEnergyOpportunity>;
+  energyOpportunitiesSub: Subscription;
+  constructor(private assessmentIdbService: AssessmentIdbService,
+    private energyOpportunityIdbService: EnergyOpportunityIdbService
+  ) { }
+
+  ngOnInit() {
+    this.assessmentSub = this.assessmentIdbService.selectedAssessment.subscribe(assessment => {
+      this.assessment = assessment;
+    });
+
+    this.energyOpportunitiesSub = this.energyOpportunityIdbService.energyOpportunities.subscribe(energyOpportunities => {
+      this.energyOpportunities = energyOpportunities.filter(opp => {
+        return opp.assessmentId == this.assessment.guid;
+      });
+    })
+  }
+
+  ngOnDestroy() {
+    this.assessmentSub.unsubscribe();
+    this.energyOpportunitiesSub.unsubscribe();
+  }
+
+}
diff --git a/src/app/company-dashboard/company-dashboard.component.css b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs-home/assessment-nebs-home.component.css
similarity index 100%
rename from src/app/company-dashboard/company-dashboard.component.css
rename to src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs-home/assessment-nebs-home.component.css
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs-home/assessment-nebs-home.component.html b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs-home/assessment-nebs-home.component.html
new file mode 100644
index 00000000..80200034
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs-home/assessment-nebs-home.component.html
@@ -0,0 +1,193 @@
+<div class="d-flex w-100 justify-content-between">
+    <div>
+        <h6 class="pt-2">Assessment Non-Energy Benefits</h6>
+    </div>
+    <div>
+        <div class="dropdown">
+            <button class="btn btn-outline-neb btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown"
+                aria-expanded="false" (click)="toggleAddNebDropdown()">
+                <fa-icon [icon]="faPlus"></fa-icon> Add NEB
+            </button>
+            <ul class="dropdown-menu" [ngClass]="{'show': showAddNebDropdown}">
+                <li>
+                    <a class="dropdown-item" (click)="addNEB()">
+                        <fa-icon [icon]="faPlus"></fa-icon> Add Custom NEB
+                    </a>
+                </li>
+                <li>
+                    <a class="dropdown-item" (click)="showSuggestedNEBs()">
+                        <fa-icon [icon]="faSearchPlus"></fa-icon> Search NEBs Database
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</div>
+<hr class="my-2">
+
+<ng-template [ngIf]="assessmentNonEnergyBenefits.length > 0 || energyOppNonEnergyBenefits.length > 0"
+    [ngIfElse]="noNebsBlock">
+    <ng-template [ngIf]="assessmentNonEnergyBenefits.length > 0" [ngIfElse]="noAssessmentNebsBlock">
+        <p class="fw-light small">
+            Use the "<fa-icon [icon]="faPlus"></fa-icon> Add NEB" dropdown to add Non-Energy Benefits
+            (<fa-icon [icon]="faWeightHanging"></fa-icon>) that
+            <span class="bold">are not associated with any specific energy efficiency opportunity</span> to this
+            assessment.
+        </p>
+        <table class="table table-bordered table-hover table-sm">
+            <thead>
+                <tr>
+                    <th>
+                        Non-Energy Benefit
+                    </th>
+                    <th>
+                        Key Performance <br> Metric Impacts
+                    </th>
+                    <th>
+                        Stakeholders
+                    </th>
+                    <th>
+                        Total Savings<br>
+                        <span class="fw-light">
+                            (&dollar;/yr)
+                        </span>
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr *ngFor="let nonEnergyBenefit of assessmentNonEnergyBenefits">
+                    <td>
+                        <fa-icon [icon]="faWeightHanging"></fa-icon>
+                        {{nonEnergyBenefit.name}}
+                    </td>
+                    <td>
+                        @let kpmImpacts = nonEnergyBenefit.guid | associatedPerformanceMetricImpacts:
+                        keyPerformanceMetricImpacts;
+                        <ng-template [ngIf]="kpmImpacts.length > 0" [ngIfElse]="noNebsBlock">
+                            <span *ngFor="let kpmImpact of kpmImpacts">
+                                <span [innerHTML]="kpmImpact.kpmGuid | kpmLabel: keyPerformanceMetrics"></span>
+                                <br>
+                            </span>
+                        </ng-template>
+                        <ng-template #noNebsBlock>
+                            &mdash;
+                        </ng-template>
+                    </td>
+                    <td>
+                        @let associatedContacts = nonEnergyBenefit.guid | associatedContacts:'nonEnergyBenefit':
+                        contacts;
+                        <ng-template [ngIf]="associatedContacts.length > 0" [ngIfElse]="noContactsBlock">
+                            <span *ngFor="let contact of associatedContacts">
+                                {{contact | contactNameDisplay}} <br>
+                            </span>
+                        </ng-template>
+                        <ng-template #noContactsBlock>
+                            &mdash;
+                        </ng-template>
+                    </td>
+                    <td>
+                        <app-single-cell-item
+                            [numValue]="nonEnergyBenefit.guid | nebTotalSavings: keyPerformanceMetricImpacts"
+                            [isCurrency]="true"></app-single-cell-item>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </ng-template>
+    <ng-template #noAssessmentNebsBlock>
+        <div class="alert alert-info p-2 text-center">
+            No non energy benefits found for this assessment. Use the "<fa-icon [icon]="faSearchPlus"></fa-icon>
+            Add NEB" dropdown to either add a custom NEB or search our NEBs database for new NEBs to be added to this
+            assessment.
+        </div>
+    </ng-template>
+
+    <ng-container *ngIf="energyOppNonEnergyBenefits.length > 0">
+        <hr>
+        <h6>Energy Opportunity Non-Energy Benefits</h6>
+        <p class="fw-light small">
+            The below are Non-Energy Benefits (<fa-icon [icon]="faWeightHanging"></fa-icon>) that
+            <span class="bold">are associated with a specific energy efficiency opportunity</span> within this
+            assessment.
+            To modify these NEBs navigate to the "Energy Efficiency Opportunities" tab.
+        </p>
+        <table class="table table-bordered table-hover table-sm">
+            <thead>
+                <tr>
+                    <th>
+                        Non-Energy Benefit
+                    </th>
+                    <th>
+                        Key Performance <br> Metric Impacts
+                    </th>
+                    <th>
+                        Stakeholders
+                    </th>
+                    <th>Energy Efficiency <br> Opportunity</th>
+                    <th>
+                        Total Savings<br>
+                        <span class="fw-light">
+                            (&dollar;/yr)
+                        </span>
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr *ngFor="let nonEnergyBenefit of energyOppNonEnergyBenefits">
+                    <td>
+                        <fa-icon [icon]="faWeightHanging"></fa-icon>
+                        {{nonEnergyBenefit.name}}
+                    </td>
+                    <td>
+                        @let kpmImpacts = nonEnergyBenefit.guid | associatedPerformanceMetricImpacts:
+                        keyPerformanceMetricImpacts;
+                        <ng-template [ngIf]="kpmImpacts.length > 0" [ngIfElse]="noNebsBlock">
+                            <span *ngFor="let kpmImpact of kpmImpacts">
+                                <span [innerHTML]="kpmImpact.kpmGuid | kpmLabel: keyPerformanceMetrics"></span>
+                                <br>
+                            </span>
+                        </ng-template>
+                        <ng-template #noNebsBlock>
+                            &mdash;
+                        </ng-template>
+                    </td>
+                    <td>
+                        @let associatedContacts = nonEnergyBenefit.guid | associatedContacts:'nonEnergyBenefit':
+                        contacts;
+                        <ng-template [ngIf]="associatedContacts.length > 0" [ngIfElse]="noContactsBlock">
+                            <span *ngFor="let contact of associatedContacts">
+                                {{contact | contactNameDisplay}} <br>
+                            </span>
+                        </ng-template>
+                        <ng-template #noContactsBlock>
+                            &mdash;
+                        </ng-template>
+                    </td>
+                    <td>
+                        <a
+                            [routerLink]="'/portfolio/assessment/'+nonEnergyBenefit.assessmentId+'/energy-opportunities/'+nonEnergyBenefit.energyOpportunityId">
+                            {{nonEnergyBenefit.energyOpportunityId | energyOpportunityDisplay: energyOpportunities}}
+                        </a>
+                    </td>
+                    <td>
+                        <app-single-cell-item
+                            [numValue]="nonEnergyBenefit.guid | nebTotalSavings: keyPerformanceMetricImpacts"
+                            [isCurrency]="true"></app-single-cell-item>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </ng-container>
+
+
+
+
+</ng-template>
+
+<ng-template #noNebsBlock>
+    <div class="alert alert-info p-2 text-center">
+        No non energy benefits found for this assessment. Use the "<fa-icon [icon]="faSearchPlus"></fa-icon>
+        Add NEB" dropdown to either add a custom NEB or search our NEBs database for new NEBs to be added to this
+        assessment.
+    </div>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs-home/assessment-nebs-home.component.spec.ts b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs-home/assessment-nebs-home.component.spec.ts
new file mode 100644
index 00000000..d48ee907
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs-home/assessment-nebs-home.component.spec.ts
@@ -0,0 +1,30 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AssessmentNebsHomeComponent } from './assessment-nebs-home.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';
+import { RouterTestingModule } from '@angular/router/testing';
+
+describe('AssessmentNebsHomeComponent', () => {
+  let component: AssessmentNebsHomeComponent;
+  let fixture: ComponentFixture<AssessmentNebsHomeComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, HelperPipesModule, TableEntriesModule, RouterTestingModule],
+      declarations: [AssessmentNebsHomeComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AssessmentNebsHomeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs-home/assessment-nebs-home.component.ts b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs-home/assessment-nebs-home.component.ts
new file mode 100644
index 00000000..df205e7a
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs-home/assessment-nebs-home.component.ts
@@ -0,0 +1,123 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+import { faPlus, faSearchPlus, faWeightHanging, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { firstValueFrom, Subscription } from 'rxjs';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
+import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
+import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
+import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
+import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
+import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
+import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
+import { IdbAssessment } from 'src/app/models/assessment';
+import { IdbContact } from 'src/app/models/contact';
+import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
+import { IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
+import { getNewIdbNonEnergyBenefit, IdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
+import { KeyPerformanceMetric } from 'src/app/shared/constants/keyPerformanceMetrics';
+import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
+
+@Component({
+  selector: 'app-assessment-nebs-home',
+  templateUrl: './assessment-nebs-home.component.html',
+  styleUrl: './assessment-nebs-home.component.css'
+})
+export class AssessmentNebsHomeComponent {
+
+  faPlus: IconDefinition = faPlus;
+  faWeightHanging: IconDefinition = faWeightHanging;
+  faSearchPlus: IconDefinition = faSearchPlus;
+
+  assessment: IdbAssessment;
+  assessmentSub: Subscription;
+
+  energyOppNonEnergyBenefits: Array<IdbNonEnergyBenefit>;
+  assessmentNonEnergyBenefits: Array<IdbNonEnergyBenefit>;
+
+  keyPerformanceMetricImpacts: Array<IdbKeyPerformanceMetricImpact>;
+  keyPerformanceMetricImpactsSub: Subscription;
+
+  contacts: Array<IdbContact>;
+  contactsSub: Subscription;
+
+  nonEnergyBenefitsSub: Subscription;
+  showAddNebDropdown: boolean = false;
+  keyPerformanceMetrics: Array<KeyPerformanceMetric>;
+  keyPerformanceIndicatorsSub: Subscription;
+
+  energyOpportunities: Array<IdbEnergyOpportunity>;
+  energyOpportunitiesSub: Subscription;
+  constructor(private assessmentIdbService: AssessmentIdbService,
+    private nonEnergyBenefitsIdbService: NonEnergyBenefitsIdbService,
+    private router: Router,
+    private toastNotificationsService: ToastNotificationsService,
+    private sharedDataService: SharedDataService,
+    private keyPerformanceMetricImpactsIdbService: KeyPerformanceMetricImpactsIdbService,
+    private contactIdbService: ContactIdbService,
+    private keyPerformanceIndicatorsIdbService: KeyPerformanceIndicatorsIdbService,
+    private energyOpportunityIdbService: EnergyOpportunityIdbService
+
+  ) { }
+
+  ngOnInit() {
+    this.assessmentSub = this.assessmentIdbService.selectedAssessment.subscribe(assessment => {
+      this.assessment = assessment;
+    });
+
+    this.nonEnergyBenefitsSub = this.nonEnergyBenefitsIdbService.nonEnergyBenefits.subscribe(nebs => {
+      this.assessmentNonEnergyBenefits = nebs.filter(neb => {
+        return neb.assessmentId == this.assessment.guid && neb.energyOpportunityId == undefined;
+      });
+      this.energyOppNonEnergyBenefits = nebs.filter(neb => {
+        return neb.assessmentId == this.assessment.guid && neb.energyOpportunityId;
+      });
+    });
+
+    this.keyPerformanceMetricImpactsSub = this.keyPerformanceMetricImpactsIdbService.keyPerformanceMetricImpacts.subscribe(kpmImpacts => {
+      this.keyPerformanceMetricImpacts = kpmImpacts;
+    });
+
+    this.contactsSub = this.contactIdbService.contacts.subscribe(contacts => {
+      this.contacts = contacts;
+    });
+
+    this.keyPerformanceIndicatorsSub = this.keyPerformanceIndicatorsIdbService.keyPerformanceIndicators.subscribe(kpis => {
+      this.keyPerformanceMetrics = kpis.flatMap(kpi => {
+        return kpi.performanceMetrics;
+      })
+    });
+
+    this.energyOpportunitiesSub = this.energyOpportunityIdbService.energyOpportunities.subscribe(energyOpportunities => {
+      this.energyOpportunities = energyOpportunities
+    });
+
+  }
+
+  ngOnDestroy() {
+    this.assessmentSub.unsubscribe();
+    this.nonEnergyBenefitsSub.unsubscribe();
+    this.keyPerformanceMetricImpactsSub.unsubscribe();
+    this.contactsSub.unsubscribe();
+    this.keyPerformanceIndicatorsSub.unsubscribe();
+    this.energyOpportunitiesSub.unsubscribe();
+  }
+
+  showSuggestedNEBs() {
+    this.showAddNebDropdown = false;
+    this.sharedDataService.displayAddNebsModal.next({
+      assessmentId: this.assessment.guid,
+      energyOpportunityId: undefined
+    });
+  }
+
+  async addNEB() {
+    this.showAddNebDropdown = false;
+    let newNonEnergyBenefit: IdbNonEnergyBenefit = getNewIdbNonEnergyBenefit(this.assessment.userId, this.assessment.companyId, this.assessment.facilityId, this.assessment.guid, undefined, undefined, true);
+    await firstValueFrom(this.nonEnergyBenefitsIdbService.addWithObservable(newNonEnergyBenefit));
+    await this.nonEnergyBenefitsIdbService.setNonEnergyBenefits();
+  }
+
+  toggleAddNebDropdown() {
+    this.showAddNebDropdown = !this.showAddNebDropdown;
+  }
+}
diff --git a/src/app/company-dashboard/company-goals/company-goals.component.css b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs.component.css
similarity index 100%
rename from src/app/company-dashboard/company-goals/company-goals.component.css
rename to src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs.component.css
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs.component.html b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs.component.html
new file mode 100644
index 00000000..bbfb42b9
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs.component.html
@@ -0,0 +1,42 @@
+<div class="d-flex">
+    <div class="d-flex nav-flex pe-3">
+        <nav class="nav navbar nav-tabs flex-column pt-0">
+
+            <div class="nav-item">
+                <a class="nav-link" [routerLink]="'/portfolio/assessment/'+assessment.guid + '/nebs'"
+                    [routerLinkActive]="'active'" [routerLinkActiveOptions]="{exact: true}">
+                    <div class="d-flex w-100 justify-content-between">
+                        <div class="d-block">
+                            Summary
+                        </div>
+                        <div>
+                            <fa-icon class="chevron float-right" [icon]="faChevronRight"></fa-icon>
+                        </div>
+                    </div>
+                </a>
+            </div>
+            <div class="w-100">
+                <hr class="my-2">
+            </div>            
+            <div class="nav-item" *ngFor="let nonEnergyBenefit of nonEnergyBenefits">
+                <a class="nav-link"
+                    [routerLink]="'/portfolio/assessment/'+nonEnergyBenefit.assessmentId + '/nebs/'+nonEnergyBenefit.guid"
+                    [routerLinkActive]="'active'">
+                    <div class="d-flex w-100 justify-content-between">
+                        <div class="d-block">
+                            {{nonEnergyBenefit.name}}
+                        </div>
+                        <div>
+                            <fa-icon class="chevron float-right" [icon]="faChevronRight"></fa-icon>
+                        </div>
+                    </div>
+                </a>
+            </div>
+        </nav>
+    </div>
+    <div class="card portfolio w-100">
+        <div class="card-body">
+            <router-outlet></router-outlet>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs.component.spec.ts b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs.component.spec.ts
new file mode 100644
index 00000000..f6f3517b
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs.component.spec.ts
@@ -0,0 +1,28 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AssessmentNebsComponent } from './assessment-nebs.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { RouterTestingModule } from '@angular/router/testing';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+
+describe('AssessmentNebsComponent', () => {
+  let component: AssessmentNebsComponent;
+  let fixture: ComponentFixture<AssessmentNebsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [RouterTestingModule, FontAwesomeModule],
+      declarations: [AssessmentNebsComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AssessmentNebsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs.component.ts b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs.component.ts
new file mode 100644
index 00000000..0a101fa6
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-nebs/assessment-nebs.component.ts
@@ -0,0 +1,44 @@
+import { Component } from '@angular/core';
+import { faChevronRight, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
+import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
+import { IdbAssessment } from 'src/app/models/assessment';
+import { IdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
+
+@Component({
+  selector: 'app-assessment-nebs',
+  templateUrl: './assessment-nebs.component.html',
+  styleUrl: './assessment-nebs.component.css'
+})
+export class AssessmentNebsComponent {
+
+  faChevronRight: IconDefinition = faChevronRight;
+
+  nonEnergyBenefits: Array<IdbNonEnergyBenefit>;
+  nonEnergyBenefitsSub: Subscription;
+
+  assessment: IdbAssessment;
+  assessmentSub: Subscription;
+
+  constructor(private assessmentIdbService: AssessmentIdbService,
+    private nonEnergyBenefitsIdbService: NonEnergyBenefitsIdbService
+  ) { }
+
+  ngOnInit() {
+    this.assessmentSub = this.assessmentIdbService.selectedAssessment.subscribe(assessment => {
+      this.assessment = assessment;
+    });
+
+    this.nonEnergyBenefitsSub = this.nonEnergyBenefitsIdbService.nonEnergyBenefits.subscribe(nonEnergyBenefits => {
+      this.nonEnergyBenefits = nonEnergyBenefits.filter(neb => {
+        return neb.assessmentId == this.assessment.guid && neb.energyOpportunityId == undefined;
+      });
+    })
+  }
+
+  ngOnDestroy() {
+    this.assessmentSub.unsubscribe();
+    this.nonEnergyBenefitsSub.unsubscribe();
+  }
+}
diff --git a/src/app/company-dashboard/company-reports/company-reports.component.css b/src/app/user-portfolio/assessment-dashboard/assessment-reports/assessment-reports.component.css
similarity index 100%
rename from src/app/company-dashboard/company-reports/company-reports.component.css
rename to src/app/user-portfolio/assessment-dashboard/assessment-reports/assessment-reports.component.css
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-reports/assessment-reports.component.html b/src/app/user-portfolio/assessment-dashboard/assessment-reports/assessment-reports.component.html
new file mode 100644
index 00000000..650b9838
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-reports/assessment-reports.component.html
@@ -0,0 +1,6 @@
+<div class="card portfolio">
+    <div class="card-body">
+        <app-assessment-savings-chart [assessmentReport]="assessmentReport"></app-assessment-savings-chart>
+        <app-assessment-savings-table [assessmentReport]="assessmentReport"></app-assessment-savings-table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-reports/assessment-reports.component.spec.ts b/src/app/user-portfolio/assessment-dashboard/assessment-reports/assessment-reports.component.spec.ts
new file mode 100644
index 00000000..3fd5e83f
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-reports/assessment-reports.component.spec.ts
@@ -0,0 +1,27 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AssessmentReportsComponent } from './assessment-reports.component';
+import { ReportsModule } from 'src/app/shared/reports/reports.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('AssessmentReportsComponent', () => {
+  let component: AssessmentReportsComponent;
+  let fixture: ComponentFixture<AssessmentReportsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ReportsModule],
+      declarations: [AssessmentReportsComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AssessmentReportsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/assessment-dashboard/assessment-reports/assessment-reports.component.ts b/src/app/user-portfolio/assessment-dashboard/assessment-reports/assessment-reports.component.ts
new file mode 100644
index 00000000..4322b7cb
--- /dev/null
+++ b/src/app/user-portfolio/assessment-dashboard/assessment-reports/assessment-reports.component.ts
@@ -0,0 +1,54 @@
+import { Component } from '@angular/core';
+import { Subscription } from 'rxjs';
+import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
+import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
+import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
+import { KeyPerformanceMetricImpactsIdbService } from 'src/app/indexed-db/key-performance-metric-impacts-idb.service';
+import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
+import { IdbAssessment } from 'src/app/models/assessment';
+import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
+import { IdbKeyPerformanceMetricImpact } from 'src/app/models/keyPerformanceMetricImpact';
+import { IdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
+import { KeyPerformanceMetric } from 'src/app/shared/constants/keyPerformanceMetrics';
+import { AssessmentReport, getAssessmentReport } from 'src/app/shared/reports/calculations/assessmentReport';
+
+@Component({
+  selector: 'app-assessment-reports',
+  templateUrl: './assessment-reports.component.html',
+  styleUrl: './assessment-reports.component.css'
+})
+export class AssessmentReportsComponent {
+
+  assessmentSub: Subscription;
+  assessment: IdbAssessment;
+
+  assessmentReport: AssessmentReport;
+  constructor(private assessmentIdbService: AssessmentIdbService,
+    private energyOpportunityIdbService: EnergyOpportunityIdbService,
+    private nonEnergyBenefitIdbService: NonEnergyBenefitsIdbService,
+    private keyPerformanceIndicatorIdbService: KeyPerformanceIndicatorsIdbService,
+    private keyPerformanceMetricImpactsIdbService: KeyPerformanceMetricImpactsIdbService
+
+  ) {
+
+  }
+
+  ngOnInit() {
+    this.assessmentSub = this.assessmentIdbService.selectedAssessment.subscribe(_assessment => {
+      this.assessment = _assessment;
+      this.setAssessmentReport();
+    });
+  }
+
+  ngOnDestroy() {
+    this.assessmentSub.unsubscribe();
+  }
+
+  setAssessmentReport() {
+    let allEnergyOpportunities: Array<IdbEnergyOpportunity> = this.energyOpportunityIdbService.energyOpportunities.getValue();
+    let allNonEnergyBenefits: Array<IdbNonEnergyBenefit> = this.nonEnergyBenefitIdbService.nonEnergyBenefits.getValue();
+    let companyPerformanceMetrics: Array<KeyPerformanceMetric> = this.keyPerformanceIndicatorIdbService.getCompanyKeyPerformanceMetrics(this.assessment.companyId);
+    let keyPerformanceMetricImpacts: Array<IdbKeyPerformanceMetricImpact> = this.keyPerformanceMetricImpactsIdbService.keyPerformanceMetricImpacts.getValue();
+    this.assessmentReport = getAssessmentReport(this.assessment, allEnergyOpportunities, allNonEnergyBenefits, companyPerformanceMetrics, keyPerformanceMetricImpacts);
+  }
+}
diff --git a/src/app/facility-dashboard/facility-dashboard-home/assessments-table/assessments-table.component.css b/src/app/user-portfolio/company-dashboard/company-dashboard-home/company-dashboard-home.component.css
similarity index 100%
rename from src/app/facility-dashboard/facility-dashboard-home/assessments-table/assessments-table.component.css
rename to src/app/user-portfolio/company-dashboard/company-dashboard-home/company-dashboard-home.component.css
diff --git a/src/app/user-portfolio/company-dashboard/company-dashboard-home/company-dashboard-home.component.html b/src/app/user-portfolio/company-dashboard/company-dashboard-home/company-dashboard-home.component.html
new file mode 100644
index 00000000..ebb545f8
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-dashboard-home/company-dashboard-home.component.html
@@ -0,0 +1,11 @@
+<div class="card portfolio">
+    <div class="card-body">
+        <div class="card-title secondary d-flex justify-content-between">
+            <div>
+                <fa-icon [icon]="faBuilding"></fa-icon>
+                {{company.generalInformation.name}}
+            </div>
+        </div>
+        <app-company-list-item [company]="company" [inCompanyDashboard]="true"></app-company-list-item>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/company-dashboard/company-dashboard-home/company-dashboard-home.component.spec.ts b/src/app/user-portfolio/company-dashboard/company-dashboard-home/company-dashboard-home.component.spec.ts
new file mode 100644
index 00000000..580987ae
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-dashboard-home/company-dashboard-home.component.spec.ts
@@ -0,0 +1,32 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompanyDashboardHomeComponent } from './company-dashboard-home.component';
+import { CompanyListItemComponent } from '../../portfolio-items-list/company-list-item/company-list-item.component';
+import { RouterTestingModule } from '@angular/router/testing';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { FacilityListItemComponent } from '../../portfolio-items-list/facility-list-item/facility-list-item.component';
+import { AssessmentListItemComponent } from '../../portfolio-items-list/assessment-list-item/assessment-list-item.component';
+
+describe('CompanyDashboardHomeComponent', () => {
+  let component: CompanyDashboardHomeComponent;
+  let fixture: ComponentFixture<CompanyDashboardHomeComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [RouterTestingModule, FontAwesomeModule, HelperPipesModule],
+      declarations: [CompanyDashboardHomeComponent, CompanyListItemComponent, FacilityListItemComponent, AssessmentListItemComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(CompanyDashboardHomeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/company-dashboard/company-dashboard-home/company-dashboard-home.component.ts b/src/app/user-portfolio/company-dashboard/company-dashboard-home/company-dashboard-home.component.ts
new file mode 100644
index 00000000..d426f95c
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-dashboard-home/company-dashboard-home.component.ts
@@ -0,0 +1,39 @@
+import { Component } from '@angular/core';
+import { faBuilding, faCopy, faTrash, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { IdbCompany } from 'src/app/models/company';
+
+@Component({
+  selector: 'app-company-dashboard-home',
+  templateUrl: './company-dashboard-home.component.html',
+  styleUrl: './company-dashboard-home.component.css'
+})
+export class CompanyDashboardHomeComponent {
+
+  faBuilding: IconDefinition = faBuilding;
+  faTrash: IconDefinition = faTrash;
+  faCopy: IconDefinition = faCopy;
+  company: IdbCompany;
+  companySub: Subscription;
+  constructor(private companyIdbService: CompanyIdbService) {
+  }
+
+  ngOnInit() {
+    this.companySub = this.companyIdbService.selectedCompany.subscribe(company => {
+      this.company = company;
+    })
+  }
+
+  ngOnDestroy() {
+    this.companySub.unsubscribe();
+  }
+
+  openCreateCopyModal(){
+
+  }
+
+  openDeleteCompanyModal(){
+    
+  }
+}
diff --git a/src/app/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.css b/src/app/user-portfolio/company-dashboard/company-dashboard-nav/company-dashboard-nav.component.css
similarity index 100%
rename from src/app/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.css
rename to src/app/user-portfolio/company-dashboard/company-dashboard-nav/company-dashboard-nav.component.css
diff --git a/src/app/user-portfolio/company-dashboard/company-dashboard-nav/company-dashboard-nav.component.html b/src/app/user-portfolio/company-dashboard/company-dashboard-nav/company-dashboard-nav.component.html
new file mode 100644
index 00000000..84f70005
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-dashboard-nav/company-dashboard-nav.component.html
@@ -0,0 +1,34 @@
+<ul class="nav nav-tabs">
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/company/'+company.guid" [routerLinkActive]="'active'"
+            [routerLinkActiveOptions]="{exact: true}">Company
+            Dashboard</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/company/'+company.guid + '/manage'" [routerLinkActive]="'active'">
+            <fa-icon [icon]="faGears"></fa-icon>
+            Details
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/company/'+company.guid + '/stakeholders'"
+            [routerLinkActive]="'active'">
+            <fa-icon [icon]="faAddressBook"></fa-icon>
+            Stakeholders
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/company/'+company.guid + '/performance-indicators'"
+            [routerLinkActive]="'active'">
+            <fa-icon [icon]="faBullseye"></fa-icon>
+            Key Performance Indicators
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/company/'+company.guid + '/reports'"
+            [routerLinkActive]="'active'">
+            <fa-icon [icon]="faFile"></fa-icon>
+            Reports
+        </a>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/src/app/user-dashboard/user-dashboard-tabs/user-dashboard-tabs.component.spec.ts b/src/app/user-portfolio/company-dashboard/company-dashboard-nav/company-dashboard-nav.component.spec.ts
similarity index 51%
rename from src/app/user-dashboard/user-dashboard-tabs/user-dashboard-tabs.component.spec.ts
rename to src/app/user-portfolio/company-dashboard/company-dashboard-nav/company-dashboard-nav.component.spec.ts
index 4c0d0da4..e4081cd3 100644
--- a/src/app/user-dashboard/user-dashboard-tabs/user-dashboard-tabs.component.spec.ts
+++ b/src/app/user-portfolio/company-dashboard/company-dashboard-nav/company-dashboard-nav.component.spec.ts
@@ -1,21 +1,23 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { UserDashboardTabsComponent } from './user-dashboard-tabs.component';
+import { CompanyDashboardNavComponent } from './company-dashboard-nav.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { RouterTestingModule } from '@angular/router/testing';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
 
-describe('UserDashboardTabsComponent', () => {
-  let component: UserDashboardTabsComponent;
-  let fixture: ComponentFixture<UserDashboardTabsComponent>;
+describe('CompanyDashboardNavComponent', () => {
+  let component: CompanyDashboardNavComponent;
+  let fixture: ComponentFixture<CompanyDashboardNavComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [FontAwesomeModule, RouterTestingModule],
-      declarations: [UserDashboardTabsComponent]
+      declarations: [CompanyDashboardNavComponent],
+      providers: stubServiceProviders
     })
     .compileComponents();
-    
-    fixture = TestBed.createComponent(UserDashboardTabsComponent);
+
+    fixture = TestBed.createComponent(CompanyDashboardNavComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/user-portfolio/company-dashboard/company-dashboard-nav/company-dashboard-nav.component.ts b/src/app/user-portfolio/company-dashboard/company-dashboard-nav/company-dashboard-nav.component.ts
new file mode 100644
index 00000000..10b6bc9b
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-dashboard-nav/company-dashboard-nav.component.ts
@@ -0,0 +1,33 @@
+import { Component } from '@angular/core';
+import { faAddressBook, faBullseye, faFile, faGears, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { IdbCompany } from 'src/app/models/company';
+
+@Component({
+  selector: 'app-company-dashboard-nav',
+  templateUrl: './company-dashboard-nav.component.html',
+  styleUrl: './company-dashboard-nav.component.css'
+})
+export class CompanyDashboardNavComponent {
+
+  faFile: IconDefinition = faFile;
+  faGears: IconDefinition = faGears;
+  faAddressBook: IconDefinition = faAddressBook;
+  faBullseye: IconDefinition = faBullseye;
+
+  company: IdbCompany;
+  companySub: Subscription;
+  constructor(private companyIdbService: CompanyIdbService) {
+  }
+
+  ngOnInit() {
+    this.companySub = this.companyIdbService.selectedCompany.subscribe(company => {
+      this.company = company;
+    })
+  }
+
+  ngOnDestroy() {
+    this.companySub.unsubscribe();
+  }
+}
diff --git a/src/app/facility-dashboard/facility-dashboard-home/facility-production-details/facility-production-details.component.css b/src/app/user-portfolio/company-dashboard/company-dashboard.component.css
similarity index 100%
rename from src/app/facility-dashboard/facility-dashboard-home/facility-production-details/facility-production-details.component.css
rename to src/app/user-portfolio/company-dashboard/company-dashboard.component.css
diff --git a/src/app/user-portfolio/company-dashboard/company-dashboard.component.html b/src/app/user-portfolio/company-dashboard/company-dashboard.component.html
new file mode 100644
index 00000000..5f537bdd
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-dashboard.component.html
@@ -0,0 +1,6 @@
+<div class="pt-2">
+    <app-company-dashboard-nav></app-company-dashboard-nav>
+</div>
+<div class="pt-2 pb-2">
+    <router-outlet></router-outlet>
+</div>
\ No newline at end of file
diff --git a/src/app/company-dashboard/company-dashboard.component.spec.ts b/src/app/user-portfolio/company-dashboard/company-dashboard.component.spec.ts
similarity index 54%
rename from src/app/company-dashboard/company-dashboard.component.spec.ts
rename to src/app/user-portfolio/company-dashboard/company-dashboard.component.spec.ts
index e912710d..65c731b2 100644
--- a/src/app/company-dashboard/company-dashboard.component.spec.ts
+++ b/src/app/user-portfolio/company-dashboard/company-dashboard.component.spec.ts
@@ -1,27 +1,23 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CompanyDashboardComponent } from './company-dashboard.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
 import { RouterTestingModule } from '@angular/router/testing';
-import { CompanyIdbService } from '../indexed-db/company-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { IdbCompany, getNewIdbCompany } from '../models/company';
-import { CompanyDashboardTabsComponent } from './company-dashboard-tabs/company-dashboard-tabs.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { CompanyDashboardNavComponent } from './company-dashboard-nav/company-dashboard-nav.component';
 
 describe('CompanyDashboardComponent', () => {
   let component: CompanyDashboardComponent;
   let fixture: ComponentFixture<CompanyDashboardComponent>;
 
-  beforeEach(() => {
-    let companyDbServiceStub: Partial<CompanyIdbService> = {
-      companies: new BehaviorSubject<Array<IdbCompany>>([]),
-      selectedCompany: new BehaviorSubject<IdbCompany>(getNewIdbCompany(''))
-    }
-    TestBed.configureTestingModule({
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
       imports: [RouterTestingModule, FontAwesomeModule],
-      declarations: [CompanyDashboardComponent, CompanyDashboardTabsComponent],
-      providers: [{ provide: CompanyIdbService, useValue: companyDbServiceStub }],
-    });
+      declarations: [CompanyDashboardComponent, CompanyDashboardNavComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
     fixture = TestBed.createComponent(CompanyDashboardComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
diff --git a/src/app/user-portfolio/company-dashboard/company-dashboard.component.ts b/src/app/user-portfolio/company-dashboard/company-dashboard.component.ts
new file mode 100644
index 00000000..3052ba14
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-dashboard.component.ts
@@ -0,0 +1,29 @@
+import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { faBuilding, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { IdbCompany } from 'src/app/models/company';
+
+@Component({
+  selector: 'app-company-dashboard',
+  templateUrl: './company-dashboard.component.html',
+  styleUrl: './company-dashboard.component.css'
+})
+export class CompanyDashboardComponent {
+
+  faBuilding: IconDefinition = faBuilding;
+  company: IdbCompany;
+  constructor(private activatedRoute: ActivatedRoute,
+    private companyIdbService: CompanyIdbService
+  ) {
+
+  }
+
+  ngOnInit() {
+    this.activatedRoute.params.subscribe(params => {
+      let guid: string = params['id'];
+      this.company = this.companyIdbService.getByGUID(guid);
+      this.companyIdbService.selectedCompany.next(this.company);
+    });
+  }
+}
diff --git a/src/app/facility-dashboard/facility-dashboard-tabs/facility-dashboard-tabs.component.css b/src/app/user-portfolio/company-dashboard/company-performance-indicators/company-performance-indicators.component.css
similarity index 100%
rename from src/app/facility-dashboard/facility-dashboard-tabs/facility-dashboard-tabs.component.css
rename to src/app/user-portfolio/company-dashboard/company-performance-indicators/company-performance-indicators.component.css
diff --git a/src/app/user-portfolio/company-dashboard/company-performance-indicators/company-performance-indicators.component.html b/src/app/user-portfolio/company-dashboard/company-performance-indicators/company-performance-indicators.component.html
new file mode 100644
index 00000000..6d8eddc4
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-performance-indicators/company-performance-indicators.component.html
@@ -0,0 +1,42 @@
+<div class="d-flex">
+    <div class="d-flex nav-flex pe-3">
+        <nav class="nav navbar nav-tabs flex-column pt-0">
+
+            <div class="nav-item">
+                <a class="nav-link" [routerLink]="'/portfolio/company/'+company.guid + '/performance-indicators'"
+                    [routerLinkActive]="'active'" [routerLinkActiveOptions]="{exact: true}">
+                    <div class="d-flex w-100 justify-content-between">
+                        <div class="d-block">
+                            Select Key Performance Indicators
+                        </div>
+                        <div class="ps-1">
+                            <fa-icon class="chevron float-right" [icon]="faChevronRight"></fa-icon>
+                        </div>
+                    </div>
+                </a>
+            </div>
+            <div class="w-100">
+                <hr class="my-2">
+            </div>
+            <div class="nav-item" *ngFor="let kpi of keyPerformanceIndicators">
+                <a class="nav-link"
+                    [routerLink]="'/portfolio/company/'+company.guid + '/performance-indicators/details/'+kpi.guid"
+                    [routerLinkActive]="'active'">
+                    <div class="d-flex w-100 justify-content-between">
+                        <div class="d-block">
+                            <span [innerHTML]="kpi.htmlLabel"></span>
+                        </div>
+                        <div class="ps-1">
+                            <fa-icon class="chevron float-right" [icon]="faChevronRight"></fa-icon>
+                        </div>
+                    </div>
+                </a>
+            </div>
+        </nav>
+    </div>
+    <div class="card portfolio w-100">
+        <div class="card-body">
+            <router-outlet></router-outlet>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/company-dashboard/company-performance-indicators/company-performance-indicators.component.spec.ts b/src/app/user-portfolio/company-dashboard/company-performance-indicators/company-performance-indicators.component.spec.ts
new file mode 100644
index 00000000..c7a8398f
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-performance-indicators/company-performance-indicators.component.spec.ts
@@ -0,0 +1,29 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompanyPerformanceIndicatorsComponent } from './company-performance-indicators.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { SharedCompanyFormsModule } from 'src/app/shared/shared-company-forms/shared-company-forms.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { RouterModule } from '@angular/router';
+
+describe('CompanyPerformanceIndicatorsComponent', () => {
+  let component: CompanyPerformanceIndicatorsComponent;
+  let fixture: ComponentFixture<CompanyPerformanceIndicatorsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, SharedCompanyFormsModule, RouterModule],
+      declarations: [CompanyPerformanceIndicatorsComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(CompanyPerformanceIndicatorsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/company-dashboard/company-performance-indicators/company-performance-indicators.component.ts b/src/app/user-portfolio/company-dashboard/company-performance-indicators/company-performance-indicators.component.ts
new file mode 100644
index 00000000..90aedbe8
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-performance-indicators/company-performance-indicators.component.ts
@@ -0,0 +1,45 @@
+import { Component } from '@angular/core';
+import { faBullseye, faChevronRight, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
+import { IdbCompany } from 'src/app/models/company';
+import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
+
+@Component({
+  selector: 'app-company-performance-indicators',
+  templateUrl: './company-performance-indicators.component.html',
+  styleUrl: './company-performance-indicators.component.css'
+})
+export class CompanyPerformanceIndicatorsComponent {
+
+  faBullseye: IconDefinition = faBullseye;
+  faChevronRight: IconDefinition = faChevronRight;
+
+  keyPerformanceIndicators: Array<IdbKeyPerformanceIndicator>;
+  keyPerformanceIndicatorsSub: Subscription;
+
+  company: IdbCompany;
+  companySub: Subscription;
+  constructor(private keyPerformanceIndicatorIdbService: KeyPerformanceIndicatorsIdbService,
+    private companyIdbService: CompanyIdbService
+  ) {
+  }
+
+  ngOnInit() {
+    this.companySub = this.companyIdbService.selectedCompany.subscribe(company => {
+      this.company = company;
+    })
+
+    this.keyPerformanceIndicatorsSub = this.keyPerformanceIndicatorIdbService.keyPerformanceIndicators.subscribe(kpis => {
+      this.keyPerformanceIndicators = kpis.filter(kpi => {
+        return kpi.companyId == this.company.guid
+      });
+    });
+  }
+
+  ngOnDestroy() {
+    this.companySub.unsubscribe();
+    this.keyPerformanceIndicatorsSub.unsubscribe();
+  }
+}
diff --git a/src/app/facility-dashboard/facility-dashboard.component.css b/src/app/user-portfolio/company-dashboard/company-reports/company-reports.component.css
similarity index 100%
rename from src/app/facility-dashboard/facility-dashboard.component.css
rename to src/app/user-portfolio/company-dashboard/company-reports/company-reports.component.css
diff --git a/src/app/user-portfolio/company-dashboard/company-reports/company-reports.component.html b/src/app/user-portfolio/company-dashboard/company-reports/company-reports.component.html
new file mode 100644
index 00000000..b2ad590b
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-reports/company-reports.component.html
@@ -0,0 +1,7 @@
+<div class="card portfolio">
+    <div class="card-body">
+        <div class="alert alert-warning p-2 mb-0">
+            Company level reports coming soon.
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/company-dashboard/company-reports/company-reports.component.spec.ts b/src/app/user-portfolio/company-dashboard/company-reports/company-reports.component.spec.ts
similarity index 99%
rename from src/app/company-dashboard/company-reports/company-reports.component.spec.ts
rename to src/app/user-portfolio/company-dashboard/company-reports/company-reports.component.spec.ts
index 91d1a98b..952e9430 100644
--- a/src/app/company-dashboard/company-reports/company-reports.component.spec.ts
+++ b/src/app/user-portfolio/company-dashboard/company-reports/company-reports.component.spec.ts
@@ -11,7 +11,7 @@ describe('CompanyReportsComponent', () => {
       declarations: [CompanyReportsComponent]
     })
     .compileComponents();
-    
+
     fixture = TestBed.createComponent(CompanyReportsComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
diff --git a/src/app/company-dashboard/company-reports/company-reports.component.ts b/src/app/user-portfolio/company-dashboard/company-reports/company-reports.component.ts
similarity index 100%
rename from src/app/company-dashboard/company-reports/company-reports.component.ts
rename to src/app/user-portfolio/company-dashboard/company-reports/company-reports.component.ts
diff --git a/src/app/facility-dashboard/facility-goals/facility-goals.component.css b/src/app/user-portfolio/company-dashboard/company-settings/company-settings.component.css
similarity index 100%
rename from src/app/facility-dashboard/facility-goals/facility-goals.component.css
rename to src/app/user-portfolio/company-dashboard/company-settings/company-settings.component.css
diff --git a/src/app/user-portfolio/company-dashboard/company-settings/company-settings.component.html b/src/app/user-portfolio/company-dashboard/company-settings/company-settings.component.html
new file mode 100644
index 00000000..bedf20ef
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-settings/company-settings.component.html
@@ -0,0 +1,89 @@
+<div class="card portfolio">
+    <div class="card-body">
+        <app-company-setup-form></app-company-setup-form>
+        <hr>
+        <div class="row">
+            <div class="col-6">
+                <h6>
+                    Create Company Copy
+                </h6>
+                <p class="fw-light">
+                    Use the button below to create a copy of this company. A copy of this company will be added to your
+                    JUSTIFI portfolio.
+                </p>
+                <button class="btn btn-secondary btn-sm" (click)="openCreateCopyModal()">
+                    <fa-icon [icon]="faCopy"></fa-icon>
+                    Copy Company
+                </button>
+            </div>
+            <div class="col-6">
+                <h6>
+                    Delete Company
+                </h6>
+                <p class="fw-light">
+                    Use the button below to delete this company and all of its corresponding data. This action cannot be
+                    undone.
+                </p>
+                <button class="btn btn-danger btn-sm" (click)="openDeleteCompanyModal()">
+                    <fa-icon [icon]="faTrash"></fa-icon>
+                    Delete Company
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<div [ngClass]="{'window-overlay': routeGuardWarningModal ||  showDeleteCompanyModal || showCreateCopyModal}"></div>
+<div class="popup" [ngClass]="{'open': routeGuardWarningModal }">
+    <div class="popup-body">
+        <div class="alert alert-danger">
+            Please fill the required fields.
+        </div>
+    </div>
+    <div class="popup-footer d-flex justify-content-end">
+        <button class="btn btn-secondary me-2" (click)="closeWarningModal()">OK</button>
+    </div>
+</div>
+
+
+<div class="popup" [ngClass]="{'open': showDeleteCompanyModal }">
+    <div class="popup-header">Delete {{company.generalInformation.name}}
+        <button type="button" class="btn-close float-end" aria-label="Close"
+            (click)="closeDeleteCompanyModal()"></button>
+    </div>
+    <div class="popup-body">
+        <div class="alert alert-danger p-2">
+            Are you sure you would like to delete this company and it's corresponding data? This will delete all
+            associated
+            facilities and assessments. This cannot be undone.
+        </div>
+        <hr>
+    </div>
+    <div class="popup-footer d-flex justify-content-end">
+        <button class="btn btn-secondary me-2 btn-sm" (click)="closeDeleteCompanyModal()">Cancel</button>
+        <button class="btn btn-danger btn-sm" (click)="confirmDelete()">
+            <fa-icon [icon]="faTrash"></fa-icon>
+            Delete {{company.generalInformation.name}}
+        </button>
+    </div>
+</div>
+
+<div class="popup" [ngClass]="{'open': showCreateCopyModal }">
+    <div class="popup-header">Create Copy of {{company.generalInformation.name}}
+        <button type="button" class="btn-close float-end" aria-label="Close" (click)="closeCreateCopyModal()"></button>
+    </div>
+    <div class="popup-body">
+        <div class="alert alert-warning p-2">
+            This feature is coming soon!
+        </div>
+        <hr>
+    </div>
+    <div class="popup-footer d-flex justify-content-end">
+        <button class="btn btn-secondary me-2 btn-sm" (click)="closeCreateCopyModal()">Cancel</button>
+        <button class="btn btn-success btn-sm" (click)="confirmCreateCopy()" [disabled]="true">
+            <fa-icon [icon]="faCopy"></fa-icon>
+            Copy {{company.generalInformation.name}}
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/company-dashboard/company-settings/company-settings.component.spec.ts b/src/app/user-portfolio/company-dashboard/company-settings/company-settings.component.spec.ts
new file mode 100644
index 00000000..ded4c974
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-settings/company-settings.component.spec.ts
@@ -0,0 +1,28 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompanySettingsComponent } from './company-settings.component';
+import { SharedCompanyFormsModule } from 'src/app/shared/shared-company-forms/shared-company-forms.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+
+describe('CompanySettingsComponent', () => {
+  let component: CompanySettingsComponent;
+  let fixture: ComponentFixture<CompanySettingsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SharedCompanyFormsModule, FontAwesomeModule],
+      declarations: [CompanySettingsComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(CompanySettingsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/company-dashboard/company-settings/company-settings.component.ts b/src/app/user-portfolio/company-dashboard/company-settings/company-settings.component.ts
new file mode 100644
index 00000000..38a16fdd
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-settings/company-settings.component.ts
@@ -0,0 +1,101 @@
+import { Component } from '@angular/core';
+import { FormControl, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
+import { faCopy, faTrash, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Observable, of, Subscription } from 'rxjs';
+import { LoadingService } from 'src/app/core-components/loading/loading.service';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
+import { IdbCompany } from 'src/app/models/company';
+
+@Component({
+  selector: 'app-company-settings',
+  templateUrl: './company-settings.component.html',
+  styleUrl: './company-settings.component.css'
+})
+export class CompanySettingsComponent {
+
+  faTrash: IconDefinition = faTrash;
+  faCopy: IconDefinition = faCopy;
+
+  showDeleteCompanyModal: boolean = false;
+  showCreateCopyModal: boolean = false;
+
+
+  company: IdbCompany;
+  companySub: Subscription;
+  name: FormControl;
+  routeGuardWarningModal: boolean = false;
+
+  hasAssessments: boolean = false;
+  constructor(
+    private companyIdbService: CompanyIdbService,
+    private dbChangesService: DbChangesService,
+    private loadingService: LoadingService,
+    private toastNotificationService: ToastNotificationsService,
+    private router: Router
+  ) {
+
+  }
+
+  ngOnInit() {
+    this.companySub = this.companyIdbService.selectedCompany.subscribe(_company => {
+      this.company = _company;
+      if (this.company) {
+        this.name = new FormControl(this.company.generalInformation.name, [Validators.required]);
+      }
+    });
+  }
+
+  canDeactivate(): Observable<boolean> {
+    if (this.name && this.name.getError('required')) {
+      this.name.markAsTouched();
+      this.displayWarningModal();
+      return of(false);
+    }
+    return of(true);
+  }
+
+  ngOnDestroy() {
+    this.companySub.unsubscribe();
+  }
+
+
+  displayWarningModal() {
+    this.routeGuardWarningModal = true;
+  }
+  closeWarningModal() {
+    this.routeGuardWarningModal = false;
+  }
+
+  openDeleteCompanyModal() {
+    this.showDeleteCompanyModal = true;
+  }
+
+  closeDeleteCompanyModal() {
+    this.showDeleteCompanyModal = false;
+  }
+
+  openCreateCopyModal() {
+    this.showCreateCopyModal = true;
+  }
+
+  closeCreateCopyModal() {
+    this.showCreateCopyModal = false;
+  }
+
+  confirmCreateCopy() {
+    //TODO...
+  }
+
+  async confirmDelete() {
+    this.showDeleteCompanyModal = false;
+    this.loadingService.setLoadingMessage('Deleting ' + this.company.generalInformation.name + '...');
+    this.loadingService.setLoadingStatus(true);
+    await this.dbChangesService.deleteCompany(this.company);
+    this.loadingService.setLoadingStatus(false);
+    this.toastNotificationService.showToast('Company Deleted!', undefined, 'bg-success', true, false);
+    this.router.navigateByUrl('/portfolio');
+  }
+}
diff --git a/src/app/facility-dashboard/facility-reports/facility-reports.component.css b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders-home/company-stakeholders-home.component.css
similarity index 100%
rename from src/app/facility-dashboard/facility-reports/facility-reports.component.css
rename to src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders-home/company-stakeholders-home.component.css
diff --git a/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders-home/company-stakeholders-home.component.html b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders-home/company-stakeholders-home.component.html
new file mode 100644
index 00000000..7a4e2871
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders-home/company-stakeholders-home.component.html
@@ -0,0 +1,53 @@
+<div class="d-flex w-100 justify-content-end">
+    <div>
+        <button class="btn btn-outline-success btn-sm" (click)="addContact()">
+            <fa-icon [icon]="faPlus"></fa-icon>
+            Add New Stakeholder
+        </button>
+    </div>
+</div>
+<hr class="my-2">
+
+<ng-template [ngIf]="companyContacts.length > 0" [ngIfElse]="noContactsBlock">
+    <table class="table table-bordered table-hover table-sm">
+        <thead>
+            <tr>
+                <th class="w-25">
+                    Name
+                </th>
+                <th class="w-25">
+                    Title
+                </th>
+                <th class="w-25">
+                    Team
+                </th>
+                <th class="w-25">
+                    Notes
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr *ngFor="let contact of companyContacts">
+                <td>
+                    {{contact | contactNameDisplay}}
+                </td>
+                <td>
+                    <app-single-cell-item [strValue]="contact.role"></app-single-cell-item>
+                </td>
+                <td>
+                    <app-single-cell-item [strValue]="contact.team"></app-single-cell-item>
+                </td>
+                <td>
+                    <app-single-cell-item [strValue]="contact.notes"></app-single-cell-item>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</ng-template>
+
+<ng-template #noContactsBlock>
+    <div class="alert alert-info p-2 text-center">
+        No stakeholders found for this company. Use the "<fa-icon [icon]="faPlus"></fa-icon>
+        Add New Stakeholder" button to add a stakeholder to this company.
+    </div>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders-home/company-stakeholders-home.component.spec.ts b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders-home/company-stakeholders-home.component.spec.ts
new file mode 100644
index 00000000..0133fad5
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders-home/company-stakeholders-home.component.spec.ts
@@ -0,0 +1,30 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompanyStakeholdersHomeComponent } from './company-stakeholders-home.component';
+import { SharedCompanyFormsModule } from 'src/app/shared/shared-company-forms/shared-company-forms.module';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';
+
+describe('CompanyStakeholdersHomeComponent', () => {
+  let component: CompanyStakeholdersHomeComponent;
+  let fixture: ComponentFixture<CompanyStakeholdersHomeComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SharedCompanyFormsModule, FontAwesomeModule, HelperPipesModule, TableEntriesModule],
+      declarations: [CompanyStakeholdersHomeComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(CompanyStakeholdersHomeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders-home/company-stakeholders-home.component.ts b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders-home/company-stakeholders-home.component.ts
new file mode 100644
index 00000000..0dc9fa91
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders-home/company-stakeholders-home.component.ts
@@ -0,0 +1,56 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+import { faPlus, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { firstValueFrom, Subscription } from 'rxjs';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
+import { IdbCompany } from 'src/app/models/company';
+import { getNewIdbContact, IdbContact } from 'src/app/models/contact';
+
+@Component({
+  selector: 'app-company-stakeholders-home',
+  templateUrl: './company-stakeholders-home.component.html',
+  styleUrl: './company-stakeholders-home.component.css'
+})
+export class CompanyStakeholdersHomeComponent {
+
+  faPlus: IconDefinition = faPlus;
+  companyContacts: Array<IdbContact>;
+  contactsSub: Subscription;
+
+  company: IdbCompany;
+  selectedCompanySub: Subscription;
+  constructor(
+    private companyIdbService: CompanyIdbService,
+    private contactIdbService: ContactIdbService,
+    private toastNotificationService: ToastNotificationsService,
+    private router: Router
+  ) {
+  }
+
+  ngOnInit() {
+    this.selectedCompanySub = this.companyIdbService.selectedCompany.subscribe(_company => {
+      this.company = _company;
+    });
+
+    this.contactsSub = this.contactIdbService.contacts.subscribe(_contacts => {
+      this.companyContacts = _contacts.filter(contact => {
+        return contact.companyId == this.company.guid
+      });
+    });
+  }
+
+  ngOnDestroy() {
+    this.selectedCompanySub.unsubscribe();
+    this.contactsSub.unsubscribe();
+  }
+
+  async addContact() {
+    let newContact: IdbContact = getNewIdbContact(this.company.userId, this.company.guid);
+    newContact = await firstValueFrom(this.contactIdbService.addWithObservable(newContact));
+    await this.contactIdbService.setContacts();
+    this.toastNotificationService.showToast('Stakeholder Added!', 'A new stakeholder has been added to ' + this.company.generalInformation.name, 'bg-success', true, false);
+    this.router.navigateByUrl('/portfolio/company/' + newContact.companyId + '/stakeholders/' + newContact.guid);
+  }
+}
diff --git a/src/app/user-dashboard/user-dashboard-help/user-dashboard-help.component.css b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders.component.css
similarity index 100%
rename from src/app/user-dashboard/user-dashboard-help/user-dashboard-help.component.css
rename to src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders.component.css
diff --git a/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders.component.html b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders.component.html
new file mode 100644
index 00000000..b1074248
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders.component.html
@@ -0,0 +1,41 @@
+<div class="d-flex">
+    <div class="d-flex nav-flex pe-3" *ngIf="companyContacts.length > 0">
+        <nav class="nav navbar nav-tabs flex-column pt-0">
+
+            <div class="nav-item">
+                <a class="nav-link" [routerLink]="'/portfolio/company/'+company.guid + '/stakeholders'"
+                    [routerLinkActive]="'active'" [routerLinkActiveOptions]="{exact: true}">
+                    <div class="d-flex w-100 justify-content-between">
+                        <div class="d-block">
+                            {{company.generalInformation.name}} Stakeholders
+                        </div>
+                        <div class="ps-1">
+                            <fa-icon class="chevron float-right" [icon]="faChevronRight"></fa-icon>
+                        </div>
+                    </div>
+                </a>
+            </div>
+            <div class="w-100">
+                <hr class="my-2">
+            </div>
+            <div class="nav-item" *ngFor="let contact of companyContacts">
+                <a class="nav-link" [routerLink]="'/portfolio/company/'+company.guid + '/stakeholders/'+contact.guid"
+                    [routerLinkActive]="'active'">
+                    <div class="d-flex w-100 justify-content-between">
+                        <div class="d-block">
+                            {{contact | contactNameDisplay}}
+                        </div>
+                        <div class="ps-1">
+                            <fa-icon class="chevron float-right" [icon]="faChevronRight"></fa-icon>
+                        </div>
+                    </div>
+                </a>
+            </div>
+        </nav>
+    </div>
+    <div class="card portfolio w-100">
+        <div class="card-body">
+            <router-outlet></router-outlet>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders.component.spec.ts b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders.component.spec.ts
new file mode 100644
index 00000000..cab1b876
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders.component.spec.ts
@@ -0,0 +1,29 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompanyStakeholdersComponent } from './company-stakeholders.component';
+import { RouterTestingModule } from '@angular/router/testing';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+
+describe('CompanyStakeholdersComponent', () => {
+  let component: CompanyStakeholdersComponent;
+  let fixture: ComponentFixture<CompanyStakeholdersComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [RouterTestingModule, FontAwesomeModule, HelperPipesModule],
+      declarations: [CompanyStakeholdersComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(CompanyStakeholdersComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders.component.ts b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders.component.ts
new file mode 100644
index 00000000..3a78d61f
--- /dev/null
+++ b/src/app/user-portfolio/company-dashboard/company-stakeholders/company-stakeholders.component.ts
@@ -0,0 +1,46 @@
+import { Component } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+import { faChevronRight, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Observable, of, Subscription } from 'rxjs';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
+import { IdbCompany } from 'src/app/models/company';
+import { IdbContact } from 'src/app/models/contact';
+import { CompanyContactsFormService } from 'src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.service';
+
+@Component({
+  selector: 'app-company-stakeholders',
+  templateUrl: './company-stakeholders.component.html',
+  styleUrl: './company-stakeholders.component.css'
+})
+export class CompanyStakeholdersComponent {
+  faChevronRight: IconDefinition = faChevronRight;
+
+  companyContacts: Array<IdbContact>;
+  contactsSub: Subscription;
+
+  company: IdbCompany;
+  selectedCompanySub: Subscription;
+  constructor(
+    private companyIdbService: CompanyIdbService,
+    private contactIdbService: ContactIdbService
+  ) {
+  }
+
+  ngOnInit() {
+    this.selectedCompanySub = this.companyIdbService.selectedCompany.subscribe(_company => {
+      this.company = _company;
+    });
+
+    this.contactsSub = this.contactIdbService.contacts.subscribe(_contacts => {
+      this.companyContacts = _contacts.filter(contact => {
+        return contact.companyId == this.company.guid
+      });
+    });
+  }
+
+  ngOnDestroy() {
+    this.selectedCompanySub.unsubscribe();
+    this.contactsSub.unsubscribe();
+  }
+}
diff --git a/src/app/user-dashboard/user-dashboard-home/assessments-table/assessments-table.component.css b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory-home/end-use-inventory-home.component.css
similarity index 100%
rename from src/app/user-dashboard/user-dashboard-home/assessments-table/assessments-table.component.css
rename to src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory-home/end-use-inventory-home.component.css
diff --git a/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory-home/end-use-inventory-home.component.html b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory-home/end-use-inventory-home.component.html
new file mode 100644
index 00000000..68ad1145
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory-home/end-use-inventory-home.component.html
@@ -0,0 +1,55 @@
+<div class="d-flex w-100 justify-content-end">
+    <div>
+        <button class="btn btn-outline-success btn-sm" (click)="addEquipment()">
+            <fa-icon [icon]="faPlus"></fa-icon>
+            Add New End Use
+        </button>
+    </div>
+</div>
+<hr class="my-2">
+
+<ng-template [ngIf]="processEquipments.length > 0" [ngIfElse]="noEndUseBlock">
+    <table class="table table-bordered table-hover table-sm">
+        <thead>
+            <tr>
+                <th class="w-25">
+                    Name
+                </th>
+                <th class="w-50">
+                    Notes
+                </th>
+                <th class="w-25">
+                    Stakeholders
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr *ngFor="let processEquipment of processEquipments">
+                <td>
+                    {{processEquipment.equipmentName}}
+                </td>
+                <td>
+                    <app-single-cell-item [strValue]="processEquipment.notes"></app-single-cell-item>
+                </td>
+                <td>
+                    @let associatedContacts = processEquipment.guid | associatedContacts:'processEquipment': contacts;
+                    <ng-template [ngIf]="associatedContacts.length > 0" [ngIfElse]="noContactsBlock">
+                        <span *ngFor="let contact of associatedContacts">
+                            {{contact | contactNameDisplay}} <br>
+                        </span>
+                    </ng-template>
+                    <ng-template #noContactsBlock>
+                        &mdash;
+                    </ng-template>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</ng-template>
+
+<ng-template #noEndUseBlock>
+    <div class="alert alert-info p-2 text-center">
+        No end use inventory items found for this facility. Use the "<fa-icon [icon]="faPlus"></fa-icon>
+        Add End Use" button to add an end use item to this facility.
+    </div>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory-home/end-use-inventory-home.component.spec.ts b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory-home/end-use-inventory-home.component.spec.ts
new file mode 100644
index 00000000..d90a8a6f
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory-home/end-use-inventory-home.component.spec.ts
@@ -0,0 +1,30 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EndUseInventoryHomeComponent } from './end-use-inventory-home.component';
+import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { SharedCompanyFormsModule } from 'src/app/shared/shared-company-forms/shared-company-forms.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('EndUseInventoryHomeComponent', () => {
+  let component: EndUseInventoryHomeComponent;
+  let fixture: ComponentFixture<EndUseInventoryHomeComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SharedCompanyFormsModule, FontAwesomeModule, HelperPipesModule, TableEntriesModule],
+      declarations: [EndUseInventoryHomeComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(EndUseInventoryHomeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory-home/end-use-inventory-home.component.ts b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory-home/end-use-inventory-home.component.ts
new file mode 100644
index 00000000..453f2388
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory-home/end-use-inventory-home.component.ts
@@ -0,0 +1,62 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+import { faPlus, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { firstValueFrom, Subscription } from 'rxjs';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
+import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { ProcessEquipmentIdbService } from 'src/app/indexed-db/process-equipment-idb.service';
+import { IdbContact } from 'src/app/models/contact';
+import { IdbFacility } from 'src/app/models/facility';
+import { getNewIdbProcessEquipment, IdbProcessEquipment } from 'src/app/models/processEquipment';
+
+@Component({
+  selector: 'app-end-use-inventory-home',
+  templateUrl: './end-use-inventory-home.component.html',
+  styleUrl: './end-use-inventory-home.component.css'
+})
+export class EndUseInventoryHomeComponent {
+
+  faPlus: IconDefinition = faPlus;
+  facility: IdbFacility;
+  facilitySub: Subscription;
+  processEquipmentSub: Subscription
+  processEquipments: Array<IdbProcessEquipment>;
+  contacts: Array<IdbContact>;
+  contactsSub: Subscription;
+  constructor(private facilityIdbService: FacilityIdbService,
+    private processEquipmentIdbService: ProcessEquipmentIdbService,
+    private contactIdbService: ContactIdbService,
+    private toastNotificationService: ToastNotificationsService,
+    private router: Router
+  ) { }
+
+  ngOnInit() {
+    this.facilitySub = this.facilityIdbService.selectedFacility.subscribe(facility => {
+      this.facility = facility;
+    });
+
+    this.processEquipmentSub = this.processEquipmentIdbService.processEquipments.subscribe(processEquipments => {
+      this.processEquipments = processEquipments.filter(equipment => {
+        return equipment.facilityId == this.facility.guid;
+      });
+    });
+    this.contactsSub = this.contactIdbService.contacts.subscribe(contacts => {
+      this.contacts = contacts;
+    });
+  }
+
+  ngOnDestroy() {
+    this.processEquipmentSub.unsubscribe();
+    this.facilitySub.unsubscribe();
+    this.contactsSub.unsubscribe();
+  }
+
+  async addEquipment() {
+    let newProcessEquipment: IdbProcessEquipment = getNewIdbProcessEquipment(this.facility.userId, this.facility.companyId, this.facility.guid);
+    await firstValueFrom(this.processEquipmentIdbService.addWithObservable(newProcessEquipment));
+    await this.processEquipmentIdbService.setProcessEquipments();
+    this.toastNotificationService.showToast('End Use Added!', 'New end use item has been added to the inventory for ' + this.facility.generalInformation.name + '!', 'bg-success', true, false);
+    this.router.navigateByUrl('/portfolio/facility/' + newProcessEquipment.facilityId + '/end-use-inventory/' + newProcessEquipment.guid);
+  }
+}
diff --git a/src/app/user-dashboard/user-dashboard-home/companies-table/companies-table.component.css b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory.component.css
similarity index 100%
rename from src/app/user-dashboard/user-dashboard-home/companies-table/companies-table.component.css
rename to src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory.component.css
diff --git a/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory.component.html b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory.component.html
new file mode 100644
index 00000000..08f844b0
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory.component.html
@@ -0,0 +1,42 @@
+<div class="d-flex">
+    <div class="d-flex nav-flex pe-3" *ngIf="processEquipments.length > 0">
+        <nav class="nav navbar nav-tabs flex-column pt-0">
+
+            <div class="nav-item">
+                <a class="nav-link" [routerLink]="'/portfolio/facility/'+facility.guid + '/end-use-inventory'"
+                    [routerLinkActive]="'active'" [routerLinkActiveOptions]="{exact: true}">
+                    <div class="d-flex w-100 justify-content-between">
+                        <div class="d-block">
+                            Summary
+                        </div>
+                        <div>
+                            <fa-icon class="chevron float-right" [icon]="faChevronRight"></fa-icon>
+                        </div>
+                    </div>
+                </a>
+            </div>
+            <div class="w-100">
+                <hr class="my-2">
+            </div>
+            <div class="nav-item" *ngFor="let processEquipment of processEquipments">
+                <a class="nav-link"
+                    [routerLink]="'/portfolio/facility/'+processEquipment.facilityId + '/end-use-inventory/'+processEquipment.guid"
+                    [routerLinkActive]="'active'">
+                    <div class="d-flex w-100 justify-content-between">
+                        <div class="d-block">
+                            {{processEquipment.equipmentName}}
+                        </div>
+                        <div>
+                            <fa-icon class="chevron float-right" [icon]="faChevronRight"></fa-icon>
+                        </div>
+                    </div>
+                </a>
+            </div>
+        </nav>
+    </div>
+    <div class="card portfolio w-100">
+        <div class="card-body">
+            <router-outlet></router-outlet>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory.component.spec.ts b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory.component.spec.ts
new file mode 100644
index 00000000..edfdc4d8
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory.component.spec.ts
@@ -0,0 +1,28 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EndUseInventoryComponent } from './end-use-inventory.component';
+import { RouterTestingModule } from '@angular/router/testing';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('EndUseInventoryComponent', () => {
+  let component: EndUseInventoryComponent;
+  let fixture: ComponentFixture<EndUseInventoryComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [RouterTestingModule, FontAwesomeModule],
+      declarations: [EndUseInventoryComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(EndUseInventoryComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory.component.ts b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory.component.ts
new file mode 100644
index 00000000..1994e3bd
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/end-use-inventory/end-use-inventory.component.ts
@@ -0,0 +1,43 @@
+import { Component } from '@angular/core';
+import { faChevronRight, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { ProcessEquipmentIdbService } from 'src/app/indexed-db/process-equipment-idb.service';
+import { IdbFacility } from 'src/app/models/facility';
+import { IdbProcessEquipment } from 'src/app/models/processEquipment';
+
+@Component({
+  selector: 'app-end-use-inventory',
+  templateUrl: './end-use-inventory.component.html',
+  styleUrl: './end-use-inventory.component.css'
+})
+export class EndUseInventoryComponent {
+
+  faChevronRight: IconDefinition = faChevronRight;
+
+  facility: IdbFacility;
+  facilitySub: Subscription;
+  processEquipmentSub: Subscription
+  processEquipments: Array<IdbProcessEquipment>;
+
+  constructor(private facilityIdbService: FacilityIdbService,
+    private processEquipmentIdbService: ProcessEquipmentIdbService
+  ) { }
+
+  ngOnInit() {
+    this.facilitySub = this.facilityIdbService.selectedFacility.subscribe(facility => {
+      this.facility = facility;
+    });
+
+    this.processEquipmentSub = this.processEquipmentIdbService.processEquipments.subscribe(processEquipments => {
+      this.processEquipments = processEquipments.filter(equipment => {
+        return equipment.facilityId == this.facility.guid;
+      });
+    });
+  }
+
+  ngOnDestroy() {
+    this.processEquipmentSub.unsubscribe();
+    this.facilitySub.unsubscribe();
+  }
+}
diff --git a/src/app/user-dashboard/user-dashboard-home/facilities-table/facilities-table.component.css b/src/app/user-portfolio/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.css
similarity index 100%
rename from src/app/user-dashboard/user-dashboard-home/facilities-table/facilities-table.component.css
rename to src/app/user-portfolio/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.css
diff --git a/src/app/user-portfolio/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.html b/src/app/user-portfolio/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.html
new file mode 100644
index 00000000..52c58e04
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.html
@@ -0,0 +1,11 @@
+<div class="card portfolio">
+    <div class="card-body">
+        <div class="card-title secondary d-flex justify-content-between">
+            <div>
+                <fa-icon class="pe-2" [icon]="faIndustry"></fa-icon>
+                {{facility.generalInformation.name}}
+            </div>
+        </div>
+        <app-facility-list-item [facility]="facility" [inFacilityDashboard]="true"></app-facility-list-item>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.spec.ts b/src/app/user-portfolio/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.spec.ts
new file mode 100644
index 00000000..e8ddd47c
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.spec.ts
@@ -0,0 +1,30 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FacilityDashboardHomeComponent } from './facility-dashboard-home.component';
+import { FacilityListItemComponent } from '../../portfolio-items-list/facility-list-item/facility-list-item.component';
+import { AssessmentListItemComponent } from '../../portfolio-items-list/assessment-list-item/assessment-list-item.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('FacilityDashboardHomeComponent', () => {
+  let component: FacilityDashboardHomeComponent;
+  let fixture: ComponentFixture<FacilityDashboardHomeComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, HelperPipesModule],
+      declarations: [FacilityDashboardHomeComponent, FacilityListItemComponent, AssessmentListItemComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(FacilityDashboardHomeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.ts b/src/app/user-portfolio/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.ts
new file mode 100644
index 00000000..fdcf9ee8
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/facility-dashboard-home/facility-dashboard-home.component.ts
@@ -0,0 +1,29 @@
+import { Component } from '@angular/core';
+import { faIndustry, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { IdbFacility } from 'src/app/models/facility';
+
+@Component({
+  selector: 'app-facility-dashboard-home',
+  templateUrl: './facility-dashboard-home.component.html',
+  styleUrl: './facility-dashboard-home.component.css'
+})
+export class FacilityDashboardHomeComponent {
+
+  faIndustry: IconDefinition = faIndustry;
+
+  facility: IdbFacility;
+  facilitySub: Subscription;
+  constructor(private facilityIdbService: FacilityIdbService) {  }
+
+  ngOnInit(){
+    this.facilitySub = this.facilityIdbService.selectedFacility.subscribe(facility => {
+      this.facility = facility;
+    })
+  }
+
+  ngOnDestroy(){
+    this.facilitySub.unsubscribe();
+  }
+}
diff --git a/src/app/user-dashboard/user-dashboard-home/user-dashboard-home.component.css b/src/app/user-portfolio/facility-dashboard/facility-dashboard-nav/facility-dashboard-nav.component.css
similarity index 100%
rename from src/app/user-dashboard/user-dashboard-home/user-dashboard-home.component.css
rename to src/app/user-portfolio/facility-dashboard/facility-dashboard-nav/facility-dashboard-nav.component.css
diff --git a/src/app/user-portfolio/facility-dashboard/facility-dashboard-nav/facility-dashboard-nav.component.html b/src/app/user-portfolio/facility-dashboard/facility-dashboard-nav/facility-dashboard-nav.component.html
new file mode 100644
index 00000000..f974d962
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/facility-dashboard-nav/facility-dashboard-nav.component.html
@@ -0,0 +1,36 @@
+<ul class="nav nav-tabs">
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/facility/'+facility.guid" [routerLinkActive]="'active'"
+            [routerLinkActiveOptions]="{exact: true}">
+            Facility
+            Dashboard
+        
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/facility/'+facility.guid + '/manage'"
+            [routerLinkActive]="'active'">
+            <fa-icon [icon]="faGears"></fa-icon>
+            Details
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/facility/'+facility.guid + '/system-inventory'"
+            [routerLinkActive]="'active'">
+            <fa-icon [icon]="faList"></fa-icon>
+            Industrial System Inventory</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/facility/'+facility.guid + '/end-use-inventory'"
+            [routerLinkActive]="'active'">
+            <fa-icon [icon]="faDiagramProject"></fa-icon>
+            End Use Inventory</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" [routerLink]="'/portfolio/facility/'+facility.guid + '/reports'"
+            [routerLinkActive]="'active'">
+            <fa-icon [icon]="faFile"></fa-icon>
+            Reports
+        </a>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/src/app/user-portfolio/facility-dashboard/facility-dashboard-nav/facility-dashboard-nav.component.spec.ts b/src/app/user-portfolio/facility-dashboard/facility-dashboard-nav/facility-dashboard-nav.component.spec.ts
new file mode 100644
index 00000000..94f995db
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/facility-dashboard-nav/facility-dashboard-nav.component.spec.ts
@@ -0,0 +1,28 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FacilityDashboardNavComponent } from './facility-dashboard-nav.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { RouterTestingModule } from '@angular/router/testing';
+
+describe('FacilityDashboardNavComponent', () => {
+  let component: FacilityDashboardNavComponent;
+  let fixture: ComponentFixture<FacilityDashboardNavComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, RouterTestingModule],
+      declarations: [FacilityDashboardNavComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(FacilityDashboardNavComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/facility-dashboard/facility-dashboard-nav/facility-dashboard-nav.component.ts b/src/app/user-portfolio/facility-dashboard/facility-dashboard-nav/facility-dashboard-nav.component.ts
new file mode 100644
index 00000000..7aec86d1
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/facility-dashboard-nav/facility-dashboard-nav.component.ts
@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+import { faDiagramProject, faFile, faGears, faList, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { IdbFacility } from 'src/app/models/facility';
+
+@Component({
+  selector: 'app-facility-dashboard-nav',
+  templateUrl: './facility-dashboard-nav.component.html',
+  styleUrl: './facility-dashboard-nav.component.css'
+})
+export class FacilityDashboardNavComponent {
+
+  faGears: IconDefinition = faGears;
+  faFile: IconDefinition = faFile;
+  faList: IconDefinition = faList;
+  faDiagramProject: IconDefinition = faDiagramProject;
+
+  facility: IdbFacility;
+  facilitySub: Subscription;
+  constructor(private facilityIdbService: FacilityIdbService) {  }
+
+  ngOnInit(){
+    this.facilitySub = this.facilityIdbService.selectedFacility.subscribe(facility => {
+      this.facility = facility;
+    })
+  }
+
+  ngOnDestroy(){
+    this.facilitySub.unsubscribe();
+  }
+}
diff --git a/src/app/user-dashboard/user-dashboard-tabs/user-dashboard-tabs.component.css b/src/app/user-portfolio/facility-dashboard/facility-dashboard.component.css
similarity index 100%
rename from src/app/user-dashboard/user-dashboard-tabs/user-dashboard-tabs.component.css
rename to src/app/user-portfolio/facility-dashboard/facility-dashboard.component.css
diff --git a/src/app/user-portfolio/facility-dashboard/facility-dashboard.component.html b/src/app/user-portfolio/facility-dashboard/facility-dashboard.component.html
new file mode 100644
index 00000000..334f094a
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/facility-dashboard.component.html
@@ -0,0 +1,6 @@
+<div class="pt-2">
+    <app-facility-dashboard-nav></app-facility-dashboard-nav>
+</div>
+<div class="pt-2 pb-2">
+    <router-outlet></router-outlet>
+</div>
\ No newline at end of file
diff --git a/src/app/facility-dashboard/facility-dashboard.component.spec.ts b/src/app/user-portfolio/facility-dashboard/facility-dashboard.component.spec.ts
similarity index 53%
rename from src/app/facility-dashboard/facility-dashboard.component.spec.ts
rename to src/app/user-portfolio/facility-dashboard/facility-dashboard.component.spec.ts
index b4687a4c..65f9626a 100644
--- a/src/app/facility-dashboard/facility-dashboard.component.spec.ts
+++ b/src/app/user-portfolio/facility-dashboard/facility-dashboard.component.spec.ts
@@ -1,27 +1,23 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { FacilityDashboardComponent } from './facility-dashboard.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
 import { RouterTestingModule } from '@angular/router/testing';
-import { FacilityIdbService } from '../indexed-db/facility-idb.service';
-import { FacilityDashboardTabsComponent } from './facility-dashboard-tabs/facility-dashboard-tabs.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { BehaviorSubject } from 'rxjs';
-import { IdbFacility, getNewIdbFacility } from '../models/facility';
+import { FacilityDashboardNavComponent } from './facility-dashboard-nav/facility-dashboard-nav.component';
 
 describe('FacilityDashboardComponent', () => {
   let component: FacilityDashboardComponent;
   let fixture: ComponentFixture<FacilityDashboardComponent>;
 
-  beforeEach(() => {
-    let facilityIdbService: Partial<FacilityIdbService> = {
-      facilities: new BehaviorSubject<Array<IdbFacility>>([]),
-      selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', ''))
-    };
-    TestBed.configureTestingModule({
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
       imports: [RouterTestingModule, FontAwesomeModule],
-      declarations: [FacilityDashboardComponent, FacilityDashboardTabsComponent],
-      providers: [{ provide: FacilityIdbService, useValue: facilityIdbService }]
-    });
+      declarations: [FacilityDashboardComponent, FacilityDashboardNavComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
     fixture = TestBed.createComponent(FacilityDashboardComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
diff --git a/src/app/user-portfolio/facility-dashboard/facility-dashboard.component.ts b/src/app/user-portfolio/facility-dashboard/facility-dashboard.component.ts
new file mode 100644
index 00000000..cb1992d0
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/facility-dashboard.component.ts
@@ -0,0 +1,31 @@
+import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { IdbCompany } from 'src/app/models/company';
+import { IdbFacility } from 'src/app/models/facility';
+
+@Component({
+  selector: 'app-facility-dashboard',
+  templateUrl: './facility-dashboard.component.html',
+  styleUrl: './facility-dashboard.component.css'
+})
+export class FacilityDashboardComponent {
+
+  constructor(private activatedRoute: ActivatedRoute,
+    private companyIdbService: CompanyIdbService,
+    private facilityIdbService: FacilityIdbService
+  ) {
+
+  }
+
+  ngOnInit() {
+    this.activatedRoute.params.subscribe(params => {
+      let guid: string = params['id'];
+      let facility: IdbFacility = this.facilityIdbService.getByGUID(guid);
+      this.facilityIdbService.selectedFacility.next(facility);
+      let company: IdbCompany = this.companyIdbService.getByGUID(facility.companyId);
+      this.companyIdbService.selectedCompany.next(company);
+    });
+  }
+}
diff --git a/src/app/user-dashboard/user-dashboard.component.css b/src/app/user-portfolio/facility-dashboard/facility-reports/facility-reports.component.css
similarity index 100%
rename from src/app/user-dashboard/user-dashboard.component.css
rename to src/app/user-portfolio/facility-dashboard/facility-reports/facility-reports.component.css
diff --git a/src/app/user-portfolio/facility-dashboard/facility-reports/facility-reports.component.html b/src/app/user-portfolio/facility-dashboard/facility-reports/facility-reports.component.html
new file mode 100644
index 00000000..645f3d08
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/facility-reports/facility-reports.component.html
@@ -0,0 +1,7 @@
+<div class="card portfolio">
+    <div class="card-body">
+        <div class="alert alert-warning p-2 mb-0">
+            Facility level reports coming soon.
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/facility-dashboard/facility-reports/facility-reports.component.spec.ts b/src/app/user-portfolio/facility-dashboard/facility-reports/facility-reports.component.spec.ts
similarity index 99%
rename from src/app/facility-dashboard/facility-reports/facility-reports.component.spec.ts
rename to src/app/user-portfolio/facility-dashboard/facility-reports/facility-reports.component.spec.ts
index 9cdc9210..c6c02a7b 100644
--- a/src/app/facility-dashboard/facility-reports/facility-reports.component.spec.ts
+++ b/src/app/user-portfolio/facility-dashboard/facility-reports/facility-reports.component.spec.ts
@@ -11,7 +11,7 @@ describe('FacilityReportsComponent', () => {
       declarations: [FacilityReportsComponent]
     })
     .compileComponents();
-    
+
     fixture = TestBed.createComponent(FacilityReportsComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
diff --git a/src/app/facility-dashboard/facility-reports/facility-reports.component.ts b/src/app/user-portfolio/facility-dashboard/facility-reports/facility-reports.component.ts
similarity index 100%
rename from src/app/facility-dashboard/facility-reports/facility-reports.component.ts
rename to src/app/user-portfolio/facility-dashboard/facility-reports/facility-reports.component.ts
diff --git a/src/app/user-dashboard/user-settings/user-settings.component.css b/src/app/user-portfolio/facility-dashboard/facility-settings/facility-settings.component.css
similarity index 100%
rename from src/app/user-dashboard/user-settings/user-settings.component.css
rename to src/app/user-portfolio/facility-dashboard/facility-settings/facility-settings.component.css
diff --git a/src/app/user-portfolio/facility-dashboard/facility-settings/facility-settings.component.html b/src/app/user-portfolio/facility-dashboard/facility-settings/facility-settings.component.html
new file mode 100644
index 00000000..e3359fa1
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/facility-settings/facility-settings.component.html
@@ -0,0 +1,90 @@
+<div class="card portfolio">
+    <div class="card-body">
+        <app-facility-setup-form></app-facility-setup-form>
+        <hr>
+        <div class="row">
+            <div class="col-6">
+                <h6>
+                    Create Facility Copy
+                </h6>
+                <p class="fw-light">
+                    Use the button below to create a copy of this facility. A copy of this facility will be added to
+                    your
+                    JUSTIFI portfolio.
+                </p>
+                <button class="btn btn-secondary btn-sm" (click)="openCreateCopyModal()">
+                    <fa-icon [icon]="faCopy"></fa-icon>
+                    Copy Facility
+                </button>
+            </div>
+            <div class="col-6">
+                <h6>
+                    Delete Facility
+                </h6>
+                <p class="fw-light">
+                    Use the button below to delete this facility and all of its corresponding data. This action cannot
+                    be
+                    undone.
+                </p>
+                <button class="btn btn-danger btn-sm" (click)="openDeleteFacilityModal()">
+                    <fa-icon [icon]="faTrash"></fa-icon>
+                    Delete Facility
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<div [ngClass]="{'window-overlay': routeGuardWarningModal ||  showDeleteFacilityModal || showCreateCopyModal}"></div>
+<div class="popup" [ngClass]="{'open': routeGuardWarningModal }">
+    <div class="popup-body">
+        <div class="alert alert-danger">
+            Please fill the required fields.
+        </div>
+    </div>
+    <div class="popup-footer d-flex justify-content-end">
+        <button class="btn btn-secondary me-2" (click)="closeWarningModal()">OK</button>
+    </div>
+</div>
+
+<div class="popup" [ngClass]="{'open': showDeleteFacilityModal }">
+    <div class="popup-header">Delete {{facility.generalInformation.name}}
+        <button type="button" class="btn-close float-end" aria-label="Close"
+            (click)="closeDeleteFacilityModal()"></button>
+    </div>
+    <div class="popup-body">
+        <div class="alert alert-danger p-2">
+            Are you sure you would like to delete this facility and it's corresponding data? This will delete all
+            associated
+            facilities and assessments. This cannot be undone.
+        </div>
+        <hr>
+    </div>
+    <div class="popup-footer d-flex justify-content-end">
+        <button class="btn btn-secondary me-2 btn-sm" (click)="closeDeleteFacilityModal()">Cancel</button>
+        <button class="btn btn-danger btn-sm" (click)="confirmDelete()">
+            <fa-icon [icon]="faTrash"></fa-icon>
+            Delete {{facility.generalInformation.name}}
+        </button>
+    </div>
+</div>
+
+<div class="popup" [ngClass]="{'open': showCreateCopyModal }">
+    <div class="popup-header">Create Copy of {{facility.generalInformation.name}}
+        <button type="button" class="btn-close float-end" aria-label="Close" (click)="closeCreateCopyModal()"></button>
+    </div>
+    <div class="popup-body">
+        <div class="alert alert-warning p-2">
+            This feature is coming soon!
+        </div>
+        <hr>
+    </div>
+    <div class="popup-footer d-flex justify-content-end">
+        <button class="btn btn-secondary me-2 btn-sm" (click)="closeCreateCopyModal()">Cancel</button>
+        <button class="btn btn-success btn-sm" (click)="confirmCreateCopy()" [disabled]="true">
+            <fa-icon [icon]="faCopy"></fa-icon>
+            Copy {{facility.generalInformation.name}}
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/facility-dashboard/facility-settings/facility-settings.component.spec.ts b/src/app/user-portfolio/facility-dashboard/facility-settings/facility-settings.component.spec.ts
new file mode 100644
index 00000000..0b43881e
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/facility-settings/facility-settings.component.spec.ts
@@ -0,0 +1,28 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FacilitySettingsComponent } from './facility-settings.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { SharedFacilityFormsModule } from 'src/app/shared/shared-facility-forms/shared-facility-forms.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('FacilitySettingsComponent', () => {
+  let component: FacilitySettingsComponent;
+  let fixture: ComponentFixture<FacilitySettingsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, SharedFacilityFormsModule],
+      declarations: [FacilitySettingsComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(FacilitySettingsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/facility-dashboard/facility-settings/facility-settings.component.ts b/src/app/user-portfolio/facility-dashboard/facility-settings/facility-settings.component.ts
new file mode 100644
index 00000000..d55bac2c
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/facility-settings/facility-settings.component.ts
@@ -0,0 +1,103 @@
+import { Component } from '@angular/core';
+import { FormControl, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
+import { faCopy, faTrash, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Observable, of, Subscription } from 'rxjs';
+import { LoadingService } from 'src/app/core-components/loading/loading.service';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
+import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { IdbFacility } from 'src/app/models/facility';
+
+@Component({
+  selector: 'app-facility-settings',
+  templateUrl: './facility-settings.component.html',
+  styleUrl: './facility-settings.component.css'
+})
+export class FacilitySettingsComponent {
+
+
+  faTrash: IconDefinition = faTrash;
+  faCopy: IconDefinition = faCopy;
+
+  showDeleteFacilityModal: boolean = false;
+  showCreateCopyModal: boolean = false;
+
+
+  name: FormControl;
+  facilityName: string;
+  facilitySub: Subscription;
+  facility: IdbFacility;
+  routeGuardWarningModal: boolean = false;
+
+  constructor(private facilityIdbService: FacilityIdbService,
+    private loadingService: LoadingService,
+    private toastNotificationService: ToastNotificationsService,
+    private dbChangesService: DbChangesService,
+    private router: Router
+  ) {
+
+  }
+
+  ngOnInit() {
+    this.facilitySub = this.facilityIdbService.selectedFacility.subscribe(facility => {
+      this.facility = facility;
+      this.name = new FormControl(this.facility.generalInformation.name, [Validators.required]);
+    });
+  }
+
+  ngOnDestroy() {
+    this.facilitySub.unsubscribe();
+  }
+
+  async saveChanges() {
+    let facility: IdbFacility = this.facilityIdbService.selectedFacility.getValue();
+    facility.generalInformation.name = this.name.value;
+    await this.facilityIdbService.asyncUpdate(facility);
+  }
+
+  canDeactivate(): Observable<boolean> {
+    if (this.name && this.name.getError('required')) {
+      this.displayWarningModal();
+      return of(false);
+    }
+    return of(true);
+  }
+
+  displayWarningModal() {
+    this.routeGuardWarningModal = true;
+  }
+  closeWarningModal() {
+    this.routeGuardWarningModal = false;
+  }
+
+  openDeleteFacilityModal() {
+    this.showDeleteFacilityModal = true;
+  }
+
+  closeDeleteFacilityModal() {
+    this.showDeleteFacilityModal = false;
+  }
+
+  openCreateCopyModal() {
+    this.showCreateCopyModal = true;
+  }
+
+  closeCreateCopyModal() {
+    this.showCreateCopyModal = false;
+  }
+
+  confirmCreateCopy() {
+    //TODO...
+  }
+
+  async confirmDelete() {
+    this.showDeleteFacilityModal = false;
+    this.loadingService.setLoadingMessage('Deleting ' + this.facility.generalInformation.name + '...');
+    this.loadingService.setLoadingStatus(true);
+    await this.dbChangesService.deleteFacility(this.facility);
+    this.loadingService.setLoadingStatus(false);
+    this.toastNotificationService.showToast('Facility Deleted!', undefined, 'bg-success', true, false);
+    this.router.navigateByUrl('/portfolio');
+  }
+}
\ No newline at end of file
diff --git a/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component.css b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component.css
new file mode 100644
index 00000000..8bbc53cc
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component.css
@@ -0,0 +1,3 @@
+th{
+    width: 20%;
+}
\ No newline at end of file
diff --git a/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component.html b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component.html
new file mode 100644
index 00000000..b652b0ec
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component.html
@@ -0,0 +1,71 @@
+<div class="d-flex w-100 justify-content-end">
+    <div>
+        <button class="btn btn-outline-success btn-sm" (click)="addEquipment()">
+            <fa-icon [icon]="faPlus"></fa-icon>
+            Add New Equipment
+        </button>
+    </div>
+</div>
+<hr class="my-2">
+
+<ng-template [ngIf]="energyEquipments.length > 0" [ngIfElse]="noEquipmentBlock">
+    <table class="table table-bordered table-hover table-sm">
+        <thead>
+            <tr>
+                <th>
+                    Name
+                </th>
+                <th>
+                    Industrial System
+                </th>
+                <th>
+                    Utility Type
+                </th>
+                <th>
+                    Energy Use<br>
+                    <span class="fw-light small">
+                        (<span [innerHTML]="companyEnergyUnit | unitsDisplay"></span>/yr)
+                    </span>
+                </th>
+                <th>
+                    Stakeholders
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr *ngFor="let energyEquipment of energyEquipments">
+                <td>
+                    {{energyEquipment.equipmentName}}
+                </td>
+                <td>
+                    <app-single-cell-item [strValue]="energyEquipment.equipmentType"></app-single-cell-item>
+                </td>
+                <td>
+                    <app-single-cell-item [strValue]="energyEquipment.utilityType"></app-single-cell-item>
+                </td>
+                <td>
+                    <app-single-cell-item [numValue]="energyEquipment.annualEnergyUse"
+                        [numValueDigits]="'1.0-0'"></app-single-cell-item>
+                </td>
+                <td>
+                    @let associatedContacts = energyEquipment.guid | associatedContacts:'energyEquipment': contacts;
+                    <ng-template [ngIf]="associatedContacts.length > 0" [ngIfElse]="noContactsBlock">
+                        <span *ngFor="let contact of associatedContacts">
+                            {{contact | contactNameDisplay}} <br>
+                        </span>
+                    </ng-template>
+                    <ng-template #noContactsBlock>
+                        &mdash;
+                    </ng-template>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</ng-template>
+
+<ng-template #noEquipmentBlock>
+    <div class="alert alert-info p-2 text-center">
+        No industrial system equipment found for this facility. Use the "<fa-icon [icon]="faPlus"></fa-icon>
+        Add New Equipment" button to add equipment to this facility.
+    </div>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component.spec.ts b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component.spec.ts
new file mode 100644
index 00000000..009b2d48
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component.spec.ts
@@ -0,0 +1,30 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { IndustrialSystemInventoryHomeComponent } from './industrial-system-inventory-home.component';
+import { SharedCompanyFormsModule } from 'src/app/shared/shared-company-forms/shared-company-forms.module';
+import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('IndustrialSystemInventoryHomeComponent', () => {
+  let component: IndustrialSystemInventoryHomeComponent;
+  let fixture: ComponentFixture<IndustrialSystemInventoryHomeComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SharedCompanyFormsModule, FontAwesomeModule, HelperPipesModule, TableEntriesModule],
+      declarations: [IndustrialSystemInventoryHomeComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(IndustrialSystemInventoryHomeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component.ts b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component.ts
new file mode 100644
index 00000000..782021f7
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component.ts
@@ -0,0 +1,80 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+import { faPlus, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { firstValueFrom, Subscription } from 'rxjs';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
+import { EnergyEquipmentIdbService } from 'src/app/indexed-db/energy-equipment-idb.service';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { IdbContact } from 'src/app/models/contact';
+import { getNewIdbEnergyEquipment, IdbEnergyEquipment } from 'src/app/models/energyEquipment';
+import { IdbFacility } from 'src/app/models/facility';
+
+@Component({
+  selector: 'app-industrial-system-inventory-home',
+  templateUrl: './industrial-system-inventory-home.component.html',
+  styleUrl: './industrial-system-inventory-home.component.css'
+})
+export class IndustrialSystemInventoryHomeComponent {
+
+  faPlus: IconDefinition = faPlus;
+
+  facility: IdbFacility;
+  facilitySub: Subscription;
+  energyEquipmentsSub: Subscription
+  energyEquipments: Array<IdbEnergyEquipment>;
+
+  companyEnergyUnit: string;
+  companySub: Subscription;
+
+  contacts: Array<IdbContact>;
+  contactsSub: Subscription;
+  constructor(private facilityIdbService: FacilityIdbService,
+    private energyEquipmentIdbService: EnergyEquipmentIdbService,
+    private companyIdbService: CompanyIdbService,
+    private contactIdbService: ContactIdbService,
+    private toastNotificationService: ToastNotificationsService,
+    private router: Router
+  ) { }
+
+  ngOnInit() {
+    this.companySub = this.companyIdbService.selectedCompany.subscribe(company => {
+      this.companyEnergyUnit = company.companyEnergyUnit;
+    });
+
+    this.facilitySub = this.facilityIdbService.selectedFacility.subscribe(facility => {
+      this.facility = facility;
+    });
+
+    this.energyEquipmentsSub = this.energyEquipmentIdbService.energyEquipments.subscribe(energyEquipments => {
+      this.energyEquipments = energyEquipments.filter(equipment => {
+        return equipment.facilityId == this.facility.guid;
+      });
+    });
+
+    this.contactsSub = this.contactIdbService.contacts.subscribe(contacts => {
+      this.contacts = contacts;
+    });
+  }
+
+  ngOnDestroy() {
+    this.energyEquipmentsSub.unsubscribe();
+    this.facilitySub.unsubscribe();
+    this.companySub.unsubscribe();
+    this.contactsSub.unsubscribe();
+  }
+
+  async addEquipment() {
+    let newEnergyEquipment: IdbEnergyEquipment = getNewIdbEnergyEquipment(
+      this.facility.userId,
+      this.facility.companyId,
+      this.facility.guid,
+      this.facility.unitSettings);
+    await firstValueFrom(this.energyEquipmentIdbService.addWithObservable(newEnergyEquipment));
+    await this.energyEquipmentIdbService.setEnergyEquipments();
+    this.toastNotificationService.showToast('Equipment Added!', 'New industrial system equipment has been added to the inventory for ' + this.facility.generalInformation.name + '!', 'bg-success', true, false);
+    this.router.navigateByUrl('/portfolio/facility/' + newEnergyEquipment.facilityId + '/system-inventory/' + newEnergyEquipment.guid);
+  }
+
+}
diff --git a/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory.component.css b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory.component.css
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory.component.html b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory.component.html
new file mode 100644
index 00000000..b2fc7d63
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory.component.html
@@ -0,0 +1,42 @@
+<div class="d-flex">
+    <div class="d-flex nav-flex pe-3" *ngIf="energyEquipments.length > 0">
+        <nav class="nav navbar nav-tabs flex-column pt-0">
+
+            <div class="nav-item">
+                <a class="nav-link" [routerLink]="'/portfolio/facility/'+facility.guid + '/system-inventory'"
+                    [routerLinkActive]="'active'" [routerLinkActiveOptions]="{exact: true}">
+                    <div class="d-flex w-100 justify-content-between">
+                        <div class="d-block">
+                            Summary
+                        </div>
+                        <div>
+                            <fa-icon class="chevron float-right" [icon]="faChevronRight"></fa-icon>
+                        </div>
+                    </div>
+                </a>
+            </div>
+            <div class="w-100">
+                <hr class="my-2">
+            </div>
+            <div class="nav-item" *ngFor="let energyEquipment of energyEquipments">
+                <a class="nav-link"
+                    [routerLink]="'/portfolio/facility/'+energyEquipment.facilityId + '/system-inventory/'+energyEquipment.guid"
+                    [routerLinkActive]="'active'">
+                    <div class="d-flex w-100 justify-content-between">
+                        <div class="d-block">
+                            {{energyEquipment.equipmentName}}
+                        </div>
+                        <div>
+                            <fa-icon class="chevron float-right" [icon]="faChevronRight"></fa-icon>
+                        </div>
+                    </div>
+                </a>
+            </div>
+        </nav>
+    </div>
+    <div class="card portfolio w-100">
+        <div class="card-body">
+            <router-outlet></router-outlet>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory.component.spec.ts b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory.component.spec.ts
new file mode 100644
index 00000000..9c7e1c05
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory.component.spec.ts
@@ -0,0 +1,28 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { IndustrialSystemInventoryComponent } from './industrial-system-inventory.component';
+import { RouterTestingModule } from '@angular/router/testing';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('IndustrialSystemInventoryComponent', () => {
+  let component: IndustrialSystemInventoryComponent;
+  let fixture: ComponentFixture<IndustrialSystemInventoryComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [RouterTestingModule, FontAwesomeModule],
+      declarations: [IndustrialSystemInventoryComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(IndustrialSystemInventoryComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory.component.ts b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory.component.ts
new file mode 100644
index 00000000..466c1c03
--- /dev/null
+++ b/src/app/user-portfolio/facility-dashboard/industrial-system-inventory/industrial-system-inventory.component.ts
@@ -0,0 +1,45 @@
+import { Component } from '@angular/core';
+import { faChevronRight, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { EnergyEquipmentIdbService } from 'src/app/indexed-db/energy-equipment-idb.service';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { IdbEnergyEquipment } from 'src/app/models/energyEquipment';
+import { IdbFacility } from 'src/app/models/facility';
+
+@Component({
+  selector: 'app-industrial-system-inventory',
+  templateUrl: './industrial-system-inventory.component.html',
+  styleUrl: './industrial-system-inventory.component.css'
+})
+export class IndustrialSystemInventoryComponent {
+
+  faChevronRight: IconDefinition = faChevronRight;
+
+  facility: IdbFacility;
+  facilitySub: Subscription;
+
+
+  energyEquipmentsSub: Subscription
+  energyEquipments: Array<IdbEnergyEquipment>;
+
+  constructor(private facilityIdbService: FacilityIdbService,
+    private energyEquipmentIdbService: EnergyEquipmentIdbService
+  ) { }
+
+  ngOnInit() {
+    this.facilitySub = this.facilityIdbService.selectedFacility.subscribe(facility => {
+      this.facility = facility;
+    });
+
+    this.energyEquipmentsSub = this.energyEquipmentIdbService.energyEquipments.subscribe(energyEquipments => {
+      this.energyEquipments = energyEquipments.filter(equipment => {
+        return equipment.facilityId == this.facility.guid;
+      });
+    });
+  }
+
+  ngOnDestroy() {
+    this.energyEquipmentsSub.unsubscribe();
+    this.facilitySub.unsubscribe();
+  }
+}
diff --git a/src/app/user-portfolio/latest-visits-table/latest-visits-table.component.css b/src/app/user-portfolio/latest-visits-table/latest-visits-table.component.css
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/user-portfolio/latest-visits-table/latest-visits-table.component.html b/src/app/user-portfolio/latest-visits-table/latest-visits-table.component.html
new file mode 100644
index 00000000..adf80722
--- /dev/null
+++ b/src/app/user-portfolio/latest-visits-table/latest-visits-table.component.html
@@ -0,0 +1,95 @@
+<div class="portfolio card">
+    <div class="card-body">
+        <div class="card-title secondary d-flex justify-content-between">
+            <div>
+                <fa-icon [icon]="faStopwatch"></fa-icon>
+                On-Site Visits
+            </div>
+            <div>
+                <button class="btn btn-outline-success btn-sm" (click)="openWizardModal()">
+                    <fa-icon [icon]="faWandMagicSparkles"></fa-icon>
+                    Setup Wizard</button>
+            </div>
+        </div>
+        <p class="card-text fw-light">
+            Below is a list of the on-site visits conducted in JUSTIFI so you can jump back in.
+            Just click the "<fa-icon [icon]="faWandMagicSparkles"></fa-icon>" button.
+        </p>
+        <ng-template [ngIf]="onSiteVisits.length > 0" [ngIfElse]="noVisitsBlock">
+            <table class="table table-bordered">
+                <thead>
+                    <tr>
+                        <th>
+                            Company
+                        </th>
+                        <th>
+                            Facility
+                        </th>
+                        <th>
+                            Assessments
+                        </th>
+                        <th>
+                            Visit Date
+                        </th>
+                        <th>
+                            Last Modified
+                        </th>
+                        <th class="actions">
+
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr *ngFor="let visit of onSiteVisits |  slice: ((currentPageNumber-1) * 5): currentPageNumber * 5">
+                        <td>
+                            <a [routerLink]="'/portfolio/company/'+visit.companyId">
+                                {{visit.companyId | companyName: companies}}
+                            </a>
+                        </td>
+                        <td>
+                            <a [routerLink]="'/portfolio/facility/'+visit.facilityId">
+                                {{visit.facilityId | facilityName: facilities}}
+                            </a>
+                        </td>
+                        <td>
+                            <!-- <span class="badge bg-dark">
+                                {{visit.assessmentIds.length}}
+                            </span> -->
+                            <ng-template [ngIf]="visit.assessmentIds.length > 0" [ngIfElse]="assessmentMdash">
+                                <span *ngFor="let assessmentId of visit.assessmentIds">
+                                    <a [routerLink]="'/portfolio/assessment/'+assessmentId">
+                                        {{assessmentId | assessmentNameDisplay: assessments}}
+                                    </a>
+                                    <br>
+                                </span>
+                            </ng-template>
+                            <ng-template #assessmentMdash>
+                                &mdash;
+                            </ng-template>
+                        </td>
+                        <td>
+                            {{visit.visitDate | date}}
+                        </td>
+                        <td>
+                            {{visit.modifiedDate | date}}
+                        </td>
+                        <th class="actions">
+                            <button class="btn btn-outline-success p-1 btn-sm" (click)="goToVisit(visit)">
+                                <fa-icon [icon]="faWandMagicSparkles"></fa-icon>
+                            </button>
+                        </th>
+                    </tr>
+                </tbody>
+            </table>
+            <div class="d-flex justify-content-end">
+                <app-table-pagination [pageNumber]="currentPageNumber" [collectionSize]="onSiteVisits.length"
+                    [itemsPerPage]="5" (emitPageNumber)="setPageCurrentPageNumber($event)"></app-table-pagination>
+            </div>
+        </ng-template>
+        <ng-template #noVisitsBlock>
+            <div class="alert alert-info text-center p-2">
+                No visits found. Use the setup wizard to add your first on site visit.
+            </div>
+        </ng-template>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/latest-visits-table/latest-visits-table.component.spec.ts b/src/app/user-portfolio/latest-visits-table/latest-visits-table.component.spec.ts
new file mode 100644
index 00000000..e39e81b3
--- /dev/null
+++ b/src/app/user-portfolio/latest-visits-table/latest-visits-table.component.spec.ts
@@ -0,0 +1,30 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LatestVisitsTableComponent } from './latest-visits-table.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { TablePaginationModule } from 'src/app/shared/table-pagination/table-pagination.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { RouterTestingModule } from '@angular/router/testing';
+
+describe('LatestVisitsTableComponent', () => {
+  let component: LatestVisitsTableComponent;
+  let fixture: ComponentFixture<LatestVisitsTableComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, TablePaginationModule, HelperPipesModule, RouterTestingModule],
+      declarations: [LatestVisitsTableComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(LatestVisitsTableComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/latest-visits-table/latest-visits-table.component.ts b/src/app/user-portfolio/latest-visits-table/latest-visits-table.component.ts
new file mode 100644
index 00000000..4a400e79
--- /dev/null
+++ b/src/app/user-portfolio/latest-visits-table/latest-visits-table.component.ts
@@ -0,0 +1,86 @@
+import { Component } from '@angular/core';
+import { faStopwatch, faWandMagicSparkles, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
+import { IdbAssessment } from 'src/app/models/assessment';
+import { IdbCompany } from 'src/app/models/company';
+import { IdbFacility } from 'src/app/models/facility';
+import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
+import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
+
+@Component({
+  selector: 'app-latest-visits-table',
+  templateUrl: './latest-visits-table.component.html',
+  styleUrl: './latest-visits-table.component.css'
+})
+export class LatestVisitsTableComponent {
+
+  faWandMagicSparkles: IconDefinition = faWandMagicSparkles;
+  faStopwatch: IconDefinition = faStopwatch;
+
+  onSiteVisits: Array<IdbOnSiteVisit>;
+  onSiteVisitSub: Subscription;
+
+  facilities: Array<IdbFacility>;
+  facilitiesSub: Subscription;
+
+  companies: Array<IdbCompany>;
+  companiesSub: Subscription;
+
+  assessments: Array<IdbAssessment>;
+  assessmentSub: Subscription;
+
+  currentPageNumber: number = 1;
+  constructor(
+    private onSiteVisitIdbService: OnSiteVisitIdbService,
+    private facilityIdbService: FacilityIdbService,
+    private companyIdbService: CompanyIdbService,
+    private sharedDataService: SharedDataService,
+    private assessmentIdbService: AssessmentIdbService
+  ) {
+
+  }
+
+  ngOnInit() {
+    this.onSiteVisitSub = this.onSiteVisitIdbService.onSiteVisits.subscribe(visits => {
+      this.onSiteVisits = visits;
+    });
+
+    this.facilitiesSub = this.facilityIdbService.facilities.subscribe(facilities => {
+      this.facilities = facilities;
+    });
+
+    this.companiesSub = this.companyIdbService.companies.subscribe(companies => {
+      this.companies = companies;
+    });
+    this.assessmentSub = this.assessmentIdbService.assessments.subscribe(assessments => {
+      this.assessments = assessments;
+    })
+  }
+
+  ngOnDestroy() {
+    this.onSiteVisitSub.unsubscribe();
+    this.facilitiesSub.unsubscribe();
+    this.companiesSub.unsubscribe();
+    this.assessmentSub.unsubscribe();
+  }
+
+
+  goToVisit(visit: IdbOnSiteVisit) {
+    this.companyIdbService.setSelectedFromGUID(visit.companyId);
+    this.facilityIdbService.setSelectedFromGUID(visit.facilityId);
+    this.onSiteVisitIdbService.setSelectedFromAssessmentGUID(visit.assessmentIds[0]);
+    this.sharedDataService.createAssessmentModalOpen.next(true);
+  }
+
+  openWizardModal() {
+    this.sharedDataService.createAssessmentModalOpen.next(true);
+  }
+
+  setPageCurrentPageNumber(pageNumber: number) {
+    this.currentPageNumber = pageNumber;
+  }
+}
diff --git a/src/app/user-portfolio/portfolio-items-list/assessment-list-item/assessment-list-item.component.css b/src/app/user-portfolio/portfolio-items-list/assessment-list-item/assessment-list-item.component.css
new file mode 100644
index 00000000..8d89b424
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/assessment-list-item/assessment-list-item.component.css
@@ -0,0 +1,3 @@
+th{
+    width: 30%;
+}
\ No newline at end of file
diff --git a/src/app/user-portfolio/portfolio-items-list/assessment-list-item/assessment-list-item.component.html b/src/app/user-portfolio/portfolio-items-list/assessment-list-item/assessment-list-item.component.html
new file mode 100644
index 00000000..678292fd
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/assessment-list-item/assessment-list-item.component.html
@@ -0,0 +1,75 @@
+<table class="table table-bordered">
+    <tbody>
+        <tr>
+            <th>
+                Assessment Type
+            </th>
+            <td>
+                {{assessment.assessmentType}}
+            </td>
+        </tr>
+        <tr>
+            <th>
+                Visit Date
+            </th>
+            <td>
+                {{assessment.visitDate | date}}
+            </td>
+        </tr>
+        <tr>
+            <th>
+                Utility Usage
+            </th>
+            <td>
+                <ng-container *ngFor="let utilityType of assessment.utilityEnergyUses">
+                    <ng-container *ngIf="utilityType.include">
+                        {{utilityType.utilityType}}: {{utilityType.energyUse | number}} <span
+                            [innerHTML]="utilityType.energyUnit | unitsDisplay"></span><br>
+                    </ng-container>
+                </ng-container>
+            </td>
+        </tr>
+        <tr>
+            <th>
+                Annual Costs
+            </th>
+            <td>
+                <ng-template [ngIf]="assessment.cost" [ngIfElse]="noCostMdash">
+                    {{assessment.cost | currency}}
+                </ng-template>
+                <ng-template #noCostMdash>
+                    &mdash;
+                </ng-template>
+            </td>
+        </tr>
+        <tr>
+            <th>
+                Energy Opportunities
+            </th>
+            <td>
+                <ng-template [ngIf]="energyOpportunities.length > 0" [ngIfElse]="noOppsMdash">
+                    <ng-container *ngFor="let opportunity of energyOpportunities">
+                        {{opportunity.name}}<br>
+                    </ng-container>
+                </ng-template>
+                <ng-template #noOppsMdash>
+                    &mdash;
+                </ng-template>
+            </td>
+        </tr>
+        <tr>
+            <th>
+                NEBs
+            </th>
+            <td>
+                @let assessmentNebs = assessment.guid | nebList:'assessment': nonEnergyBenefits;
+                <ng-template [ngIf]="assessmentNebs.length > 0">
+                    <span *ngFor="let neb of assessmentNebs">
+                        <fa-icon [icon]="faWeightHanging"></fa-icon>
+                        {{neb.name}} <br>
+                    </span>
+                </ng-template>
+            </td>
+        </tr>
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/src/app/user-portfolio/portfolio-items-list/assessment-list-item/assessment-list-item.component.spec.ts b/src/app/user-portfolio/portfolio-items-list/assessment-list-item/assessment-list-item.component.spec.ts
new file mode 100644
index 00000000..aa7229f1
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/assessment-list-item/assessment-list-item.component.spec.ts
@@ -0,0 +1,31 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AssessmentListItemComponent } from './assessment-list-item.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { getNewIdbAssessment } from 'src/app/models/assessment';
+import { getDefaultUnitSettings } from 'src/app/models/unitSettings';
+
+describe('AssessmentListItemComponent', () => {
+  let component: AssessmentListItemComponent;
+  let fixture: ComponentFixture<AssessmentListItemComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, HelperPipesModule],
+      declarations: [AssessmentListItemComponent],
+      providers: stubServiceProviders
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AssessmentListItemComponent);
+    component = fixture.componentInstance;
+    component.assessment = getNewIdbAssessment('123', '123', '123', getDefaultUnitSettings());
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/portfolio-items-list/assessment-list-item/assessment-list-item.component.ts b/src/app/user-portfolio/portfolio-items-list/assessment-list-item/assessment-list-item.component.ts
new file mode 100644
index 00000000..c57032be
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/assessment-list-item/assessment-list-item.component.ts
@@ -0,0 +1,48 @@
+import { Component, Input } from '@angular/core';
+import { faWeightHanging, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
+import { NonEnergyBenefitsIdbService } from 'src/app/indexed-db/non-energy-benefits-idb.service';
+import { IdbAssessment } from 'src/app/models/assessment';
+import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
+import { IdbNonEnergyBenefit } from 'src/app/models/nonEnergyBenefit';
+
+@Component({
+  selector: 'app-assessment-list-item',
+  templateUrl: './assessment-list-item.component.html',
+  styleUrl: './assessment-list-item.component.css'
+})
+export class AssessmentListItemComponent {
+  @Input({ required: true })
+  assessment: IdbAssessment;
+  @Input()
+  inAssessmentDashboard: boolean;
+
+  faWeightHanging: IconDefinition = faWeightHanging;
+  energyOpportunitiesSub: Subscription;
+  energyOpportunities: Array<IdbEnergyOpportunity>;
+
+  nonEnergyBenefitsSub: Subscription;
+  nonEnergyBenefits: Array<IdbNonEnergyBenefit>;
+  constructor(private energyOpportunityIdbService: EnergyOpportunityIdbService,
+    private nonEnergyBenefitIdbService: NonEnergyBenefitsIdbService
+  ) {
+  }
+
+  ngOnInit() {
+    this.energyOpportunitiesSub = this.energyOpportunityIdbService.energyOpportunities.subscribe(opportunities => {
+      this.energyOpportunities = opportunities.filter(opp => {
+        return opp.assessmentId == this.assessment.guid
+      });
+    });
+
+    this.nonEnergyBenefitsSub = this.nonEnergyBenefitIdbService.nonEnergyBenefits.subscribe(nebs => {
+      this.nonEnergyBenefits = nebs;
+    });
+  }
+
+  ngOnDestroy() {
+    this.energyOpportunitiesSub.unsubscribe();
+    this.nonEnergyBenefitsSub.unsubscribe();
+  }
+}
diff --git a/src/app/user-portfolio/portfolio-items-list/company-list-item/company-list-item.component.css b/src/app/user-portfolio/portfolio-items-list/company-list-item/company-list-item.component.css
new file mode 100644
index 00000000..9695f083
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/company-list-item/company-list-item.component.css
@@ -0,0 +1,4 @@
+.accordion-body{
+    border-left: solid var(--facility-color) 5px;
+}
+
diff --git a/src/app/user-portfolio/portfolio-items-list/company-list-item/company-list-item.component.html b/src/app/user-portfolio/portfolio-items-list/company-list-item/company-list-item.component.html
new file mode 100644
index 00000000..0c8b9602
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/company-list-item/company-list-item.component.html
@@ -0,0 +1,74 @@
+@let companyAddress = company.generalInformation | addressDisplay;
+<ng-container *ngIf="companyAddress">
+    <p class="fw-light mb-0">
+        {{companyAddress}}
+    </p>
+</ng-container>
+<hr>
+<div class="d-flex justify-content-between mb-1">
+    <div>
+        <h6>
+            {{company.generalInformation.name}} Facilities
+        </h6>
+    </div>
+    <div *ngIf="inCompanyDashboard">
+        <button class="btn btn-outline-success btn-sm" (click)="openAddFacilityModal()">
+            <fa-icon [icon]="faPlus"></fa-icon>
+            Add Facility
+        </button>
+    </div>
+</div>
+<ng-template [ngIf]="facilities.length > 0" [ngIfElse]="noFacilitiesBlock">
+    <div class="accordion" [id]="'facilityAccordion_' + company.guid">
+        <div class="accordion-item facility-item"
+            *ngFor="let facility of facilities; let index = index; let last = last;">
+            <h2 class="accordion-header">
+                <div class="d-flex">
+                    <button class="btn btn-outline-primary btn-sm" (click)="goToFacilityDashboard(facility)">
+                        <fa-icon [icon]="faArrowRight"></fa-icon>
+                    </button>
+                    <button class="accordion-button" type="button" [attr.data-bs-target]="'#'+facility.guid"
+                        aria-expanded="true" [attr.aria-controls]="facility.guid" (click)="toggleBS(facility.guid)"
+                        [ngClass]="{'collapsed': accordionGuid != facility.guid}">
+                        <fa-icon class="pe-2" [icon]="faIndustry"></fa-icon>
+                        {{facility.generalInformation.name}}
+                    </button>
+                </div>
+            </h2>
+            <div [id]="'#'+facility.guid" class="accordion-collapse collapse"
+                [attr.data-bs-parent]="'#facilityAccordion_' + company.guid">
+                <div class="accordion-body">
+                    <app-facility-list-item [facility]="facility"></app-facility-list-item>
+                </div>
+            </div>
+        </div>
+    </div>
+</ng-template>
+
+<ng-template #noFacilitiesBlock>
+    <div class="alert alert-info p-2">
+        No facilities found for this company. Use the "<fa-icon [icon]="faPlus"></fa-icon> Add Facility" button to add a
+        facility to this company.
+    </div>
+</ng-template>
+
+<div [ngClass]="{'window-overlay': displayAddFacilityModal}"></div>
+<div class="popup" [ngClass]="{'open': displayAddFacilityModal }">
+    <div class="popup-header">Add New Facility
+        <button type="button" class="btn-close float-end" aria-label="Close"
+            (click)="closeAddFacilityModal()"></button>
+    </div>
+    <div class="popup-body">
+        <p class="fw-light">
+            Create a new facility that will be added to your portfolio.
+        </p>
+        <hr>
+    </div>
+    <div class="popup-footer d-flex justify-content-end">
+        <button class="btn btn-secondary me-2 btn-sm" (click)="closeAddFacilityModal()">Cancel</button>
+        <button class="btn btn-success btn-sm" (click)="confirmCreate()">
+            <fa-icon [icon]="faPlus"></fa-icon>
+            Create Facility
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/portfolio-items-list/company-list-item/company-list-item.component.spec.ts b/src/app/user-portfolio/portfolio-items-list/company-list-item/company-list-item.component.spec.ts
new file mode 100644
index 00000000..fd7e0561
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/company-list-item/company-list-item.component.spec.ts
@@ -0,0 +1,32 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompanyListItemComponent } from './company-list-item.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { FacilityListItemComponent } from '../facility-list-item/facility-list-item.component';
+import { AssessmentListItemComponent } from '../assessment-list-item/assessment-list-item.component';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { getNewIdbCompany } from 'src/app/models/company';
+
+describe('CompanyListItemComponent', () => {
+  let component: CompanyListItemComponent;
+  let fixture: ComponentFixture<CompanyListItemComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, HelperPipesModule],
+      declarations: [CompanyListItemComponent, FacilityListItemComponent, AssessmentListItemComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(CompanyListItemComponent);
+    component = fixture.componentInstance;
+    component.company = getNewIdbCompany('123');
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/portfolio-items-list/company-list-item/company-list-item.component.ts b/src/app/user-portfolio/portfolio-items-list/company-list-item/company-list-item.component.ts
new file mode 100644
index 00000000..18ca2d8d
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/company-list-item/company-list-item.component.ts
@@ -0,0 +1,79 @@
+import { Component, Input } from '@angular/core';
+import { Router } from '@angular/router';
+import { faArrowRight, faIndustry, faPlus, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { IdbCompany } from 'src/app/models/company';
+import { IdbFacility } from 'src/app/models/facility';
+import { BootstrapService } from 'src/app/shared/shared-services/bootstrap.service';
+
+@Component({
+  selector: 'app-company-list-item',
+  templateUrl: './company-list-item.component.html',
+  styleUrl: './company-list-item.component.css'
+})
+export class CompanyListItemComponent {
+  @Input({ required: true })
+  company: IdbCompany;
+  @Input()
+  inCompanyDashboard: boolean;
+
+  faIndustry: IconDefinition = faIndustry;
+  faArrowRight: IconDefinition = faArrowRight;
+  faPlus: IconDefinition = faPlus;
+
+  facilities: Array<IdbFacility>;
+  facilitiesSub: Subscription;
+  accordionGuid: string;
+  displayAddFacilityModal: boolean = false;
+  constructor(private facilityIdbService: FacilityIdbService,
+    private bootstrapService: BootstrapService,
+    private router: Router,
+    private companyIdbService: CompanyIdbService,
+    private toastNotificationService: ToastNotificationsService
+  ) {
+
+  }
+
+  ngOnInit() {
+    this.facilitiesSub = this.facilityIdbService.facilities.subscribe(facilities => {
+      this.facilities = facilities.filter(facility => { return facility.companyId == this.company.guid });
+    });
+  }
+
+  ngOnDestroy() {
+    this.facilitiesSub.unsubscribe();
+  }
+
+  toggleBS(companyGuid: string) {
+    this.bootstrapService.bsCollapse('#' + companyGuid);
+    if (this.accordionGuid != companyGuid) {
+      this.accordionGuid = companyGuid;
+    } else {
+      this.accordionGuid = undefined;
+    }
+  }
+
+  goToFacilityDashboard(facility: IdbFacility) {
+    this.router.navigateByUrl('/portfolio/facility/' + facility.guid);
+  }
+
+  openAddFacilityModal() {
+    this.displayAddFacilityModal = true;
+  }
+
+  closeAddFacilityModal() {
+    this.displayAddFacilityModal = false;
+  }
+
+  async confirmCreate() {
+    this.closeAddFacilityModal();
+    let company: IdbCompany = this.companyIdbService.selectedCompany.getValue();
+    let newFacilityGuid: string = await this.facilityIdbService.addNewFacility(company.userId, company.guid);
+    let newFacility: IdbFacility = this.facilityIdbService.getByGUID(newFacilityGuid)
+    this.router.navigateByUrl('/portfolio/facility/' + newFacility.guid + '/manage');
+    this.toastNotificationService.showToast('New Facility Added!', undefined, 'bg-success', true, false);
+  }
+}
diff --git a/src/app/user-portfolio/portfolio-items-list/facility-list-item/facility-list-item.component.css b/src/app/user-portfolio/portfolio-items-list/facility-list-item/facility-list-item.component.css
new file mode 100644
index 00000000..b0116dcb
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/facility-list-item/facility-list-item.component.css
@@ -0,0 +1,3 @@
+.accordion-body{
+    border-left: solid var(--assessment-color) 5px;
+}
\ No newline at end of file
diff --git a/src/app/user-portfolio/portfolio-items-list/facility-list-item/facility-list-item.component.html b/src/app/user-portfolio/portfolio-items-list/facility-list-item/facility-list-item.component.html
new file mode 100644
index 00000000..5acc4bd2
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/facility-list-item/facility-list-item.component.html
@@ -0,0 +1,54 @@
+@let facilityAddress = facility.generalInformation | addressDisplay;
+<ng-container *ngIf="facilityAddress">
+    <p class="fw-light mb-0">
+        {{facilityAddress}}
+    </p>
+</ng-container>
+<hr>
+<div class="d-flex justify-content-between mb-1">
+    <div>
+        <h6>
+            {{facility.generalInformation.name}} Assessments
+        </h6>
+    </div>
+    <div *ngIf="inFacilityDashboard">
+        <button class="btn btn-outline-success btn-sm" (click)="goToVisit(undefined)">
+            <fa-icon [icon]="faWandMagicSparkles"></fa-icon>
+            Setup Wizard
+        </button>
+    </div>
+</div>
+<ng-template [ngIf]="assessments.length != 0" [ngIfElse]="noAssessmentsBlock">
+    <div class="accordion" [id]="'assessmentsAccordion_' + facility.guid">
+        <div class="accordion-item assessment-item"
+            *ngFor="let assessment of assessments; let index = index; let last = last;">
+            <h2 class="accordion-header">
+                <div class="d-flex">
+                    <button class="btn btn-outline-success btn-sm" (click)="goToVisit(assessment)">
+                        <fa-icon [icon]="faWandMagicSparkles"></fa-icon>
+                    </button>
+                    <button class="btn btn-outline-primary btn-sm" (click)="goToAssessmentDashboard(assessment)">
+                        <fa-icon [icon]="faArrowRight"></fa-icon>
+                    </button>
+                    <button class="accordion-button" type="button" [attr.data-bs-target]="'#'+assessment.guid"
+                        aria-expanded="true" [attr.aria-controls]="assessment.guid" (click)="toggleBS(assessment.guid)"
+                        [ngClass]="{'collapsed': accordionGuid != assessment.guid}">
+                        <fa-icon class="pe-2" [icon]="faScrewdriverWrench"></fa-icon>
+                        {{assessment.name}}
+                    </button>
+                </div>
+            </h2>
+            <div [id]="'#'+assessment.guid" class="accordion-collapse collapse"
+                [attr.data-bs-parent]="'#assessmentsAccordion_' + facility.guid">
+                <div class="accordion-body">
+                    <app-assessment-list-item [assessment]="assessment"></app-assessment-list-item>
+                </div>
+            </div>
+        </div>
+    </div>
+</ng-template>
+<ng-template #noAssessmentsBlock>
+    <div class="alert alert-info p-2 small">
+        No assessments found for this facility.
+    </div>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/user-portfolio/portfolio-items-list/facility-list-item/facility-list-item.component.spec.ts b/src/app/user-portfolio/portfolio-items-list/facility-list-item/facility-list-item.component.spec.ts
new file mode 100644
index 00000000..a788e185
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/facility-list-item/facility-list-item.component.spec.ts
@@ -0,0 +1,31 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FacilityListItemComponent } from './facility-list-item.component';
+import { AssessmentListItemComponent } from '../assessment-list-item/assessment-list-item.component';
+import { getNewIdbFacility } from 'src/app/models/facility';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+
+describe('FacilityListItemComponent', () => {
+  let component: FacilityListItemComponent;
+  let fixture: ComponentFixture<FacilityListItemComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, HelperPipesModule],
+      declarations: [FacilityListItemComponent, AssessmentListItemComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(FacilityListItemComponent);
+    component = fixture.componentInstance;
+    component.facility = getNewIdbFacility('123', '123');
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/portfolio-items-list/facility-list-item/facility-list-item.component.ts b/src/app/user-portfolio/portfolio-items-list/facility-list-item/facility-list-item.component.ts
new file mode 100644
index 00000000..1010f40c
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/facility-list-item/facility-list-item.component.ts
@@ -0,0 +1,80 @@
+import { Component, Input } from '@angular/core';
+import { Router } from '@angular/router';
+import { faArrowRight, faScrewdriverWrench, faWandMagicSparkles, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
+import { IdbAssessment } from 'src/app/models/assessment';
+import { IdbFacility } from 'src/app/models/facility';
+import { BootstrapService } from 'src/app/shared/shared-services/bootstrap.service';
+import { SharedDataService } from 'src/app/shared/shared-services/shared-data.service';
+
+@Component({
+  selector: 'app-facility-list-item',
+  templateUrl: './facility-list-item.component.html',
+  styleUrl: './facility-list-item.component.css'
+})
+export class FacilityListItemComponent {
+  @Input({ required: true })
+  facility: IdbFacility;
+  @Input()
+  inFacilityDashboard: boolean;
+
+
+  faScrewdriverWrench: IconDefinition = faScrewdriverWrench;
+  faArrowRight: IconDefinition = faArrowRight;
+  faWandMagicSparkles: IconDefinition = faWandMagicSparkles;
+
+  assessments: Array<IdbAssessment>;
+  assessmentsSub: Subscription;
+  accordionGuid: string;
+  constructor(private assessmentIdbService: AssessmentIdbService,
+    private bootstrapService: BootstrapService,
+    private router: Router,
+    private companyIdbService: CompanyIdbService,
+    private facilityIdbService: FacilityIdbService,
+    private onSiteVisitIdbService: OnSiteVisitIdbService,
+    private sharedDataService: SharedDataService
+  ) {
+
+  }
+
+  ngOnInit() {
+    this.assessmentsSub = this.assessmentIdbService.assessments.subscribe(assessments => {
+      this.assessments = assessments.filter(assessment => {
+        return assessment.facilityId == this.facility.guid;
+      })
+    });
+  }
+
+  ngOnDestroy() {
+    this.assessmentsSub.unsubscribe();
+  }
+
+  toggleBS(assessmentGuid: string) {
+    this.bootstrapService.bsCollapse('#' + assessmentGuid);
+    if (this.accordionGuid != assessmentGuid) {
+      this.accordionGuid = assessmentGuid;
+    } else {
+      this.accordionGuid = undefined;
+    }
+  }
+
+  goToAssessmentDashboard(assessment: IdbAssessment) {
+    this.router.navigateByUrl('/portfolio/assessment/' + assessment.guid);
+  }
+
+  goToVisit(assessment: IdbAssessment) {
+    this.companyIdbService.setSelectedFromGUID(this.facility.companyId);
+    this.facilityIdbService.setSelectedFromGUID(this.facility.guid);
+    if (assessment) {
+      this.onSiteVisitIdbService.setSelectedFromAssessmentGUID(assessment.guid);
+    } else {
+      this.onSiteVisitIdbService.selectedVisit.next(undefined);
+    }
+    this.sharedDataService.createAssessmentModalOpen.next(true);
+  }
+
+}
diff --git a/src/app/user-portfolio/portfolio-items-list/portfolio-items-list.component.css b/src/app/user-portfolio/portfolio-items-list/portfolio-items-list.component.css
new file mode 100644
index 00000000..d05eb2ec
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/portfolio-items-list.component.css
@@ -0,0 +1,5 @@
+
+
+.accordion-body{
+    border-left: solid var(--company-color) 5px;
+}
\ No newline at end of file
diff --git a/src/app/user-portfolio/portfolio-items-list/portfolio-items-list.component.html b/src/app/user-portfolio/portfolio-items-list/portfolio-items-list.component.html
new file mode 100644
index 00000000..e7b1df69
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/portfolio-items-list.component.html
@@ -0,0 +1,70 @@
+<div class="card portfolio">
+    <div class="card-body">
+        <div class="card-title secondary d-flex justify-content-between mb-2">
+            <div>
+                <fa-icon [icon]="faFolderTree"></fa-icon>
+                Companies, Facilities, and Assessments
+            </div>
+            <div>
+                <button class="btn btn-outline-success btn-sm" (click)="openAddCompanyModal()">
+                    <fa-icon [icon]="faPlus"></fa-icon>
+                    Add Company
+                </button>
+            </div>
+        </div>
+        <ng-template [ngIf]="companies.length > 0" [ngIfElse]="noCompaniesBlock">
+            <div class="accordion" [id]="'companyAccordion'">
+                <div class="accordion-item company-item"
+                    *ngFor="let company of companies; let index = index; let last = last;">
+                    <h2 class="accordion-header">
+
+                        <div class="d-flex">
+                            <button class="btn btn-outline-primary btn-sm" (click)="goToCompanyDashboard(company)">
+                                <fa-icon [icon]="faArrowRight"></fa-icon>
+                            </button>
+                            <button class="accordion-button" type="button" [attr.data-bs-target]="'#'+company.guid"
+                                aria-expanded="true" [attr.aria-controls]="company.guid"
+                                (click)="toggleBS(company.guid)"
+                                [ngClass]="{'collapsed': accordionGuid != company.guid}">
+                                <fa-icon class="pe-2" [icon]="faBuilding"></fa-icon>
+                                {{company.generalInformation.name}}
+                            </button>
+                        </div>
+                    </h2>
+                    <div [id]="'#'+company.guid" class="accordion-collapse collapse"
+                        [attr.data-bs-parent]="'#companyAccordion'">
+                        <div class="accordion-body">
+                            <app-company-list-item [company]="company"></app-company-list-item>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </ng-template>
+        <ng-template #noCompaniesBlock>
+            <div class="alert alert-info p-2 text-center">
+                No companies found in your portfolio. Use the "<fa-icon [icon]="faPlus"></fa-icon>
+                Add Company" button to add your first company.
+            </div>
+        </ng-template>
+    </div>
+</div>
+
+<div [ngClass]="{'window-overlay': displayAddCompanyModal}"></div>
+<div class="popup" [ngClass]="{'open': displayAddCompanyModal }">
+    <div class="popup-header">Add New Company
+        <button type="button" class="btn-close float-end" aria-label="Close" (click)="closeAddCompanyModal()"></button>
+    </div>
+    <div class="popup-body">
+        <p class="fw-light">
+            Create a new company that will be added to your portfolio.
+        </p>
+        <hr>
+    </div>
+    <div class="popup-footer d-flex justify-content-end">
+        <button class="btn btn-secondary me-2 btn-sm" (click)="closeAddCompanyModal()">Cancel</button>
+        <button class="btn btn-success btn-sm" (click)="confirmCreate()">
+            <fa-icon [icon]="faPlus"></fa-icon>
+            Create Company
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/portfolio-items-list/portfolio-items-list.component.spec.ts b/src/app/user-portfolio/portfolio-items-list/portfolio-items-list.component.spec.ts
new file mode 100644
index 00000000..82e4b75f
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/portfolio-items-list.component.spec.ts
@@ -0,0 +1,31 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PortfolioItemsListComponent } from './portfolio-items-list.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { CompanyListItemComponent } from './company-list-item/company-list-item.component';
+import { AssessmentListItemComponent } from './assessment-list-item/assessment-list-item.component';
+import { FacilityListItemComponent } from './facility-list-item/facility-list-item.component';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+
+describe('PortfolioItemsListComponent', () => {
+  let component: PortfolioItemsListComponent;
+  let fixture: ComponentFixture<PortfolioItemsListComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, HelperPipesModule],
+      declarations: [PortfolioItemsListComponent, CompanyListItemComponent, AssessmentListItemComponent, FacilityListItemComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(PortfolioItemsListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/portfolio-items-list/portfolio-items-list.component.ts b/src/app/user-portfolio/portfolio-items-list/portfolio-items-list.component.ts
new file mode 100644
index 00000000..3e8c575c
--- /dev/null
+++ b/src/app/user-portfolio/portfolio-items-list/portfolio-items-list.component.ts
@@ -0,0 +1,75 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+import { faArrowRight, faBuilding, faFolderTree, faPlus, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { Subscription } from 'rxjs';
+import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { UserIdbService } from 'src/app/indexed-db/user-idb.service';
+import { IdbCompany } from 'src/app/models/company';
+import { IdbUser } from 'src/app/models/user';
+import { BootstrapService } from 'src/app/shared/shared-services/bootstrap.service';
+
+@Component({
+  selector: 'app-portfolio-items-list',
+  templateUrl: './portfolio-items-list.component.html',
+  styleUrl: './portfolio-items-list.component.css'
+})
+export class PortfolioItemsListComponent {
+
+  faFolderTree: IconDefinition = faFolderTree;
+  faBuilding: IconDefinition = faBuilding;
+  faPlus: IconDefinition = faPlus;
+  faArrowRight: IconDefinition = faArrowRight;
+
+  companies: Array<IdbCompany>
+  companiesSub: Subscription
+  accordionGuid: string;
+
+  displayAddCompanyModal: boolean = false;
+  constructor(private companyIdbService: CompanyIdbService,
+    private bootstrapService: BootstrapService,
+    private router: Router,
+    private userIdbService: UserIdbService,
+    private toastNotificationService: ToastNotificationsService
+  ) { }
+
+  ngOnInit() {
+    this.companiesSub = this.companyIdbService.companies.subscribe(companies => {
+      this.companies = companies;
+    });
+  }
+
+  ngOnDestroy() {
+    this.companiesSub.unsubscribe();
+  }
+
+  toggleBS(companyGuid: string) {
+    this.bootstrapService.bsCollapse('#' + companyGuid);
+    if (this.accordionGuid != companyGuid) {
+      this.accordionGuid = companyGuid;
+    } else {
+      this.accordionGuid = undefined;
+    }
+  }
+
+  goToCompanyDashboard(company: IdbCompany) {
+    this.router.navigateByUrl('/portfolio/company/' + company.guid);
+  }
+
+  openAddCompanyModal() {
+    this.displayAddCompanyModal = true;
+  }
+
+  closeAddCompanyModal() {
+    this.displayAddCompanyModal = false;
+  }
+
+  async confirmCreate() {
+    this.closeAddCompanyModal();
+    let user: IdbUser = this.userIdbService.user.getValue();
+    let newCompanyGuid: string = await this.companyIdbService.addNewCompany(user.guid)
+    let newCompany: IdbCompany = this.companyIdbService.getByGUID(newCompanyGuid);
+    this.router.navigateByUrl('/portfolio/company/' + newCompany.guid + '/manage');
+    this.toastNotificationService.showToast('New Company Added!', undefined, 'bg-success', true, false);
+  }
+}
diff --git a/src/app/user-portfolio/user-portfolio-home/user-portfolio-home.component.css b/src/app/user-portfolio/user-portfolio-home/user-portfolio-home.component.css
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/user-portfolio/user-portfolio-home/user-portfolio-home.component.html b/src/app/user-portfolio/user-portfolio-home/user-portfolio-home.component.html
new file mode 100644
index 00000000..31126763
--- /dev/null
+++ b/src/app/user-portfolio/user-portfolio-home/user-portfolio-home.component.html
@@ -0,0 +1,8 @@
+<div class="col-12 pt-2">
+    <app-portfolio-items-list></app-portfolio-items-list>
+</div>
+<div class="col-12">
+    <hr>
+    <app-latest-visits-table></app-latest-visits-table>
+    <hr>
+</div>
\ No newline at end of file
diff --git a/src/app/user-portfolio/user-portfolio-home/user-portfolio-home.component.spec.ts b/src/app/user-portfolio/user-portfolio-home/user-portfolio-home.component.spec.ts
new file mode 100644
index 00000000..1ebbe374
--- /dev/null
+++ b/src/app/user-portfolio/user-portfolio-home/user-portfolio-home.component.spec.ts
@@ -0,0 +1,35 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserPortfolioHomeComponent } from './user-portfolio-home.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { PortfolioItemsListComponent } from '../portfolio-items-list/portfolio-items-list.component';
+import { LatestVisitsTableComponent } from '../latest-visits-table/latest-visits-table.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { RouterTestingModule } from '@angular/router/testing';
+import { CompanyListItemComponent } from '../portfolio-items-list/company-list-item/company-list-item.component';
+import { FacilityListItemComponent } from '../portfolio-items-list/facility-list-item/facility-list-item.component';
+import { AssessmentListItemComponent } from '../portfolio-items-list/assessment-list-item/assessment-list-item.component';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+import { TablePaginationModule } from 'src/app/shared/table-pagination/table-pagination.module';
+
+describe('UserPortfolioHomeComponent', () => {
+  let component: UserPortfolioHomeComponent;
+  let fixture: ComponentFixture<UserPortfolioHomeComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, RouterTestingModule, HelperPipesModule, TablePaginationModule],
+      declarations: [UserPortfolioHomeComponent, PortfolioItemsListComponent, LatestVisitsTableComponent, CompanyListItemComponent, AssessmentListItemComponent, FacilityListItemComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(UserPortfolioHomeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/user-portfolio-home/user-portfolio-home.component.ts b/src/app/user-portfolio/user-portfolio-home/user-portfolio-home.component.ts
new file mode 100644
index 00000000..f1d33287
--- /dev/null
+++ b/src/app/user-portfolio/user-portfolio-home/user-portfolio-home.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-user-portfolio-home',
+  templateUrl: './user-portfolio-home.component.html',
+  styleUrl: './user-portfolio-home.component.css'
+})
+export class UserPortfolioHomeComponent {
+
+}
diff --git a/src/app/user-portfolio/user-portfolio.component.css b/src/app/user-portfolio/user-portfolio.component.css
new file mode 100644
index 00000000..6bfdbf50
--- /dev/null
+++ b/src/app/user-portfolio/user-portfolio.component.css
@@ -0,0 +1,15 @@
+.card{
+    border-radius: 0;
+}
+
+/* .card-title{
+    font-size: 26px;
+} */
+
+/* .card-title.secondary{
+    font-size: 20px;
+} */
+
+.card-text{
+    font-size: 14px;
+}
\ No newline at end of file
diff --git a/src/app/user-portfolio/user-portfolio.component.html b/src/app/user-portfolio/user-portfolio.component.html
new file mode 100644
index 00000000..f5fe992b
--- /dev/null
+++ b/src/app/user-portfolio/user-portfolio.component.html
@@ -0,0 +1,44 @@
+<div class="container-fluid portfolio p-0">
+    <nav class="navbar primary-nav bg-white border-bottom sticky-top" style="--bs-breadcrumb-divider: '>';"
+        aria-label="breadcrumb">
+        <div class="container-fluid">
+            <ol class="breadcrumb mb-0">
+                <li class="breadcrumb-item" [ngClass]="{'active': context == 'home'}">
+                    <fa-icon class="pe-1" [icon]="faFolderOpen"></fa-icon>
+                    <a [routerLink]="'/portfolio'">JUSTIFI Portfolio</a>
+                </li>
+                <ng-container *ngIf="company">
+                    <li class="breadcrumb-item" [ngClass]="{'active': context == 'company'}">
+                        <fa-icon class="pe-1" [icon]="faBuilding"></fa-icon>
+                        <a [routerLink]="'/portfolio/company/'+company.guid">{{company.generalInformation.name}}
+                        </a>
+                    </li>
+                </ng-container>
+                <ng-container *ngIf="facility && context != 'company'">
+                    <li class="breadcrumb-item" [ngClass]="{'active': context == 'facility'}">
+                        <fa-icon class="pe-1" [icon]="faIndustry"></fa-icon>
+                        <a [routerLink]="'/portfolio/facility/'+facility.guid">{{facility.generalInformation.name}}
+                        </a>
+                    </li>
+                </ng-container>
+                <ng-container *ngIf="assessment && context != 'company' && context != 'facility'">
+                    <li class="breadcrumb-item" [ngClass]="{'active': context == 'assessment'}">
+                        <fa-icon class="pe-1" [icon]="faScrewdriverWrench"></fa-icon>
+                        <a [routerLink]="'/portfolio/assessment/'+assessment.guid">{{assessment.name}}
+                        </a>
+                    </li>
+                </ng-container>
+            </ol>
+        </div>
+    </nav>
+    <div class="pe-2 ps-2">
+        <router-outlet></router-outlet>
+    </div>
+</div>
+
+
+<app-add-nebs-modal *ngIf="displayAddNebsModal"></app-add-nebs-modal>
+
+<app-contact-modal *ngIf="displayContactModal" (emitCancelContact)="closeContactModal()"
+    [contextGuid]="displayContactModal.contextGuid" [contactContext]="displayContactModal.context"
+    [selectedContact]="displayContactModal.viewContact" [companyGuid]="displayContactModal.companyId"></app-contact-modal>
diff --git a/src/app/user-portfolio/user-portfolio.component.spec.ts b/src/app/user-portfolio/user-portfolio.component.spec.ts
new file mode 100644
index 00000000..4bae191c
--- /dev/null
+++ b/src/app/user-portfolio/user-portfolio.component.spec.ts
@@ -0,0 +1,31 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserPortfolioComponent } from './user-portfolio.component';
+import { SharedAssessmentFormsModule } from '../shared/shared-assessment-forms/shared-assessment-forms.module';
+import { ContactModalModule } from '../shared/contact-modal/contact-modal.module';
+import { RouterTestingModule } from '@angular/router/testing';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { stubServiceProviders } from '../spec-helpers/spec-test-service-stub';
+
+describe('UserPortfolioComponent', () => {
+  let component: UserPortfolioComponent;
+  let fixture: ComponentFixture<UserPortfolioComponent>;
+
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SharedAssessmentFormsModule, ContactModalModule, RouterTestingModule, FontAwesomeModule],
+      declarations: [UserPortfolioComponent],
+      providers: stubServiceProviders
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(UserPortfolioComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/user-portfolio/user-portfolio.component.ts b/src/app/user-portfolio/user-portfolio.component.ts
new file mode 100644
index 00000000..27a693c5
--- /dev/null
+++ b/src/app/user-portfolio/user-portfolio.component.ts
@@ -0,0 +1,126 @@
+import { ChangeDetectorRef, Component } from '@angular/core';
+import { NavigationEnd, Router } from '@angular/router';
+import { faBuilding, faFolderOpen, faIndustry, faScrewdriverWrench, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { CompanyIdbService } from '../indexed-db/company-idb.service';
+import { FacilityIdbService } from '../indexed-db/facility-idb.service';
+import { AssessmentIdbService } from '../indexed-db/assessment-idb.service';
+import { IdbCompany } from '../models/company';
+import { IdbFacility } from '../models/facility';
+import { IdbAssessment } from '../models/assessment';
+import { Subscription } from 'rxjs';
+import { SharedDataService } from '../shared/shared-services/shared-data.service';
+import { ContactContext, IdbContact } from '../models/contact';
+
+@Component({
+  selector: 'app-user-portfolio',
+  templateUrl: './user-portfolio.component.html',
+  styleUrl: './user-portfolio.component.css'
+})
+export class UserPortfolioComponent {
+
+  faFolderOpen: IconDefinition = faFolderOpen;
+  faBuilding: IconDefinition = faBuilding;
+  faIndustry: IconDefinition = faIndustry;
+  faScrewdriverWrench: IconDefinition = faScrewdriverWrench;
+
+  context: 'home' | 'company' | 'facility' | 'assessment';
+  company: IdbCompany;
+  companySub: Subscription;
+  facility: IdbFacility;
+  facilitySub: Subscription;
+  assessment: IdbAssessment;
+  assessmentSub: Subscription;
+  routerSub: Subscription;
+  displayAddNebsModal: {
+    assessmentId: string,
+    energyOpportunityId: string
+  };
+  displayAddNebsModalSub: Subscription;
+  displayContactModal: { context: ContactContext, viewContact: IdbContact, contextGuid: string, companyId: string };
+  displayContactModalSub: Subscription;
+  constructor(
+    private router: Router,
+    private companyIdbService: CompanyIdbService,
+    private facilityIdbService: FacilityIdbService,
+    private assessmentIdbService: AssessmentIdbService,
+    private cd: ChangeDetectorRef,
+    private sharedDataService: SharedDataService
+  ) {
+  }
+
+  ngOnInit() {
+    this.routerSub = this.router.events.subscribe(event => {
+      if (event instanceof NavigationEnd) {
+        this.setContext(event.urlAfterRedirects);
+      }
+    });
+    this.setContext(this.router.url);
+    this.companySub = this.companyIdbService.selectedCompany.subscribe(selectedCompany => {
+      this.company = selectedCompany;
+      this.cd.detectChanges();
+    });
+    this.facilitySub = this.facilityIdbService.selectedFacility.subscribe(selectedFacility => {
+      this.facility = selectedFacility;
+      this.cd.detectChanges();
+    });
+    this.assessmentSub = this.assessmentIdbService.selectedAssessment.subscribe(selectedAssessment => {
+      this.assessment = selectedAssessment;
+      this.cd.detectChanges();
+    })
+    this.displayAddNebsModalSub = this.sharedDataService.displayAddNebsModal.subscribe(val => {
+      this.displayAddNebsModal = val;
+    });
+    this.displayContactModalSub = this.sharedDataService.displayContactModal.subscribe(val => {
+      this.displayContactModal = val;
+    })
+  }
+
+  ngOnDestroy() {
+    this.displayAddNebsModalSub.unsubscribe();
+    this.displayContactModalSub.unsubscribe();
+    this.companySub.unsubscribe();
+    this.facilitySub.unsubscribe();
+    this.assessmentSub.unsubscribe();
+    this.routerSub.unsubscribe();
+  }
+
+  setContext(url: string) {
+    if (url.includes('company')) {
+      this.context = 'company';
+      this.facilityIdbService.selectedFacility.next(undefined);
+      this.assessmentIdbService.selectedAssessment.next(undefined);
+    } else if (url.includes('facility')) {
+      this.context = 'facility';
+      this.assessmentIdbService.selectedAssessment.next(undefined);
+    } else if (url.includes('assessment')) {
+      this.context = 'assessment';
+    } else {
+      this.context = 'home';
+      this.facilityIdbService.selectedFacility.next(undefined);
+      this.assessmentIdbService.selectedAssessment.next(undefined);
+      this.companyIdbService.selectedCompany.next(undefined);
+    }
+  }
+
+  setValues(guid: string) {
+    if (this.context != 'home') {
+      if (this.context == 'company') {
+        this.assessment = undefined;
+        this.facility = undefined;
+        this.company = this.companyIdbService.getByGUID(guid);
+      } else if (this.context == 'facility') {
+        this.assessment = undefined;
+        this.facility = this.facilityIdbService.getByGUID(guid);
+        this.company = this.companyIdbService.getByGUID(this.facility.companyId);
+      } else if (this.context == 'assessment') {
+        this.assessment = this.assessmentIdbService.getByGuid(guid);
+        this.facility = this.facilityIdbService.getByGUID(this.assessment.facilityId);
+        this.company = this.companyIdbService.getByGUID(this.assessment.companyId);
+      }
+    }
+  }
+
+  closeContactModal() {
+    this.sharedDataService.displayContactModal.next(undefined);
+  }
+}
diff --git a/src/app/user-portfolio/user-portfolio.module.ts b/src/app/user-portfolio/user-portfolio.module.ts
new file mode 100644
index 00000000..22fcc0d6
--- /dev/null
+++ b/src/app/user-portfolio/user-portfolio.module.ts
@@ -0,0 +1,98 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { UserPortfolioComponent } from './user-portfolio.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { LatestVisitsTableComponent } from './latest-visits-table/latest-visits-table.component';
+import { HelperPipesModule } from '../shared/helper-pipes/_helper-pipes.module';
+import { PortfolioItemsListComponent } from './portfolio-items-list/portfolio-items-list.component';
+import { CompanyListItemComponent } from './portfolio-items-list/company-list-item/company-list-item.component';
+import { FacilityListItemComponent } from './portfolio-items-list/facility-list-item/facility-list-item.component';
+import { AssessmentListItemComponent } from './portfolio-items-list/assessment-list-item/assessment-list-item.component';
+import { TablePaginationModule } from '../shared/table-pagination/table-pagination.module';
+import { UserPortfolioHomeComponent } from './user-portfolio-home/user-portfolio-home.component';
+import { RouterModule } from '@angular/router';
+import { CompanyDashboardComponent } from './company-dashboard/company-dashboard.component';
+import { FacilityDashboardComponent } from './facility-dashboard/facility-dashboard.component';
+import { AssessmentDashboardComponent } from './assessment-dashboard/assessment-dashboard.component';
+import { CompanyDashboardNavComponent } from './company-dashboard/company-dashboard-nav/company-dashboard-nav.component';
+import { CompanyDashboardHomeComponent } from './company-dashboard/company-dashboard-home/company-dashboard-home.component';
+import { CompanyPerformanceIndicatorsComponent } from './company-dashboard/company-performance-indicators/company-performance-indicators.component';
+import { CompanyStakeholdersComponent } from './company-dashboard/company-stakeholders/company-stakeholders.component';
+import { CompanyReportsComponent } from './company-dashboard/company-reports/company-reports.component';
+import { CompanySettingsComponent } from './company-dashboard/company-settings/company-settings.component';
+import { FacilityDashboardNavComponent } from './facility-dashboard/facility-dashboard-nav/facility-dashboard-nav.component';
+import { FacilityDashboardHomeComponent } from './facility-dashboard/facility-dashboard-home/facility-dashboard-home.component';
+import { IndustrialSystemInventoryComponent } from './facility-dashboard/industrial-system-inventory/industrial-system-inventory.component';
+import { EndUseInventoryComponent } from './facility-dashboard/end-use-inventory/end-use-inventory.component';
+import { FacilityReportsComponent } from './facility-dashboard/facility-reports/facility-reports.component';
+import { FacilitySettingsComponent } from './facility-dashboard/facility-settings/facility-settings.component';
+import { AssessmentDashboardHomeComponent } from './assessment-dashboard/assessment-dashboard-home/assessment-dashboard-home.component';
+import { AssessmentDashboardNavComponent } from './assessment-dashboard/assessment-dashboard-nav/assessment-dashboard-nav.component';
+import { AssessmentReportsComponent } from './assessment-dashboard/assessment-reports/assessment-reports.component';
+import { SharedAssessmentFormsModule } from "../shared/shared-assessment-forms/shared-assessment-forms.module";
+import { AssessmentDetailsComponent } from './assessment-dashboard/assessment-details/assessment-details.component';
+import { AssessmentEnergyOpportunitiesComponent } from './assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities.component';
+import { ReportsModule } from '../shared/reports/reports.module';
+import { SharedCompanyFormsModule } from "../shared/shared-company-forms/shared-company-forms.module";
+import { SharedFacilityFormsModule } from '../shared/shared-facility-forms/shared-facility-forms.module';
+import { AssessmentEnergyOpportunitiesHomeComponent } from './assessment-dashboard/assessment-energy-opportunities/assessment-energy-opportunities-home/assessment-energy-opportunities-home.component';
+import { AssessmentNebsComponent } from './assessment-dashboard/assessment-nebs/assessment-nebs.component';
+import { AssessmentNebsHomeComponent } from './assessment-dashboard/assessment-nebs/assessment-nebs-home/assessment-nebs-home.component';
+import { ContactModalModule } from '../shared/contact-modal/contact-modal.module';
+import { IndustrialSystemInventoryHomeComponent } from './facility-dashboard/industrial-system-inventory/industrial-system-inventory-home/industrial-system-inventory-home.component';
+import { EndUseInventoryHomeComponent } from './facility-dashboard/end-use-inventory/end-use-inventory-home/end-use-inventory-home.component';
+import { CompanyStakeholdersHomeComponent } from './company-dashboard/company-stakeholders/company-stakeholders-home/company-stakeholders-home.component';
+import { TableEntriesModule } from "../shared/table-entries/table-entries.module";
+
+@NgModule({
+  declarations: [
+    UserPortfolioComponent,
+    LatestVisitsTableComponent,
+    PortfolioItemsListComponent,
+    CompanyListItemComponent,
+    FacilityListItemComponent,
+    AssessmentListItemComponent,
+    UserPortfolioHomeComponent,
+    CompanyDashboardComponent,
+    FacilityDashboardComponent,
+    AssessmentDashboardComponent,
+    CompanyDashboardNavComponent,
+    CompanyDashboardHomeComponent,
+    CompanyPerformanceIndicatorsComponent,
+    CompanyStakeholdersComponent,
+    CompanyReportsComponent,
+    CompanySettingsComponent,
+    FacilityDashboardNavComponent,
+    FacilityDashboardHomeComponent,
+    IndustrialSystemInventoryComponent,
+    EndUseInventoryComponent,
+    FacilityReportsComponent,
+    FacilitySettingsComponent,
+    AssessmentDashboardHomeComponent,
+    AssessmentDashboardNavComponent,
+    AssessmentReportsComponent,
+    AssessmentDetailsComponent,
+    AssessmentEnergyOpportunitiesComponent,
+    AssessmentEnergyOpportunitiesHomeComponent,
+    AssessmentNebsComponent,
+    AssessmentNebsHomeComponent,
+    IndustrialSystemInventoryHomeComponent,
+    EndUseInventoryHomeComponent,
+    CompanyStakeholdersHomeComponent
+  ],
+  imports: [
+    CommonModule,
+    FontAwesomeModule,
+    HelperPipesModule,
+    TablePaginationModule,
+    RouterModule,
+    SharedAssessmentFormsModule,
+    ReportsModule,
+    SharedCompanyFormsModule,
+    SharedFacilityFormsModule,
+    ContactModalModule,
+    TableEntriesModule,
+    TableEntriesModule
+]
+})
+export class UserPortfolioModule { }
diff --git a/src/assets/styles/accordion.css b/src/assets/styles/accordion.css
index 6597ca17..931b78b7 100644
--- a/src/assets/styles/accordion.css
+++ b/src/assets/styles/accordion.css
@@ -17,4 +17,16 @@
 
 .accordion-button{
     padding: .25rem;
+}
+
+.portfolio .accordion .accordion-button{
+    font-size: 18px;
+}
+
+.accordion-button, .accordion-item:first-of-type>.accordion-header .accordion-button, .accordion-item:last-of-type>.accordion-header .accordion-button.collapsed  {
+    border-radius: 0;
+    padding-top: .25rem;
+    padding-bottom: .25rem;
+    padding-left: .5rem;
+    padding-right: .5rem;
 }
\ No newline at end of file
diff --git a/src/assets/styles/dashboards.css b/src/assets/styles/dashboards.css
new file mode 100644
index 00000000..e6f62aef
--- /dev/null
+++ b/src/assets/styles/dashboards.css
@@ -0,0 +1,45 @@
+.card{
+    border-radius: 0;
+}
+
+.portfolio .primary-nav{
+    font-size: 20px;
+    margin-bottom: 0px;
+}
+
+.portfolio .card-title{
+    font-size: 18px;
+    margin-bottom: 0px;
+}
+.portfolio .card-body {
+    padding: .5rem .5rem;
+}
+
+
+.portfolio .card-text{
+    font-size: 14px;
+}
+
+.portfolio th.actions,.portfolio  td.actions, .dashboard th.actions,.dashboard  td.actions{
+    width: 15px;
+}
+
+.portfolio table th,.portfolio  table td, .dashboard table th,.dashboard  table td{
+    padding: .2rem;
+    vertical-align: middle;
+}
+
+
+.container-fluid.portfolio{
+    margin-bottom: 1rem;
+}
+
+.portfolio .btn:hover .d-none{
+    display: inline !important;
+}
+
+
+
+.portfolio .table {
+    margin-bottom: 0px;
+}
\ No newline at end of file
diff --git a/src/assets/styles/modals.css b/src/assets/styles/modals.css
index e3f78a5c..99b6d9ca 100644
--- a/src/assets/styles/modals.css
+++ b/src/assets/styles/modals.css
@@ -57,4 +57,8 @@
 .lg-popup.popup .popup-body{
     height: calc(98vh - 125px);
     overflow-y: auto;
+}
+
+.toast .toast-body{
+    background-color: white;
 }
\ No newline at end of file
diff --git a/src/assets/styles/setup-wizard.css b/src/assets/styles/setup-wizard.css
index ae741f77..f128d311 100644
--- a/src/assets/styles/setup-wizard.css
+++ b/src/assets/styles/setup-wizard.css
@@ -1,5 +1,5 @@
 .setup-wizard-content{
-    height: calc(100% - 4rem);
+    height: calc(100% - 3rem);
     /* background-color: red; */
     overflow-y: auto;
 }
@@ -11,10 +11,19 @@
 }
 
 .setup-wizard-footer.navbar{
-    height: 4rem;
-    background-color: #0079c2 !important;
+    height: 3rem;
+    padding: .25rem;
+    background-color:  #5e6c75 !important;
 }
 
+.setup-wizard-footer.navbar .nav-btn{
+    background-color: var(--portfolio-nav-color);
+    color: white;    
+}
+.setup-wizard-footer.navbar .btn.nav-btn:hover {
+    background-color: #8DABBE;
+    color: black;
+}
 
 .add-neb-btn{
     background-color: #186A3B;
diff --git a/src/assets/styles/tabs.css b/src/assets/styles/tabs.css
index 19cd5a72..85136db6 100644
--- a/src/assets/styles/tabs.css
+++ b/src/assets/styles/tabs.css
@@ -10,3 +10,109 @@
     border-left: 1px solid;
     border-right: 1px solid;
 }
+
+
+.nav-link:hover {
+    cursor: pointer;
+}
+
+/*
+PORTFOLIO TABS
+*/
+
+.portfolio .navbar {
+    overflow-y: auto;
+    /* flex-wrap: nowrap; */
+}
+
+.portfolio .breadcrumb .breadcrumb-item a {
+    color: var(--portfolio-nav-color);
+}
+
+.portfolio .navbar .nav-item {
+    width: 100%;
+}
+
+.portfolio .navbar .nav-item .nav-link {
+    padding: .25rem;
+    text-wrap-mode: nowrap;
+    border-bottom: solid 1px;
+    /* border-color: black; */
+    /* border-top-left-radius: 0px;
+    border-bottom-right-radius: .5rem;
+    border-bottom-right-radius: .5rem; */
+}
+
+.portfolio .nav-item .nav-link {
+    padding: .25rem;
+    /* text-wrap-mode: nowrap; */
+    /* border-bottom: solid 1px; */
+    border-color: var(--portfolio-nav-color);
+    color: var(--portfolio-nav-color);
+}
+
+a {
+    color: var(--portfolio-nav-color);
+}
+
+.btn.nav-btn{
+    background-color: var(--portfolio-nav-color);
+    color: white;
+}
+
+.portfolio .nav-item .nav-link.active {
+    background-color: var(--portfolio-nav-color);
+    color: white;
+    border-bottom-color: black;
+}
+
+.portfolio .nav-item .nav-link:hover, .btn.nav-btn:hover {
+    background-color: #8DABBE;
+    color: black;
+}
+
+.portfolio .navbar .text-end {
+    text-align: right;
+}
+
+.portfolio .nav-flex {
+    height: fit-content;
+}
+
+.portfolio .navbar .nav-item .nav-link .chevron.float-right {
+    color: white;
+    float: right;
+    padding-left: .25rem;
+}
+
+.portfolio .btn-outline-primary {
+    --bs-btn-color: var(--portfolio-nav-color);
+    --bs-btn-border-color: var(--portfolio-nav-color);
+    --bs-btn-hover-color: #fff;
+    --bs-btn-hover-bg: var(--portfolio-nav-color);
+    --bs-btn-hover-border-color: var(--portfolio-nav-color);
+    --bs-btn-focus-shadow-rgb: 13, 110, 253;
+    --bs-btn-active-color: #fff;
+    --bs-btn-active-bg: var(--portfolio-nav-color);
+    --bs-btn-active-border-color: var(--portfolio-nav-color);
+    --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+    --bs-btn-disabled-color: var(--portfolio-nav-color);
+    --bs-btn-disabled-bg: transparent;
+    --bs-btn-disabled-border-color: var(--portfolio-nav-color);
+    --bs-gradient: none;
+}
+
+.portfolio .nav-tabs .nav-link{
+    /* border-top-left-radius: 0px;
+    border-top-right-radius: 0px; */
+    padding: .25rem .5rem;
+}
+
+.portfolio .breadcrumb .breadcrumb-item.active {
+    color: black;
+}
+
+.portfolio .breadcrumb .breadcrumb-item.active a {
+    text-decoration: none;
+    color: black;
+}
diff --git a/src/styles.css b/src/styles.css
index 9fb01ac9..0c12ab6a 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -5,6 +5,10 @@
     --energy-opp-color: #2e4053;
     --metric-color: #1f618d;
     --neb-color: #085646;
+    --company-color: #5b2c6f;
+    --facility-color: #212f3c;
+    --assessment-color: #196f3d;
+    --portfolio-nav-color: #006aaa;
 }