diff --git a/projects/nshmp-apps/cypress/integration/dev/math/exceedance-explorer/exceedance-explorer.spec.ts b/projects/nshmp-apps/cypress/integration/dev/math/exceedance-explorer/exceedance-explorer.spec.ts
index 90965311560ac7ee361e1f994d61561fad014eab..f3f644ecbf872a6b324b372914781867d357d735 100644
--- a/projects/nshmp-apps/cypress/integration/dev/math/exceedance-explorer/exceedance-explorer.spec.ts
+++ b/projects/nshmp-apps/cypress/integration/dev/math/exceedance-explorer/exceedance-explorer.spec.ts
@@ -20,7 +20,7 @@ describe('Exceedance Explorer Application', () => {
     utils.changePlotSettings('.exceedance-plot', '.exceedance-settings');
 
     it('Has default plot', () => {
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find('plotly-plot')
         .should('be.visible');
     });
diff --git a/projects/nshmp-apps/cypress/integration/hazard/disagg/disagg.spec.ts b/projects/nshmp-apps/cypress/integration/hazard/disagg/disagg.spec.ts
index ade920cfaf8e2776f7ff0c788f974c6ab1ed7638..ec8be6590f3fb6029400c1508384b9e411c544f2 100644
--- a/projects/nshmp-apps/cypress/integration/hazard/disagg/disagg.spec.ts
+++ b/projects/nshmp-apps/cypress/integration/hazard/disagg/disagg.spec.ts
@@ -34,7 +34,7 @@ describe('Disagg Application', () => {
         plotClass: 'hazard-lib-disagg-plot',
       });
 
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find('.export-button')
         .scrollIntoView()
         .click();
@@ -47,7 +47,7 @@ describe('Disagg Application', () => {
         plotClass: 'hazard-lib-disagg-plot',
       });
 
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find('.summary')
         .find('.summary-report')
         .scrollIntoView()
@@ -68,25 +68,25 @@ describe('Disagg Application', () => {
 
       cy.get('.cdk-overlay-container').as('overlay');
 
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find('.component-select')
         .find('mat-select')
         .should('be.visible')
         .click();
       cy.get('@overlay').find('mat-option').should('not.exist');
 
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find('.export-button')
         .should('be.visible')
         .should('not.be.enabled');
 
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find('.summary')
         .find('app-disagg-summary')
         .scrollIntoView()
         .should('not.be.visible');
 
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find('.summary')
         .find('app-disagg-contributors')
         .scrollIntoView()
@@ -96,7 +96,7 @@ describe('Disagg Application', () => {
         plotClass: 'hazard-lib-disagg-plot',
       });
 
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find('.component-select')
         .scrollIntoView()
         .find('mat-select')
@@ -105,20 +105,20 @@ describe('Disagg Application', () => {
       cy.get('@overlay').find('mat-option').should('have.length.above', 1);
       utils.selectMatOption('Total');
 
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find('.export-button')
         .scrollIntoView()
         .should('be.visible')
         .should('be.enabled')
         .click();
 
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find('.summary')
         .find('app-disagg-summary')
         .scrollIntoView()
         .should('be.visible');
 
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find('.summary')
         .find('app-disagg-contributors')
         .scrollIntoView()
diff --git a/projects/nshmp-apps/cypress/utils/nshmp-template.utils.ts b/projects/nshmp-apps/cypress/utils/nshmp-template.utils.ts
index 86f9982fd2e93d9728f41b4b48c4851bb1ede50c..18cd9977aec361cc6bda4df3bd2e142afbd73621 100644
--- a/projects/nshmp-apps/cypress/utils/nshmp-template.utils.ts
+++ b/projects/nshmp-apps/cypress/utils/nshmp-template.utils.ts
@@ -121,7 +121,7 @@ export function hasNshmpTemplate(navList: NavigationList[]) {
 
 export function hasPlotContent() {
   it('Has plot content', () => {
-    cy.get('nshmp-template-plot-content').should('exist');
+    cy.get('nshmp-template-main-content').should('exist');
   });
 }
 
@@ -129,7 +129,7 @@ export function submitFormCheckPlot(options: CheckPlot) {
   options.intercept =
     options.intercept === undefined ? true : options.intercept;
 
-  cy.get('nshmp-template-plot-content')
+  cy.get('nshmp-template-main-content')
     .find(options.plotClass)
     .then(originalPlot => {
       if (options.intercept) {
@@ -145,7 +145,7 @@ export function submitFormCheckPlot(options: CheckPlot) {
         cy.wait('@service-call');
       }
 
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find(options.plotClass)
         .should(updatedPlot => {
           expect(originalPlot).to.not.equal(updatedPlot);
@@ -157,10 +157,10 @@ export function submitFormCheckPlots(options: CheckPlots) {
   options.intercept =
     options.intercept === undefined ? true : options.intercept;
 
-  cy.get('nshmp-template-plot-content')
+  cy.get('nshmp-template-main-content')
     .find(options.firstPlotClass)
     .then(originalFirstPlot => {
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find(options.secondPlotClass)
         .then(originalSecondPlot => {
           if (options.intercept) {
@@ -178,12 +178,12 @@ export function submitFormCheckPlots(options: CheckPlots) {
             });
           }
 
-          cy.get('nshmp-template-plot-content')
+          cy.get('nshmp-template-main-content')
             .find(options.firstPlotClass)
             .should(updatedFirstPlot => {
               expect(originalFirstPlot).to.not.equal(updatedFirstPlot);
             });
-          cy.get('nshmp-template-plot-content')
+          cy.get('nshmp-template-main-content')
             .find(options.secondPlotClass)
             .should(updatedSecondPlot => {
               expect(originalSecondPlot).to.not.equal(updatedSecondPlot);
@@ -214,9 +214,9 @@ export function togglePlotPanel() {
       .should('be.enabled')
       .as('plot-button');
 
-    cy.get('nshmp-template-plot-content').should('exist');
+    cy.get('nshmp-template-main-content').should('exist');
     cy.get('@plot-button').click();
-    cy.get('nshmp-template-plot-content').should('not.exist');
+    cy.get('nshmp-template-main-content').should('not.exist');
   });
 }
 
diff --git a/projects/nshmp-apps/cypress/utils/plot-lib.utils.ts b/projects/nshmp-apps/cypress/utils/plot-lib.utils.ts
index 3aa50136d37a73519f4a59c4fbda248238d6fe53..7bd671a795b2091857f28dd44e1abf91c567d70c 100644
--- a/projects/nshmp-apps/cypress/utils/plot-lib.utils.ts
+++ b/projects/nshmp-apps/cypress/utils/plot-lib.utils.ts
@@ -14,7 +14,7 @@ export function changePlotSettings(plotClass: string, settingsClass: string) {
         .find(settingsClass)
         .scrollIntoView()
         .as('plot-settings');
-      cy.get('nshmp-template-plot-content')
+      cy.get('nshmp-template-main-content')
         .find(plotClass)
         .scrollIntoView()
         .as('plot');
diff --git a/projects/nshmp-apps/cypress/utils/utils.ts b/projects/nshmp-apps/cypress/utils/utils.ts
index d71198b4e883b5e79ee17a649adee20b8e15c8bd..c5fbc4f1e992de0de6a0846ab13c7eed487fac9a 100644
--- a/projects/nshmp-apps/cypress/utils/utils.ts
+++ b/projects/nshmp-apps/cypress/utils/utils.ts
@@ -1,7 +1,7 @@
 import 'cypress';
 
 export function hasApplicationTab(tabClass: string) {
-  cy.get('nshmp-template-plot-content')
+  cy.get('nshmp-template-main-content')
     .find('mat-tab-group')
     .find(tabClass)
     .should('be.visible')
diff --git a/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.html b/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.html
index cdf8fb7e3520b4e27986db1fdd7d0edf776c1372..464fe56b0043d779f6b76cc773592bb909e855df 100644
--- a/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.html
+++ b/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
 
     <nshmp-template-settings>
       <app-plot-settings-panel />
diff --git a/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.ts b/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.ts
index 6131c2f823ada3d4f79f9b9e3eab5447bb4c4f5d..b306d8a4ac2dd49f12c736f0c95ebbba3de80559 100644
--- a/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.ts
+++ b/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.ts
@@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
   NshmpTemplateSettingsComponent,
 } from '@ghsc/nshmp-template';
 import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
@@ -21,7 +21,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateControlPanelComponent,
     NshmpTemplateContentContainerComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpLibNgAboutPageComponent,
     NshmpTemplateSettingsComponent,
     ControlPanelComponent,
diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.html b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.html
index ef6d2a8806a58e8945043ed44ceb9b67c8db67b7..996e7c48b91f5ffa312d91013ff4dd70132b8a8a 100644
--- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.html
+++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.html
@@ -6,9 +6,9 @@
     </nshmp-template-control-panel>
 
     <!-- Plots -->
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
 
     <!-- Settings -->
     <nshmp-template-settings>
diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.ts b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.ts
index e892e89171ac879260502c8c9a6cd3cafe8541b8..199bd29b0890fdb04ffe692abb2de4a759a88618 100644
--- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.ts
+++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.ts
@@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
   NshmpTemplateSettingsComponent,
 } from '@ghsc/nshmp-template';
 import {devApps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
@@ -21,7 +21,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateContentContainerComponent,
     NshmpTemplateControlPanelComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpTemplateSettingsComponent,
     NshmpLibNgAboutPageComponent,
     ControlPanelComponent,
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.html b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.html
index 375b90fa6d390e2841ee1455e38a1a4a9a7a7906..e86be1762c08239a2f7139d58a004fc4623ac6f7 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.html
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.html
@@ -6,9 +6,9 @@
     </nshmp-template-control-panel>
 
     <!-- Plots -->
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
 
     <!-- Settings -->
     <nshmp-template-settings>
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.ts
index f239fca482c0df32f72f8d4ee681ab4cee84c87b..22774c738d84bc2cae526435564bb7976ca46082 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.ts
@@ -5,7 +5,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
   NshmpTemplateSettingsComponent,
 } from '@ghsc/nshmp-template';
 import {devApps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
@@ -22,7 +22,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateContentContainerComponent,
     NshmpTemplateControlPanelComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpTemplateSettingsComponent,
     NshmpLibNgHazardProvisionalModelComponent,
     NshmpLibNgAboutPageComponent,
diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.html b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.html
index 5e121fa46dc54ead22e5a80295f01cda9ae6bb44..3e40d662b9aab1ac6d28633c8813a37ca0b52ad3 100644
--- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.html
+++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-plot />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
 
     <nshmp-template-settings>
       <app-plot-settings-panel />
diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.ts b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.ts
index 6fd5c89d286d1129fc2041c71bf6d92bcc257456..578861498c75149a6e647c51ac2135b41c83ea0f 100644
--- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.ts
+++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.ts
@@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
   NshmpTemplateSettingsComponent,
 } from '@ghsc/nshmp-template';
 import {devApps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
@@ -25,7 +25,7 @@ import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-
     NshmpLibNgTemplateComponent,
     NshmpTemplateContentContainerComponent,
     NshmpTemplateControlPanelComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpTemplateSettingsComponent,
     NshmpLibNgAboutPageComponent,
     ControlPanelComponent,
diff --git a/projects/nshmp-apps/src/app/gmm/distance/app.component.html b/projects/nshmp-apps/src/app/gmm/distance/app.component.html
index cdf8fb7e3520b4e27986db1fdd7d0edf776c1372..464fe56b0043d779f6b76cc773592bb909e855df 100644
--- a/projects/nshmp-apps/src/app/gmm/distance/app.component.html
+++ b/projects/nshmp-apps/src/app/gmm/distance/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
 
     <nshmp-template-settings>
       <app-plot-settings-panel />
diff --git a/projects/nshmp-apps/src/app/gmm/distance/app.component.ts b/projects/nshmp-apps/src/app/gmm/distance/app.component.ts
index 9c546cadf268b33ef1bf085b5580f48b67909ece..92ff39db7b83e61306b4a9aba84c0a3e48cce1d3 100644
--- a/projects/nshmp-apps/src/app/gmm/distance/app.component.ts
+++ b/projects/nshmp-apps/src/app/gmm/distance/app.component.ts
@@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
   NshmpTemplateSettingsComponent,
 } from '@ghsc/nshmp-template';
 import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
@@ -28,7 +28,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateContentContainerComponent,
     NshmpTemplateControlPanelComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpTemplateSettingsComponent,
     NshmpLibNgAboutPageComponent,
     ControlPanelComponent,
diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.html b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.html
index cdf8fb7e3520b4e27986db1fdd7d0edf776c1372..464fe56b0043d779f6b76cc773592bb909e855df 100644
--- a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.html
+++ b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
 
     <nshmp-template-settings>
       <app-plot-settings-panel />
diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.ts b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.ts
index 8e288d5cb14f0d75daf69dd92da153bded6c3ef4..1d80636ca79111cd32e01f4b04350a7ed4deed28 100644
--- a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.ts
+++ b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.ts
@@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
   NshmpTemplateSettingsComponent,
 } from '@ghsc/nshmp-template';
 import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
@@ -28,7 +28,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateControlPanelComponent,
     NshmpTemplateContentContainerComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpTemplateSettingsComponent,
     NshmpLibNgAboutPageComponent,
     ControlPanelComponent,
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/app.component.html b/projects/nshmp-apps/src/app/gmm/spectra/app.component.html
index cdf8fb7e3520b4e27986db1fdd7d0edf776c1372..464fe56b0043d779f6b76cc773592bb909e855df 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/app.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
 
     <nshmp-template-settings>
       <app-plot-settings-panel />
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/app.component.ts b/projects/nshmp-apps/src/app/gmm/spectra/app.component.ts
index d1b3103672e4af429f72ea2741f18c11721be915..ed3a8c451eb59a684cedfa2fb96870b14cc110fa 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/app.component.ts
+++ b/projects/nshmp-apps/src/app/gmm/spectra/app.component.ts
@@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
   NshmpTemplateSettingsComponent,
 } from '@ghsc/nshmp-template';
 import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
@@ -28,7 +28,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateControlPanelComponent,
     NshmpTemplateContentContainerComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpTemplateSettingsComponent,
     NshmpLibNgAboutPageComponent,
     ControlPanelComponent,
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/app.component.html b/projects/nshmp-apps/src/app/hazard/disagg/app.component.html
index c38decbf22fd470d2ddc1a1a920fc97f436930d6..12181bf4bed00941ff00faddd624759c4ea3f0a7 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/app.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
   </nshmp-template-content-container>
 
   <!-- Provisional model warning -->
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/app.component.ts b/projects/nshmp-apps/src/app/hazard/disagg/app.component.ts
index 048c8b8bec96ae48bc3076dfd3dadebe82f8e6ae..8b970cb29fafb196c6b0a2c935432769cd5b2dd9 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/app.component.ts
+++ b/projects/nshmp-apps/src/app/hazard/disagg/app.component.ts
@@ -5,7 +5,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
 } from '@ghsc/nshmp-template';
 import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
 import {navigation} from 'projects/nshmp-apps/src/shared/utils/navigation.utils';
@@ -23,7 +23,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateControlPanelComponent,
     NshmpTemplateContentContainerComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpLibNgAboutPageComponent,
     NshmpLibNgHazardProvisionalModelComponent,
     ControlPanelComponent,
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html
index 03bdde34cccaca1ef8567a9c19e937c0a8fbd4bd..b7c70d9bdd1656521be13d513dcf150766718885 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
 
     <nshmp-template-settings>
       <app-plot-settings-panel />
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts
index 084042bc4dbc41d1c4debb1fb5ad52e2926ec3af..b1ea4cd94a8be405acdf6edccd9f69898fc3d22c 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts
@@ -5,7 +5,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
   NshmpTemplateSettingsComponent,
 } from '@ghsc/nshmp-template';
 import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
@@ -25,7 +25,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateControlPanelComponent,
     NshmpTemplateContentContainerComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpLibNgAboutPageComponent,
     NshmpLibNgHazardProvisionalModelComponent,
     NshmpTemplateSettingsComponent,
diff --git a/projects/nshmp-apps/src/app/hazard/static/app.component.html b/projects/nshmp-apps/src/app/hazard/static/app.component.html
index cdf8fb7e3520b4e27986db1fdd7d0edf776c1372..464fe56b0043d779f6b76cc773592bb909e855df 100644
--- a/projects/nshmp-apps/src/app/hazard/static/app.component.html
+++ b/projects/nshmp-apps/src/app/hazard/static/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
 
     <nshmp-template-settings>
       <app-plot-settings-panel />
diff --git a/projects/nshmp-apps/src/app/hazard/static/app.component.ts b/projects/nshmp-apps/src/app/hazard/static/app.component.ts
index 04a4ef74d335ee23fe5cce8ceeecb12f785f9a6e..903650eabe7f2cd25ffd0b2ae6be5371d55dc163 100644
--- a/projects/nshmp-apps/src/app/hazard/static/app.component.ts
+++ b/projects/nshmp-apps/src/app/hazard/static/app.component.ts
@@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
   NshmpTemplateSettingsComponent,
 } from '@ghsc/nshmp-template';
 import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
@@ -24,7 +24,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateControlPanelComponent,
     NshmpTemplateContentContainerComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpLibNgAboutPageComponent,
     NshmpTemplateSettingsComponent,
     ControlPanelComponent,
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.html
index 9e5ed1e206622d1f8b2e8613bb614163b4a295c9..30ea230dcc154436eed88a17184780ff5b9eea39 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
   </nshmp-template-content-container>
 
   <!-- About page -->
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.ts
index 0cbfa4c25a29d435f12de5995d4522976da62776..3c9c639c23497902b6209fc75665385c970fef01 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.ts
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.ts
@@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
 } from '@ghsc/nshmp-template';
 import {internalApps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
 import {internalNavigation} from 'projects/nshmp-apps/src/shared/utils/navigation.utils';
@@ -27,7 +27,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateContentContainerComponent,
     NshmpTemplateControlPanelComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpLibNgAboutPageComponent,
     ControlPanelComponent,
     ContentComponent,
diff --git a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.html b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.html
index 9e5ed1e206622d1f8b2e8613bb614163b4a295c9..30ea230dcc154436eed88a17184780ff5b9eea39 100644
--- a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
   </nshmp-template-content-container>
 
   <!-- About page -->
diff --git a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.ts
index 464e028556fe38c849fb1104e478cfbd4760218e..c40822124fd026bf96868bc665a7acd24ce7fa87 100644
--- a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.ts
+++ b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.ts
@@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
 } from '@ghsc/nshmp-template';
 import {internalApps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
 import {internalNavigation} from 'projects/nshmp-apps/src/shared/utils/navigation.utils';
@@ -25,7 +25,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateContentContainerComponent,
     NshmpTemplateControlPanelComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpLibNgAboutPageComponent,
     ControlPanelComponent,
     ContentComponent,
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.html b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.html
index 7b42a2066f03e462b5cd7988f2479fa9f14f278b..3f2a7bef6075f20daf89a70e6fd188a2bffde42f 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.html
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
 
     <nshmp-template-settings>
       <app-plot-settings-panel />
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.ts b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.ts
index 32e2387a5ea476e2eea66f7f1319d555714f857d..c1327eec073f7986e907c92e2c080bc948d183b1 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.ts
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.ts
@@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
   NshmpTemplateSettingsComponent,
 } from '@ghsc/nshmp-template';
 import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
@@ -21,7 +21,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateControlPanelComponent,
     NshmpTemplateContentContainerComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpLibNgAboutPageComponent,
     NshmpTemplateSettingsComponent,
     ControlPanelComponent,
diff --git a/projects/nshmp-apps/src/app/source/mfd/app.component.html b/projects/nshmp-apps/src/app/source/mfd/app.component.html
index 03bdde34cccaca1ef8567a9c19e937c0a8fbd4bd..b7c70d9bdd1656521be13d513dcf150766718885 100644
--- a/projects/nshmp-apps/src/app/source/mfd/app.component.html
+++ b/projects/nshmp-apps/src/app/source/mfd/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
 
     <nshmp-template-settings>
       <app-plot-settings-panel />
diff --git a/projects/nshmp-apps/src/app/source/mfd/app.component.ts b/projects/nshmp-apps/src/app/source/mfd/app.component.ts
index 4caa9b025485a76bfe1b4221f657a2d52607e6a3..509376c6dcab573ffda677a60244ea08e774bf86 100644
--- a/projects/nshmp-apps/src/app/source/mfd/app.component.ts
+++ b/projects/nshmp-apps/src/app/source/mfd/app.component.ts
@@ -5,7 +5,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
   NshmpTemplateService,
   NshmpTemplateSettingsComponent,
 } from '@ghsc/nshmp-template';
@@ -29,7 +29,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateContentContainerComponent,
     NshmpTemplateControlPanelComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpTemplateSettingsComponent,
     NshmpLibNgHazardProvisionalModelComponent,
     NshmpLibNgAboutPageComponent,
diff --git a/projects/nshmp-apps/src/app/source/model-maps/app.component.html b/projects/nshmp-apps/src/app/source/model-maps/app.component.html
index 8c5371544bee801ad470186c97b75f15786f6d84..85fc7ab01a23544fb1e0a84c56625d222f96a4c1 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/app.component.html
+++ b/projects/nshmp-apps/src/app/source/model-maps/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-map-content>
+    <nshmp-template-main-content>
       <app-map />
-    </nshmp-template-map-content>
+    </nshmp-template-main-content>
 
     <nshmp-template-settings>
       <app-plot-settings-panel />
diff --git a/projects/nshmp-apps/src/app/source/model-maps/app.component.ts b/projects/nshmp-apps/src/app/source/model-maps/app.component.ts
index b893795adb26d2d27befe02f08f4f95e48a07ec1..7fc0ed3d682b77ea953b3d2f7a918b535196d3d8 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/app.component.ts
+++ b/projects/nshmp-apps/src/app/source/model-maps/app.component.ts
@@ -6,7 +6,7 @@ import {
   AppControlsService,
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplateMapContentComponent,
+  NshmpTemplateMainContentComponent,
   NshmpTemplateSettingsComponent,
 } from '@ghsc/nshmp-template';
 import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
@@ -33,7 +33,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateContentContainerComponent,
     NshmpTemplateControlPanelComponent,
-    NshmpTemplateMapContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpTemplateSettingsComponent,
     NshmpLibNgHazardProvisionalModelComponent,
     NshmpLibNgAboutPageComponent,
diff --git a/projects/nshmp-apps/src/app/source/rates/app.component.html b/projects/nshmp-apps/src/app/source/rates/app.component.html
index 03bdde34cccaca1ef8567a9c19e937c0a8fbd4bd..b7c70d9bdd1656521be13d513dcf150766718885 100644
--- a/projects/nshmp-apps/src/app/source/rates/app.component.html
+++ b/projects/nshmp-apps/src/app/source/rates/app.component.html
@@ -4,9 +4,9 @@
       <app-control-panel />
     </nshmp-template-control-panel>
 
-    <nshmp-template-plot-content>
+    <nshmp-template-main-content>
       <app-content />
-    </nshmp-template-plot-content>
+    </nshmp-template-main-content>
 
     <nshmp-template-settings>
       <app-plot-settings-panel />
diff --git a/projects/nshmp-apps/src/app/source/rates/app.component.ts b/projects/nshmp-apps/src/app/source/rates/app.component.ts
index 637796ffe2f5df1a76f3e38ecf020cdd460c60c9..7cfe965356c7942233d5dd1558950456b7064047 100644
--- a/projects/nshmp-apps/src/app/source/rates/app.component.ts
+++ b/projects/nshmp-apps/src/app/source/rates/app.component.ts
@@ -5,7 +5,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
 import {
   NshmpTemplateContentContainerComponent,
   NshmpTemplateControlPanelComponent,
-  NshmpTemplatePlotContentComponent,
+  NshmpTemplateMainContentComponent,
   NshmpTemplateSettingsComponent,
 } from '@ghsc/nshmp-template';
 import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils';
@@ -22,7 +22,7 @@ import {AppService} from './services/app.service';
     NshmpLibNgTemplateComponent,
     NshmpTemplateContentContainerComponent,
     NshmpTemplateControlPanelComponent,
-    NshmpTemplatePlotContentComponent,
+    NshmpTemplateMainContentComponent,
     NshmpTemplateSettingsComponent,
     NshmpLibNgHazardProvisionalModelComponent,
     NshmpLibNgAboutPageComponent,