diff --git a/libs/causality/src/lib/CausalAnalysisDashboard/CausalInsights.styles.ts b/libs/causality/src/lib/CausalAnalysisDashboard/CausalInsights.styles.ts
index 8333969b68..cca90386f9 100644
--- a/libs/causality/src/lib/CausalAnalysisDashboard/CausalInsights.styles.ts
+++ b/libs/causality/src/lib/CausalAnalysisDashboard/CausalInsights.styles.ts
@@ -17,7 +17,8 @@ export const causalInsightsStyles: () => IProcessedStyleSet<ICausalInsightsStyle
     const theme = getTheme();
     return mergeStyleSets<ICausalInsightsStyles>({
       container: {
-        color: theme.semanticColors.bodyText
+        color: theme.semanticColors.bodyText,
+        padding: "0 40px 10px 20px"
       }
     });
   };
diff --git a/libs/causality/src/lib/CausalAnalysisDashboard/CausalInsightsTab.tsx b/libs/causality/src/lib/CausalAnalysisDashboard/CausalInsightsTab.tsx
index c933f67a11..de068223ed 100644
--- a/libs/causality/src/lib/CausalAnalysisDashboard/CausalInsightsTab.tsx
+++ b/libs/causality/src/lib/CausalAnalysisDashboard/CausalInsightsTab.tsx
@@ -7,13 +7,7 @@ import {
   ModelAssessmentContext
 } from "@responsible-ai/core-ui";
 import { localization } from "@responsible-ai/localization";
-import {
-  Text,
-  Pivot,
-  PivotItem,
-  Stack,
-  MessageBar
-} from "office-ui-fabric-react";
+import { Pivot, PivotItem, Stack, MessageBar } from "office-ui-fabric-react";
 import React from "react";
 
 import { CausalAnalysisOptions } from "./CausalAnalysisEnums";
@@ -45,15 +39,10 @@ export class CausalInsightsTab extends React.PureComponent<
     return (
       <Stack
         grow
-        className={classNames.container}
         id="causalInsightsTab"
         tokens={{ padding: "l1" }}
+        className={classNames.container}
       >
-        <Stack.Item>
-          <Text variant={"xxLarge"} id="causalAnalysisHeader">
-            {localization.ModelAssessment.ComponentNames.CausalAnalysis}
-          </Text>
-        </Stack.Item>
         <Stack.Item>
           <MessageBar>
             {localization.CausalAnalysis.MainMenu.cohortInfo}
diff --git a/libs/counterfactuals/src/lib/CounterfactualsTab.styles.ts b/libs/counterfactuals/src/lib/CounterfactualsTab.styles.ts
index 50a28a4ae2..e02fdc0fb7 100644
--- a/libs/counterfactuals/src/lib/CounterfactualsTab.styles.ts
+++ b/libs/counterfactuals/src/lib/CounterfactualsTab.styles.ts
@@ -17,7 +17,8 @@ export const counterfactualsTabStyles: () => IProcessedStyleSet<ICounterfactuals
     const theme = getTheme();
     return mergeStyleSets<ICounterfactualsTabStyles>({
       container: {
-        color: theme.semanticColors.bodyText
+        color: theme.semanticColors.bodyText,
+        padding: "0 40px 10px 40px"
       }
     });
   };
diff --git a/libs/counterfactuals/src/lib/CounterfactualsTab.tsx b/libs/counterfactuals/src/lib/CounterfactualsTab.tsx
index b2ee9c5e49..8e9e07fa83 100644
--- a/libs/counterfactuals/src/lib/CounterfactualsTab.tsx
+++ b/libs/counterfactuals/src/lib/CounterfactualsTab.tsx
@@ -2,41 +2,74 @@
 // Licensed under the MIT License.
 
 import {
+  Cohort,
   defaultModelAssessmentContext,
   ICounterfactualData,
-  ModelAssessmentContext
+  ModelAssessmentContext,
+  ModelTypes,
+  WeightVectorOption
 } from "@responsible-ai/core-ui";
 import { localization } from "@responsible-ai/localization";
-import { Text, Stack } from "office-ui-fabric-react";
+import { Dictionary } from "lodash";
+import { Stack, Text } from "office-ui-fabric-react";
 import React from "react";
 
+import { buildCounterfactualState } from "./buildCounterfactualState";
+import { CounterfactualChart } from "./CounterfactualChart";
 import { counterfactualsTabStyles } from "./CounterfactualsTab.styles";
-import { CounterfactualsView } from "./CounterfactualsView";
 
 export interface ICounterfactualsTabProps {
   data: ICounterfactualData;
 }
+export interface ICounterfactualsTabState {
+  cohorts: Cohort[];
+  weightVectorOptions: WeightVectorOption[];
+  weightVectorLabels: Dictionary<string>;
+  selectedWeightVector: WeightVectorOption;
+}
 
-export class CounterfactualsTab extends React.PureComponent<ICounterfactualsTabProps> {
+export class CounterfactualsTab extends React.PureComponent<
+  ICounterfactualsTabProps,
+  ICounterfactualsTabState
+> {
   public static contextType = ModelAssessmentContext;
   public context: React.ContextType<typeof ModelAssessmentContext> =
     defaultModelAssessmentContext;
+  public constructor(props: ICounterfactualsTabProps) {
+    super(props);
+    this.state = buildCounterfactualState(
+      this.context.dataset,
+      this.context.jointDataset,
+      ModelTypes.Multiclass
+    );
+  }
 
   public render(): React.ReactNode {
     const classNames = counterfactualsTabStyles();
     return (
-      <Stack
-        className={classNames.container}
-        horizontal={false}
-        tokens={{ childrenGap: "l1" }}
-      >
+      <Stack grow tokens={{ padding: "l1" }} className={classNames.container}>
         <Stack.Item>
-          <Text variant={"xxLarge"}>{localization.Counterfactuals.header}</Text>
+          <Text variant={"medium"}>
+            {localization.Counterfactuals.whatifDescription}
+          </Text>
         </Stack.Item>
         <Stack.Item>
-          <CounterfactualsView data={this.props.data} />
+          <CounterfactualChart
+            invokeModel={this.context.requestPredictions}
+            data={this.props.data}
+            selectedWeightVector={this.state.selectedWeightVector}
+            weightOptions={this.state.weightVectorOptions}
+            weightLabels={this.state.weightVectorLabels}
+            onWeightChange={this.onWeightVectorChange}
+          />
         </Stack.Item>
       </Stack>
     );
   }
+
+  private onWeightVectorChange = (weightOption: WeightVectorOption): void => {
+    this.context.jointDataset.buildLocalFlattenMatrix(weightOption);
+    this.state.cohorts.forEach((cohort) => cohort.clearCachedImportances());
+    this.setState({ selectedWeightVector: weightOption });
+  };
 }
diff --git a/libs/counterfactuals/src/lib/CounterfactualsView.tsx b/libs/counterfactuals/src/lib/CounterfactualsView.tsx
deleted file mode 100644
index 62ad099fd3..0000000000
--- a/libs/counterfactuals/src/lib/CounterfactualsView.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import {
-  Cohort,
-  defaultModelAssessmentContext,
-  ICounterfactualData,
-  ModelAssessmentContext,
-  ModelTypes,
-  WeightVectorOption
-} from "@responsible-ai/core-ui";
-import { localization } from "@responsible-ai/localization";
-import { Dictionary } from "lodash";
-import { Stack, Text } from "office-ui-fabric-react";
-import React from "react";
-
-import { buildCounterfactualState } from "./buildCounterfactualState";
-import { CounterfactualChart } from "./CounterfactualChart";
-
-export interface ICounterfactualsViewProps {
-  data: ICounterfactualData;
-}
-export interface ICounterfactualsViewState {
-  cohorts: Cohort[];
-  weightVectorOptions: WeightVectorOption[];
-  weightVectorLabels: Dictionary<string>;
-  selectedWeightVector: WeightVectorOption;
-}
-
-export class CounterfactualsView extends React.PureComponent<
-  ICounterfactualsViewProps,
-  ICounterfactualsViewState
-> {
-  public static contextType = ModelAssessmentContext;
-  public context: React.ContextType<typeof ModelAssessmentContext> =
-    defaultModelAssessmentContext;
-  public constructor(props: ICounterfactualsViewProps) {
-    super(props);
-    this.state = buildCounterfactualState(
-      this.context.dataset,
-      this.context.jointDataset,
-      ModelTypes.Multiclass
-    );
-  }
-
-  public render(): React.ReactNode {
-    return (
-      <Stack grow tokens={{ padding: "l1" }}>
-        <Stack.Item>
-          <Text variant={"medium"}>
-            {localization.Counterfactuals.whatifDescription}
-          </Text>
-        </Stack.Item>
-        <Stack.Item>
-          <CounterfactualChart
-            invokeModel={this.context.requestPredictions}
-            data={this.props.data}
-            selectedWeightVector={this.state.selectedWeightVector}
-            weightOptions={this.state.weightVectorOptions}
-            weightLabels={this.state.weightVectorLabels}
-            onWeightChange={this.onWeightVectorChange}
-          />
-        </Stack.Item>
-      </Stack>
-    );
-  }
-
-  private onWeightVectorChange = (weightOption: WeightVectorOption): void => {
-    this.context.jointDataset.buildLocalFlattenMatrix(weightOption);
-    this.state.cohorts.forEach((cohort) => cohort.clearCachedImportances());
-    this.setState({ selectedWeightVector: weightOption });
-  };
-}
diff --git a/libs/counterfactuals/src/lib/buildCounterfactualState.ts b/libs/counterfactuals/src/lib/buildCounterfactualState.ts
index 14c000ffbb..60dbe25fc4 100644
--- a/libs/counterfactuals/src/lib/buildCounterfactualState.ts
+++ b/libs/counterfactuals/src/lib/buildCounterfactualState.ts
@@ -10,13 +10,13 @@ import {
 } from "@responsible-ai/core-ui";
 import { localization } from "@responsible-ai/localization";
 
-import { ICounterfactualsViewState } from "./CounterfactualsView";
+import { ICounterfactualsTabState } from "./CounterfactualsTab";
 
 export function buildCounterfactualState(
   dataset: IDataset,
   jointDataset: JointDataset,
   modelType: ModelTypes
-): ICounterfactualsViewState {
+): ICounterfactualsTabState {
   const cohorts = [
     new Cohort(localization.Interpret.Cohort.defaultLabel, jointDataset, [])
   ];
diff --git a/libs/error-analysis/src/lib/ErrorAnalysisDashboard/Controls/ErrorAnalysisView/ErrorAnalysisViewTab.tsx b/libs/error-analysis/src/lib/ErrorAnalysisDashboard/Controls/ErrorAnalysisView/ErrorAnalysisViewTab.tsx
index e9addff031..7956cf526f 100644
--- a/libs/error-analysis/src/lib/ErrorAnalysisDashboard/Controls/ErrorAnalysisView/ErrorAnalysisViewTab.tsx
+++ b/libs/error-analysis/src/lib/ErrorAnalysisDashboard/Controls/ErrorAnalysisView/ErrorAnalysisViewTab.tsx
@@ -10,7 +10,6 @@ import { localization } from "@responsible-ai/localization";
 import {
   CommandBarButton,
   IIconProps,
-  Text,
   Pivot,
   PivotItem,
   Stack,
@@ -72,9 +71,6 @@ export class ErrorAnalysisViewTab extends React.Component<
           tokens={{ padding: "l1" }}
           className={classNames.errorAnalysis}
         >
-          <Text variant={"xxLarge"} id="errorAnalysisHeader">
-            {localization.ErrorAnalysis.MainMenu.errorAnalysisLabel}
-          </Text>
           <Stack horizontal>
             <Stack.Item>
               <Pivot
diff --git a/libs/model-assessment/src/lib/ModelAssessmentDashboard/Controls/FeatureImportances.tsx b/libs/model-assessment/src/lib/ModelAssessmentDashboard/Controls/FeatureImportances.tsx
index 52614f6cd3..343735f401 100644
--- a/libs/model-assessment/src/lib/ModelAssessmentDashboard/Controls/FeatureImportances.tsx
+++ b/libs/model-assessment/src/lib/ModelAssessmentDashboard/Controls/FeatureImportances.tsx
@@ -12,13 +12,7 @@ import {
 import { GlobalExplanationTab } from "@responsible-ai/interpret";
 import { localization } from "@responsible-ai/localization";
 import { Dictionary } from "lodash";
-import {
-  Pivot,
-  PivotItem,
-  PivotLinkSize,
-  Stack,
-  Text
-} from "office-ui-fabric-react";
+import { Pivot, PivotItem, PivotLinkSize, Stack } from "office-ui-fabric-react";
 import * as React from "react";
 
 import { featureImportanceTabStyles } from "./FeatureImportances.styles";
@@ -76,11 +70,6 @@ export class FeatureImportancesTab extends React.PureComponent<
 
     return (
       <Stack className={classNames.container}>
-        <Stack.Item className={classNames.header}>
-          <Text variant={"xxLarge"} id="featureImportanceHeader">
-            {localization.ModelAssessment.ComponentNames.FeatureImportances}
-          </Text>
-        </Stack.Item>
         <Stack.Item>
           <Pivot
             selectedKey={this.state.activeFeatureImportancesOption}
diff --git a/libs/model-assessment/src/lib/ModelAssessmentDashboard/Controls/TabsView/TabsView.tsx b/libs/model-assessment/src/lib/ModelAssessmentDashboard/Controls/TabsView/TabsView.tsx
index f8b814fce1..3478a8a989 100644
--- a/libs/model-assessment/src/lib/ModelAssessmentDashboard/Controls/TabsView/TabsView.tsx
+++ b/libs/model-assessment/src/lib/ModelAssessmentDashboard/Controls/TabsView/TabsView.tsx
@@ -112,36 +112,51 @@ export class TabsView extends React.PureComponent<
             >
               {t.key === GlobalTabKeys.ErrorAnalysisTab &&
                 this.props.errorAnalysisData?.[0] && (
-                  <ErrorAnalysisViewTab
-                    disabledView={disabledView}
-                    tree={this.props.errorAnalysisData[0].tree}
-                    matrix={this.props.errorAnalysisData[0].matrix}
-                    matrixFeatures={
-                      this.props.errorAnalysisData[0].matrix_features
-                    }
-                    messages={this.props.stringParams?.contextualHelp}
-                    getTreeNodes={this.props.requestDebugML}
-                    getMatrix={this.props.requestMatrix}
-                    updateSelectedCohort={this.props.updateSelectedCohort}
-                    features={
-                      this.props.errorAnalysisData[0].tree_features ||
-                      this.props.dataset.feature_names
-                    }
-                    selectedFeatures={this.state.selectedFeatures}
-                    errorAnalysisOption={this.state.errorAnalysisOption}
-                    selectedCohort={this.props.selectedCohort}
-                    baseCohort={this.props.baseCohort}
-                    selectFeatures={(features: string[]): void =>
-                      this.setState({ selectedFeatures: features })
-                    }
-                    importances={this.state.importances}
-                    onSaveCohortClick={(): void => {
-                      this.props.setSaveCohortVisible();
-                    }}
-                    showCohortName={false}
-                    handleErrorDetectorChanged={this.handleErrorDetectorChanged}
-                    selectedKey={this.state.errorAnalysisOption}
-                  />
+                  <>
+                    <div
+                      className={classNames.sectionHeader}
+                      id="errorAnalysisHeader"
+                    >
+                      <Text variant={"xxLarge"}>
+                        {
+                          localization.ModelAssessment.ComponentNames
+                            .ErrorAnalysis
+                        }
+                      </Text>
+                    </div>
+                    <ErrorAnalysisViewTab
+                      disabledView={disabledView}
+                      tree={this.props.errorAnalysisData[0].tree}
+                      matrix={this.props.errorAnalysisData[0].matrix}
+                      matrixFeatures={
+                        this.props.errorAnalysisData[0].matrix_features
+                      }
+                      messages={this.props.stringParams?.contextualHelp}
+                      getTreeNodes={this.props.requestDebugML}
+                      getMatrix={this.props.requestMatrix}
+                      updateSelectedCohort={this.props.updateSelectedCohort}
+                      features={
+                        this.props.errorAnalysisData[0].tree_features ||
+                        this.props.dataset.feature_names
+                      }
+                      selectedFeatures={this.state.selectedFeatures}
+                      errorAnalysisOption={this.state.errorAnalysisOption}
+                      selectedCohort={this.props.selectedCohort}
+                      baseCohort={this.props.baseCohort}
+                      selectFeatures={(features: string[]): void =>
+                        this.setState({ selectedFeatures: features })
+                      }
+                      importances={this.state.importances}
+                      onSaveCohortClick={(): void => {
+                        this.props.setSaveCohortVisible();
+                      }}
+                      showCohortName={false}
+                      handleErrorDetectorChanged={
+                        this.handleErrorDetectorChanged
+                      }
+                      selectedKey={this.state.errorAnalysisOption}
+                    />
+                  </>
                 )}
               {t.key === GlobalTabKeys.ModelOverviewTab && (
                 <>
@@ -168,28 +183,61 @@ export class TabsView extends React.PureComponent<
               )}
               {t.key === GlobalTabKeys.FeatureImportancesTab &&
                 this.props.modelExplanationData?.[0] && (
-                  <FeatureImportancesTab
-                    modelMetadata={this.props.modelMetadata}
-                    modelExplanationData={this.props.modelExplanationData}
-                    selectedWeightVector={this.state.selectedWeightVector}
-                    weightVectorOptions={this.state.weightVectorOptions}
-                    weightVectorLabels={this.state.weightVectorLabels}
-                    requestPredictions={this.props.requestPredictions}
-                    onWeightVectorChange={this.onWeightVectorChange}
-                  />
+                  <>
+                    <div className={classNames.sectionHeader}>
+                      <Text variant={"xxLarge"} id="featureImportanceHeader">
+                        {
+                          localization.ModelAssessment.ComponentNames
+                            .FeatureImportances
+                        }
+                      </Text>
+                    </div>
+                    <FeatureImportancesTab
+                      modelMetadata={this.props.modelMetadata}
+                      modelExplanationData={this.props.modelExplanationData}
+                      selectedWeightVector={this.state.selectedWeightVector}
+                      weightVectorOptions={this.state.weightVectorOptions}
+                      weightVectorLabels={this.state.weightVectorLabels}
+                      requestPredictions={this.props.requestPredictions}
+                      onWeightVectorChange={this.onWeightVectorChange}
+                    />
+                  </>
                 )}
               {t.key === GlobalTabKeys.CausalAnalysisTab &&
                 this.props.causalAnalysisData?.[0] && (
-                  <CausalInsightsTab
-                    data={this.props.causalAnalysisData?.[0]}
-                  />
+                  <>
+                    <div
+                      className={classNames.sectionHeader}
+                      id="causalAnalysisHeader"
+                    >
+                      <Text variant={"xxLarge"} id="causalInsightsTab">
+                        {
+                          localization.ModelAssessment.ComponentNames
+                            .CausalAnalysis
+                        }
+                      </Text>
+                    </div>
+                    <CausalInsightsTab
+                      data={this.props.causalAnalysisData?.[0]}
+                    />
+                  </>
                 )}
 
               {t.key === GlobalTabKeys.CounterfactualsTab &&
                 this.props.counterfactualData?.[0] && (
-                  <CounterfactualsTab
-                    data={this.props.counterfactualData?.[0]}
-                  />
+                  <>
+                    <div className={classNames.sectionHeader}>
+                      <Text variant={"xxLarge"}>
+                        {
+                          localization.ModelAssessment.ComponentNames
+                            .Counterfactuals
+                        }
+                      </Text>
+                    </div>
+                    <CounterfactualsTab
+                      data={this.props.counterfactualData?.[0]}
+                    />
+                  </>
                 )}
             </Stack.Item>
             <Stack.Item className={classNames.buttonSection}>