diff --git a/src/client/lib/UMBE_card_navigation.js b/src/client/lib/UMBE_card_navigation.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/components/design/content/banner-saeule.svelte b/src/components/design/content/banner-saeule.svelte
index e9eaf931..46e53345 100644
--- a/src/components/design/content/banner-saeule.svelte
+++ b/src/components/design/content/banner-saeule.svelte
@@ -31,7 +31,7 @@
 
     <div class="saeule">
         <div class="blue-top">
-            <img class="" src="/images/right-sidebar/UMBE_wohngebaeude-weiss.svg" alt="Wohnhaus Bedarfsausweis"/>
+            <img class="" src="/images/right-sidebar/UMBE_gewerbegebaeude-weiss.svg" alt="Wohnhaus Bedarfsausweis"/>
             <div class="name">Verbrauchsausweis<br>Gewerbe</div> 
         </div>   
         <div class="orange">
@@ -56,7 +56,7 @@
 
     <div class="saeule">
         <div class="blue-top">
-            <img class="" src="/images/right-sidebar/UMBE_gewerbegebaeude-weiss.svg" alt="Gewerbe Verbrauchsausweis"/>
+            <img class="" src="/images/right-sidebar/UMBE_wohngebaeude-weiss.svg" alt="Gewerbe Verbrauchsausweis"/>
             <div class="name">Bedarfsausweis<br>Wohngebäude</div> 
         </div>   
         <div class="orange">
@@ -108,9 +108,11 @@
 
 <style lang="scss">
 
-#saeulen{@apply grid grid-cols-[1fr,1fr,1fr,1fr] gap-4;
+#saeulen{@apply grid grid-cols-[1fr] gap-4 
+    lg:grid-cols-[1fr,1fr,1fr]
+    xl:grid-cols-[1fr,1fr,1fr,1fr];
 .saeule{@apply grid;
-img{@apply w-full justify-self-center mb-1}
+img{@apply w-full justify-self-center mb-1 min-h-[50px] }
 .blue-top{@apply bg-secondary text-white text-center font-bold rounded-md mb-1 p-4}
 .name{@apply w-full}
 .name{font-size: clamp(15px, 2vh, 18px)}
@@ -122,7 +124,7 @@ img{@apply w-full justify-self-center mb-1}
 .white{@apply border-x-[1px] border-gray-500 text-center text-black p-4}
 .services{@apply py-2}
 .services:first-child{@apply font-bold}
-.services:nth-child(even){@apply bg-secondary/10}
+.services:nth-child(even){@apply bg-white}
 .services:not(:last-child){@apply border-b-[1px] border-gray-300}
 .blue-bottom{@apply bg-secondary text-white text-center font-bold rounded-b-md p-4}
 }
diff --git a/src/components/design/header/Header.astro b/src/components/design/header/Header.astro
index 3fe39428..62409eea 100644
--- a/src/components/design/header/Header.astro
+++ b/src/components/design/header/Header.astro
@@ -1,5 +1,6 @@
 <header class="max-w-[1920px] w-full relative bg-white
-md:bg-[url('/images/header/header-bg.jpg')] md:bg-cover md:grid md:grid-cols-2
+md:bg-[url('/images/header/header-bg.jpg')] 
+md:bg-cover md:grid md:grid-cols-2
 lg:grid lg:grid-cols-3">
 
 
diff --git a/src/components/design/sidebars/cards/SidebarWidgetLogin.svelte b/src/components/design/sidebars/cards/SidebarWidgetLogin.svelte
index 6cb248dd..05388992 100644
--- a/src/components/design/sidebars/cards/SidebarWidgetLogin.svelte
+++ b/src/components/design/sidebars/cards/SidebarWidgetLogin.svelte
@@ -25,7 +25,7 @@
 <div
 	id="card-login"
 	class="box card hidden bg-white px-6 py-4 mb-5
-			lg:block"
+			lg:block lg:ring-2 lg:ring-secondary/50"
 >
 	<div class="grid">
 		<div class="grid grid-cols-[2rem,1fr,1fr]">
@@ -38,12 +38,12 @@
 			<div class="justify-self-end text-secondary">
 				<a
 					class="text-lg font-bold text-box-heading leading-6 no-underline hover:text-primary"
-					href="">Kontakt</a
+					href="./kontakt">Kontakt</a
 				>
 				/
 				<a
 					class="text-lg font-bold text-box-heading leading-6 no-underline hover:text-primary"
-					href="">AGB</a
+					href="./agb">AGB</a
 				>
 			</div>
 		</div>
diff --git a/src/components/design/sidebars/cards/card-BA-G-promo.svelte b/src/components/design/sidebars/cards/card-BA-G-promo.svelte
index 175f0a90..c06325a9 100644
--- a/src/components/design/sidebars/cards/card-BA-G-promo.svelte
+++ b/src/components/design/sidebars/cards/card-BA-G-promo.svelte
@@ -12,7 +12,7 @@ class="	box card hidden bg-white px-6 py-4 mb-5
 <hr class="mb-4">
 <img class="w-[80%] justify-self-center !min-w-[100px] mb-[1rem]" src="/images/right-sidebar/UMBE_gewerbegebaeude.svg" alt="Wohnhaus Verbrauchsausweis"/>
 
-<a href="#" id="link-BA-promo" 
+<a href="./energieausweis-erstellen/bedarfsausweis-gewerbe/" id="link-BA-promo" 
         class="	w-[90%] justify-self-center text-center text-white font-[700] bg-secondary rounded-md px-3 py-1 mt-2 no-underline text-[1rem]
                 hover:bg-primary
         " >jetzt Bedarfssausweis erstellen</a>
diff --git a/src/components/design/sidebars/cards/card-BA-promo.svelte b/src/components/design/sidebars/cards/card-BA-promo.svelte
index c36f2c73..762156e3 100644
--- a/src/components/design/sidebars/cards/card-BA-promo.svelte
+++ b/src/components/design/sidebars/cards/card-BA-promo.svelte
@@ -12,7 +12,7 @@ class="	box card hidden bg-white px-6 py-4 mb-5
 <hr class="mb-4">
 <img class="w-[80%] justify-self-center !min-w-[100px] mb-[1rem]" src="/images/right-sidebar/UMBE_wohngebaeude.svg" alt="Wohnhaus Verbrauchsausweis"/>
 
-<a href="index" id="link-BA-promo" 
+<a href="./energieausweis-erstellen/bedarfsausweis-wohngebaeude/" id="link-BA-promo" 
         class="	w-[90%] justify-self-center text-center text-white font-[700] bg-secondary rounded-md px-3 py-1 mt-2 no-underline text-[1rem]
                 hover:bg-primary
         " >jetzt Bedarfssausweis erstellen</a>
diff --git a/src/components/design/sidebars/cards/card-VA-G-promo.svelte b/src/components/design/sidebars/cards/card-VA-G-promo.svelte
index cfa95d9d..716e0fcd 100644
--- a/src/components/design/sidebars/cards/card-VA-G-promo.svelte
+++ b/src/components/design/sidebars/cards/card-VA-G-promo.svelte
@@ -12,7 +12,7 @@
 	<hr class="mb-4">
 	<img class="w-[80%] justify-self-center !min-w-[100px] mb-[1rem]" src="/images/right-sidebar/UMBE_gewerbegebaeude.svg" alt="Gewerbe Verbrauchsausweis"/>
 
-	<a href="index" id="link-VA-promo" 
+	<a href="./energieausweis-erstellen/verbrauchsausweis-gewerbe/" id="link-VA-promo" 
 			class="	w-[90%] justify-self-center text-center text-white font-[700] bg-secondary rounded-md px-3 py-1 mt-2 no-underline text-[1rem]
 					hover:bg-primary
 			" >jetzt Verbrauchsausweis erstellen</a>
diff --git a/src/components/design/sidebars/cards/card-VA-promo.svelte b/src/components/design/sidebars/cards/card-VA-promo.svelte
index 3e468ff4..5da1d304 100644
--- a/src/components/design/sidebars/cards/card-VA-promo.svelte
+++ b/src/components/design/sidebars/cards/card-VA-promo.svelte
@@ -12,7 +12,7 @@
 	<hr class="mb-4">
 	<img class="w-[80%] justify-self-center !min-w-[100px] mb-[1rem]" src="/images/right-sidebar/UMBE_wohngebaeude.svg" alt="Wohnhaus Verbrauchsausweis"/>
 
-	<a href="" id="link-VA-promo" 
+	<a href="./energieausweis-erstellen/verbrauchsausweis-wohngebaeude/" id="link-VA-promo" 
 			class="	w-[90%] justify-self-center text-center text-white font-[700] bg-secondary rounded-md px-3 py-1 mt-2 no-underline text-[1rem]
 					hover:bg-primary
 			" >jetzt Verbrauchsausweis erstellen</a>
diff --git a/src/components/design/sidebars/cards/card-navigation.svelte b/src/components/design/sidebars/cards/card-navigation.svelte
index 93d4d5e3..14fe4cdd 100644
--- a/src/components/design/sidebars/cards/card-navigation.svelte
+++ b/src/components/design/sidebars/cards/card-navigation.svelte
@@ -1,291 +1,229 @@
 <script>
-	import ThemeController from "#components/ThemeController.svelte";
+let innerWidth
 
-	let innerWidth;
+function dropdown(){
 
-	function dropdown() {
-		const innerWidth = window.innerWidth;
-		console.log(innerWidth);
-		if (innerWidth < 1024) {
-			const check_element = this.lastChild;
+const innerWidth = window.innerWidth;
+console.log(innerWidth);
+if(innerWidth<1024){
+   
+    const check_element     = this.lastChild;
+    
+    const rotate_list       = document.querySelectorAll(".dd-symbol-clone");
+    const rotate_element    = this.childNodes[0].children[0];
 
-			const rotate_list = document.querySelectorAll(".dd-symbol-clone");
-			const rotate_element = this.childNodes[0].children[0];
+    console.log(rotate_element);
 
-			console.log(rotate_element);
+    var first_check = check_element.classList.contains("show-dropdown-content");
+    const nodeList = document.querySelectorAll(".dropdown-content");
+    
+    if(first_check == true){
+    check_element.classList.remove("show-dropdown-content");
+    rotate_element.classList.toggle("rotate-symbol");
+    
+    }else{
+      for (let i = 0; i < nodeList.length; i++) {
+        const element = nodeList[i];
+        element.classList.remove("show-dropdown-content");
+        
+      }
+      for (let i = 0; i < rotate_list.length; i++) {
+        const element = rotate_list[i];
+        element.classList.remove("rotate-symbol");
+      }
 
-			var first_check = check_element.classList.contains(
-				"show-dropdown-content"
-			);
-			const nodeList = document.querySelectorAll(".dropdown-content");
+    check_element.classList.add("show-dropdown-content");
+    rotate_element.classList.add("rotate-symbol");
+    }
+  }
 
-			if (first_check == true) {
-				check_element.classList.remove("show-dropdown-content");
-				rotate_element.classList.toggle("rotate-symbol");
-			} else {
-				for (let i = 0; i < nodeList.length; i++) {
-					const element = nodeList[i];
-					element.classList.remove("show-dropdown-content");
-				}
-				for (let i = 0; i < rotate_list.length; i++) {
-					const element = rotate_list[i];
-					element.classList.remove("rotate-symbol");
-				}
+}
 
-				check_element.classList.add("show-dropdown-content");
-				rotate_element.classList.add("rotate-symbol");
-			}
-		}
-	}
+function hover(){
+const innerWidth = window.innerWidth;
+console.log(innerWidth);
+if(innerWidth>1024){
+    const check_element     = this.firstChild.lastChild;
+    console.log(check_element);
+    check_element.style.visibility = "visible";
+  }
+}
 
-	function hover() {
-		const innerWidth = window.innerWidth;
-		console.log(innerWidth);
-		if (innerWidth > 1024) {
-			const check_element = this.firstChild.lastChild;
-			console.log(check_element);
-			check_element.style.visibility = "visible";
-		}
-	}
+function hoverout(){
+const innerWidth = window.innerWidth;
+console.log(innerWidth);
+if(innerWidth>1024){
+    const check_element     = this.firstChild.lastChild;
+    console.log(check_element);
+    check_element.style.visibility = "hidden";
+  }
+}
 
-	function hoverout() {
-		const innerWidth = window.innerWidth;
-		console.log(innerWidth);
-		if (innerWidth > 1024) {
-			const check_element = this.firstChild.lastChild;
-			console.log(check_element);
-			check_element.style.visibility = "hidden";
-		}
-	}
+  function hamburger(){
+    const nodeList = document.querySelectorAll(".dropdown-content");
+    for (let i = 0; i < nodeList.length; i++) {
+    nodeList[i].classList.remove("show-dropdown-content");}
+    var element = document.getElementById("card-navigation");
+    element.classList.toggle("hidden");
 
-	function hamburger() {
-		const nodeList = document.querySelectorAll(".dropdown-content");
-		for (let i = 0; i < nodeList.length; i++) {
-			nodeList[i].classList.remove("show-dropdown-content");
-		}
-		var element = document.getElementById("card-navigation");
-		element.classList.toggle("hidden");
-
-		const spans = this.children;
-		var first_check = spans[0].classList.contains("hamburger-swing-0");
-
-		if (first_check == true) {
-			for (let i = 0; i < spans.length; i++) {
-				spans[i].classList.remove("hamburger-swing-" + i);
-			}
-			const rotate_list = document.querySelectorAll(".dd-symbol");
-			for (let i = 0; i < rotate_list.length; i++) {
-				rotate_list[i].classList.remove("rotate-symbol");
-			}
-		} else {
-			for (let i = 0; i < spans.length; i++) {
-				spans[i].classList.add("hamburger-swing-" + i);
-			}
-		}
-	}
+    const spans = this.children;
+    var first_check = spans[0].classList.contains("hamburger-swing-0");
+    
+    if(first_check == true){
+      for (let i = 0; i < spans.length; i++)
+      {spans[i].classList.remove("hamburger-swing-"+i);} 
+      const rotate_list     = document.querySelectorAll(".dd-symbol");
+      for (let i = 0; i < rotate_list.length; i++)
+      {rotate_list[i].classList.remove("rotate-symbol");}     
+      }else{
+      for (let i = 0; i < spans.length; i++)
+      {spans[i].classList.add("hamburger-swing-"+i);} }
+}
 </script>
 
 <svelte:window bind:innerWidth />
 
-<div
-	class="hamburger_menu py-1 px-2 bg-secondary
+
+<div class="hamburger_menu py-1 px-2 bg-secondary
             xs:px-6
-            lg:hidden"
->
-	<div
-		id="hamburger"
-		on:click={hamburger}
-		on:keydown={hamburger}
-		class="cursor-pointer"
-	>
-		<span></span>
-		<span></span>
-		<span></span>
-	</div>
+            lg:hidden">
+
+              <div id="hamburger" on:click={hamburger} on:keydown={hamburger} class="cursor-pointer">
+                <span></span>
+                <span></span>
+                <span></span>
+              </div>
 </div>
 
-<nav id="card-navigation" class="card-navigation hidden box lg:block">
-	<div
-		class="nav-element dropdown lg:dropdown-right"
-		on:click={dropdown}
-		on:keydown={dropdown}
-		on:mouseover={hover}
-		on:mouseleave={hoverout}
-	>
-		{#if innerWidth > 1023}
-			<a href="/energieausweis-erstellen/verbrauchsausweis-wohnen" class="nav-element-child xl:rounded-t-[.75rem]"
-				>Energieausweis erstellen<span class="dd-symbol-clone">❯</span
-				><span class="dd-symbol">❯</span></a
-			>
-		{:else}
-			<a href="/energieausweis-erstellen/verbrauchsausweis-wohnen" class="nav-element-child xl:rounded-t-[.75rem]"
-				>Energieausweis erstellen<span class="dd-symbol-clone">❯</span
-				><span class="dd-symbol">❯</span></a
-			>
-		{/if}
 
-		<ul class="dropdown-content energieasusweis-erstellen">
-			{#if innerWidth < 1023}
-				<li><a href="/energieausweis-erstellen/verbrauchsausweis-wohnen">Energieausweis erstellen</a></li>
-			{/if}
-			<li><a href="/energieausweis-erstellen/verbrauchsausweis-wohnen">Verbrauchsausweis erstellen</a></li>
-			<li><a href="">Bedarfsausweis erstellen</a></li>
-			<li><a href="">Verbrauchsausweis Gewerbe erstellen</a></li>
-			<li><a href="">Bedarfsausweis Gewerbe erstellen</a></li>
-		</ul>
-	</div>
 
-	<div class="nav-element dropdown">
-		<div class="nav-element-child">Welcher Energieausweis?</div>
-	</div>
+<nav id="card-navigation" class="card-navigation hidden box ring-2 ring-primary/50 lg:block"> 
 
-	<div
-		class="nav-element dropdown lg:dropdown-right"
-		on:click={dropdown}
-		on:keydown={dropdown}
-		on:mouseover={hover}
-		on:mouseleave={hoverout}
-	>
-		<a href="#" class="nav-element-child"
-			>Verbrauchsausweis<span class="dd-symbol-clone">❯</span><span
-				class="dd-symbol">❯</span
-			></a
-		>
-		<ul class="dropdown-content verbrauchsausweis">
-			{#if innerWidth < 1023}
-				<li><a href="">Verbrauchsausweis</a></li>
-			{/if}
-			<li><a href="">Verbrauchsausweis Wohngebäude</a></li>
-			<li><a href="">Verbrauchsausweis online erstellen</a></li>
-			<li><a href="">Häufige Fragen zum Verbrauchsausweis</a></li>
-			<li>
-				<a href="">Statistiken zum Verbrauchsausweis Wohngebäude</a>
-			</li>
-			<li><a href="">Verbrauchsausweis Gewerbe</a></li>
-			<li><a href="">Verbrauchsausweis Gewerbe online erstellen</a></li>
-			<li><a href="">Häufige Fragen zum Verbrauchsausweis Gewerbe</a></li>
-			<li><a href="">Statistiken zum Verbrauchsausweis Gewerbe</a></li>
-		</ul>
-	</div>
+  <div class="nav-element dropdown lg:dropdown-right" on:click={dropdown} on:keydown={dropdown} on:mouseover={hover} on:mouseleave={hoverout}>
+    {#if innerWidth > 1023}
+    <a href="" class="nav-element-child xl:rounded-t-[.75rem] lg:rounded-t-lg xl:rounded-t-xl " >Energieausweis erstellen<span class="dd-symbol-clone">❯</span><span class="dd-symbol">❯</span></a>
+    {:else}
+    <a href="javascript:void(0)" class="nav-element-child xl:rounded-t-[.75rem]">Energieausweis erstellen<span class="dd-symbol-clone">❯</span><span class="dd-symbol">❯</span></a>
+    {/if}
+    
+    <ul class="dropdown-content energieasusweis-erstellen">
+      {#if innerWidth < 1023}
+      <li><a href="">Energieausweis erstellen</a></li>
+      {/if}
+      <li><a href="/energieausweis-erstellen/verbrauchsausweis-wohngebaeude/">Verbrauchsausweis erstellen</a></li>
+      <li><a href="/energieausweis-erstellen/bedarfsausweis-wohngebaeude/">Bedarfsausweis erstellen</a></li>
+      <li><a href="/energieausweis-erstellen/verbrauchsausweis-gewerbe/">Verbrauchsausweis Gewerbe erstellen</a></li>
+      <li><a href="/energieausweis-erstellen/bedarfsausweis-gewerbe/">Bedarfsausweis Gewerbe erstellen</a></li>
+    </ul>
+  </div>
 
-	<div
-		class="nav-element dropdown lg:dropdown-right"
-		on:click={dropdown}
-		on:keydown={dropdown}
-		on:mouseover={hover}
-		on:mouseleave={hoverout}
-	>
-		<a href="#" class="nav-element-child"
-			>Bedarfsausweis<span class="dd-symbol-clone">❯</span><span
-				class="dd-symbol">❯</span
-			></a
-		>
-		<ul class="dropdown-content bedarfsausweis">
-			{#if innerWidth < 1023}
-				<li><a href="">Bedarfsausweis</a></li>
-			{/if}
-			<li><a href="">Bedarfsausweis Wohngebäude</a></li>
-			<li><a href="">Bedarfsausweis online erstellen</a></li>
-			<li><a href="">Häufige Fragen zum Bedarfsausweis</a></li>
-			<li><a href="">Statistiken zum Bedarfsausweis Wohngebäude</a></li>
-			<li><a href="">Bedarfsausweis Gewerbe</a></li>
-			<li><a href="">Bedarfsausweis Gewerbe online erstellen</a></li>
-			<li><a href="">Häufige Fragen zum Bedarfsausweis Gewerbe</a></li>
-			<li><a href="">Statistiken zum Bedarfsausweis Gewerbe</a></li>
-		</ul>
-	</div>
+  <div class="nav-element">
+    <a class="no-dropdown nav-element-child" href="/welcher-energieausweis">Welcher Energieausweis?</a>
+  </div>
+
+<div class="nav-element dropdown lg:dropdown-right" on:click={dropdown} on:keydown={dropdown} on:mouseover={hover} on:mouseleave={hoverout}>
+  <a href="javascript:void(0)" class="nav-element-child">Verbrauchsausweis<span class="dd-symbol-clone">❯</span><span class="dd-symbol">❯</span></a>
+    <ul class="dropdown-content verbrauchsausweis">
+      {#if innerWidth < 1023}
+      <li><a href="index">Verbrauchsausweis</a></li>
+      {/if}
+      <li><a href="index">Verbrauchsausweis Wohngebäude</a></li>
+      <li><a href="index">Verbrauchsausweis online erstellen</a></li>
+      <li><a href="index">Häufige Fragen zum Verbrauchsausweis</a></li>
+      <li><a href="index">Statistiken zum Verbrauchsausweis Wohngebäude</a></li>
+      <li><a href="index">Verbrauchsausweis Gewerbe</a></li>
+      <li><a href="index">Verbrauchsausweis Gewerbe online erstellen</a></li>
+      <li><a href="index">Häufige Fragen zum Verbrauchsausweis Gewerbe</a></li>
+      <li><a href="index">Statistiken zum Verbrauchsausweis Gewerbe</a></li>
+  </div>
+
+<div class="nav-element dropdown lg:dropdown-right" on:click={dropdown} on:keydown={dropdown} on:mouseover={hover} on:mouseleave={hoverout}>
+  <a href="javascript:void(0)" class="nav-element-child">Bedarfsausweis<span class="dd-symbol-clone">❯</span><span class="dd-symbol">❯</span></a>
+    <ul class="dropdown-content bedarfsausweis">
+      {#if innerWidth < 1023}
+      <li><a href="index">Bedarfsausweis</a></li>
+      {/if}
+      <li><a href="index">Bedarfsausweis Wohngebäude</a></li>
+      <li><a href="index">Bedarfsausweis online erstellen</a></li>
+      <li><a href="index">Häufige Fragen zum Bedarfsausweis</a></li>
+      <li><a href="index">Statistiken zum Bedarfsausweis Wohngebäude</a></li>
+      <li><a href="index">Bedarfsausweis Gewerbe</a></li>
+      <li><a href="index">Bedarfsausweis Gewerbe online erstellen</a></li>
+      <li><a href="index">Häufige Fragen zum Bedarfsausweis Gewerbe</a></li>
+      <li><a href="index">Statistiken zum Bedarfsausweis Gewerbe</a></li>
+    </ul>
+</div>
+
+
+<div class="nav-element dropdown lg:dropdown-right" on:click={dropdown} on:keydown={dropdown} on:mouseover={hover} on:mouseleave={hoverout}>
+  <a href="javascript:void(0)" class="nav-element-child">Energieausweis<span class="dd-symbol-clone">❯</span><span class="dd-symbol">❯</span></a>
+  <ul class="dropdown-content energieausweis">
+    {#if innerWidth < 1023}
+    <li><a href="index">Energieausweis</a></li>
+    {/if}
+    <li class=""><a href="index">Energieausweis Pflicht</a></li>
+    <li class=""><a href="index">Energieausweis Kosten</a></li>
+    <li class=""><a href="index">Energieausweis Haus</a></li>
+  </ul>
+</div>
+
+<div class="nav-element">
+<a class="no-dropdown nav-element-child" href="/enev-zusammenfassung">EnEV Zusammenfassung - Archiv</a>
+</div>
+<div class="nav-element">
+<a class="no-dropdown nav-element-child" href="/energieausweis-aussteller">Energieausweis Aussteller</a>
+</div>
+<div class="nav-element">
+<a class="no-dropdown nav-element-child" href="/kundenbewertungen">Kundenbewertungen</a>
+</div>
+<div class="nav-element">
+<a class="no-dropdown nav-element-child" href="/faq">FAQ</a>
+</div>
+<div class="nav-element">
+  <a class="no-dropdown nav-element-child lg:!rounded-b-lg xl:!rounded-b-xl"href="/fuer-entwickler">Für Entwickler</a>
+</div>
 
-	<div
-		class="nav-element dropdown lg:dropdown-right"
-		on:click={dropdown}
-		on:keydown={dropdown}
-		on:mouseover={hover}
-		on:mouseleave={hoverout}
-	>
-		<a href="#" class="nav-element-child"
-			>Energieausweis<span class="dd-symbol-clone">❯</span><span
-				class="dd-symbol">❯</span
-			></a
-		>
-		<ul class="dropdown-content energieausweis">
-			{#if innerWidth < 1023}
-				<li><a href="">Energieausweis</a></li>
-			{/if}
-			<li class=""><a href="">Energieausweis Pflicht</a></li>
-			<li class=""><a href="">Energieausweis Kosten</a></li>
-			<li class=""><a href="">Energieausweis Haus</a></li>
-		</ul>
-	</div>
 
-	<div class="nav-element dropdown">
-		<div class="nav-element-child">EnEV Zusammenfassung - Archiv</div>
-	</div>
-	<div class="nav-element dropdown">
-		<div class="nav-element-child">Energieausweis Aussteller</div>
-	</div>
-	<div class="nav-element dropdown">
-		<div class="nav-element-child">Kundenbewertungen</div>
-	</div>
-	<div class="nav-element dropdown">
-		<div class="nav-element-child">FAQ</div>
-	</div>
-	<div class="nav-element dropdown">
-		<div class="nav-element-child xl:!rounded-b-xl">Für Entwickler</div>
-	</div>
-	<div class="nav-element dropdown">
-		<ThemeController></ThemeController>
-	</div>
 </nav>
 
+
 <style>
-	.dd-symbol::before {
-		content: "❯";
-		font-size: 0.95rem;
-		position: absolute;
-		top: 0px;
-		left: -7px;
-		animation-name: flim;
-		animation-duration: 2s;
-		animation-iteration-count: infinite;
-	}
 
-	.dd-symbol {
-		visibility: hidden;
-	}
+.dd-symbol::before{
+  content:'❯';
+  font-size:0.95rem;
+  position:absolute;
+  top:0px;
+  left:-7px;
+  animation-name: flim;
+  animation-duration: 2s;
+  animation-iteration-count: infinite;
+}
 
-	.dd-symbol::after {
-		content: "❯";
-		font-size: 0.95rem;
-		position: absolute;
-		top: 0px;
-		right: -7px;
-		animation-name: flim;
-		animation-duration: 2s;
-		animation-delay: 1s;
-		animation-iteration-count: infinite;
-	}
+.dd-symbol{visibility: hidden;}
 
-	@keyframes flim {
-		0% {
-			opacity: 0;
-		}
-		16.66% {
-			opacity: 0.25;
-		}
-		33.32% {
-			opacity: 0.5;
-		}
-		49.98% {
-			opacity: 0.75;
-		}
-		66.64% {
-			opacity: 0.5;
-		}
-		83.33% {
-			opacity: 0.25;
-		}
-		100% {
-			opacity: 0;
-		}
-	}
-</style>
+.dd-symbol::after{
+  content:'❯';
+  font-size:0.95rem;
+  position:absolute;
+  top:0px;
+  right:-7px;
+  animation-name: flim;
+  animation-duration: 2s;
+  animation-delay: 1s;
+  animation-iteration-count: infinite;
+}
+
+  @keyframes flim{
+  0%   {opacity: 0;}
+  16.66%  {opacity: 0.25;}
+  33.32%  {opacity: 0.5;}
+  49.98%  {opacity: 0.75;}
+  66.64% {opacity: 0.5;}
+  83.33% {opacity: 0.25;}
+  100% {opacity: 0;}
+}
+
+
+
+</style>
\ No newline at end of file
diff --git a/src/components/design/sidebars/left/SidebarLeft.astro b/src/components/design/sidebars/left/SidebarLeft.astro
index 2957559c..7b28b87d 100644
--- a/src/components/design/sidebars/left/SidebarLeft.astro
+++ b/src/components/design/sidebars/left/SidebarLeft.astro
@@ -5,6 +5,8 @@ import Preistabelle from "#sidebarCards/card-price-info.svelte";
 ---
 
 <div class="flex flex-col grow">
+
+
 <Navigation client:load />
 <Preistabelle client:load />
 </div>
\ No newline at end of file
diff --git a/src/components/design/sidebars/right/SidebarRight.astro b/src/components/design/sidebars/right/SidebarRight.astro
index 9e67fbb6..953812c3 100644
--- a/src/components/design/sidebars/right/SidebarRight.astro
+++ b/src/components/design/sidebars/right/SidebarRight.astro
@@ -11,7 +11,6 @@ import BAGpromo from "#sidebarCards/card-BA-G-promo.svelte";
 <div class="hidden
             xl:flex xl:flex-col xl:grow
             ">
-
     <Login client:load />
     <Contact client:load />
     <Review client:load />
diff --git a/src/layouts/AusweisLayout.astro b/src/layouts/AusweisLayout.astro
index 8845b62a..3464572d 100644
--- a/src/layouts/AusweisLayout.astro
+++ b/src/layouts/AusweisLayout.astro
@@ -1,9 +1,10 @@
 ---
-import "#style/global.css"
+import "../style/global.css";
 import "../../svelte-dialogs.config"
-import Footer from '#components/design/footer/Footer.astro';
-import Header from '#components/design/header/Header.astro';
-import SidebarLeft from '#components/design/sidebars/left/SidebarLeft.astro';
+import Header from "#header/Header.astro";
+import Footer from "#footer/Footer.astro";
+import SidebarLeft from "#sidebarLeft/SidebarLeft.astro";
+import { NotificationWrapper } from "@ibcornelsen/ui";
 
 export interface Props {
 	title: string;
@@ -11,38 +12,14 @@ export interface Props {
 
 const { title } = Astro.props;
 
-const schema = JSON.stringify({
-	'@context': 'http://schema.org',
-	'@type': 'Corporation',
-	name: 'IB Cornelsen',
-	alternateName: 'online-energieausweis.org',
-	url: 'https://online-energieausweis.org',
-	logo: 'https://online-energieausweis.org/ib-cornelsen.png',
-	address: {
-		'@type': 'PostalAddress',
-		streetAddress: 'Katendeich 5A',
-		addressLocality: 'Hamburg',
-		postalCode: '21035',
-		addressCountry: 'Deutschland',
-		email: 'info@online-energieausweis.org',
-	},
-	contactPoint: {
-		'@type': 'ContactPoint',
-		telephone: '+49-040-209339850',
-		faxNumber: '+49-040-209339859',
-		contactType: 'customer service',
-		areaServed: 'DE',
-		availableLanguage: 'German',
-	},
-});
+
 ---
 
 <!DOCTYPE html>
-<html lang="en">
+<html lang="de">
 	<head>
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="width=device-width" />
-		<script type="application/ld+json" set:html={schema}></script>
 		<link rel="icon" type="image/svg+xml" href="/favicon.jpg" />
 
 		<meta
@@ -83,14 +60,30 @@ const schema = JSON.stringify({
 	</head>
 
 	<body>
+		<container class="w-full max-w-[1920px]">
+		
 		<Header />
-		<main class="grid gap-6 p-6 grid-cols-[2fr,8fr] max-w-[1920px] w-full bg-base-100">
-			<SidebarLeft></SidebarLeft>
-			<article class="bg-base-200 rounded-lg border border-base-300 h-min">
-				<slot />
-			</article>
+
+		<main
+			class="w-full p-0 grid
+			sm:grid-cols-[minmax(1fr,1fr)] sm:gap-1 sm:p-1
+			md:grid-cols-[minmax(1fr,1fr)] md:gap-2 md:p-2
+			lg:grid-cols-[minmax(250px,250px)1fr] lg:gap-3 lg:p-3
+			xl:grid-cols-[minmax(350px,350px)1fr] xl:gap-4 xl:p-4
+			2xl:grid-cols-[minmax(350px,350px)1fr] 2xl:gap-5 2xl:p-5
+		">
+
+		<SidebarLeft />
+		
+		<article class="box grow">
+		<slot />
+		</article>
+
 		</main>
+	
 		<Footer />
+		<NotificationWrapper client:load />
+	</container>
 	</body>
 </html>
 
@@ -186,15 +179,6 @@ article {
 		); */
 	}
 
-	.box {
-		@apply border-2 border-[#ffcc03] p-4 rounded-lg bg-base-200;
-		/* background: linear-gradient(
-			135deg,
-			rgba(252, 234, 187, 1) 0%,
-			rgba(253, 235, 189, 1) 52%,
-			rgba(251, 223, 147, 1) 100%
-		); */
-	}
 
 	.headline {
 		@apply text-lg;
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 90a974a1..c050f1e3 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -33,13 +33,16 @@ const { title } = Astro.props;
 
 	<body>
 		<container class="w-full max-w-[1920px]">
+		
 		<Header />
-		<main
-			class="w-full p-0
-			lg:grid grid-cols-[max-content,6fr] lg:gap-3 lg:p-3
-			xl:grid-cols-[2fr,6fr,2fr]  xl:py-4 xl:px-3
-			2xl:grid-cols-[2fr,6fr,2fr] 2xl:gap-5 2xl:py-4 2xl:px-9
 
+		<main
+			class="w-full p-0 grid
+			sm:grid-cols-[minmax(1fr,1fr)] sm:gap-1 sm:p-1
+			md:grid-cols-[minmax(1fr,1fr)] md:gap-2 md:p-2
+			lg:grid-cols-[minmax(250px,250px)1fr] lg:gap-3 lg:p-3
+			xl:grid-cols-[minmax(350px,350px)1fr] xl:gap-4 xl:p-4
+			2xl:grid-cols-[minmax(350px,350px)1fr_minmax(350px,350px)] 2xl:gap-5 2xl:p-5
 		">
 
 		<SidebarLeft />
diff --git a/src/pages/agb.mdx b/src/pages/agb.mdx
index 589a1f22..bbc15847 100644
--- a/src/pages/agb.mdx
+++ b/src/pages/agb.mdx
@@ -1,6 +1,6 @@
 ---
-layout; ../layouts/Layout.astro
-title: AGB - online-energieausweis.org
+layout: ../layouts/Layout.astro
+title: "Allgemeine Geschäftsbedingungen"
 ---
 
 # Allgemeine Geschäftsbedingungen
diff --git a/src/pages/energieausweis-erstellen/bedarfsausweis-wohnen/index.astro b/src/pages/energieausweis-erstellen/bedarfsausweis-wohngebaeude/index.astro
similarity index 100%
rename from src/pages/energieausweis-erstellen/bedarfsausweis-wohnen/index.astro
rename to src/pages/energieausweis-erstellen/bedarfsausweis-wohngebaeude/index.astro
diff --git a/src/pages/energieausweis-erstellen/verbrauchsausweis-wohnen/index.astro b/src/pages/energieausweis-erstellen/verbrauchsausweis-wohngebaeude/index.astro
similarity index 100%
rename from src/pages/energieausweis-erstellen/verbrauchsausweis-wohnen/index.astro
rename to src/pages/energieausweis-erstellen/verbrauchsausweis-wohngebaeude/index.astro
diff --git a/src/pages/kontakt.astro b/src/pages/kontakt.astro
index e69de29b..94b366cc 100644
--- a/src/pages/kontakt.astro
+++ b/src/pages/kontakt.astro
@@ -0,0 +1,14 @@
+---
+import Layout from "#layouts/Layout.astro";
+
+
+---
+
+<Layout title="Ingeneurbüro Cornelsen Kontakt - Online Energieausweis">
+	<h1>Kontakt - Online Energieausweis</h1>
+	
+
+	
+
+
+</Layout>
\ No newline at end of file
diff --git a/src/style/global.css b/src/style/global.css
index 8d815820..54b7dc7e 100644
--- a/src/style/global.css
+++ b/src/style/global.css
@@ -72,7 +72,9 @@ article {
 /*BOXES*/
 .box{
 	@apply 	rounded-none
-			xl:rounded-xl lg:shadow-box lg:ring-1 lg:ring-gray-300 
+			lg:rounded-lg lg:shadow-box lg:ring-1 lg:ring-gray-300
+			xl:rounded-xl 
+			 
 }
 
 .card{
@@ -91,8 +93,14 @@ article {
 
 .nav-element:not(:first-child){@apply border-gray-200 border-t-[1px]}
 
+.no-dropdown, .no-dropdown:hover{@apply text-black no-underline}
+
 .nav-element:hover > .nav-element-child{ 
-    	@apply 		!bg-primary !text-white cursor-pointer
+    	@apply 		!bg-primary !text-white cursor-pointer 
+}
+
+.nav-element:hover > .nav-element-child .no-dropdown{ 
+	@apply 		!bg-primary !text-white cursor-pointer 
 }
 
 .nav-element:hover > .dropdown-content{ 
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
index b0d3415c..490949fe 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -2,7 +2,9 @@
 module.exports = {
 	content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}", "./node_modules/@ibcornelsen/ui/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"],
 	darkMode: "class",
-	plugins: [require("daisyui"), require("@tailwindcss/typography")],
+	plugins: 
+	[require("daisyui"), 
+	require("@tailwindcss/typography")],
 	important: true,
 	theme: {
 		extend: {
@@ -17,6 +19,21 @@ module.exports = {
 			},
 			boxShadow: {
 				'box': '3px 3px 6px rgba(0, 0, 0, 0.1)',				
+			  },
+			
+			gridTemplateColumns: {
+				// Simple 16 column grid
+				//'standard-sm': 'minmax(350px, 2fr) 6fr minmax(350px, 2fr)',
+				//'standard-md': 'minmax(350px, 2fr) 6fr minmax(350px, 2fr)',
+				//'standard-lg': 'minmax(350px, 2fr) 6fr minmax(350px, 2fr)',
+				//'standard-xl': 'minmax(350px, 2fr) 6fr minmax(350px, 2fr)',
+				//'standard-2xl': 'minmax(300px, 300px) 6fr minmax(300px, 300px)',
+				//'formular-sm': 'minmax(350px, max-content) 8fr',
+				//'formular-md': 'minmax(350px, max-content) 8fr',
+				//'formular-lg': 'minmax(350px, max-content) 8fr',
+				//'formular-xl': 'minmax(350px, max-content) 8fr',
+				//'formular-2xl': 'minmax(350px, max-content) 8fr',
+		
 			  }
 		},
 	},
diff --git a/tsconfig.json b/tsconfig.json
index a595c637..748fb6e2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -28,13 +28,15 @@
 			"#client/*": ["./src/client/*"],
 			"#server/*": ["./src/server/*"],
 			"#style/*": ["./src/style/*"],
-			
+	
 			"#footer/*": ["./src/components/design/footer/*"],
 			"#header/*": ["./src/components/design/header/*"],
 			"#content/*": ["./src/components/design/content/*"],
 			"#sidebarCards/*": ["./src/components/design/sidebars/cards/*"],
 			"#sidebarLeft/*": ["./src/components/design/sidebars/left/*"],
 			"#sidebarRight/*": ["./src/components/design/sidebars/right/*"],
+
+			"#ausweise/*": ["./src/pages/energieausweis-erstellen/*"],
 		},
 		"types": ["cypress", "cypress-file-upload", "bun-types", "svelte"]
 	}