diff --git a/opencti-platform/opencti-front/lang/front/de.json b/opencti-platform/opencti-front/lang/front/de.json
index c1f43546a5444..11afa3876dc0f 100644
--- a/opencti-platform/opencti-front/lang/front/de.json
+++ b/opencti-platform/opencti-front/lang/front/de.json
@@ -339,6 +339,7 @@
   "Content": "Inhalt",
   "Content mapping view": "Ansicht des Content Mappings",
   "Content max marking definition levels": "Maximale Markierungsdefinitionsstufen für Inhalte",
+  "Content view": "Ansicht des Inhalts",
   "contest": "Flüchtige Gruppierung",
   "Context": "Kontext",
   "context": "Kontext",
diff --git a/opencti-platform/opencti-front/lang/front/en.json b/opencti-platform/opencti-front/lang/front/en.json
index 600f200039c10..9dd573312ef0b 100644
--- a/opencti-platform/opencti-front/lang/front/en.json
+++ b/opencti-platform/opencti-front/lang/front/en.json
@@ -339,6 +339,7 @@
   "Content": "Content",
   "Content mapping view": "Content mapping view",
   "Content max marking definition levels": "Content max marking definition levels",
+  "Content view": "Content view",
   "contest": "Ephemeral groupment",
   "Context": "Context",
   "context": "Context",
diff --git a/opencti-platform/opencti-front/lang/front/es.json b/opencti-platform/opencti-front/lang/front/es.json
index 28d1bea04a9ff..7e23840e9f838 100644
--- a/opencti-platform/opencti-front/lang/front/es.json
+++ b/opencti-platform/opencti-front/lang/front/es.json
@@ -339,6 +339,7 @@
   "Content": "Contenido",
   "Content mapping view": "Vista de mapeo de contenidos",
   "Content max marking definition levels": "Niveles de definición de marcado máximo de contenido",
+  "Content view": "Vista del contenido",
   "contest": "Movimiento espontáneo",
   "context": "Contexto",
   "Context": "Contexto",
diff --git a/opencti-platform/opencti-front/lang/front/fr.json b/opencti-platform/opencti-front/lang/front/fr.json
index f1bc1d97d8e0f..946f2a30e023d 100644
--- a/opencti-platform/opencti-front/lang/front/fr.json
+++ b/opencti-platform/opencti-front/lang/front/fr.json
@@ -339,6 +339,7 @@
   "Content": "Contenu",
   "Content mapping view": "Vue de la cartographie du contenu",
   "Content max marking definition levels": "Niveaux de marquage maximum du contenu",
+  "Content view": "Vue du contenu",
   "contest": "Mouvement spontané",
   "context": "Contexte",
   "Context": "Contexte",
diff --git a/opencti-platform/opencti-front/lang/front/ja.json b/opencti-platform/opencti-front/lang/front/ja.json
index a84d7c4b3aa16..8be17b150013f 100644
--- a/opencti-platform/opencti-front/lang/front/ja.json
+++ b/opencti-platform/opencti-front/lang/front/ja.json
@@ -339,6 +339,7 @@
   "Content": "内容",
   "Content mapping view": "コンテンツマッピングビュー",
   "Content max marking definition levels": "コンテンツの最大マーキング定義レベル",
+  "Content view": "コンテンツビュー",
   "contest": "一時的なグループ",
   "context": "コンテキスト",
   "Context": "コンテキスト",
diff --git a/opencti-platform/opencti-front/lang/front/zh.json b/opencti-platform/opencti-front/lang/front/zh.json
index f23a51eb2e9d9..3250f08b3b298 100644
--- a/opencti-platform/opencti-front/lang/front/zh.json
+++ b/opencti-platform/opencti-front/lang/front/zh.json
@@ -339,6 +339,7 @@
   "Content": "内容",
   "Content mapping view": "内容映射视图",
   "Content max marking definition levels": "内容最大标记定义级别",
+  "Content view": "内容视图",
   "contest": "比赛",
   "context": "关联",
   "Context": "上下文",
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingCreation.tsx b/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingCreation.tsx
index 7ea0f864842dd..40da3a14ec38c 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingCreation.tsx
@@ -150,7 +150,7 @@ export const GroupingCreationForm: FunctionComponent<GroupingFormProps> = ({
         }
         if (mapAfter) {
           navigate(
-            `/dashboard/analyses/groupings/${response.groupingAdd?.id}/knowledge/content`,
+            `/dashboard/analyses/groupings/${response.groupingAdd?.id}/content/mapping`,
           );
         }
       },
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingKnowledge.jsx b/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingKnowledge.jsx
index 005ea3e57647b..2d2d3eff71be2 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingKnowledge.jsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingKnowledge.jsx
@@ -158,7 +158,7 @@ class GroupingKnowledgeComponent extends Component {
             container={grouping}
             PopoverComponent={<GroupingPopover />}
             link={`/dashboard/analyses/groupings/${grouping.id}/knowledge`}
-            modes={['graph', 'content', 'correlation', 'matrix']}
+            modes={['graph', 'correlation', 'matrix']}
             currentMode={mode}
             knowledge={true}
             enableSuggestions={true}
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingKnowledgeGraph.jsx b/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingKnowledgeGraph.jsx
index cb890d884992d..acd0433aec90d 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingKnowledgeGraph.jsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingKnowledgeGraph.jsx
@@ -1013,7 +1013,7 @@ class GroupingKnowledgeGraphComponent extends Component {
                 container={grouping}
                 PopoverComponent={<GroupingPopover />}
                 link={`/dashboard/analyses/groupings/${grouping.id}/knowledge`}
-                modes={['graph', 'content', 'correlation', 'matrix']}
+                modes={['graph', 'correlation', 'matrix']}
                 currentMode={mode}
                 adjust={this.handleZoomToFit.bind(this)}
                 knowledge={true}
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/groupings/Root.tsx b/opencti-platform/opencti-front/src/private/components/analyses/groupings/Root.tsx
index 77e67731e2b5e..e877b2fb61a64 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/groupings/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/groupings/Root.tsx
@@ -11,7 +11,7 @@ import Tab from '@mui/material/Tab';
 import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import { RootReportSubscription } from '@components/analyses/reports/__generated__/RootReportSubscription.graphql';
 import StixCoreObjectSimulationResult from '@components/common/stix_core_objects/StixCoreObjectSimulationResult';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import { QueryRenderer } from '../../../../relay/environment';
 import Grouping from './Grouping';
 import GroupingPopover from './GroupingPopover';
@@ -87,6 +87,13 @@ const RootGrouping = () => {
   const enableReferences = useIsEnforceReference('Grouping') && !useGranted([BYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
+
+  const getCurrentTab = (grouping) => {
+    if (location.pathname.includes(`/dashboard/analyses/groupings/${grouping.id}/knowledge`)) return `/dashboard/analyses/groupings/${grouping.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/analyses/groupings/${grouping.id}/content`)) return `/dashboard/analyses/groupings/${grouping.id}/content`;
+    return location.pathname;
+  };
+
   return (
     <>
       <QueryRenderer
@@ -115,6 +122,13 @@ const RootGrouping = () => {
               ) {
                 paddingRight = 350;
               }
+              if (
+                location.pathname.includes(
+                  `/dashboard/analyses/groupings/${grouping.id}/content/mapping`,
+                )
+              ) {
+                paddingRight = 0;
+              }
               return (
                 <div style={{ paddingRight }}>
                   <Breadcrumbs variant="object" elements={[
@@ -138,13 +152,7 @@ const RootGrouping = () => {
                     }}
                   >
                     <Tabs
-                      value={
-                                location.pathname.includes(
-                                  `/dashboard/analyses/groupings/${grouping.id}/knowledge`,
-                                )
-                                  ? `/dashboard/analyses/groupings/${grouping.id}/knowledge`
-                                  : location.pathname
-                              }
+                      value={getCurrentTab(grouping)}
                     >
                       <Tab
                         component={Link}
@@ -213,10 +221,11 @@ const RootGrouping = () => {
                       }
                     />
                     <Route
-                      path="/content"
+                      path="/content/*"
                       element={
-                        <StixCoreObjectContent
+                        <StixCoreObjectContentRoot
                           stixCoreObject={grouping}
+                          isContainer={true}
                         />
                       }
                     />
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/Root.tsx b/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/Root.tsx
index ade119a39b7f0..ac77c07a6741c 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/Root.tsx
@@ -9,6 +9,7 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import { QueryRenderer } from '../../../../relay/environment';
 import ErrorNotFound from '../../../../components/ErrorNotFound';
 import Loader from '../../../../components/Loader';
@@ -76,6 +77,11 @@ const RootMalwareAnalysis = () => {
   const location = useLocation();
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
+  const getCurrentTab = (malwareAnalysis) => {
+    if (location.pathname.includes(`/dashboard/analyses/malware_analyses/${malwareAnalysis.id}/knowledge`)) return `/dashboard/analyses/malware_analyses/${malwareAnalysis.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/analyses/malware_analyses/${malwareAnalysis.id}/content`)) return `/dashboard/analyses/malware_analyses/${malwareAnalysis.id}/content`;
+    return location.pathname;
+  };
   const link = `/dashboard/analyses/malware_analyses/${malwareAnalysisId}/knowledge`;
   return (
     <>
@@ -86,8 +92,23 @@ const RootMalwareAnalysis = () => {
           if (props) {
             if (props.malwareAnalysis) {
               const { malwareAnalysis } = props;
+              let paddingRight = 0;
+              if (
+                location.pathname.includes(
+                  `/dashboard/analyses/malware_analyses/${malwareAnalysis.id}/content`,
+                )
+              ) {
+                paddingRight = 350;
+              }
+              if (
+                location.pathname.includes(
+                  `/dashboard/analyses/malware_analyses/${malwareAnalysis.id}/content/mapping`,
+                )
+              ) {
+                paddingRight = 0;
+              }
               return (
-                <>
+                <div style={{ paddingRight }}>
                   <Breadcrumbs variant="object" elements={[
                     { label: t_i18n('Analyses') },
                     { label: t_i18n('Malware analyses'), link: '/dashboard/analyses/malware_analyses' },
@@ -98,8 +119,8 @@ const RootMalwareAnalysis = () => {
                     entityType={'Malware-Analysis'}
                     stixDomainObject={malwareAnalysis}
                     PopoverComponent={
-                      <MalwareAnalysisPopover id={malwareAnalysisId} />
-                    }
+                      <MalwareAnalysisPopover id={malwareAnalysisId}/>
+                          }
                     noAliases={true}
                   />
                   <Box
@@ -110,13 +131,7 @@ const RootMalwareAnalysis = () => {
                     }}
                   >
                     <Tabs
-                      value={
-                        location.pathname.includes(
-                          `/dashboard/analyses/malware_analyses/${malwareAnalysis.id}/knowledge`,
-                        )
-                          ? `/dashboard/analyses/malware_analyses/${malwareAnalysis.id}/knowledge`
-                          : location.pathname
-                      }
+                      value={getCurrentTab(malwareAnalysis)}
                     >
                       <Tab
                         component={Link}
@@ -130,6 +145,12 @@ const RootMalwareAnalysis = () => {
                         value={`/dashboard/analyses/malware_analyses/${malwareAnalysis.id}/knowledge`}
                         label={t_i18n('Knowledge')}
                       />
+                      <Tab
+                        component={Link}
+                        to={`/dashboard/analyses/malware_analyses/${malwareAnalysis.id}/content`}
+                        value={`/dashboard/analyses/malware_analyses/${malwareAnalysis.id}/content`}
+                        label={t_i18n('Content')}
+                      />
                       <Tab
                         component={Link}
                         to={`/dashboard/analyses/malware_analyses/${malwareAnalysis.id}/files`}
@@ -180,6 +201,14 @@ const RootMalwareAnalysis = () => {
                           entityId={malwareAnalysisId}
                         />}
                     />
+                    <Route
+                      path="/content/*"
+                      element={
+                        <StixCoreObjectContentRoot
+                          stixCoreObject={malwareAnalysis}
+                        />
+                      }
+                    />
                     <Route
                       path="/files"
                       element={
@@ -198,10 +227,10 @@ const RootMalwareAnalysis = () => {
                         />}
                     />
                   </Routes>
-                </>
+                </div>
               );
             }
-            return <ErrorNotFound />;
+            return <ErrorNotFound/>;
           }
           return <Loader />;
         }}
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportCreation.tsx b/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportCreation.tsx
index 193692fe8678b..c8cc9348a39c0 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportCreation.tsx
@@ -164,7 +164,7 @@ export const ReportCreationForm: FunctionComponent<ReportFormProps> = ({
         }
         if (mapAfter) {
           navigate(
-            `/dashboard/analyses/reports/${response.reportAdd?.id}/knowledge/content`,
+            `/dashboard/analyses/reports/${response.reportAdd?.id}/content/mapping`,
           );
         }
       },
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportKnowledge.jsx b/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportKnowledge.jsx
index b9cb01b2f6735..9924a79097a53 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportKnowledge.jsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportKnowledge.jsx
@@ -262,7 +262,7 @@ class ReportKnowledgeComponent extends Component {
           container={report}
           PopoverComponent={<ReportPopover />}
           link={`/dashboard/analyses/reports/${report.id}/knowledge`}
-          modes={['graph', 'content', 'timeline', 'correlation', 'matrix']}
+          modes={['graph', 'timeline', 'correlation', 'matrix']}
           currentMode={mode}
           knowledge={true}
           enableSuggestions={true}
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportKnowledgeGraph.jsx b/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportKnowledgeGraph.jsx
index a0fb9ae623380..21ec4d0046b25 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportKnowledgeGraph.jsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/reports/ReportKnowledgeGraph.jsx
@@ -1016,7 +1016,6 @@ class ReportKnowledgeGraphComponent extends Component {
                 link={`/dashboard/analyses/reports/${report.id}/knowledge`}
                 modes={[
                   'graph',
-                  'content',
                   'timeline',
                   'correlation',
                   'matrix',
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/reports/Root.tsx b/opencti-platform/opencti-front/src/private/components/analyses/reports/Root.tsx
index 1476957da16bc..1b0bdb026cf84 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/reports/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/reports/Root.tsx
@@ -9,6 +9,7 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import StixCoreObjectSimulationResult from '../../common/stix_core_objects/StixCoreObjectSimulationResult';
 import { QueryRenderer } from '../../../../relay/environment';
 import Report from './Report';
@@ -22,7 +23,6 @@ import ContainerStixDomainObjects from '../../common/containers/ContainerStixDom
 import ContainerStixCyberObservables from '../../common/containers/ContainerStixCyberObservables';
 import ErrorNotFound from '../../../../components/ErrorNotFound';
 import StixCoreObjectFilesAndHistory from '../../common/stix_core_objects/StixCoreObjectFilesAndHistory';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import Breadcrumbs from '../../../../components/Breadcrumbs';
 import { useFormatter } from '../../../../components/i18n';
 import { useIsEnforceReference } from '../../../../utils/hooks/useEntitySettings';
@@ -86,6 +86,11 @@ const RootReport = () => {
   const enableReferences = useIsEnforceReference('Report') && !useGranted([BYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
+  const getCurrentTab = (report) => {
+    if (location.pathname.includes(`/dashboard/analyses/reports/${report.id}/knowledge`)) return `/dashboard/analyses/reports/${report.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/analyses/reports/${report.id}/content`)) return `/dashboard/analyses/reports/${report.id}/content`;
+    return location.pathname;
+  };
   return (
     <>
       <QueryRenderer
@@ -114,6 +119,13 @@ const RootReport = () => {
               ) {
                 paddingRight = 350;
               }
+              if (
+                location.pathname.includes(
+                  `/dashboard/analyses/reports/${report.id}/content/mapping`,
+                )
+              ) {
+                paddingRight = 0;
+              }
               return (
                 <div style={{ paddingRight }} data-testid="report-details-page">
                   <Breadcrumbs variant="object" elements={[
@@ -140,13 +152,7 @@ const RootReport = () => {
                     }}
                   >
                     <Tabs
-                      value={
-                        location.pathname.includes(
-                          `/dashboard/analyses/reports/${report.id}/knowledge`,
-                        )
-                          ? `/dashboard/analyses/reports/${report.id}/knowledge`
-                          : location.pathname
-                      }
+                      value={getCurrentTab(report)}
                     >
                       <Tab
                         component={Link}
@@ -224,10 +230,11 @@ const RootReport = () => {
                       )}
                     />
                     <Route
-                      path="/content"
+                      path="/content/*"
                       element={
-                        <StixCoreObjectContent
+                        <StixCoreObjectContentRoot
                           stixCoreObject={report}
+                          isContainer={true}
                         />
                       }
                     />
diff --git a/opencti-platform/opencti-front/src/private/components/arsenal/channels/Root.jsx b/opencti-platform/opencti-front/src/private/components/arsenal/channels/Root.jsx
index bd4cce5ef3b80..7f7770b4dadea 100644
--- a/opencti-platform/opencti-front/src/private/components/arsenal/channels/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/arsenal/channels/Root.jsx
@@ -6,11 +6,11 @@ import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
 import * as R from 'ramda';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import Channel from './Channel';
 import ChannelKnowledge from './ChannelKnowledge';
 import StixDomainObjectHeader from '../../common/stix_domain_objects/StixDomainObjectHeader';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import FileManager from '../../common/files/FileManager';
 import ChannelPopover from './ChannelPopover';
 import Loader from '../../../../components/Loader';
@@ -85,6 +85,11 @@ class RootChannel extends Component {
       location,
       params: { channelId },
     } = this.props;
+    const getCurrentTab = (channel) => {
+      if (location.pathname.includes(`/dashboard/arsenal/channels/${channel.id}/knowledge`)) return `/dashboard/arsenal/channels/${channel.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/arsenal/channels/${channel.id}/content`)) return `/dashboard/arsenal/channels/${channel.id}/content`;
+      return location.pathname;
+    };
     const link = `/dashboard/arsenal/channels/${channelId}/knowledge`;
     return (
       <div>
@@ -130,6 +135,13 @@ class RootChannel extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/arsenal/channels/${channel.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -152,13 +164,7 @@ class RootChannel extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/arsenal/channels/${channel.id}/knowledge`,
-                          )
-                            ? `/dashboard/arsenal/channels/${channel.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(channel)}
                       >
                         <Tab
                           component={Link}
@@ -223,12 +229,12 @@ class RootChannel extends Component {
                         )}
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
-                            stixCoreObject={props.channel}
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
+                            stixCoreObject={channel}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses/*"
diff --git a/opencti-platform/opencti-front/src/private/components/arsenal/malwares/Root.jsx b/opencti-platform/opencti-front/src/private/components/arsenal/malwares/Root.jsx
index 50bb9b7a9270b..cbc0eb387f49a 100644
--- a/opencti-platform/opencti-front/src/private/components/arsenal/malwares/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/arsenal/malwares/Root.jsx
@@ -6,8 +6,8 @@ import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
 import * as R from 'ramda';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import StixCoreObjectSimulationResult from '../../common/stix_core_objects/StixCoreObjectSimulationResult';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import Malware from './Malware';
@@ -88,6 +88,11 @@ class RootMalware extends Component {
       location,
       params: { malwareId },
     } = this.props;
+    const getCurrentTab = (malware) => {
+      if (location.pathname.includes(`/dashboard/arsenal/malwares/${malware.id}/knowledge`)) return `/dashboard/arsenal/malwares/${malware.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/arsenal/malwares/${malware.id}/content`)) return `/dashboard/arsenal/malwares/${malware.id}/content`;
+      return location.pathname;
+    };
     const link = `/dashboard/arsenal/malwares/${malwareId}/knowledge`;
     return (
       <>
@@ -137,6 +142,13 @@ class RootMalware extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/arsenal/malwares/${malware.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -159,13 +171,7 @@ class RootMalware extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/arsenal/malwares/${malware.id}/knowledge`,
-                          )
-                            ? `/dashboard/arsenal/malwares/${malware.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(malware)}
                       >
                         <Tab
                           component={Link}
@@ -230,12 +236,12 @@ class RootMalware extends Component {
                           />}
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={malware}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/arsenal/tools/Root.jsx b/opencti-platform/opencti-front/src/private/components/arsenal/tools/Root.jsx
index 1c787f37bb23a..126ccf07a8026 100644
--- a/opencti-platform/opencti-front/src/private/components/arsenal/tools/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/arsenal/tools/Root.jsx
@@ -6,12 +6,12 @@ import * as R from 'ramda';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import Tool from './Tool';
 import ToolKnowledge from './ToolKnowledge';
 import StixDomainObjectHeader from '../../common/stix_domain_objects/StixDomainObjectHeader';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import FileManager from '../../common/files/FileManager';
 import ToolPopover from './ToolPopover';
 import Loader from '../../../../components/Loader';
@@ -87,6 +87,11 @@ class RootTool extends Component {
       location,
       params: { toolId },
     } = this.props;
+    const getCurrentTab = (tool) => {
+      if (location.pathname.includes(`/dashboard/arsenal/tools/${tool.id}/knowledge`)) return `/dashboard/arsenal/tools/${tool.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/arsenal/tools/${tool.id}/content`)) return `/dashboard/arsenal/tools/${tool.id}/content`;
+      return location.pathname;
+    };
     const link = `/dashboard/arsenal/tools/${toolId}/knowledge`;
     return (
       <>
@@ -131,6 +136,13 @@ class RootTool extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/arsenal/tools/${tool.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -153,13 +165,7 @@ class RootTool extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/arsenal/tools/${tool.id}/knowledge`,
-                          )
-                            ? `/dashboard/arsenal/tools/${tool.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(tool)}
                       >
                         <Tab
                           component={Link}
@@ -222,12 +228,12 @@ class RootTool extends Component {
                         )}
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={tool}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses/*"
diff --git a/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/Root.jsx b/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/Root.jsx
index 1bcb7fdb8d4b8..abecb35c8e490 100644
--- a/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/Root.jsx
@@ -6,12 +6,12 @@ import * as R from 'ramda';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import Vulnerability from './Vulnerability';
 import VulnerabilityKnowledge from './VulnerabilityKnowledge';
 import StixDomainObjectHeader from '../../common/stix_domain_objects/StixDomainObjectHeader';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import FileManager from '../../common/files/FileManager';
 import VulnerabilityPopover from './VulnerabilityPopover';
 import Loader from '../../../../components/Loader';
@@ -85,6 +85,11 @@ class RootVulnerability extends Component {
       location,
       params: { vulnerabilityId },
     } = this.props;
+    const getCurrentTab = (vulnerability) => {
+      if (location.pathname.includes(`/dashboard/arsenal/vulnerabilities/${vulnerability.id}/knowledge`)) return `/dashboard/arsenal/vulnerabilities/${vulnerability.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/arsenal/vulnerabilities/${vulnerability.id}/content`)) return `/dashboard/arsenal/vulnerabilities/${vulnerability.id}/content`;
+      return location.pathname;
+    };
     const link = `/dashboard/arsenal/vulnerabilities/${vulnerabilityId}/knowledge`;
     return (
       <div>
@@ -131,6 +136,13 @@ class RootVulnerability extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/arsenal/vulnerabilities/${vulnerability.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -154,13 +166,7 @@ class RootVulnerability extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/arsenal/vulnerabilities/${vulnerability.id}/knowledge`,
-                          )
-                            ? `/dashboard/arsenal/vulnerabilities/${vulnerability.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(vulnerability)}
                       >
                         <Tab
                           component={Link}
@@ -227,12 +233,12 @@ class RootVulnerability extends Component {
                         )}
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={vulnerability}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_incidents/CaseIncidentCreation.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_incidents/CaseIncidentCreation.tsx
index 9fb4786bb09e0..05292ce5fda0b 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_incidents/CaseIncidentCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_incidents/CaseIncidentCreation.tsx
@@ -153,7 +153,7 @@ export const CaseIncidentCreationForm: FunctionComponent<IncidentFormProps> = ({
         }
         if (mapAfter) {
           navigate(
-            `/dashboard/cases/incidents/${response.caseIncidentAdd?.id}/knowledge/content`,
+            `/dashboard/cases/incidents/${response.caseIncidentAdd?.id}/content/mapping`,
           );
         }
       },
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_incidents/IncidentKnowledge.jsx b/opencti-platform/opencti-front/src/private/components/cases/case_incidents/IncidentKnowledge.jsx
index ea62fe49086b3..7e2fac972cbed 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_incidents/IncidentKnowledge.jsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_incidents/IncidentKnowledge.jsx
@@ -263,7 +263,7 @@ class IncidentKnowledgeComponent extends Component {
           container={caseData}
           PopoverComponent={<CaseIncidentPopover id={caseData.id} />}
           link={`/dashboard/cases/incidents/${caseData.id}/knowledge`}
-          modes={['graph', 'content', 'timeline', 'correlation', 'matrix']}
+          modes={['graph', 'timeline', 'correlation', 'matrix']}
           currentMode={mode}
           knowledge={true}
           enableSuggestions={true}
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_incidents/IncidentKnowledgeGraph.jsx b/opencti-platform/opencti-front/src/private/components/cases/case_incidents/IncidentKnowledgeGraph.jsx
index 7bc92e4d3eb67..a11e67471853c 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_incidents/IncidentKnowledgeGraph.jsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_incidents/IncidentKnowledgeGraph.jsx
@@ -1017,7 +1017,6 @@ class IncidentKnowledgeGraphComponent extends Component {
                 link={`/dashboard/cases/incidents/${caseData.id}/knowledge`}
                 modes={[
                   'graph',
-                  'content',
                   'timeline',
                   'correlation',
                   'matrix',
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_incidents/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_incidents/Root.tsx
index 118307f02891c..8f559b9e1814e 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_incidents/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_incidents/Root.tsx
@@ -10,6 +10,7 @@ import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
 import StixCoreObjectSimulationResult from '@components/common/stix_core_objects/StixCoreObjectSimulationResult';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import ErrorNotFound from '../../../../components/ErrorNotFound';
 import Loader, { LoaderVariant } from '../../../../components/Loader';
 import useQueryLoading from '../../../../utils/hooks/useQueryLoading';
@@ -17,7 +18,6 @@ import ContainerHeader from '../../common/containers/ContainerHeader';
 import ContainerStixCyberObservables from '../../common/containers/ContainerStixCyberObservables';
 import ContainerStixDomainObjects from '../../common/containers/ContainerStixDomainObjects';
 import StixCoreObjectFilesAndHistory from '../../common/stix_core_objects/StixCoreObjectFilesAndHistory';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import { RootIncidentCaseQuery } from './__generated__/RootIncidentCaseQuery.graphql';
 import CaseIncident from './CaseIncident';
 import CaseIncidentPopover from './CaseIncidentPopover';
@@ -84,6 +84,11 @@ const RootCaseIncidentComponent = ({ queryRef, caseId }) => {
   const enableReferences = useIsEnforceReference('Case-Incident') && !useGranted([BYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
+  const getCurrentTab = (caseData) => {
+    if (location.pathname.includes(`/dashboard/cases/incidents/${caseData.id}/knowledge`)) return `/dashboard/cases/incidents/${caseData.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/cases/incidents/${caseData.id}/content`)) return `/dashboard/cases/incidents/${caseData.id}/content`;
+    return location.pathname;
+  };
   const {
     caseIncident: caseData,
     connectorsForExport,
@@ -109,6 +114,13 @@ const RootCaseIncidentComponent = ({ queryRef, caseId }) => {
     ) {
       paddingRight = 350;
     }
+    if (
+      location.pathname.includes(
+        `/dashboard/cases/incidents/${caseData.id}/content/mapping`,
+      )
+    ) {
+      paddingRight = 0;
+    }
   }
   return (
     <>
@@ -134,13 +146,7 @@ const RootCaseIncidentComponent = ({ queryRef, caseId }) => {
             }}
           >
             <Tabs
-              value={
-                location.pathname.includes(
-                  `/dashboard/cases/incidents/${caseData.id}/knowledge`,
-                )
-                  ? `/dashboard/cases/incidents/${caseData.id}/knowledge`
-                  : location.pathname
-              }
+              value={getCurrentTab(caseData)}
             >
               <Tab
                 component={Link}
@@ -213,11 +219,13 @@ const RootCaseIncidentComponent = ({ queryRef, caseId }) => {
                 />}
             />
             <Route
-              path="/content"
+              path="/content/*"
               element={
-                <StixCoreObjectContent
+                <StixCoreObjectContentRoot
                   stixCoreObject={caseData}
-                />}
+                  isContainer={true}
+                />
+              }
             />
             <Route
               path="/knowledge/*"
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiCreation.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiCreation.tsx
index 78017cc1ddda9..6fd49e96e580d 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiCreation.tsx
@@ -151,7 +151,7 @@ export const CaseRfiCreationForm: FunctionComponent<CaseRfiFormProps> = ({
         }
         if (mapAfter) {
           navigate(
-            `/dashboard/cases/rfis/${response.caseRfiAdd?.id}/knowledge/content`,
+            `/dashboard/cases/rfis/${response.caseRfiAdd?.id}/content/mapping`,
           );
         }
       },
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiKnowledge.jsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiKnowledge.jsx
index b7ffd75222cc4..48d673ffbd0a3 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiKnowledge.jsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiKnowledge.jsx
@@ -263,7 +263,7 @@ class CaseRfiKnowledgeComponent extends Component {
           container={caseData}
           PopoverComponent={<CaseRfiPopover id={caseData.id}/>}
           link={`/dashboard/cases/rfis/${caseData.id}/knowledge`}
-          modes={['graph', 'content', 'timeline', 'correlation', 'matrix']}
+          modes={['graph', 'timeline', 'correlation', 'matrix']}
           currentMode={mode}
           knowledge={true}
           enableSuggestions={true}
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiKnowledgeGraph.jsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiKnowledgeGraph.jsx
index aa920ac57869f..b7a38cd745645 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiKnowledgeGraph.jsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_rfis/CaseRfiKnowledgeGraph.jsx
@@ -1017,7 +1017,6 @@ class CaseRfiKnowledgeGraphComponent extends Component {
                 link={`/dashboard/cases/rfis/${caseData.id}/knowledge`}
                 modes={[
                   'graph',
-                  'content',
                   'timeline',
                   'correlation',
                   'matrix',
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfis/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfis/Root.tsx
index aa3391718eead..eb7dff37b0148 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_rfis/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_rfis/Root.tsx
@@ -9,11 +9,11 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import ErrorNotFound from '../../../../components/ErrorNotFound';
 import useQueryLoading from '../../../../utils/hooks/useQueryLoading';
 import Loader, { LoaderVariant } from '../../../../components/Loader';
 import ContainerHeader from '../../common/containers/ContainerHeader';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import StixCoreObjectFilesAndHistory from '../../common/stix_core_objects/StixCoreObjectFilesAndHistory';
 import CaseRfiPopover from './CaseRfiPopover';
 import CaseRfi from './CaseRfi';
@@ -84,6 +84,11 @@ const RootCaseRfiComponent = ({ queryRef, caseId }) => {
   const enableReferences = useIsEnforceReference('Case-Rfi') && !useGranted([BYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
+  const getCurrentTab = (caseData) => {
+    if (location.pathname.includes(`/dashboard/cases/rfis/${caseData.id}/knowledge`)) return `/dashboard/cases/rfis/${caseData.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/cases/rfis/${caseData.id}/content`)) return `/dashboard/cases/rfis/${caseData.id}/content`;
+    return location.pathname;
+  };
   const {
     caseRfi: caseData,
     connectorsForExport,
@@ -106,6 +111,11 @@ const RootCaseRfiComponent = ({ queryRef, caseId }) => {
     ) {
       paddingRight = 350;
     }
+    if (
+      location.pathname.includes(`/dashboard/cases/rfis/${caseData.id}/content/mapping`)
+    ) {
+      paddingRight = 0;
+    }
   }
   return (
     <>
@@ -131,13 +141,7 @@ const RootCaseRfiComponent = ({ queryRef, caseId }) => {
             }}
           >
             <Tabs
-              value={
-                location.pathname.includes(
-                  `/dashboard/cases/rfis/${caseData.id}/knowledge`,
-                )
-                  ? `/dashboard/cases/rfis/${caseData.id}/knowledge`
-                  : location.pathname
-              }
+              value={getCurrentTab(caseData)}
             >
               <Tab
                 component={Link}
@@ -207,10 +211,11 @@ const RootCaseRfiComponent = ({ queryRef, caseId }) => {
               }
             />
             <Route
-              path="/content"
+              path="/content/*"
               element={
-                <StixCoreObjectContent
+                <StixCoreObjectContentRoot
                   stixCoreObject={caseData}
+                  isContainer={true}
                 />
               }
             />
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftCreation.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftCreation.tsx
index 0d7f7ca338a62..04ad8935d7af1 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftCreation.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftCreation.tsx
@@ -153,7 +153,7 @@ export const CaseRftCreationForm: FunctionComponent<CaseRftFormProps> = ({
         }
         if (mapAfter) {
           navigate(
-            `/dashboard/cases/rfts/${response.caseRftAdd?.id}/knowledge/content`,
+            `/dashboard/cases/rfts/${response.caseRftAdd?.id}/content/mapping`,
           );
         }
       },
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftKnowledge.jsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftKnowledge.jsx
index 85a57b16c8f28..553ffb079956e 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftKnowledge.jsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftKnowledge.jsx
@@ -262,7 +262,7 @@ class CaseRftKnowledgeComponent extends Component {
           container={caseData}
           PopoverComponent={<CaseRftPopover id={caseData.id}/>}
           link={`/dashboard/cases/rfts/${caseData.id}/knowledge`}
-          modes={['graph', 'content', 'timeline', 'correlation', 'matrix']}
+          modes={['graph', 'timeline', 'correlation', 'matrix']}
           currentMode={mode}
           knowledge={true}
           enableSuggestions={true}
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftKnowledgeGraph.jsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftKnowledgeGraph.jsx
index 872d74efdb48f..2ec198c23d6dd 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftKnowledgeGraph.jsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_rfts/CaseRftKnowledgeGraph.jsx
@@ -1016,7 +1016,6 @@ class CaseRftKnowledgeGraphComponent extends Component {
                 link={`/dashboard/cases/rfts/${caseData.id}/knowledge`}
                 modes={[
                   'graph',
-                  'content',
                   'timeline',
                   'correlation',
                   'matrix',
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfts/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfts/Root.tsx
index 2596a14673087..bcd398a20253d 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_rfts/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_rfts/Root.tsx
@@ -9,11 +9,11 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import ErrorNotFound from '../../../../components/ErrorNotFound';
 import useQueryLoading from '../../../../utils/hooks/useQueryLoading';
 import Loader, { LoaderVariant } from '../../../../components/Loader';
 import ContainerHeader from '../../common/containers/ContainerHeader';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import StixCoreObjectFilesAndHistory from '../../common/stix_core_objects/StixCoreObjectFilesAndHistory';
 import StixCoreObjectHistory from '../../common/stix_core_objects/StixCoreObjectHistory';
 import CaseRft from './CaseRft';
@@ -83,6 +83,11 @@ const RootCaseRftComponent = ({ queryRef, caseId }) => {
   const enableReferences = useIsEnforceReference('Case-Rft') && !useGranted([BYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
+  const getCurrentTab = (caseData) => {
+    if (location.pathname.includes(`/dashboard/cases/rfts/${caseData.id}/knowledge`)) return `/dashboard/cases/rfts/${caseData.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/cases/rfts/${caseData.id}/content`)) return `/dashboard/cases/rfts/${caseData.id}/content`;
+    return location.pathname;
+  };
   const {
     caseRft: caseData,
     connectorsForExport,
@@ -105,6 +110,11 @@ const RootCaseRftComponent = ({ queryRef, caseId }) => {
     ) {
       paddingRight = 350;
     }
+    if (
+      location.pathname.includes(`/dashboard/cases/rfts/${caseData.id}/content/mapping`)
+    ) {
+      paddingRight = 0;
+    }
   }
   return (
     <>
@@ -130,13 +140,7 @@ const RootCaseRftComponent = ({ queryRef, caseId }) => {
             }}
           >
             <Tabs
-              value={
-                location.pathname.includes(
-                  `/dashboard/cases/rfts/${caseData.id}/knowledge`,
-                )
-                  ? `/dashboard/cases/rfts/${caseData.id}/knowledge`
-                  : location.pathname
-              }
+              value={getCurrentTab(caseData)}
             >
               <Tab
                 component={Link}
@@ -200,12 +204,13 @@ const RootCaseRftComponent = ({ queryRef, caseId }) => {
               )}
             />
             <Route
-              path="/content"
-              element={(
-                <StixCoreObjectContent
+              path="/content/*"
+              element={
+                <StixCoreObjectContentRoot
                   stixCoreObject={caseData}
+                  isContainer={true}
                 />
-              )}
+              }
             />
             <Route
               path="/knowledge"
diff --git a/opencti-platform/opencti-front/src/private/components/cases/feedbacks/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/feedbacks/Root.tsx
index e4e816043d37a..01494aaff4bff 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/feedbacks/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/feedbacks/Root.tsx
@@ -10,6 +10,7 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
 import StixCoreRelationship from '@components/common/stix_core_relationships/StixCoreRelationship';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import ErrorNotFound from '../../../../components/ErrorNotFound';
 import useQueryLoading from '../../../../utils/hooks/useQueryLoading';
 import Loader, { LoaderVariant } from '../../../../components/Loader';
@@ -19,7 +20,6 @@ import ContainerHeader from '../../common/containers/ContainerHeader';
 import FileManager from '../../common/files/FileManager';
 import FeedbackPopover from './FeedbackPopover';
 import StixCoreObjectHistory from '../../common/stix_core_objects/StixCoreObjectHistory';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import Feedback from './Feedback';
 import { useFormatter } from '../../../../components/i18n';
 import Breadcrumbs from '../../../../components/Breadcrumbs';
@@ -103,6 +103,11 @@ const RootFeedbackComponent = ({ queryRef, caseId }) => {
   const location = useLocation();
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
+  const getCurrentTab = (feedback) => {
+    if (location.pathname.includes(`/dashboard/incidents/feedbacks/${feedback.id}/knowledge`)) return `/dashboard/incidents/feedbacks/${feedback.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/incidents/feedbacks/${feedback.id}/content`)) return `/dashboard/incidents/feedbacks/${feedback.id}/content`;
+    return location.pathname;
+  };
   const {
     feedback: feedbackData,
     connectorsForExport,
@@ -117,6 +122,13 @@ const RootFeedbackComponent = ({ queryRef, caseId }) => {
     ) {
       paddingRight = 350;
     }
+    if (
+      location.pathname.includes(
+        `/dashboard/cases/feedbacks/${feedbackData.id}/content/mapping`,
+      )
+    ) {
+      paddingRight = 0;
+    }
   }
   const canManage = feedbackData?.currentUserAccessRight === 'admin';
   return (
@@ -146,13 +158,7 @@ const RootFeedbackComponent = ({ queryRef, caseId }) => {
             }}
           >
             <Tabs
-              value={
-                location.pathname.includes(
-                  `/dashboard/cases/feedbacks/${feedbackData.id}/knowledge`,
-                )
-                  ? `/dashboard/cases/feedbacks/${feedbackData.id}/knowledge`
-                  : location.pathname
-              }
+              value={getCurrentTab(feedbackData)}
             >
               <Tab
                 component={Link}
@@ -189,10 +195,11 @@ const RootFeedbackComponent = ({ queryRef, caseId }) => {
                 />}
             />
             <Route
-              path="/content"
+              path="/content/*"
               element={
-                <StixCoreObjectContent
+                <StixCoreObjectContentRoot
                   stixCoreObject={feedbackData}
+                  isContainer={true}
                 />
               }
             />
diff --git a/opencti-platform/opencti-front/src/private/components/cases/tasks/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/tasks/Root.tsx
index aee4b59ade5cb..d7faeace7ae15 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/tasks/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/tasks/Root.tsx
@@ -9,11 +9,11 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import ErrorNotFound from '../../../../components/ErrorNotFound';
 import useQueryLoading from '../../../../utils/hooks/useQueryLoading';
 import Loader, { LoaderVariant } from '../../../../components/Loader';
 import ContainerHeader from '../../common/containers/ContainerHeader';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import StixCoreObjectFilesAndHistory from '../../common/stix_core_objects/StixCoreObjectFilesAndHistory';
 import StixCoreObjectHistory from '../../common/stix_core_objects/StixCoreObjectHistory';
 import CaseTask from './Task';
@@ -71,6 +71,11 @@ const RootTaskComponent = ({ queryRef, taskId }) => {
   const location = useLocation();
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
+  const getCurrentTab = (task) => {
+    if (location.pathname.includes(`/dashboard/cases/tasks/${task.id}/knowledge`)) return `/dashboard/cases/tasks/${task.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/cases/tasks/${task.id}/content`)) return `/dashboard/cases/tasks/${task.id}/content`;
+    return location.pathname;
+  };
   const {
     task: data,
     connectorsForExport,
@@ -83,6 +88,11 @@ const RootTaskComponent = ({ queryRef, taskId }) => {
     ) {
       paddingRight = 350;
     }
+    if (
+      location.pathname.includes(`/dashboard/cases/tasks/${data.id}/content/mapping`)
+    ) {
+      paddingRight = 0;
+    }
   }
   return (
     <>
@@ -107,13 +117,7 @@ const RootTaskComponent = ({ queryRef, taskId }) => {
             }}
           >
             <Tabs
-              value={
-                location.pathname.includes(
-                  `/dashboard/cases/tasks/${data.id}/knowledge`,
-                )
-                  ? `/dashboard/cases/tasks/${data.id}/knowledge`
-                  : location.pathname
-              }
+              value={getCurrentTab(data)}
             >
               <Tab
                 component={Link}
@@ -147,9 +151,11 @@ const RootTaskComponent = ({ queryRef, taskId }) => {
               element={<CaseTask data={data} />}
             />
             <Route
-              path="/content"
+              path="/content/*"
               element={
-                <StixCoreObjectContent stixCoreObject={data} />
+                <StixCoreObjectContentRoot
+                  stixCoreObject={data}
+                />
               }
             />
             <Route
diff --git a/opencti-platform/opencti-front/src/private/components/common/containers/ContainerHeader.jsx b/opencti-platform/opencti-front/src/private/components/common/containers/ContainerHeader.jsx
index ff100606d317f..866ea4052f131 100644
--- a/opencti-platform/opencti-front/src/private/components/common/containers/ContainerHeader.jsx
+++ b/opencti-platform/opencti-front/src/private/components/common/containers/ContainerHeader.jsx
@@ -4,7 +4,7 @@ import Typography from '@mui/material/Typography';
 import { Link } from 'react-router-dom';
 import Tooltip from '@mui/material/Tooltip';
 import { ChartTimeline, VectorLink, VectorPolygon } from 'mdi-material-ui';
-import { AddTaskOutlined, AssistantOutlined, DifferenceOutlined, ViewColumnOutlined } from '@mui/icons-material';
+import { AddTaskOutlined, AssistantOutlined, ViewColumnOutlined } from '@mui/icons-material';
 import ToggleButton from '@mui/material/ToggleButton';
 import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
 import { DialogTitle } from '@mui/material';
@@ -814,20 +814,6 @@ const ContainerHeader = (props) => {
                   </ToggleButton>
                 </Tooltip>
               )}
-              {modes.includes('content') && (
-                <Tooltip title={t_i18n('Content mapping view')}>
-                  <ToggleButton
-                    component={Link}
-                    to={`${link}/content`}
-                    selected={currentMode === 'content'}
-                  >
-                    <DifferenceOutlined
-                      fontSize="small"
-                      color={currentMode === 'content' ? 'primary' : 'inherit'}
-                    />
-                  </ToggleButton>
-                </Tooltip>
-              )}
               {modes.includes('timeline') && (
                 <Tooltip title={t_i18n('TimeLine view')}>
                   <ToggleButton
diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectContentHeader.tsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectContentHeader.tsx
new file mode 100644
index 0000000000000..41b0d70b2c98e
--- /dev/null
+++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectContentHeader.tsx
@@ -0,0 +1,63 @@
+import React, { FunctionComponent } from 'react';
+import Tooltip from '@mui/material/Tooltip';
+import ToggleButton from '@mui/material/ToggleButton';
+import { Link } from 'react-router-dom';
+import { DifferenceOutlined } from '@mui/icons-material';
+import { VectorPolygon } from 'mdi-material-ui';
+import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
+import { useFormatter } from '../../../../components/i18n';
+
+interface StixCoreObjectContentHeaderProps {
+  currentMode?: string;
+  modes: string[];
+}
+
+const StixCoreObjectContentHeader: FunctionComponent<StixCoreObjectContentHeaderProps> = ({
+  currentMode,
+  modes,
+}) => {
+  const { t_i18n } = useFormatter();
+
+  return (
+    <div style={{
+      margin: '-75px 0 0 0',
+      float: 'right',
+    }}
+    >
+      <ToggleButtonGroup size="small" exclusive={true}>
+        {modes.includes('content') && (
+        <Tooltip title={t_i18n('Content view')}>
+          <ToggleButton
+            component={Link}
+            to=''
+            selected={currentMode === 'content'}
+            value={'content'}
+          >
+            <VectorPolygon
+              fontSize="small"
+              color={currentMode === 'mapping' ? 'inherit' : 'primary'}
+            />
+          </ToggleButton>
+        </Tooltip>
+        )}
+        {modes.includes('mapping') && (
+        <Tooltip title={t_i18n('Content mapping view')}>
+          <ToggleButton
+            component={Link}
+            to='mapping'
+            selected={currentMode === 'mapping'}
+            value={'mapping'}
+          >
+            <DifferenceOutlined
+              fontSize="small"
+              color={currentMode === 'mapping' ? 'primary' : 'inherit'}
+            />
+          </ToggleButton>
+        </Tooltip>
+        )}
+      </ToggleButtonGroup>
+    </div>
+  );
+};
+
+export default StixCoreObjectContentHeader;
diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectContentRoot.tsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectContentRoot.tsx
new file mode 100644
index 0000000000000..81bd6b60039f4
--- /dev/null
+++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectContentRoot.tsx
@@ -0,0 +1,46 @@
+import React, { FunctionComponent } from 'react';
+import StixCoreObjectContentHeader from '@components/common/stix_core_objects/StixCoreObjectContentHeader';
+import { Route, Routes, useLocation } from 'react-router-dom';
+
+import ContainerContent from '@components/common/containers/ContainerContent';
+import StixCoreObjectContent from '@components/common/stix_core_objects/StixCoreObjectContent';
+
+interface StixCoreObjectContentRootProps {
+  stixCoreObject: unknown;
+  isContainer?: boolean;
+}
+
+const StixCoreObjectContentRoot: FunctionComponent<StixCoreObjectContentRootProps> = ({
+  stixCoreObject, isContainer = false,
+}) => {
+  const { pathname } = useLocation();
+  const currentMode = pathname.endsWith('/mapping') ? 'mapping' : 'content';
+  const modes = isContainer ? ['content', 'mapping'] : [];
+  return (
+    <>
+      <StixCoreObjectContentHeader
+        currentMode={currentMode}
+        modes={modes}
+      />
+      <Routes>
+        <Route
+          path="/mapping"
+          element={
+            <ContainerContent
+              containerData={stixCoreObject}
+            />
+          }
+        />
+        <Route
+          path="/"
+          element={
+            <StixCoreObjectContent
+              stixCoreObject={stixCoreObject}
+            />}
+        />
+      </Routes>
+    </>
+  );
+};
+
+export default StixCoreObjectContentRoot;
diff --git a/opencti-platform/opencti-front/src/private/components/entities/events/Root.jsx b/opencti-platform/opencti-front/src/private/components/entities/events/Root.jsx
index 1afe464c5ad5e..6a865137ded20 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/events/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/events/Root.jsx
@@ -6,7 +6,7 @@ import * as R from 'ramda';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import Event from './Event';
@@ -85,6 +85,13 @@ class RootEvent extends Component {
       params: { eventId },
     } = this.props;
     const link = `/dashboard/entities/events/${eventId}/knowledge`;
+
+    const getCurrentTab = (event) => {
+      if (location.pathname.includes(`/dashboard/entities/events/${event.id}/knowledge`)) return `/dashboard/entities/events/${event.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/entities/events/${event.id}/content`)) return `/dashboard/entities/events/${event.id}/content`;
+      return location.pathname;
+    };
+
     return (
       <>
         <Routes>
@@ -130,6 +137,13 @@ class RootEvent extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/entities/events/${event.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -152,13 +166,7 @@ class RootEvent extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/entities/events/${event.id}/knowledge`,
-                          )
-                            ? `/dashboard/entities/events/${event.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(event)}
                       >
                         <Tab
                           component={Link}
@@ -227,12 +235,12 @@ class RootEvent extends Component {
                         }
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={event}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/entities/individuals/Root.jsx b/opencti-platform/opencti-front/src/private/components/entities/individuals/Root.jsx
index 4ce6136ad2e8c..80cd9d7ee5125 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/individuals/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/individuals/Root.jsx
@@ -7,7 +7,7 @@ import * as R from 'ramda';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import Individual from './Individual';
@@ -117,6 +117,13 @@ class RootIndividual extends Component {
     } = this.props;
     const { viewAs } = this.state;
     const link = `/dashboard/entities/individuals/${individualId}/knowledge`;
+
+    const getCurrentTab = (individual) => {
+      if (location.pathname.includes(`/dashboard/entities/individuals/${individual.id}/knowledge`)) return `/dashboard/entities/individuals/${individual.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/entities/individuals/${individual.id}/content`)) return `/dashboard/entities/individuals/${individual.id}/content`;
+      return location.pathname;
+    };
+
     return (
       <>
         <Routes>
@@ -164,6 +171,13 @@ class RootIndividual extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/entities/individuals/${individual.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -190,13 +204,7 @@ class RootIndividual extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/entities/individuals/${individual.id}/knowledge`,
-                          )
-                            ? `/dashboard/entities/individuals/${individual.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(individual)}
                       >
                         <Tab
                           component={Link}
@@ -271,12 +279,12 @@ class RootIndividual extends Component {
                         }
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={individual}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/entities/organizations/Root.jsx b/opencti-platform/opencti-front/src/private/components/entities/organizations/Root.jsx
index 3ee87da3acb9e..fae3c48cefca8 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/organizations/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/organizations/Root.jsx
@@ -7,7 +7,7 @@ import * as R from 'ramda';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import Organization from './Organization';
@@ -116,6 +116,13 @@ class RootOrganization extends Component {
     } = this.props;
     const { viewAs } = this.state;
     const link = `/dashboard/entities/organizations/${organizationId}/knowledge`;
+
+    const getCurrentTab = (organization) => {
+      if (location.pathname.includes(`/dashboard/entities/organizations/${organization.id}/knowledge`)) return `/dashboard/entities/organizations/${organization.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/entities/organizations/${organization.id}/content`)) return `/dashboard/entities/organizations/${organization.id}/content`;
+      return location.pathname;
+    };
+
     return (
       <>
         <Routes>
@@ -167,6 +174,13 @@ class RootOrganization extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/entities/organizations/${organization.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -193,13 +207,7 @@ class RootOrganization extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/entities/organizations/${organization.id}/knowledge`,
-                          )
-                            ? `/dashboard/entities/organizations/${organization.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(organization)}
                       >
                         <Tab
                           component={Link}
@@ -274,12 +282,12 @@ class RootOrganization extends Component {
                         }
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={organization}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/entities/sectors/Root.jsx b/opencti-platform/opencti-front/src/private/components/entities/sectors/Root.jsx
index 368fbffa3a3e7..10f9ea23436b3 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/sectors/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/sectors/Root.jsx
@@ -6,7 +6,7 @@ import * as R from 'ramda';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import Sector from './Sector';
@@ -87,6 +87,13 @@ class RootSector extends Component {
       params: { sectorId },
     } = this.props;
     const link = `/dashboard/entities/sectors/${sectorId}/knowledge`;
+
+    const getCurrentTab = (sector) => {
+      if (location.pathname.includes(`/dashboard/entities/sectors/${sector.id}/knowledge`)) return `/dashboard/entities/sectors/${sector.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/entities/sectors/${sector.id}/content`)) return `/dashboard/entities/sectors/${sector.id}/content`;
+      return location.pathname;
+    };
+
     return (
       <>
         <Routes>
@@ -130,6 +137,13 @@ class RootSector extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/entities/sectors/${sector.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -154,13 +168,7 @@ class RootSector extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/entities/sectors/${sector.id}/knowledge`,
-                          )
-                            ? `/dashboard/entities/sectors/${sector.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(sector)}
                       >
                         <Tab
                           component={Link}
@@ -229,12 +237,12 @@ class RootSector extends Component {
                         )}
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={sector}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/entities/systems/Root.jsx b/opencti-platform/opencti-front/src/private/components/entities/systems/Root.jsx
index 07bb39bb01131..7301284dd9f37 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/systems/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/systems/Root.jsx
@@ -7,7 +7,7 @@ import * as R from 'ramda';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import System from './System';
@@ -115,6 +115,13 @@ class RootSystem extends Component {
     } = this.props;
     const { viewAs } = this.state;
     const link = `/dashboard/entities/systems/${systemId}/knowledge`;
+
+    const getCurrentTab = (system) => {
+      if (location.pathname.includes(`/dashboard/entities/systems/${system.id}/knowledge`)) return `/dashboard/entities/systems/${system.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/entities/systems/${system.id}/content`)) return `/dashboard/entities/systems/${system.id}/content`;
+      return location.pathname;
+    };
+
     return (
       <>
         <Routes>
@@ -161,6 +168,13 @@ class RootSystem extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/entities/systems/${system.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -187,13 +201,7 @@ class RootSystem extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/entities/systems/${system.id}/knowledge`,
-                          )
-                            ? `/dashboard/entities/systems/${system.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(system)}
                       >
                         <Tab
                           component={Link}
@@ -268,12 +276,12 @@ class RootSystem extends Component {
                         }
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={system}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses/*"
diff --git a/opencti-platform/opencti-front/src/private/components/events/incidents/Root.tsx b/opencti-platform/opencti-front/src/private/components/events/incidents/Root.tsx
index c17c12d739a4f..f0742d34038d5 100644
--- a/opencti-platform/opencti-front/src/private/components/events/incidents/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/events/incidents/Root.tsx
@@ -9,6 +9,7 @@ import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
 import StixCoreObjectSimulationResult from '@components/common/stix_core_objects/StixCoreObjectSimulationResult';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import Incident from './Incident';
 import IncidentKnowledge from './IncidentKnowledge';
 import StixDomainObjectHeader from '../../common/stix_domain_objects/StixDomainObjectHeader';
@@ -19,9 +20,7 @@ import StixCoreObjectHistory from '../../common/stix_core_objects/StixCoreObject
 import StixCoreObjectOrStixCoreRelationshipContainers from '../../common/containers/StixCoreObjectOrStixCoreRelationshipContainers';
 import ErrorNotFound from '../../../../components/ErrorNotFound';
 import StixCoreObjectKnowledgeBar from '../../common/stix_core_objects/StixCoreObjectKnowledgeBar';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import useQueryLoading from '../../../../utils/hooks/useQueryLoading';
-
 import { RootIncidentQuery } from './__generated__/RootIncidentQuery.graphql';
 import { RootIncidentSubscription } from './__generated__/RootIncidentSubscription.graphql';
 import { useFormatter } from '../../../../components/i18n';
@@ -80,12 +79,18 @@ const RootIncidentComponent = ({ queryRef }) => {
   const location = useLocation();
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
+  const getCurrentTab = (incident) => {
+    if (location.pathname.includes(`/dashboard/events/incidents/${incident.id}/knowledge`)) return `/dashboard/events/incidents/${incident.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/events/incidents/${incident.id}/content`)) return `/dashboard/events/incidents/${incident.id}/content`;
+    return location.pathname;
+  };
   const data = usePreloadedQuery(incidentQuery, queryRef);
   const { incident, connectorsForImport, connectorsForExport } = data;
   const isOverview = location.pathname === `/dashboard/events/incidents/${incident?.id}`;
   const paddingRightValue = () => {
     if (location.pathname.includes(`/dashboard/events/incidents/${incident.id}/knowledge`)) return 200;
     if (location.pathname.includes(`/dashboard/events/incidents/${incident.id}/content`)) return 350;
+    if (location.pathname.includes(`/dashboard/events/incidents/${incident.id}/content/mapping`)) return 0;
     return 0;
   };
   return (
@@ -110,13 +115,7 @@ const RootIncidentComponent = ({ queryRef }) => {
             sx={{ borderBottom: 1, borderColor: 'divider', marginBottom: 4 }}
           >
             <Tabs
-              value={
-                location.pathname.includes(
-                  `/dashboard/events/incidents/${incident.id}/knowledge`,
-                )
-                  ? `/dashboard/events/incidents/${incident.id}/knowledge`
-                  : location.pathname
-              }
+              value={getCurrentTab(incident)}
             >
               <Tab
                 component={Link}
@@ -178,12 +177,12 @@ const RootIncidentComponent = ({ queryRef }) => {
               element={<IncidentKnowledge incidentData={incident} />}
             />
             <Route
-              path="/content"
-              element={(
-                <StixCoreObjectContent
+              path="/content/*"
+              element={
+                <StixCoreObjectContentRoot
                   stixCoreObject={incident}
                 />
-              )}
+              }
             />
             <Route
               path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/locations/administrative_areas/Root.tsx b/opencti-platform/opencti-front/src/private/components/locations/administrative_areas/Root.tsx
index fcc1cb647aa8b..dfe13baf2e934 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/administrative_areas/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/administrative_areas/Root.tsx
@@ -8,7 +8,7 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import AdministrativeArea from './AdministrativeArea';
 import AdministrativeAreaKnowledge from './AdministrativeAreaKnowledge';
 import StixDomainObjectHeader from '../../common/stix_domain_objects/StixDomainObjectHeader';
@@ -193,18 +193,18 @@ const RootAdministrativeAreaComponent = ({
               }
             />
             <Route
-              path="/knowledge/*"
+              path="/content/*"
               element={
-                <AdministrativeAreaKnowledge administrativeAreaData={administrativeArea} />
+                <StixCoreObjectContentRoot
+                  stixCoreObject={administrativeArea}
+                />
               }
             />
             <Route
-              path="/content"
-              element={(
-                <StixCoreObjectContent
-                  stixCoreObject={administrativeArea}
-                />
-              )}
+              path="/knowledge/*"
+              element={
+                <AdministrativeAreaKnowledge administrativeAreaData={administrativeArea} />
+              }
             />
             <Route
               path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/locations/cities/Root.tsx b/opencti-platform/opencti-front/src/private/components/locations/cities/Root.tsx
index 99e03bcd9a625..14f43bee35c4c 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/cities/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/cities/Root.tsx
@@ -8,7 +8,7 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import City from './City';
 import CityKnowledge from './CityKnowledge';
 import StixDomainObjectHeader from '../../common/stix_domain_objects/StixDomainObjectHeader';
@@ -78,6 +78,13 @@ const RootCityComponent = ({ queryRef, cityId, link }) => {
   const { t_i18n } = useFormatter();
   const data = usePreloadedQuery(cityQuery, queryRef);
   const { city, connectorsForImport, connectorsForExport } = data;
+
+  const getCurrentTab = () => {
+    if (location.pathname.includes(`/dashboard/locations/cities/${city.id}/knowledge`)) return `/dashboard/locations/cities/${city.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/locations/cities/${city.id}/content`)) return `/dashboard/locations/cities/${city.id}/content`;
+    return location.pathname;
+  };
+
   let paddingRight = 0;
   if (
     location.pathname.includes(
@@ -93,6 +100,13 @@ const RootCityComponent = ({ queryRef, cityId, link }) => {
   ) {
     paddingRight = 350;
   }
+  if (
+    location.pathname.includes(
+      `/dashboard/locations/cities/${city.id}/content/mapping`,
+    )
+  ) {
+    paddingRight = 0;
+  }
   return (
     <>
       {city ? (
@@ -119,13 +133,7 @@ const RootCityComponent = ({ queryRef, cityId, link }) => {
             }}
           >
             <Tabs
-              value={
-                location.pathname.includes(
-                  `/dashboard/locations/cities/${city.id}/knowledge`,
-                )
-                  ? `/dashboard/locations/cities/${city.id}/knowledge`
-                  : location.pathname
-              }
+              value={getCurrentTab()}
             >
               <Tab
                 component={Link}
@@ -187,12 +195,12 @@ const RootCityComponent = ({ queryRef, cityId, link }) => {
               element={<CityKnowledge cityData={city} />}
             />
             <Route
-              path="/content"
-              element={(
-                <StixCoreObjectContent
+              path="/content/*"
+              element={
+                <StixCoreObjectContentRoot
                   stixCoreObject={city}
                 />
-              )}
+              }
             />
             <Route
               path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/locations/countries/Root.tsx b/opencti-platform/opencti-front/src/private/components/locations/countries/Root.tsx
index ef831c679508f..8262b623f1e3c 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/countries/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/countries/Root.tsx
@@ -8,7 +8,7 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import Country from './Country';
 import CountryKnowledge from './CountryKnowledge';
 import StixDomainObjectHeader from '../../common/stix_domain_objects/StixDomainObjectHeader';
@@ -77,9 +77,15 @@ const RootCountryComponent = ({ queryRef, countryId, link }) => {
   );
   useSubscription(subConfig);
   const location = useLocation();
+  const getCurrentTab = (country) => {
+    if (location.pathname.includes(`/dashboard/locations/countries/${country.id}/knowledge`)) return `/dashboard/locations/countries/${country.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/locations/countries/${country.id}/content`)) return `/dashboard/locations/countries/${country.id}/content`;
+    return location.pathname;
+  };
   const { t_i18n } = useFormatter();
   const data = usePreloadedQuery(countryQuery, queryRef);
   const { country, connectorsForImport, connectorsForExport } = data;
+
   let paddingRight = 0;
   if (
     location.pathname.includes(
@@ -95,6 +101,13 @@ const RootCountryComponent = ({ queryRef, countryId, link }) => {
   ) {
     paddingRight = 350;
   }
+  if (
+    location.pathname.includes(
+      `/dashboard/locations/countries/${country.id}/content/mapping`,
+    )
+  ) {
+    paddingRight = 0;
+  }
   return (
     <>
       {country ? (
@@ -121,13 +134,7 @@ const RootCountryComponent = ({ queryRef, countryId, link }) => {
             }}
           >
             <Tabs
-              value={
-                location.pathname.includes(
-                  `/dashboard/locations/countries/${country.id}/knowledge`,
-                )
-                  ? `/dashboard/locations/countries/${country.id}/knowledge`
-                  : location.pathname
-              }
+              value={getCurrentTab(country)}
             >
               <Tab
                 component={Link}
@@ -189,12 +196,12 @@ const RootCountryComponent = ({ queryRef, countryId, link }) => {
               element={<CountryKnowledge countryData={country} />}
             />
             <Route
-              path="/content"
-              element={(
-                <StixCoreObjectContent
+              path="/content/*"
+              element={
+                <StixCoreObjectContentRoot
                   stixCoreObject={country}
                 />
-              )}
+              }
             />
             <Route
               path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/locations/positions/Root.jsx b/opencti-platform/opencti-front/src/private/components/locations/positions/Root.jsx
index 6a059a674e4c2..cc3e3214990a1 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/positions/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/positions/Root.jsx
@@ -6,7 +6,7 @@ import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
 import * as R from 'ramda';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import Position from './Position';
@@ -85,6 +85,13 @@ class RootPosition extends Component {
       params: { positionId },
     } = this.props;
     const link = `/dashboard/locations/positions/${positionId}/knowledge`;
+
+    const getCurrentTab = (position) => {
+      if (location.pathname.includes(`/dashboard/locations/positions/${position.id}/knowledge`)) return `/dashboard/locations/positions/${position.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/locations/positions/${position.id}/content`)) return `/dashboard/locations/positions/${position.id}/content`;
+      return location.pathname;
+    };
+
     return (
       <>
         <Routes>
@@ -134,6 +141,13 @@ class RootPosition extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/locations/positions/${position.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -158,13 +172,7 @@ class RootPosition extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/locations/positions/${position.id}/knowledge`,
-                          )
-                            ? `/dashboard/locations/positions/${position.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(position)}
                       >
                         <Tab
                           component={Link}
@@ -230,12 +238,12 @@ class RootPosition extends Component {
                         }
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={position}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/locations/regions/Root.tsx b/opencti-platform/opencti-front/src/private/components/locations/regions/Root.tsx
index 05f155280c166..739dbdacb3c6b 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/regions/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/regions/Root.tsx
@@ -9,7 +9,7 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import Region from './Region';
 import RegionKnowledge from './RegionKnowledge';
 import StixDomainObjectHeader from '../../common/stix_domain_objects/StixDomainObjectHeader';
@@ -81,10 +81,17 @@ const RootRegionComponent = ({ queryRef, regionId, link }) => {
   const { t_i18n } = useFormatter();
   const data = usePreloadedQuery(regionQuery, queryRef);
   const { region, connectorsForImport, connectorsForExport } = data;
+
+  const getCurrentTab = () => {
+    if (location.pathname.includes(`/dashboard/locations/regions/${region.id}/knowledge`)) return `/dashboard/locations/regions/${region.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/locations/regions/${region.id}/content`)) return `/dashboard/locations/regions/${region.id}/content`;
+    return location.pathname;
+  };
+
   let paddingRight = 0;
   if (
     location.pathname.includes(
-      `/dashboard/locations/regions/${region.id}/knowledge`,
+      'c',
     )
   ) {
     paddingRight = 200;
@@ -96,6 +103,13 @@ const RootRegionComponent = ({ queryRef, regionId, link }) => {
   ) {
     paddingRight = 350;
   }
+  if (
+    location.pathname.includes(
+      `/dashboard/locations/regions/${region.id}/content/mapping`,
+    )
+  ) {
+    paddingRight = 0;
+  }
   return (
     <>
       {region ? (
@@ -122,13 +136,7 @@ const RootRegionComponent = ({ queryRef, regionId, link }) => {
             }}
           >
             <Tabs
-              value={
-                location.pathname.includes(
-                  `/dashboard/locations/regions/${region.id}/knowledge`,
-                )
-                  ? `/dashboard/locations/regions/${region.id}/knowledge`
-                  : location.pathname
-              }
+              value={getCurrentTab()}
             >
               <Tab
                 component={Link}
@@ -190,12 +198,12 @@ const RootRegionComponent = ({ queryRef, regionId, link }) => {
               element={<RegionKnowledge regionData={region} />}
             />
             <Route
-              path="/content"
-              element={(
-                <StixCoreObjectContent
+              path="/content/*"
+              element={
+                <StixCoreObjectContentRoot
                   stixCoreObject={region}
                 />
-              )}
+              }
             />
             <Route
               path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/observations/artifacts/Root.jsx b/opencti-platform/opencti-front/src/private/components/observations/artifacts/Root.jsx
index 9667ca431c752..78b484e36a26e 100644
--- a/opencti-platform/opencti-front/src/private/components/observations/artifacts/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/observations/artifacts/Root.jsx
@@ -6,7 +6,7 @@ import * as R from 'ramda';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import StixCoreRelationship from '../../common/stix_core_relationships/StixCoreRelationship';
@@ -85,6 +85,11 @@ class RootArtifact extends Component {
       location,
       params: { observableId },
     } = this.props;
+    const getCurrentTab = (observable) => {
+      if (location.pathname.includes(`/dashboard/observations/artifacts/${observable.id}/knowledge`)) return `/dashboard/observations/artifacts/${observable.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/observations/artifacts/${observable.id}/content`)) return `/dashboard/observations/artifacts/${observable.id}/content`;
+      return location.pathname;
+    };
     const link = `/dashboard/observations/artifacts/${observableId}/knowledge`;
     return (
       <>
@@ -95,8 +100,23 @@ class RootArtifact extends Component {
             if (props) {
               if (props.stixCyberObservable) {
                 const { stixCyberObservable } = props;
+                let paddingRight = 0;
+                if (
+                  location.pathname.includes(
+                    `/dashboard/observations/artifacts/${stixCyberObservable.id}/content`,
+                  )
+                ) {
+                  paddingRight = 350;
+                }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/observations/artifacts/${stixCyberObservable.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
-                  <>
+                  <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
                       { label: t('Observations') },
                       { label: t('Artifacts'), link: '/dashboard/observations/artifacts' },
@@ -115,13 +135,7 @@ class RootArtifact extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/observations/artifacts/${stixCyberObservable.id}/knowledge`,
-                          )
-                            ? `/dashboard/observations/artifacts/${stixCyberObservable.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(stixCyberObservable)}
                       >
                         <Tab
                           component={Link}
@@ -174,7 +188,7 @@ class RootArtifact extends Component {
                           <StixCyberObservable
                             stixCyberObservable={stixCyberObservable}
                           />
-                        )}
+                                )}
                       />
                       <Route
                         path="/knowledge"
@@ -183,15 +197,15 @@ class RootArtifact extends Component {
                             stixCyberObservable={stixCyberObservable}
                             connectorsForImport={props.connectorsForImport}
                           />
-                        }
+                                }
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={stixCyberObservable}
                           />
-                        )}
+                                }
                       />
                       <Route
                         path="/sightings"
@@ -212,7 +226,7 @@ class RootArtifact extends Component {
                               'System',
                             ]}
                           />
-                        )}
+                                )}
                       />
                       <Route
                         path="/files"
@@ -225,7 +239,7 @@ class RootArtifact extends Component {
                             isArtifact={true}
                             directDownload={true}
                           />
-                        )}
+                                )}
                       />
                       <Route
                         path="/history"
@@ -233,7 +247,7 @@ class RootArtifact extends Component {
                           <StixCoreObjectHistory
                             stixCoreObjectId={observableId}
                           />
-                        )}
+                                )}
                       />
                       <Route
                         path="/knowledge/relations/:relationId"
@@ -241,7 +255,7 @@ class RootArtifact extends Component {
                           <StixCoreRelationship
                             entityId={observableId}
                           />
-                        )}
+                                )}
                       />
                       <Route
                         path="/knowledge/sightings/:sightingId"
@@ -250,10 +264,10 @@ class RootArtifact extends Component {
                             entityId={observableId}
                             paddingRight
                           />
-                        )}
+                                )}
                       />
                     </Routes>
-                  </>
+                  </div>
                 );
               }
               return <ErrorNotFound />;
diff --git a/opencti-platform/opencti-front/src/private/components/observations/indicators/Root.jsx b/opencti-platform/opencti-front/src/private/components/observations/indicators/Root.jsx
index 2e5fe29d90845..6df7e043e2ef6 100644
--- a/opencti-platform/opencti-front/src/private/components/observations/indicators/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/observations/indicators/Root.jsx
@@ -6,7 +6,7 @@ import * as R from 'ramda';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import StixCoreRelationship from '../../common/stix_core_relationships/StixCoreRelationship';
 import Indicator from './Indicator';
@@ -86,6 +86,11 @@ class RootIndicator extends Component {
       location,
       params: { indicatorId },
     } = this.props;
+    const getCurrentTab = (indicator) => {
+      if (location.pathname.includes(`/dashboard/observations/indicators/${indicator.id}/knowledge`)) return `/dashboard/observations/indicators/${indicator.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/observations/indicators/${indicator.id}/content`)) return `/dashboard/observations/indicators/${indicator.id}/content`;
+      return location.pathname;
+    };
     return (
       <>
         <QueryRenderer
@@ -95,8 +100,23 @@ class RootIndicator extends Component {
             if (props) {
               if (props.indicator) {
                 const { indicator } = props;
+                let paddingRight = 0;
+                if (
+                  location.pathname.includes(
+                    `/dashboard/observations/indicators/${indicator.id}/content`,
+                  )
+                ) {
+                  paddingRight = 350;
+                }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/observations/indicators/${indicator.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
-                  <>
+                  <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
                       { label: t('Observations') },
                       { label: t('Indicators'), link: '/dashboard/observations/indicators' },
@@ -106,7 +126,7 @@ class RootIndicator extends Component {
                     <StixDomainObjectHeader
                       entityType="Indicator"
                       stixDomainObject={indicator}
-                      PopoverComponent={<IndicatorPopover />}
+                      PopoverComponent={<IndicatorPopover/>}
                       noAliases={true}
                     />
                     <Box
@@ -117,13 +137,7 @@ class RootIndicator extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/observations/indicators/${indicator.id}/knowledge`,
-                          )
-                            ? `/dashboard/observations/indicators/${indicator.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(indicator)}
                       >
                         <Tab
                           component={Link}
@@ -172,15 +186,15 @@ class RootIndicator extends Component {
                     <Routes>
                       <Route
                         path="/"
-                        element={(<Indicator indicator={indicator} />)}
+                        element={(<Indicator indicator={indicator}/>)}
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={indicator}
                           />
-                        )}
+                                }
                       />
                       <Route
                         path="/analyses"
@@ -188,7 +202,7 @@ class RootIndicator extends Component {
                           <StixCoreObjectOrStixCoreRelationshipContainers
                             stixDomainObjectOrStixCoreRelationship={indicator}
                           />
-                        )}
+                                )}
                       />
                       <Route
                         path="/sightings"
@@ -206,7 +220,7 @@ class RootIndicator extends Component {
                               'System',
                             ]}
                           />
-                        )}
+                                )}
                       />
                       <Route
                         path="/files"
@@ -217,7 +231,7 @@ class RootIndicator extends Component {
                             connectorsExport={props.connectorsForExport}
                             entity={props.indicator}
                           />
-                        )}
+                                )}
                       />
                       <Route
                         path="/history"
@@ -225,7 +239,7 @@ class RootIndicator extends Component {
                           <StixCoreObjectHistory
                             stixCoreObjectId={indicatorId}
                           />
-                        )}
+                                )}
                       />
                       <Route
                         path="/knowledge"
@@ -233,7 +247,7 @@ class RootIndicator extends Component {
                           <IndicatorEntities
                             indicatorId={indicatorId}
                           />
-                        )}
+                                )}
                       />
                       <Route
                         path="/knowledge/relations/:relationId"
@@ -241,18 +255,18 @@ class RootIndicator extends Component {
                           <StixCoreRelationship
                             entityId={indicatorId}
                           />
-                        )}
+                                )}
                       />
                       <Route
                         path="/knowledge/sightings/:sightingId"
-                        element={ (
+                        element={(
                           <StixSightingRelationship
                             entityId={indicatorId}
                           />
-                        )}
+                                )}
                       />
                     </Routes>
-                  </>
+                  </div>
                 );
               }
               return <ErrorNotFound />;
diff --git a/opencti-platform/opencti-front/src/private/components/observations/infrastructures/Root.tsx b/opencti-platform/opencti-front/src/private/components/observations/infrastructures/Root.tsx
index 88c010fcb7e03..fa97c1e32f8b7 100644
--- a/opencti-platform/opencti-front/src/private/components/observations/infrastructures/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/observations/infrastructures/Root.tsx
@@ -9,9 +9,9 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import InfrastructureKnowledge from './InfrastructureKnowledge';
 import StixDomainObjectHeader from '../../common/stix_domain_objects/StixDomainObjectHeader';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import FileManager from '../../common/files/FileManager';
 import InfrastructurePopover from './InfrastructurePopover';
 import Loader, { LoaderVariant } from '../../../../components/Loader';
@@ -76,19 +76,24 @@ const RootInfrastructureComponent = ({ queryRef, infrastructureId }) => {
   const location = useLocation();
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
+  const getCurrentTab = (infrastructure) => {
+    if (location.pathname.includes(`/dashboard/observations/infrastructures/${infrastructure.id}/knowledge`)) return `/dashboard/observations/infrastructures/${infrastructure.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/observations/infrastructures/${infrastructure.id}/content`)) return `/dashboard/observations/infrastructures/${infrastructure.id}/content`;
+    return location.pathname;
+  };
   const data = usePreloadedQuery(infrastructureQuery, queryRef);
   const { infrastructure, connectorsForImport, connectorsForExport } = data;
+  const paddingRightValue = () => {
+    if (location.pathname.includes(`/dashboard/observations/infrastructures/${infrastructure.id}/knowledge`)) return 200;
+    if (location.pathname.includes(`/dashboard/observations/infrastructures/${infrastructure.id}/content`)) return 350;
+    if (location.pathname.includes(`/dashboard/observations/infrastructures/${infrastructure.id}/content/mapping`)) return 0;
+    return 0;
+  };
   return (
     <>
       {infrastructure ? (
         <div
-          style={{
-            paddingRight: location.pathname.includes(
-              `/dashboard/observations/infrastructures/${infrastructure.id}/knowledge`,
-            )
-              ? 200
-              : 0,
-          }}
+          style={{ paddingRight: paddingRightValue() }}
         >
           <Breadcrumbs variant="object" elements={[
             { label: t_i18n('Observations') },
@@ -106,13 +111,7 @@ const RootInfrastructureComponent = ({ queryRef, infrastructureId }) => {
             sx={{ borderBottom: 1, borderColor: 'divider', marginBottom: 4 }}
           >
             <Tabs
-              value={
-                location.pathname.includes(
-                  `/dashboard/observations/infrastructures/${infrastructure.id}/knowledge`,
-                )
-                  ? `/dashboard/observations/infrastructures/${infrastructure.id}/knowledge`
-                  : location.pathname
-              }
+              value={getCurrentTab(infrastructure)}
             >
               <Tab
                 component={Link}
@@ -156,7 +155,7 @@ const RootInfrastructureComponent = ({ queryRef, infrastructureId }) => {
 
             <Route
               path="/"
-              element={<Infrastructure data={infrastructure} />}
+              element={<Infrastructure data={infrastructure}/>}
             />
             <Route
               path="/knowledge"
@@ -165,19 +164,19 @@ const RootInfrastructureComponent = ({ queryRef, infrastructureId }) => {
                   replace={true}
                   to={`/dashboard/observations/infrastructures/${infrastructureId}/knowledge/overview`}
                 />
-              )}
+                  )}
             />
             <Route
               path="/knowledge/*"
-              element={<InfrastructureKnowledge infrastructure={infrastructure} />}
+              element={<InfrastructureKnowledge infrastructure={infrastructure}/>}
             />
             <Route
-              path="/content"
-              element={(
-                <StixCoreObjectContent
+              path="/content/*"
+              element={
+                <StixCoreObjectContentRoot
                   stixCoreObject={infrastructure}
                 />
-              )}
+                  }
             />
             <Route
               path="/analyses/*"
@@ -206,7 +205,7 @@ const RootInfrastructureComponent = ({ queryRef, infrastructureId }) => {
           </Routes>
         </div>
       ) : (
-        <ErrorNotFound />
+        <ErrorNotFound/>
       )}
     </>
   );
diff --git a/opencti-platform/opencti-front/src/private/components/observations/stix_cyber_observables/Root.jsx b/opencti-platform/opencti-front/src/private/components/observations/stix_cyber_observables/Root.jsx
index fc672c21ffc6e..d45a5e562e63d 100644
--- a/opencti-platform/opencti-front/src/private/components/observations/stix_cyber_observables/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/observations/stix_cyber_observables/Root.jsx
@@ -6,7 +6,7 @@ import * as R from 'ramda';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import StixCoreRelationship from '../../common/stix_core_relationships/StixCoreRelationship';
@@ -86,6 +86,11 @@ class RootStixCyberObservable extends Component {
       location,
       params: { observableId },
     } = this.props;
+    const getCurrentTab = (observable) => {
+      if (location.pathname.includes(`/dashboard/observations/observables/${observable.id}/knowledge`)) return `/dashboard/observations/observables/${observable.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/observations/observables/${observable.id}/content`)) return `/dashboard/observations/observables/${observable.id}/content`;
+      return location.pathname;
+    };
     const link = `/dashboard/observations/observables/${observableId}/knowledge`;
     return (
       <>
@@ -96,8 +101,23 @@ class RootStixCyberObservable extends Component {
             if (props) {
               if (props.stixCyberObservable) {
                 const { stixCyberObservable } = props;
+                let paddingRight = 0;
+                if (
+                  location.pathname.includes(
+                    `/dashboard/observations/observables/${stixCyberObservable.id}/content`,
+                  )
+                ) {
+                  paddingRight = 350;
+                }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/observations/observables/${stixCyberObservable.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
-                  <>
+                  <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
                       { label: t('Observations') },
                       { label: t('Observables'), link: '/dashboard/observations/observables' },
@@ -115,13 +135,7 @@ class RootStixCyberObservable extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/observations/observables/${stixCyberObservable.id}/knowledge`,
-                          )
-                            ? `/dashboard/observations/observables/${stixCyberObservable.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(stixCyberObservable)}
                       >
                         <Tab
                           component={Link}
@@ -174,7 +188,7 @@ class RootStixCyberObservable extends Component {
                           <StixCyberObservable
                             stixCyberObservable={props.stixCyberObservable}
                           />
-                        }
+                                }
                       />
                       <Route
                         path="/knowledge"
@@ -182,25 +196,25 @@ class RootStixCyberObservable extends Component {
                           <StixCyberObservableKnowledge
                             stixCyberObservable={props.stixCyberObservable}
                           />
-                        }
+                                }
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
-                            stixCoreObject={props.stixCyberObservable}
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
+                            stixCoreObject={stixCyberObservable}
                           />
-                        )}
+                                }
                       />
                       <Route
                         path="/analyses"
                         element={
                           <StixCoreObjectOrStixCoreRelationshipContainers
                             stixDomainObjectOrStixCoreRelationship={
-                              props.stixCyberObservable
-                            }
+                                            props.stixCyberObservable
+                                        }
                           />
-                        }
+                                }
                       />
                       <Route
                         path="/sightings"
@@ -221,7 +235,7 @@ class RootStixCyberObservable extends Component {
                               'System',
                             ]}
                           />
-                        }
+                                }
                       />
                       <Route
                         path="/files"
@@ -232,7 +246,7 @@ class RootStixCyberObservable extends Component {
                             connectorsExport={props.connectorsForExport}
                             entity={props.stixCyberObservable}
                           />
-                        }
+                                }
                       />
                       <Route
                         path="/history"
@@ -240,7 +254,7 @@ class RootStixCyberObservable extends Component {
                           <StixCoreObjectHistory
                             stixCoreObjectId={observableId}
                           />
-                        }
+                                }
                       />
                       <Route
                         path="/knowledge/relations/:relationId"
@@ -248,7 +262,7 @@ class RootStixCyberObservable extends Component {
                           <StixCoreRelationship
                             entityId={observableId}
                           />
-                        }
+                                }
                       />
                       <Route
                         path="/sightings/:sightingId"
@@ -256,13 +270,13 @@ class RootStixCyberObservable extends Component {
                           <StixSightingRelationship
                             entityId={observableId}
                           />
-                        }
+                                }
                       />
                     </Routes>
-                  </>
+                  </div>
                 );
               }
-              return <ErrorNotFound />;
+              return <ErrorNotFound/>;
             }
             return <Loader />;
           }}
diff --git a/opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/Root.jsx b/opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/Root.jsx
index 78e8cd11a9385..098b4dbdcdc51 100644
--- a/opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/Root.jsx
@@ -6,7 +6,7 @@ import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
 import * as R from 'ramda';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import AttackPattern from './AttackPattern';
@@ -85,6 +85,11 @@ class RootAttackPattern extends Component {
       location,
       params: { attackPatternId },
     } = this.props;
+    const getCurrentTab = (attackPattern) => {
+      if (location.pathname.includes(`/dashboard/techniques/attack_patterns/${attackPattern.id}/knowledge`)) return `/dashboard/techniques/attack_patterns/${attackPattern.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/techniques/attack_patterns/${attackPattern.id}/content`)) return `/dashboard/techniques/attack_patterns/${attackPattern.id}/content`;
+      return location.pathname;
+    };
     const link = `/dashboard/techniques/attack_patterns/${attackPatternId}/knowledge`;
     return (
       <div>
@@ -132,6 +137,13 @@ class RootAttackPattern extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/techniques/attack_patterns/${attackPattern.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -154,13 +166,7 @@ class RootAttackPattern extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/techniques/attack_patterns/${attackPattern.id}/knowledge`,
-                          )
-                            ? `/dashboard/techniques/attack_patterns/${attackPattern.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(attackPattern)}
                       >
                         <Tab
                           component={Link}
@@ -220,12 +226,12 @@ class RootAttackPattern extends Component {
                         }
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={attackPattern}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/techniques/courses_of_action/Root.jsx b/opencti-platform/opencti-front/src/private/components/techniques/courses_of_action/Root.jsx
index 86c5c63338523..431cd00e78243 100644
--- a/opencti-platform/opencti-front/src/private/components/techniques/courses_of_action/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/techniques/courses_of_action/Root.jsx
@@ -6,7 +6,7 @@ import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
 import * as R from 'ramda';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import CourseOfAction from './CourseOfAction';
@@ -81,6 +81,11 @@ class RootCourseOfAction extends Component {
       location,
       params: { courseOfActionId },
     } = this.props;
+    const getCurrentTab = (courseOfAction) => {
+      if (location.pathname.includes(`/dashboard/techniques/courses_of_action/${courseOfAction.id}/knowledge`)) return `/dashboard/techniques/courses_of_action/${courseOfAction.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/techniques/courses_of_action/${courseOfAction.id}/content`)) return `/dashboard/techniques/courses_of_action/${courseOfAction.id}/content`;
+      return location.pathname;
+    };
     return (
       <div>
         <QueryRenderer
@@ -105,6 +110,13 @@ class RootCourseOfAction extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/techniques/courses_of_action/${courseOfAction.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -128,13 +140,7 @@ class RootCourseOfAction extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/techniques/courses_of_action/${courseOfAction.id}/knowledge`,
-                          )
-                            ? `/dashboard/techniques/courses_of_action/${courseOfAction.id}`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(courseOfAction)}
                       >
                         <Tab
                           component={Link}
@@ -176,12 +182,12 @@ class RootCourseOfAction extends Component {
                         }
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={courseOfAction}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/files"
diff --git a/opencti-platform/opencti-front/src/private/components/techniques/data_components/Root.tsx b/opencti-platform/opencti-front/src/private/components/techniques/data_components/Root.tsx
index 1a7c2a95f56a1..bb4a5fa404a5a 100644
--- a/opencti-platform/opencti-front/src/private/components/techniques/data_components/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/techniques/data_components/Root.tsx
@@ -9,7 +9,7 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import { QueryRenderer } from '../../../../relay/environment';
 import Loader from '../../../../components/Loader';
 import ErrorNotFound from '../../../../components/ErrorNotFound';
@@ -77,6 +77,11 @@ const RootDataComponent = () => {
   );
   useSubscription(subConfig);
   const location = useLocation();
+  const getCurrentTab = (dataComponent) => {
+    if (location.pathname.includes(`/dashboard/arsenal/techniques/${dataComponent.id}/data_components`)) return `/dashboard/techniques/data_components/${dataComponent.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/arsenal/techniques/${dataComponent.id}/data_components`)) return `/dashboard/techniques/data_components/${dataComponent.id}/content`;
+    return location.pathname;
+  };
   const { t_i18n } = useFormatter();
   return (
     <>
@@ -102,6 +107,13 @@ const RootDataComponent = () => {
               ) {
                 paddingRight = 350;
               }
+              if (
+                location.pathname.includes(
+                  `/dashboard/techniques/data_components/${dataComponent.id}/content/mapping`,
+                )
+              ) {
+                paddingRight = 0;
+              }
               return (
                 <div style={{ paddingRight }}>
                   <Breadcrumbs variant="object" elements={[
@@ -126,13 +138,7 @@ const RootDataComponent = () => {
                     }}
                   >
                     <Tabs
-                      value={
-                        location.pathname.includes(
-                          `/dashboard/techniques/data_components/${dataComponent.id}/knowledge`,
-                        )
-                          ? `/dashboard/techniques/data_components/${dataComponent.id}/knowledge`
-                          : location.pathname
-                      }
+                      value={getCurrentTab(dataComponent)}
                     >
                       <Tab
                         component={Link}
@@ -174,12 +180,12 @@ const RootDataComponent = () => {
                       }
                     />
                     <Route
-                      path="/content"
-                      element={(
-                        <StixCoreObjectContent
+                      path="/content/*"
+                      element={
+                        <StixCoreObjectContentRoot
                           stixCoreObject={dataComponent}
                         />
-                      )}
+                      }
                     />
                     <Route
                       path="/files"
diff --git a/opencti-platform/opencti-front/src/private/components/techniques/data_sources/Root.tsx b/opencti-platform/opencti-front/src/private/components/techniques/data_sources/Root.tsx
index 8ed38ede067b1..e3aeb9c4dd143 100644
--- a/opencti-platform/opencti-front/src/private/components/techniques/data_sources/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/techniques/data_sources/Root.tsx
@@ -9,7 +9,7 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
 import Box from '@mui/material/Box';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import StixDomainObjectHeader from '../../common/stix_domain_objects/StixDomainObjectHeader';
 import FileManager from '../../common/files/FileManager';
 import StixCoreObjectHistory from '../../common/stix_core_objects/StixCoreObjectHistory';
@@ -75,6 +75,11 @@ const RootDataSourceComponent = ({ queryRef, dataSourceId }) => {
   );
   useSubscription(subConfig);
   const location = useLocation();
+  const getCurrentTab = (dataSource) => {
+    if (location.pathname.includes(`/dashboard/techniques/data_sources/${dataSource.id}/knowledge`)) return `/dashboard/techniques/data_sources/${dataSource.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/techniques/data_sources/${dataSource.id}/content`)) return `/dashboard/techniques/data_sources/${dataSource.id}/content`;
+    return location.pathname;
+  };
   const { t_i18n } = useFormatter();
   const data = usePreloadedQuery(dataSourceQuery, queryRef);
   const { dataSource, connectorsForImport, connectorsForExport, settings } = data;
@@ -93,6 +98,13 @@ const RootDataSourceComponent = ({ queryRef, dataSourceId }) => {
   ) {
     paddingRight = 350;
   }
+  if (
+    location.pathname.includes(
+      `/dashboard/techniques/data_sources/${dataSource.id}/content/mapping`,
+    )
+  ) {
+    paddingRight = 0;
+  }
   return (
     <>
       {dataSource ? (
@@ -114,13 +126,7 @@ const RootDataSourceComponent = ({ queryRef, dataSourceId }) => {
             sx={{ borderBottom: 1, borderColor: 'divider', marginBottom: 4 }}
           >
             <Tabs
-              value={
-                location.pathname.includes(
-                  `/dashboard/techniques/data_sources/${dataSource.id}/knowledge`,
-                )
-                  ? `/dashboard/techniques/data_sources/${dataSource.id}/knowledge`
-                  : location.pathname
-              }
+              value={getCurrentTab(dataSource)}
             >
               <Tab
                 component={Link}
@@ -167,12 +173,12 @@ const RootDataSourceComponent = ({ queryRef, dataSourceId }) => {
               }
             />
             <Route
-              path="/content"
-              element={(
-                <StixCoreObjectContent
+              path="/content/*"
+              element={
+                <StixCoreObjectContentRoot
                   stixCoreObject={dataSource}
                 />
-              )}
+              }
             />
             <Route
               path="/files"
diff --git a/opencti-platform/opencti-front/src/private/components/techniques/narratives/Root.jsx b/opencti-platform/opencti-front/src/private/components/techniques/narratives/Root.jsx
index 356603799ebf4..6223b957e0794 100644
--- a/opencti-platform/opencti-front/src/private/components/techniques/narratives/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/techniques/narratives/Root.jsx
@@ -6,7 +6,7 @@ import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
 import * as R from 'ramda';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import Narrative from './Narrative';
@@ -85,6 +85,11 @@ class RootNarrative extends Component {
       location,
       params: { narrativeId },
     } = this.props;
+    const getCurrentTab = (narrative) => {
+      if (location.pathname.includes(`/dashboard/techniques/narratives/${narrative.id}/knowledge`)) return `/dashboard/techniques/narratives/${narrative.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/techniques/narratives/${narrative.id}/content`)) return `/dashboard/techniques/narratives/${narrative.id}/content`;
+      return location.pathname;
+    };
     const link = `/dashboard/techniques/narratives/${narrativeId}/knowledge`;
     return (
       <>
@@ -129,6 +134,13 @@ class RootNarrative extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/techniques/narratives/${narrative.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }} >
                     <Breadcrumbs variant="object" elements={[
@@ -151,13 +163,7 @@ class RootNarrative extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/techniques/narratives/${narrative.id}/knowledge`,
-                          )
-                            ? `/dashboard/techniques/narratives/${narrative.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(narrative)}
                       >
                         <Tab
                           component={Link}
@@ -217,12 +223,12 @@ class RootNarrative extends Component {
                         }
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
                             stixCoreObject={narrative}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/threats/campaigns/Root.jsx b/opencti-platform/opencti-front/src/private/components/threats/campaigns/Root.jsx
index 8665189347334..30f472412dddf 100644
--- a/opencti-platform/opencti-front/src/private/components/threats/campaigns/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/threats/campaigns/Root.jsx
@@ -6,8 +6,8 @@ import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
 import * as R from 'ramda';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import StixCoreObjectSimulationResult from '../../common/stix_core_objects/StixCoreObjectSimulationResult';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import Campaign from './Campaign';
@@ -86,6 +86,11 @@ class RootCampaign extends Component {
       location,
       params: { campaignId },
     } = this.props;
+    const getCurrentTab = (campaign) => {
+      if (location.pathname.includes(`/dashboard/threats/campaigns/${campaign.id}/knowledge`)) return `/dashboard/threats/campaigns/${campaign.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/threats/campaigns/${campaign.id}/content`)) return `/dashboard/threats/campaigns/${campaign.id}/content`;
+      return location.pathname;
+    };
     const link = `/dashboard/threats/campaigns/${campaignId}/knowledge`;
     return (
       <div>
@@ -137,6 +142,13 @@ class RootCampaign extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/threats/campaigns/${campaign.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -159,13 +171,7 @@ class RootCampaign extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/threats/campaigns/${campaign.id}/knowledge`,
-                          )
-                            ? `/dashboard/threats/campaigns/${campaign.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(campaign)}
                       >
                         <Tab
                           component={Link}
@@ -228,12 +234,12 @@ class RootCampaign extends Component {
                         }
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
-                            stixCoreObject={props.campaign}
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
+                            stixCoreObject={campaign}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/threats/intrusion_sets/Root.jsx b/opencti-platform/opencti-front/src/private/components/threats/intrusion_sets/Root.jsx
index c9a7f1aaee995..94474f5d92120 100644
--- a/opencti-platform/opencti-front/src/private/components/threats/intrusion_sets/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/threats/intrusion_sets/Root.jsx
@@ -6,8 +6,8 @@ import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
 import * as R from 'ramda';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import StixCoreObjectSimulationResult from '../../common/stix_core_objects/StixCoreObjectSimulationResult';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import IntrusionSet from './IntrusionSet';
@@ -91,6 +91,11 @@ class RootIntrusionSet extends Component {
       location,
       params: { intrusionSetId },
     } = this.props;
+    const getCurrentTab = (intrusionSet) => {
+      if (location.pathname.includes(`/dashboard/threats/intrusion_sets/${intrusionSet.id}/knowledge`)) return `/dashboard/threats/intrusion_sets/${intrusionSet.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/threats/intrusion_sets/${intrusionSet.id}/content`)) return `/dashboard/threats/intrusion_sets/${intrusionSet.id}/content`;
+      return location.pathname;
+    };
     const link = `/dashboard/threats/intrusion_sets/${intrusionSetId}/knowledge`;
     return (
       <>
@@ -143,6 +148,13 @@ class RootIntrusionSet extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/threats/intrusion_sets/${intrusionSet.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }} data-testid="intrusionSet-details-page">
                     <Breadcrumbs variant="object" elements={[
@@ -166,13 +178,7 @@ class RootIntrusionSet extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/threats/intrusion_sets/${intrusionSet.id}/knowledge`,
-                          )
-                            ? `/dashboard/threats/intrusion_sets/${intrusionSet.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(intrusionSet)}
                       >
                         <Tab
                           component={Link}
@@ -237,12 +243,12 @@ class RootIntrusionSet extends Component {
                         }
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
-                            stixCoreObject={props.intrusionSet}
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
+                            stixCoreObject={intrusionSet}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/threats/threat_actors_group/Root.jsx b/opencti-platform/opencti-front/src/private/components/threats/threat_actors_group/Root.jsx
index 4b1c12a1adbc0..c9ef02069026c 100644
--- a/opencti-platform/opencti-front/src/private/components/threats/threat_actors_group/Root.jsx
+++ b/opencti-platform/opencti-front/src/private/components/threats/threat_actors_group/Root.jsx
@@ -6,8 +6,8 @@ import { graphql } from 'react-relay';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
+import StixCoreObjectContentRoot from '../../common/stix_core_objects/StixCoreObjectContentRoot';
 import StixCoreObjectSimulationResult from '../../common/stix_core_objects/StixCoreObjectSimulationResult';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import { QueryRenderer, requestSubscription } from '../../../../relay/environment';
 import ThreatActorGroup from './ThreatActorGroup';
@@ -88,6 +88,11 @@ class RootThreatActorGroup extends Component {
       location,
       params: { threatActorGroupId },
     } = this.props;
+    const getCurrentTab = (threatActorGroup) => {
+      if (location.pathname.includes(`/dashboard/threats/threat_actors_group/${threatActorGroup.id}/knowledge`)) return `/dashboard/threats/threat_actors_group/${threatActorGroup.id}/knowledge`;
+      if (location.pathname.includes(`/dashboard/threats/threat_actors_group/${threatActorGroup.id}/content`)) return `/dashboard/threats/threat_actors_group/${threatActorGroup.id}/content`;
+      return location.pathname;
+    };
     const link = `/dashboard/threats/threat_actors_group/${threatActorGroupId}/knowledge`;
     return (
       <>
@@ -141,6 +146,13 @@ class RootThreatActorGroup extends Component {
                 ) {
                   paddingRight = 350;
                 }
+                if (
+                  location.pathname.includes(
+                    `/dashboard/threats/threat_actors_group/${threatActorGroup.id}/content/mapping`,
+                  )
+                ) {
+                  paddingRight = 0;
+                }
                 return (
                   <div style={{ paddingRight }}>
                     <Breadcrumbs variant="object" elements={[
@@ -163,13 +175,7 @@ class RootThreatActorGroup extends Component {
                       }}
                     >
                       <Tabs
-                        value={
-                          location.pathname.includes(
-                            `/dashboard/threats/threat_actors_group/${threatActorGroup.id}/knowledge`,
-                          )
-                            ? `/dashboard/threats/threat_actors_group/${threatActorGroup.id}/knowledge`
-                            : location.pathname
-                        }
+                        value={getCurrentTab(threatActorGroup)}
                       >
                         <Tab
                           component={Link}
@@ -232,12 +238,12 @@ class RootThreatActorGroup extends Component {
                         }
                       />
                       <Route
-                        path="/content"
-                        element={(
-                          <StixCoreObjectContent
-                            stixCoreObject={props.threatActorGroup}
+                        path="/content/*"
+                        element={
+                          <StixCoreObjectContentRoot
+                            stixCoreObject={threatActorGroup}
                           />
-                        )}
+                        }
                       />
                       <Route
                         path="/analyses"
diff --git a/opencti-platform/opencti-front/src/private/components/threats/threat_actors_individual/Root.tsx b/opencti-platform/opencti-front/src/private/components/threats/threat_actors_individual/Root.tsx
index c352ea81302ba..f19a0653a9df4 100644
--- a/opencti-platform/opencti-front/src/private/components/threats/threat_actors_individual/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/threats/threat_actors_individual/Root.tsx
@@ -9,8 +9,8 @@ import { GraphQLSubscriptionConfig } from 'relay-runtime';
 import Box from '@mui/material/Box';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
+import StixCoreObjectContentRoot from '@components/common/stix_core_objects/StixCoreObjectContentRoot';
 import StixCoreObjectSimulationResult from '../../common/stix_core_objects/StixCoreObjectSimulationResult';
-import StixCoreObjectContent from '../../common/stix_core_objects/StixCoreObjectContent';
 import ErrorNotFound from '../../../../components/ErrorNotFound';
 import useQueryLoading from '../../../../utils/hooks/useQueryLoading';
 import Loader, { LoaderVariant } from '../../../../components/Loader';
@@ -85,6 +85,11 @@ const RootThreatActorIndividualComponent = ({
   );
   useSubscription(subConfig);
   const location = useLocation();
+  const getCurrentTab = (data) => {
+    if (location.pathname.includes(`/dashboard/threats/threat_actors_individual/${data.id}/knowledge`)) return `/dashboard/threats/threat_actors_individual/${data.id}/knowledge`;
+    if (location.pathname.includes(`/dashboard/threats/threat_actors_individual/${data.id}/content`)) return `/dashboard/threats/threat_actors_individual/${data.id}/content`;
+    return location.pathname;
+  };
   const { t_i18n } = useFormatter();
   const {
     threatActorIndividual: data,
@@ -111,6 +116,13 @@ const RootThreatActorIndividualComponent = ({
   ) {
     paddingRight = 350;
   }
+  if (
+    location.pathname.includes(
+      `/dashboard/threats/threat_actors_individual/${data.id}/content/mapping`,
+    )
+  ) {
+    paddingRight = 0;
+  }
   return (
     <>
       <Routes>
@@ -161,13 +173,7 @@ const RootThreatActorIndividualComponent = ({
               sx={{ borderBottom: 1, borderColor: 'divider', marginBottom: 4 }}
             >
               <Tabs
-                value={
-                  location.pathname.includes(
-                    `/dashboard/threats/threat_actors_individual/${data.id}/knowledge`,
-                  )
-                    ? `/dashboard/threats/threat_actors_individual/${data.id}/knowledge`
-                    : location.pathname
-                }
+                value={getCurrentTab(data)}
               >
                 <Tab
                   component={Link}
@@ -230,12 +236,12 @@ const RootThreatActorIndividualComponent = ({
                 }
               />
               <Route
-                path="/content"
-                element={(
-                  <StixCoreObjectContent
+                path="/content/*"
+                element={
+                  <StixCoreObjectContentRoot
                     stixCoreObject={data}
                   />
-                )}
+                }
               />
               <Route
                 path="/analyses"