diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index 1f0749bfbc..56d99104ca 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -442,8 +442,8 @@ const SystemOverviewContent = ({ entity }: { entity: SystemEntity }) => (
     <Grid item md={6}>
       <AboutCard entity={entity} variant="gridItem" />
     </Grid>
-    <Grid item xs={12} md={8}>
-      <SystemDiagram entity={entity} />
+    <Grid item md={4} sm={6}>
+      <EntityLinksCard entity={entity} />
     </Grid>
     <Grid item md={6}>
       <EntityHasComponentsCard variant="gridItem" />
@@ -492,6 +492,11 @@ const DomainEntityPage = ({ entity }: { entity: Entity }) => (
       title="Docs"
       element={<DocsRouter entity={entity} />}
     />
+    <EntityPageLayout.Content
+      path="/diagram/*"
+      title="Diagram"
+      element={<SystemDiagram entity={entity} />}
+    />
   </EntityPageLayout>
 );