diff --git a/src/components/SwagLinkLine.vue b/src/components/SwagLinkLine.vue
index 2c205c5b..857c4ae1 100644
--- a/src/components/SwagLinkLine.vue
+++ b/src/components/SwagLinkLine.vue
@@ -4,7 +4,7 @@
        :href="`https://github.com/${repo}/edit/${branch}/${file}`">
       <SwagIcon icon="github"/>
       Edit this page on GitHub</a>
-    <a href="https://stackoverflow.com/questions/ask?tags=shopware">
+    <a :href="`https://stackoverflow.com/questions/ask${tags}`">
       <SwagIcon icon="stackoverflow"/>
       Ask question on Stackoverflow</a>
     <slot />
@@ -24,5 +24,9 @@ defineProps({
     required: false,
     default: 'main',
   },
+  tags: {
+    required: false,
+    default: '?tags=shopware',
+  },
 });
 </script>
\ No newline at end of file
diff --git a/src/frontend.md b/src/frontend.md
index 7ecdfe50..4f0e6027 100644
--- a/src/frontend.md
+++ b/src/frontend.md
@@ -9,9 +9,9 @@
                     <template #title>Checkout</template>
                     <ul>
                         <li><a href="https://frontends.shopware.com/getting-started/e-commerce/cart.html">Create a cart</a></li>
-                        <li><a href="https://frontends.shopware.com/framework/composables.html">Create a checkout</a></li>
-                        <li><a href="https://frontends.shopware.com/framework/shopping-experiences.html">Payment and Custom Payments</a></li>
-                        <li><a href="https://frontends.shopware.com/packages/composables.html#cart-checkout">Composables functions</a></li>
+                        <li><a href="https://frontends.shopware.com/getting-started/e-commerce/checkout.html">Create a checkout</a></li>
+                        <li><a href="https://frontends.shopware.com/getting-started/e-commerce/payments.html">Payment and Custom Payments</a></li>
+                        <li><a href="https://frontends.shopware.com/packages/composables/#cart--checkout">Composables</a></li>
                     </ul>
                 </SwagCardSummary>
                 <SwagCardSummary icon="storefront">
@@ -20,8 +20,8 @@
                         <li><a href="https://frontends.shopware.com/getting-started/e-commerce/product-listing.html">Create a Product Listing</a></li>
                         <li><a href="https://frontends.shopware.com/getting-started/e-commerce/product-detail-page.html">Fetch Product detail page</a></li>
                         <li><a href="https://frontends.shopware.com/getting-started/e-commerce/prices.html">Work with Prices</a></li>
-                        <li><a href="https://frontends.shopware.com/getting-started/languages.html">Wishlist Management</a></li>
-                        <li><a href="https://frontends.shopware.com/getting-started/page-elements/">Composables functions</a></li>
+                        <li><a href="https://frontends.shopware.com/getting-started/features/wishlist.html">Wishlist Management</a></li>
+                        <li><a href="https://frontends.shopware.com/packages/composables/#product">Composables</a></li>
                     </ul>
                 </SwagCardSummary>
             </div>
@@ -33,7 +33,7 @@
                     <li><a href="https://frontends.shopware.com/getting-started/cms/create-blocks.html">Create blocks</a></li>
                     <li><a href="https://frontends.shopware.com/getting-started/cms/create-elements.html">Create elements</a></li>
                     <li><a href="https://frontends.shopware.com/getting-started/cms/overwriting-cms.html">Overwriting CMS</a></li>
-                    <li><a href="https://frontends.shopware.com/getting-started/cms/customize-components.html">Custamize components</a></li>
+                    <li><a href="https://frontends.shopware.com/getting-started/cms/customize-components.html">Customize Components</a></li>
                 </ul>
             </SwagCardSummary>
         </div>
diff --git a/src/storefront/index.md b/src/storefront/index.md
index 78d0a991..60532e1b 100644
--- a/src/storefront/index.md
+++ b/src/storefront/index.md
@@ -11,25 +11,25 @@ import SwagLinkLine from "../components/SwagLinkLine.vue";
 <SwagLanding image="/landing/apps.png">
     <template #title>Shopware Frontends</template>
     <template #description>
-        Shopware Composable Frontends is Shopware's toolkit for creating <b>platform agnostic</b> custom storefronts. The demo store implementation is based on <b>Vue.js</b> and <b>Nuxt3</b>.
+        Shopware Composable Frontends is Shopware's toolkit for creating <b>platform agnostic</b> custom storefronts. The <a href="https://frontends-demo.vercel.app/" target="_blank" rel="noopener noreferrer">demo store</a> implementation is based on <b>Vue.js</b> and <b>Nuxt3</b>.
     </template>
     <template #ctas>
-        <PageRef page="/docs/guides/plugins/apps/app-base-guide.html" title="Start building your first Shopware Frontends project" sub="Learn how to set up your development environment and start coding within a couple of minutes." />
+        <PageRef page="/frontends/getting-started/templates.html" title="Start building your first Shopware Frontends project" sub="Take a look at the types of templates we have and how you can set them up in just a few minutes. Choose between blank, demo store, vue, react or astro templates." />
     </template>
     <template #exposed>
-        <SwagLinkLine file="src/storefront/index.md" />
+        <SwagLinkLine file="src/storefront/index.md" tags="?tags=shopware&tags=composable-frontends" />
         <SwagLandingCardList>
             <template #title>Starter guides</template>
             <template #description>
                 The number of topics that are available for exploration can be overwhelming. To help you navigate this complexity, we have curated tutorials that are designed to familiarize you with some of our core concepts.
             </template>
             <template #cards>
-                <PageRef page="/frontends/getting-started/templates.html">
-                    <template #title>Setup templates</template>
-                    <template #sub>Learn how to get started with custom frontend with pre-existing templates.</template>
+                <PageRef page="/frontends/framework/internal-structure.html">
+                    <template #title>Internal Structure (Packages)</template>
+                    <template #sub>Learn how to use the abstract packages you need for your Project.</template>
                 </PageRef>
-                <PageRef page="/frontends/resources/examples/">
-                    <template #title>Cookbook recepies</template>
+                <PageRef page="/frontends/getting-started/page-elements/examples/">
+                    <template #title>Cookbook recipes</template>
                     <template #sub>Kickstart your frontends project with provided example codes.</template>
                 </PageRef>
                 <PageRef page="/frontends/getting-started/templates/demo-store-template.html">