diff --git a/packages/visual-editor/src/components/footer/FooterLinksSlot.tsx b/packages/visual-editor/src/components/footer/FooterLinksSlot.tsx
index f06eee9b8..ef977830c 100644
--- a/packages/visual-editor/src/components/footer/FooterLinksSlot.tsx
+++ b/packages/visual-editor/src/components/footer/FooterLinksSlot.tsx
@@ -57,7 +57,7 @@ const FooterLinksSlotInternal: PuckComponent<FooterLinksSlotProps> = (
 
   return (
     <div
-      className={`${
+      className={`${puck.isEditing ? "min-h-[30px]" : ""} ${
         variant === "secondary"
           ? `gap-5 flex flex-col md:flex-row w-full ${secondaryItemsAlignment}`
           : "w-full grid grid-cols-1 md:grid-cols-5 gap-6"
diff --git a/packages/visual-editor/src/components/header/HeaderLinks.tsx b/packages/visual-editor/src/components/header/HeaderLinks.tsx
index 141766921..c19af2566 100644
--- a/packages/visual-editor/src/components/header/HeaderLinks.tsx
+++ b/packages/visual-editor/src/components/header/HeaderLinks.tsx
@@ -286,7 +286,7 @@ const HeaderLinksComponent: PuckComponent<HeaderLinksProps> = ({
   // Early return for empty state
   if (validLinks.length + validAlwaysCollapsedLinks.length === 0) {
     return puck.isEditing ? (
-      <nav className="h-5 min-w-[100px] opacity-20" />
+      <nav className="h-5 min-w-[100px] min-h-[30px] opacity-20" />
     ) : (
       <></>
     );
@@ -296,7 +296,7 @@ const HeaderLinksComponent: PuckComponent<HeaderLinksProps> = ({
     <nav
       aria-label={ariaLabel}
       ref={navRef}
-      className={`flex md:gap-6 md:items-center ${justifyClass}`}
+      className={`flex md:gap-6 md:items-center ${justifyClass} ${puck.isEditing ? " min-w-[100px] min-h-[30px]" : ""}`}
     >
       {/* Hidden measure list for overflow math */}
       <ul
diff --git a/packages/visual-editor/src/internal/utils/removeDuplicateActionBars.ts b/packages/visual-editor/src/internal/utils/removeDuplicateActionBars.ts
index 1fdc0ae38..2dbddcd0e 100644
--- a/packages/visual-editor/src/internal/utils/removeDuplicateActionBars.ts
+++ b/packages/visual-editor/src/internal/utils/removeDuplicateActionBars.ts
@@ -59,6 +59,7 @@ export const removeDuplicateActionBars = (): void => {
     pt("callToAction", "Call To Action"),
     pt("components.secondaryHeader", "Secondary Header"),
     pt("components.headerLinks", "Header Links"),
+    pt("components.footerSocialLinksSlot", "Social Links"),
   ];
 
   targets.forEach((target) => {
diff --git a/packages/visual-editor/src/vite-plugin/defaultLayoutData.ts b/packages/visual-editor/src/vite-plugin/defaultLayoutData.ts
index 7b52d849b..18124375e 100644
--- a/packages/visual-editor/src/vite-plugin/defaultLayoutData.ts
+++ b/packages/visual-editor/src/vite-plugin/defaultLayoutData.ts
@@ -1975,6 +1975,7 @@ const mainDefaultLayout = {
             bgColor: "bg-palette-primary-light",
             textColor: "text-black",
           },
+          showSectionHeading: true,
         },
         data: {
           field: "",