diff --git a/.project_index.json b/.project_index.json
index 99ec381..028c04e 100644
--- a/.project_index.json
+++ b/.project_index.json
@@ -569,12 +569,12 @@
     "role": "ui",
     "tags": [],
     "used_in": [
+      "src/components/navbar/NavbarLayoutFloatingInline.tsx",
+      "src/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen.tsx",
       "src/components/navbar/NavbarStyleCentered/NavbarStyleCentered.tsx",
-      "src/components/navbar/NavbarStyleApple/NavbarStyleApple.tsx",
       "src/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay.tsx",
       "src/components/navbar/NavbarStyleMinimal.tsx",
-      "src/components/navbar/NavbarLayoutFloatingInline.tsx",
-      "src/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen.tsx"
+      "src/components/navbar/NavbarStyleApple/NavbarStyleApple.tsx"
     ],
     "can_modify_directly": true,
     "can_delete": true,
@@ -2694,10 +2694,10 @@
     "role": "ui",
     "tags": [],
     "used_in": [
-      "src/components/button/ButtonTextShift/ButtonTextShift.tsx",
+      "src/components/button/ButtonShiftHover/ButtonShiftHover.tsx",
       "src/components/button/ButtonTextStagger/ButtonTextStagger.tsx",
-      "src/components/button/ButtonBounceEffect/ButtonBounceEffect.tsx",
-      "src/components/button/ButtonShiftHover/ButtonShiftHover.tsx"
+      "src/components/button/ButtonTextShift/ButtonTextShift.tsx",
+      "src/components/button/ButtonBounceEffect/ButtonBounceEffect.tsx"
     ],
     "can_modify_directly": true,
     "can_delete": true,
@@ -2748,17 +2748,17 @@
       "button"
     ],
     "used_in": [
-      "src/components/button/ButtonHoverBubble.tsx",
+      "src/components/button/ButtonShiftHover/ButtonShiftHover.tsx",
+      "src/components/button/ButtonBounceEffect/ButtonBounceEffect.tsx",
       "src/components/button/ButtonIconArrow.tsx",
+      "src/components/button/ButtonTextShift/ButtonTextShift.tsx",
+      "src/components/button/ButtonTextUnderline.tsx",
+      "src/components/button/ButtonExpandHover.tsx",
+      "src/components/button/ButtonElasticEffect/ButtonElasticEffect.tsx",
+      "src/components/button/ButtonHoverMagnetic/ButtonHoverMagnetic.tsx",
       "src/components/button/ButtonDirectionalHover/ButtonDirectionalHover.tsx",
       "src/components/button/ButtonTextStagger/ButtonTextStagger.tsx",
-      "src/components/button/ButtonElasticEffect/ButtonElasticEffect.tsx",
-      "src/components/button/ButtonTextUnderline.tsx",
-      "src/components/button/ButtonTextShift/ButtonTextShift.tsx",
-      "src/components/button/ButtonHoverMagnetic/ButtonHoverMagnetic.tsx",
-      "src/components/button/ButtonShiftHover/ButtonShiftHover.tsx",
-      "src/components/button/ButtonExpandHover.tsx",
-      "src/components/button/ButtonBounceEffect/ButtonBounceEffect.tsx"
+      "src/components/button/ButtonHoverBubble.tsx"
     ],
     "can_modify_directly": true,
     "can_delete": true,
@@ -2815,10 +2815,10 @@
       "button"
     ],
     "used_in": [
-      "src/components/navbar/NavbarStyleMinimal.tsx",
       "src/components/Textbox.tsx",
       "src/components/navbar/NavbarLayoutFloatingInline.tsx",
-      "src/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay.tsx"
+      "src/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay.tsx",
+      "src/components/navbar/NavbarStyleMinimal.tsx"
     ],
     "can_modify_directly": true,
     "can_delete": true,
@@ -2837,8 +2837,8 @@
       "button"
     ],
     "used_in": [
-      "src/components/button/Button.tsx",
-      "src/components/navbar/NavbarLayoutFloatingInline.tsx"
+      "src/components/navbar/NavbarLayoutFloatingInline.tsx",
+      "src/components/button/Button.tsx"
     ],
     "can_modify_directly": true,
     "can_delete": true,
@@ -3143,15 +3143,15 @@
       "product"
     ],
     "used_in": [
-      "src/components/cardStack/layouts/timelines/TimelineBase.tsx",
-      "src/components/cardStack/layouts/carousels/FullWidthCarousel.tsx",
-      "src/components/cardStack/layouts/timelines/TimelinePhoneView.tsx",
-      "src/components/cardStack/layouts/timelines/TimelineProcessFlow.tsx",
-      "src/components/cardStack/layouts/timelines/TimelineCardStack.tsx",
-      "src/components/cardStack/layouts/carousels/AutoCarousel.tsx",
-      "src/components/cardStack/layouts/timelines/TimelineHorizontalCardStack.tsx",
       "src/components/cardStack/layouts/carousels/ButtonCarousel.tsx",
-      "src/components/cardStack/layouts/grid/GridLayout.tsx"
+      "src/components/cardStack/layouts/timelines/TimelineProcessFlow.tsx",
+      "src/components/cardStack/layouts/carousels/FullWidthCarousel.tsx",
+      "src/components/cardStack/layouts/timelines/TimelineBase.tsx",
+      "src/components/cardStack/layouts/timelines/TimelineHorizontalCardStack.tsx",
+      "src/components/cardStack/layouts/grid/GridLayout.tsx",
+      "src/components/cardStack/layouts/timelines/TimelinePhoneView.tsx",
+      "src/components/cardStack/layouts/carousels/AutoCarousel.tsx",
+      "src/components/cardStack/layouts/timelines/TimelineCardStack.tsx"
     ],
     "can_modify_directly": true,
     "can_delete": true,
@@ -3168,11 +3168,11 @@
     "role": "ui",
     "tags": [],
     "used_in": [
-      "src/components/cardStack/layouts/carousels/FullWidthCarousel.tsx",
-      "src/components/cardStack/layouts/carousels/AutoCarousel.tsx",
-      "src/components/cardStack/CardStack.tsx",
       "src/components/cardStack/layouts/carousels/ButtonCarousel.tsx",
-      "src/components/cardStack/layouts/grid/GridLayout.tsx"
+      "src/components/cardStack/layouts/carousels/FullWidthCarousel.tsx",
+      "src/components/cardStack/CardStack.tsx",
+      "src/components/cardStack/layouts/grid/GridLayout.tsx",
+      "src/components/cardStack/layouts/carousels/AutoCarousel.tsx"
     ],
     "can_modify_directly": true,
     "can_delete": true,
@@ -3389,11 +3389,11 @@
       "product"
     ],
     "used_in": [
-      "src/components/cardStack/layouts/timelines/TimelineProcessFlow.tsx",
-      "src/components/cardStack/layouts/carousels/AutoCarousel.tsx",
-      "src/components/cardStack/layouts/timelines/TimelineBase.tsx",
       "src/components/cardStack/layouts/carousels/ButtonCarousel.tsx",
-      "src/components/cardStack/layouts/grid/GridLayout.tsx"
+      "src/components/cardStack/layouts/timelines/TimelineProcessFlow.tsx",
+      "src/components/cardStack/layouts/timelines/TimelineBase.tsx",
+      "src/components/cardStack/layouts/grid/GridLayout.tsx",
+      "src/components/cardStack/layouts/carousels/AutoCarousel.tsx"
     ],
     "can_modify_directly": true,
     "can_delete": true,
diff --git a/src/app/page.tsx b/src/app/page.tsx
index ae289f5..ec73909 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -25,12 +25,11 @@ export default function LandingPage() {
       termsText="We respect your privacy. Unsubscribe at any time."
     />
   </div>
-import EmailSignupForm from '@/components/form/EmailSignupForm';
+import ContactForm from '@/components/form/ContactForm';
 
   <div id="contact" data-section="contact">
-    <ContactForm />
+    <EmailSignupForm />
   </div>
-
   return (
     <ThemeProvider
       defaultButtonVariant="icon-arrow"
@@ -39,6 +38,7 @@ import EmailSignupForm from '@/components/form/EmailSignupForm';
       contentWidth="smallMedium"
       sizing="largeSmallSizeLargeTitles"
       background="plain"
+      cardStyle="elevated"
 import EmailSignupForm from '@/components/form/EmailSignupForm';
 
   <div id="contact" data-section="contact">
@@ -51,7 +51,6 @@ import EmailSignupForm from '@/components/form/EmailSignupForm';
       termsText="We respect your privacy. Unsubscribe at any time."
     />
   </div>
-      cardStyle="elevated"
       primaryButtonStyle="diagonal-gradient"
       secondaryButtonStyle="solid"
       headingFontWeight="medium"