diff --git a/src/layout/Group/GroupSummary.tsx b/src/layout/Group/GroupSummary.tsx
index 2c8747e56..406b73f9d 100644
--- a/src/layout/Group/GroupSummary.tsx
+++ b/src/layout/Group/GroupSummary.tsx
@@ -39,7 +39,6 @@ const ChildComponents = ({ componentNode, hierarchyLevel, summaryOverride }: Gro
       return (
         <Grid
           item
-          spacing={6}
           key={child?.id}
         >
           <GroupSummary
diff --git a/src/layout/Tabs/TabsSummary.tsx b/src/layout/Tabs/TabsSummary.tsx
index bbacd429a..bdf99c6d6 100644
--- a/src/layout/Tabs/TabsSummary.tsx
+++ b/src/layout/Tabs/TabsSummary.tsx
@@ -28,9 +28,14 @@ export const TabsSummary = ({ componentNode }: TabsSummaryProps) => {
     >
       {tabs.map((tab, index) => (
         <>
-          {index != 0 && <hr className={classes.tabDivider} />}
+          {index != 0 && (
+            <hr
+              key={`${tab.title}-${index}-divider`}
+              className={classes.tabDivider}
+            />
+          )}
           <div
-            key={tab.id}
+            key={`${tab.title}-${index}`}
             className={classes.tabWrapper}
           >
             <Heading