diff --git a/app/app.vue b/app/app.vue
old mode 100644
new mode 100755
index a084371..a738821
--- a/app/app.vue
+++ b/app/app.vue
@@ -1,18 +1,11 @@
 <template>
-  <PpNavigation />
-  <NuxtLayout>
-    <NuxtPage />
-  </NuxtLayout>
+  <div class="page-wrapper">
+    <PpHeader />
+    <div class="page">
+      <NuxtPage />
+    </div>
+    <PpFooter />
+  </div>
 </template>
-
-<style>
-.page-enter-active,
-.page-leave-active {
-  transition: all 2000ms;
-}
-.page-enter-from,
-.page-leave-to {
-  opacity: 0;
-  filter: blur(.5rem);
-}
-</style>
\ No newline at end of file
+<script setup lang="ts">
+</script>
\ No newline at end of file
diff --git a/app/assets/styles/button.css b/app/assets/styles/button.css
index e334808..11a6a95 100755
--- a/app/assets/styles/button.css
+++ b/app/assets/styles/button.css
@@ -1,5 +1,5 @@
 .Button {
-    --padding: var(--padding-xs);
+    --padding: .2rem;
     --background: var(--color-main-dark);
     --color: var(--color-lightest);
     --background-hover: var(--color-main-dark);
@@ -8,7 +8,7 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    gap: var(--padding-default);
+    gap: 1rem;
     cursor: pointer;
     transition: var(--transition-default);
     outline: none;
@@ -19,13 +19,13 @@
     &.transparent {
         --background: transparent;
         box-shadow: none;
-        padding: var(--padding-s) var(--padding-l);
+        padding: .5em 1.5em;
         border-radius: var(--radius-default);
     }
 
     &.raised {
         box-shadow: var(--box-shadow-z2);
-        padding: var(--padding-s) var(--padding-l);
+        padding: .5em 1.5em;
         border-radius: var(--radius-default);
 
         &.danger {
@@ -37,7 +37,7 @@
     &.text {
         --background: transparent;
         --color: var(--color-darkest);
-        padding: var(--padding-s) var(--padding-l);
+        padding: .5em 1.5em;
         border-radius: var(--radius-default);
 
         &:hover {
@@ -62,13 +62,13 @@
         justify-content: center;
         align-items: center;
         border-radius: 100%;
-        padding: var(--padding-s);
+        padding: .5rem;
     }
 
     &.cta {
         background: var(--background);
         color: var(--color);
-        padding: var(--padding-s) var(--padding-l);
+        padding: .5rem 1.5rem;
         border-radius: var(--radius-default);
         box-shadow: var(--box-shadow-z2);
 
@@ -98,7 +98,7 @@
         --color: var(--color-main-darkest);
         border-radius: 100%;
         padding: var(--padding);
-        font-size: var(--font-size-l);
+        font-size: 1.1em;
 
         &:hover {
             scale: 1.2;
@@ -106,17 +106,17 @@
     }
 
     &.mini-button {
-        padding: var(--padding-s) var(--padding-l);
+        padding: .5rem 1.5rem;
         display: flex;
         flex-direction: column;
-        gap: var(--padding-xs);
+        gap: .5rem;
 
         & > .icon {
-            font-size: var(--font-size-xl);
+            font-size: 1.5rem;
         }
 
         & > span {
-            font-size: var(--font-size-s);
+            font-size: .8rem;
         }
     }
 }
\ No newline at end of file
diff --git a/app/assets/styles/buttonGroup.css b/app/assets/styles/buttonGroup.css
index bb8ffd8..4b46732 100644
--- a/app/assets/styles/buttonGroup.css
+++ b/app/assets/styles/buttonGroup.css
@@ -9,8 +9,8 @@
         display: flex;
         align-items: center;
         justify-content: center;
-        gap: var(--padding-xs);
-        padding: var(--padding-s);
+        gap: .5rem;
+        padding: .5rem;
         flex-grow: 1;
         background: var(--background);
         color: var(--color);
diff --git a/app/assets/styles/dialog.css b/app/assets/styles/dialog.css
index 0f44254..afa1065 100644
--- a/app/assets/styles/dialog.css
+++ b/app/assets/styles/dialog.css
@@ -7,7 +7,7 @@ dialog {
     border: none;
     border-radius: var(--radius-default);
     background: var(--color-lightest);
-    font-size: var(--font-size-default);
+    font-size: 1rem;
     color: var(--color-darkest);
     position: relative;
 
@@ -40,7 +40,7 @@ dialog {
     & > .wrapper {
         display: flex;
         flex-direction: column;
-        gap: var(--padding-default);
+        gap: 1rem;
     }
 
     & header {
diff --git a/app/assets/styles/footer.css b/app/assets/styles/footer.css
index 5d2f50c..baaa1fe 100644
--- a/app/assets/styles/footer.css
+++ b/app/assets/styles/footer.css
@@ -12,27 +12,27 @@
 
     & .bottom {
         display: flex;
-        gap: var(--padding-default);
+        gap: 1rem;
         justify-content: space-between;
         color: var(--color-light);
     }
 
     & .socials {
-        font-size: var(--font-size-xl);
+        font-size: 1.5rem;
         justify-content: center;
-        margin-bottom: var(--padding-xl);
+        margin-bottom: 2rem;
     }
 
     & .data-links {
         justify-content: flex-end;
-        font-size: var(--font-size-s);
+        font-size: .8rem;
     }
 
     & ul {
         list-style: none;
         display: flex;
         align-items: center;
-        gap: var(--padding-default);
+        gap: 1rem;
 
         & a {
             color: var(--color-lightest);
diff --git a/app/assets/styles/form/search.css b/app/assets/styles/form/search.css
index e03c6a4..5a30772 100644
--- a/app/assets/styles/form/search.css
+++ b/app/assets/styles/form/search.css
@@ -1,15 +1,15 @@
 .Search {
     border-radius: 9999px;
     background: var(--color-lightest);
-    padding: 0 var(--padding-default);
+    padding: 0 1rem;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    gap: var(--padding-default);
+    gap: 1rem;
 
     & > input {
         all: unset;
         flex-grow: 1;
-        padding: var(--padding-s) 0;
+        padding: .5rem 0;
     }
 }
\ No newline at end of file
diff --git a/app/assets/styles/form/textfield.css b/app/assets/styles/form/textfield.css
index d2cfaf8..b6c1959 100755
--- a/app/assets/styles/form/textfield.css
+++ b/app/assets/styles/form/textfield.css
@@ -1,9 +1,9 @@
 .TextField {
   --border-color: var(--color-light);
   --label-color: var(--color-middle);
-  --label-position-top: var(--font-size-default);
-  --label-position-left: 2.5rem;
-  --label-font-size: var(--font-size-default);
+  --label-position-top: 0.4em;
+  --label-font-size: 1rem;
+  --icon-color: var(--color-main-dark);
   --message-color: var(--color-middle);
 
   position: relative;
@@ -15,11 +15,15 @@
 
   &:focus-within,
   &:has(input:not(:placeholder-shown)) {
+    --icon-color: var(--color-main-dark);
     --label-color: var(--color-main-dark);
+    --label-position-top: -11px;
+    --label-font-size: 0.8rem;
   }
 
   &.error {
-    --label-color: var(--color-error) !important;
+    --label-color: var(--color-error);
+    --icon-color: var(--color-error);
     --border-color: var(--color-error);
     --message-color: var(--color-error);
   }
@@ -27,46 +31,37 @@
   & .wrapper {
     display: flex;
     align-items: center;
-    padding: var(--padding-xxs) var(--padding-xs);
+    padding: 0.1rem 0.5rem;
     border: 1px solid var(--border-color);
     border-radius: var(--radius-default);
   }
 
   & label {
     position: absolute;
-    display: flex;
-    align-items: center;
+    background: var(--color-lightest);
+    padding: 0.2rem;
+    left: 1.8rem;
     color: var(--label-color);
-    gap: 2px;
-    top: -6px;
-    left: calc(var(--padding-xs) - 2px);
-    font-size: var(--font-size-s);
+    top: var(--label-position-top);
+    font-size: var(--label-font-size);
     transition: var(--transition-default);
-
-    & > * {
-      background: var(--color-lightest);
-      padding: 0 2px;
-    }
   }
 
   & .icon {
-    position: relative;
-    color: var(--label-color);
-    font-size: var(--font-size-default);
-    top: -1px;
+    color: var(--icon-color);
   }
 
   & input {
     all: unset;
-    padding: var(--padding-xxs) var(--padding-s) var(--padding-xxs) 0;
-    font-size: var(--font-size-s);
+    padding: var(--padding-small);
+    font-size: 1rem;
     width: 100%;
     flex: 25% 1 0;
     color: var(--color-darkest);
   }
 
-  & > span {
+  & span {
     color: var(--message-color);
-    font-size: var(--font-size-xs);
+    font-size: 0.6rem;
   }
 }
diff --git a/app/assets/styles/general.css b/app/assets/styles/general.css
index 99a8bc6..672acd2 100755
--- a/app/assets/styles/general.css
+++ b/app/assets/styles/general.css
@@ -1,7 +1,14 @@
 :root {
+  --padding-default: 1rem;
+  --padding-small: 0.5rem;
+  --padding-large: 2rem;
+  --radius-default: 3px;
+  --radius-border: 15px;
+  --transition-default: 150ms;
+
   --color-success: #328104;
   --color-error: #a20606;
-  --color-blue-light: #d7e1f1;
+  --color-blue-light: #0ddce7;
   --color-blue: #05b0ff;
   --color-blue-dark: #0266f2;
   --color-blue-darkest: #013174;
@@ -19,7 +26,6 @@
   --color-green-darkest-most: #157c2a;
 
   --color-main: var(--color-blue);
-  --color-main-lightest: var(--color-blue-light);
   --color-main-light: var(--color-blue-light);
   --color-main-dark: var(--color-blue-dark);
   --color-main-darkest: var(--color-blue-darkest);
@@ -29,9 +35,6 @@
   --color-accent-dark: var(--color-green-dark);
   --color-accent-darkest: var(--color-green-darkest);
 
-  --color-text: var(--color-darkest);
-  --color-text-invert: var(--color-lightest);
-
   --color-gradient-main: linear-gradient(to bottom right, var(--color-main), var(--color-main-light));
   --color-gradient-main-dark: linear-gradient(to bottom right, var(--color-main-darkest), var(--color-main-dark));
   --color-gradient-accent: linear-gradient(to bottom right, var(--color-accent), var(--color-accent-light));
@@ -42,29 +45,6 @@
   --box-shadow-upper: 0 -3px 6px rgba(0, 0, 0, 0.16), 0 -3px 6px rgba(0, 0, 0, 0.23);
   --box-shadow-z2: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
   --box-shadow-inset: inset 0 3px 6px rgba(0, 0, 0, 0.16), inset 0 3px 6px rgba(0, 0, 0, 0.23);
-
-  /* Font Sizes & Scaling Factor*/
-  --scaling-factor: 1.25;
-  --font-size-xs: calc(var(--font-size-s) / var(--scaling-factor));
-  --font-size-s: calc(var(--font-size-default) / var(--scaling-factor));
-  --font-size-default: 1rem;
-  --font-size-l: calc(var(--font-size-default) * var(--scaling-factor));
-  --font-size-xl: calc(var(--font-size-l) * var(--scaling-factor));
-  --font-size-xxl: calc(var(--font-size-xl) * var(--scaling-factor));
-
-  /* Paddings depend on Font-Size */
-  --padding-xxs: calc(var(--padding-xs) / var(--scaling-factor));
-  --padding-xs: calc(var(--padding-s) / var(--scaling-factor));
-  --padding-default: var(--font-size-default);
-  --padding-s: calc(var(--padding-default) / var(--scaling-factor));
-  --padding-l: calc(var(--padding-default) * var(--scaling-factor));
-  --padding-xl: calc(var(--padding-l) * var(--scaling-factor));
-  --padding-xxl: calc(var(--padding-xl) * var(--scaling-factor));
-
-  --radius-default: calc(var(--font-size-default) / 3);
-  --radius-border: var(--font-size-default);
-
-  --transition-default: 150ms;
 }
 
 * {
@@ -79,29 +59,43 @@ body {
   overflow-x: hidden;
   font-family: sans-serif;
   background: var(--color-main-darkest);
-  color: var(--color-text);
-  font-size: var(--font-size-default);
 }
 
-h1, h2, h3 {
-  margin: var(--padding-xl) 0 var(--padding-default);
-  text-wrap: balance;
-  hyphens: auto;
-  font-size: var(--font-size-xl);
+.dot {
+  --size: 10px;
+  width: var(--size);
+  height: var(--size);
+  top: 5px;
+  right: 25%;
+  border-radius: 50%;
+  background-color: var(--color-accent);
+  display: inline-block;
+  margin-right: 0.5rem;
+  position: absolute;
+  box-shadow: var(--box-shadow-z2);
+  scale: 0;
+  transition: var(--transition-default);
+
+  &.visible {
+    scale: 1;
+    animation: pulse 1s infinite;
+  }
 }
 
-h2 {
-  margin: var(--padding-l) 0 var(--padding-default);
-  font-size: var(--font-size-l);
-}
+@keyframes pulse {
+  0% {
+    transform: scale(0.95);
+    box-shadow: 0 0 0 0 rgba(255, 255, 255, 0.7);
+  }
+  70% {
+    transform: scale(1);
+    box-shadow: 0 0 0 10px rgba(255, 255, 255, 0);
+  }
 
-h3 {
-  margin: var(--padding-default) 0 var(--padding-default);
-  font-size: var(--font-size-default);
-}
-
-a:has(button) {
-  text-decoration: none;
+  100% {
+    transform: scale(0.95);
+    box-shadow: 0 0 0 0 rgba(255, 255, 255, 0);
+  }
 }
 
 .card {
@@ -121,7 +115,7 @@ a:has(button) {
 }
 
 .text-white {
-  color: var(--color-text-invert);
+  color: var(--color-lightest);
 }
 
 .bg-main {
@@ -136,16 +130,12 @@ a:has(button) {
   background-color: var(--color-main-dark);
 }
 
-.bg-main-darkest {
-  background-color: var(--color-main-darkest);
-}
-
 .bg-main-dark-hover:hover {
   background-color: var(--color-main-dark);
 }
 
 .gap-default {
-  gap: var(--padding-default);
+  gap: 1rem;
 }
 
 .bg-blue {
@@ -157,13 +147,13 @@ a:has(button) {
 }
 
 .padding {
-  gap: var(--padding-default);
+  gap: 1rem;
   padding: var(--padding-default);
 }
 
 .padding-small {
-  gap: var(--padding-default);
-  padding: var(--padding-s);
+  gap: 1rem;
+  padding: var(--padding-small);
 }
 
 .roboto-condensed {
@@ -180,5 +170,5 @@ a:has(button) {
 
 .grow {
   flex-grow: 1;
-  height: var(--padding-s);
+  height: 10px;
 }
\ No newline at end of file
diff --git a/app/assets/styles/header.css b/app/assets/styles/header.css
index 6b61bc4..6732374 100755
--- a/app/assets/styles/header.css
+++ b/app/assets/styles/header.css
@@ -2,37 +2,20 @@
     position: sticky;
     top: 0;
     z-index: 100;
+    background: var(--color-main-darkest);
     display: flex;
     align-items: center;
-    gap: var(--padding-default);
+    gap: 1rem;
     padding: var(--padding-default);
 
-    &:not(.lp) {
-        background: var(--color-main-darkest);
-    }
-
-    &.lp {
-        position: absolute;
-        backdrop-filter: blur(10px);
-        mask: linear-gradient(to top, transparent, black 20%);
-        width: 100%;
-        top: 0;
-    }
-
     & .logo {
         height: 40px;
     }
 
-    & .burger-button {
-        all: unset;
-        color: var(--color-lightest);
-    }
-
     & header {
         display: flex;
         align-items: center;
         justify-content: space-between;
-        width: 100%;
         font-weight: bold;
 
         & a {
@@ -43,7 +26,7 @@
         & .header-text {
             display: flex;
             align-items: center;
-            gap: var(--padding-default);
+            gap: 1rem;
 
             & > div {
                 display: flex;
@@ -51,35 +34,69 @@
             }
 
             & .big {
-                font-size: var(--font-size-xl);
+                font-size: 1.5em;
             }
 
             & .small {
-                font-size: var(--font-size-s);
+                font-size: .8em;
                 font-weight: 100;
             }
         }
+
+        & input[type="checkbox"] {
+            display: none;
+        }
+
+        & input[type="checkbox"]:checked + nav {
+            translate: 0;
+        }
+
+        & nav,
+        & ul {
+            gap: 1em;
+        }
+
+        & nav {
+            position: fixed;
+            padding: var(--padding-default);
+            translate: 100% 0;
+            width: 100vw;
+            right: 0;
+            top: 0;
+            height: 100dvh;
+            transition: 150ms ease-in-out;
+            background: var(--color-lightest);
+            font-size: 2em;
+            align-items: end;
+            z-index: 100;
+        }
+
+        & ul {
+            width: 100%;
+            align-items: center;
+            & li {
+                list-style: none;
+            }
+        }
     }
 
-    &:not(.lp) {
-        &:after, &:before {
-            content: '';
-            display: block;
-            position: absolute;
-            bottom: calc(-1 * var(--radius-border));
-            background: var(--color-blue-darkest);
-            width: var(--radius-border);
-            height: var(--radius-border);
-        }
+    &:after, &:before {
+        content: '';
+        display: block;
+        position: absolute;
+        bottom: calc(-1 * var(--radius-border));
+        background: var(--color-blue-darkest);
+        width: var(--radius-border);
+        height: var(--radius-border);
+    }
 
-        &:after {
-            right: 0;
-            mask: radial-gradient(var(--radius-border) at 0 100%,#0000 98%,#000);
-        }
+    &:after {
+        right: 0;
+        mask: radial-gradient(var(--radius-border) at 0 100%,#0000 98%,#000);
+    }
 
-        &:before {
-            left: 0;
-            mask: radial-gradient(var(--radius-border) at 100% 100%,#0000 98%,#000);
-        }
+    &:before {
+        left: 0;
+        mask: radial-gradient(var(--radius-border) at 100% 100%,#0000 98%,#000);
     }
 }
\ No newline at end of file
diff --git a/app/assets/styles/landingpage.css b/app/assets/styles/landingpage.css
deleted file mode 100644
index 5d45215..0000000
--- a/app/assets/styles/landingpage.css
+++ /dev/null
@@ -1,30 +0,0 @@
-.home-hero {
-    background-image: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4)), url("/img/hero-image.webp"); /* single color gradient for dark layer over image */
-    background-repeat: no-repeat;
-    background-position: center center;
-    background-size: cover;
-    color: var(--color-text-invert);
-    text-align: center;
-    height: 100vh;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    button {
-        margin: var(--padding-xxl) auto 0;
-    }
-
-    .text {
-        padding: var(--padding-default);
-    }
-
-    h1 {
-        font-size: var(--font-size-xxl);
-    }
-}
-
-.home-text {
-    padding: var(--padding-xxl) var(--padding-default);
-    text-align: center;
-}
-
diff --git a/app/assets/styles/navigation.css b/app/assets/styles/navigation.css
deleted file mode 100644
index 2b12356..0000000
--- a/app/assets/styles/navigation.css
+++ /dev/null
@@ -1,69 +0,0 @@
-.Navigation {
-    position: fixed;
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
-    z-index: 5000;
-    width: 100vw;
-    height: 100dvh;
-    right: 0;
-    top: 0;
-    transition: 150ms ease-in-out;
-    pointer-events: none;
-
-    &.open {
-        pointer-events: all;
-        background: rgba(0, 0, 0, .5);
-
-        & nav {
-            translate: -1rem 0;
-        }
-    }
-
-    nav {
-        background: var(--color-lightest);
-        align-items: end;
-        box-shadow: var(--box-shadow-z2);
-        padding: var(--padding-default);
-        height: calc(100% - var(--padding-xxl));
-        width: 70%;
-        translate: 100% 0;
-        transition: 150ms ease-in-out;
-        border-radius: var(--radius-default);
-    }
-
-    & button {
-        justify-self: flex-end;
-        font-size: var(--font-size-xl);
-    }
-
-    & ul {
-        width: 100%;
-        align-items: flex-start;
-        font-size: var(--font-size-l);
-        gap: var(--padding-default);
-
-        & li {
-            list-style: none;
-            width: 100%;
-
-            & a {
-                text-decoration: none;
-                display: flex;
-                align-items: center;
-                gap: var(--padding-default);
-                color: var(--color-middle);
-                border-radius: var(--radius-default);
-                padding: var(--padding-xs) var(--padding-s);
-                transition: var(--transition-default);
-                background: transparent;
-                cursor: pointer;
-
-                &.active {
-                    background: var(--color-main-light);
-                    color: var(--color-main-dark);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/assets/styles/page.css b/app/assets/styles/page.css
index 7dd7b75..d621995 100644
--- a/app/assets/styles/page.css
+++ b/app/assets/styles/page.css
@@ -49,18 +49,10 @@
     overflow: hidden;
     background: var(--color-lightest);
     height: 100%;
-
-    h1:first-of-type,
-    h2:first-of-type,
-    h3:first-of-type,
-    p:first-of-type,
-    figure:first-of-type {
-        margin-top: 0;
-    }
 }
 
 .content-text {
-    padding: var(--padding-xl) var(--padding-default) 0;
+    padding: var(--padding-large) var(--padding-default) var(--padding-default);
     color: var(--color-darkest);
     text-align: center;
 }
@@ -75,6 +67,6 @@
 }
 
 .Legal {
-    padding: var(--padding-l) var(--padding-default);
+    padding: var(--padding-large) var(--padding-default);
     color: var(--color-darkest);
 }
\ No newline at end of file
diff --git a/app/assets/styles/priceCard.css b/app/assets/styles/priceCard.css
index 655f581..4abf44e 100755
--- a/app/assets/styles/priceCard.css
+++ b/app/assets/styles/priceCard.css
@@ -15,7 +15,7 @@
         & > * {
             flex-grow: 1;
             color: var(--color-lightest);
-            font-size: var(--font-size-xl);
+            font-size: 2rem;
             display: flex;
             align-items: center;
 
@@ -26,13 +26,13 @@
 
         & .bg-edit {
             background: var(--color-main-dark);
-            padding: var(--padding-xl);
+            padding: 2rem;
             text-align: left;
         }
 
         & .bg-delete {
             background: var(--color-error);
-            padding: var(--padding-xl);
+            padding: 2rem;
             text-align: right;
             justify-content: flex-end;
         }
@@ -42,7 +42,7 @@
         position: relative;
         background: var(--color-lightest);
         z-index: 2;
-        gap: var(--padding-default);
+        gap: 1rem;
         padding: var(--padding-default);
 
         &.animated {
@@ -56,14 +56,14 @@
             color: var(--color-darkest);
 
             & .icon {
-                font-size: var(--font-size-default);
+                font-size: 1rem;
                 cursor: pointer;
             }
         }
 
         & .name-price {
             display: flex;
-            gap: var(--padding-xs);
+            gap: .5rem;
 
             & > span:nth-child(1) {
                 font-weight: bold;
@@ -75,7 +75,7 @@
 
             & > span:nth-child(2)::before {
                 content: '•';
-                margin-right: var(--padding-xs);
+                margin-right: .5rem;
                 color: var(--color-middle);
             }
         }
@@ -84,19 +84,19 @@
             display: flex;
             flex-direction: row;
             width: 100%;
-            gap: var(--padding-default);
+            gap: 1rem;
             justify-content: space-between;
 
             & > .info {
                 flex-grow: 0;
                 align-items: center;
-                gap: var(--padding-xxs);
+                gap: .25rem;
                 font-weight: bold;
 
                 & > .price {
                     display: flex;
                     align-items: center;
-                    gap: var(--padding-xs);
+                    gap: .5rem;
 
                     & > .icon {
                         color: var(--color-main-dark);
@@ -104,7 +104,7 @@
                 }
 
                 & > .pro {
-                    font-size: var(--font-size-xs);
+                    font-size: .6rem;
                     color: var(--color-middle);
                     font-weight: lighter;
                 }
diff --git a/app/assets/styles/toolbar.css b/app/assets/styles/toolbar.css
index d78e9f7..7a39e32 100755
--- a/app/assets/styles/toolbar.css
+++ b/app/assets/styles/toolbar.css
@@ -8,6 +8,7 @@
     box-shadow: var(--box-shadow-upper);
 
     & > .Button {
-        font-size: var(--font-size-default);
+        --padding: 1rem;
+        font-size: 1rem;
     }
 }
\ No newline at end of file
diff --git a/app/components/Pp/Form/TextField.vue b/app/components/Pp/Form/TextField.vue
index 4e84828..0c4f803 100755
--- a/app/components/Pp/Form/TextField.vue
+++ b/app/components/Pp/Form/TextField.vue
@@ -1,11 +1,9 @@
 <template>
   <div class="TextField">
     <div class="wrapper">
-      <input v-model="text" :type="type" :id="id" :placeholder="placeholder" @blur="emit('blur')" @input="emit('input')" :inputmode="mode" />
-      <label :for="id">
-        <Icon v-if="icon" class="icon" :name="icon" mode="svg" />
-        <span>{{ label }}</span>
-      </label>
+      <Icon v-if="icon" class="icon" :name="icon" mode="svg" />
+      <input v-model="text" :type="type" :id="id" placeholder=" " @blur="emit('blur')" @input="emit('input')" :inputmode="mode" />
+      <label :for="id">{{ label }}</label>
     </div>
     <span v-if="message">{{ message }}</span>
   </div>
@@ -13,13 +11,12 @@
 
 <script setup lang="ts">
 type Props = {
-  type?: 'text' | 'number'
-  message?: string
-  icon?: string
-  label: string
-  placeholder: string
-  id: string
-  mode?: 'text' | 'email' | 'search' | 'tel' | 'url' | 'none' | 'numeric' | 'decimal'
+  type?: 'text' | 'number';
+  message?: string;
+  icon?: string;
+  label: string;
+  id: string;
+  mode?: 'text' | 'email' | 'search' | 'tel' | 'url' | 'none' | 'numeric' | 'decimal';
 };
 
 const { type = "text", mode = "text" } = defineProps<Props>();
diff --git a/app/components/Pp/Header.vue b/app/components/Pp/Header.vue
index ed560d3..bba771f 100755
--- a/app/components/Pp/Header.vue
+++ b/app/components/Pp/Header.vue
@@ -1,28 +1,33 @@
 <template>
-  <div class="Header" :class="[type]">
-    <header class="roboto-condensed">
-      <NuxtLink class="header-text" to="/">
-        <img class="logo" src="/img/propapier.svg" alt="ProPapier logo" />
-        <div>
-          <span class="big">ProPapier</span>
-          <span class="small">Vergleichen. Schnell. Unkompliziert.</span>
-        </div>
-      </NuxtLink>
-      <button class="burger-button" @click="open()">
-        <Icon name="uil:bars" size="2em" />
-      </button>
-    </header>
-    <div id="subheader" />
+  <div class="Header">
+    <div>
+      <header class="roboto-condensed">
+        <NuxtLink class="header-text" to="/">
+          <img class="logo" src="/img/propapier.svg" alt="ProPapier logo" />
+          <div>
+            <span class="big">ProPapier</span>
+            <span class="small">Vergleichen. Schnell. Unkompliziert.</span>
+          </div>
+        </NuxtLink>
+        <label for="burger_nav_toggle" v-if="available">
+          <Icon name="solar:hamburger-menu-broken" size="2em" />
+        </label>
+        <input type="checkbox" id="burger_nav_toggle" v-if="available" />
+        <nav class="flex-col" v-if="available">
+          <label for="burger_nav_toggle">
+            <Icon name="solar:close-circle-broken" />
+          </label>
+          <ul class="flex-col">
+            <li>Home</li>
+            <li>Übersicht</li>
+          </ul>
+        </nav>
+      </header>
+      <div id="subheader" />
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-type Props = {
-  type ?: 'lp'
-}
-
-defineProps<Props>()
-
-const nav = useNavigation()
-const open = () => { nav.showNavigation() }
+const available = false
 </script>
diff --git a/app/components/Pp/Navigation.vue b/app/components/Pp/Navigation.vue
deleted file mode 100644
index 9e88fb8..0000000
--- a/app/components/Pp/Navigation.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <section class="Navigation" :class="{ open }">
-    <nav>
-      <PpButton class="round text" @click="close()">
-        <Icon name="uil:times" mode="svg" />
-      </PpButton>
-      <ul class="flex-col">
-        <li v-for="page in pages">
-          <NuxtLink :to="page.route" @click="close()" active-class="active">
-            <Icon class="icon" :name="`uil:${page.icon}`" mode="svg" />
-            <span>{{ page.label }}</span>
-          </NuxtLink>
-        </li>
-      </ul>
-    </nav>
-  </section>
-</template>
-
-<script setup lang="ts">
-const nav = useNavigation()
-const close = () => nav.hideNavigation()
-const open = computed(() => nav.isNavigationVisible.value)
-
-const pages = [
-  {
-    label: 'Home',
-    icon: 'home',
-    route: '/'
-  },
-  {
-    label: 'Schnellrechner',
-    icon: 'calculator',
-    route: '/rechner'
-  },
-  // {
-  //   label: 'Über uns',
-  //   icon: 'users-alt',
-  //   route: '/about-us'
-  // }
-]
-</script>
\ No newline at end of file
diff --git a/app/components/Pp/PriceCardDialog.vue b/app/components/Pp/PriceCardDialog.vue
index 5e74207..2d1493b 100644
--- a/app/components/Pp/PriceCardDialog.vue
+++ b/app/components/Pp/PriceCardDialog.vue
@@ -16,8 +16,7 @@
               v-model="currentCard.name"
               id="card_name"
               label="Name"
-              icon="uil:pricetag-alt"
-              :placeholder="randomName"
+              icon="uil:user"
               :class="{ error: !validFields.name }"
               :message="!validFields.name ? 'Feld darf nicht leer sein.' : ''"
               @input="validFields.name = true"
@@ -26,7 +25,6 @@
               v-model="currentCard.price"
               id="card_price"
               label="Preis"
-              placeholder="2,49"
               icon="uil:euro"
               mode="decimal"
               :class="{ error: !validFields.price }"
@@ -39,7 +37,6 @@
               v-model="currentCard.roles"
               id="card_roles"
               label="Rollen"
-              placeholder="8"
               icon="uil:toilet-paper"
               mode="decimal"
               :class="{ error: !validFields.roles }"
@@ -50,7 +47,6 @@
               v-model="currentCard.sheets"
               id="card_sheets"
               label="Blatt"
-              placeholder="150"
               icon="uil:file-landscape"
               mode="decimal"
               :class="{ error: !validFields.sheets }"
@@ -61,7 +57,6 @@
               v-model="currentCard.layers"
               id="card_layers"
               label="Lagen"
-              placeholder="3"
               icon="uil:layer-group"
               mode="decimal"
               :class="{ error: !validFields.layers }"
@@ -99,25 +94,6 @@ const emit = defineEmits(['update'])
 const dialog = useTemplateRef<HTMLDialogElement>('dialog')
 const wrapper = useTemplateRef<HTMLElement>('wrapper')
 
-const market = [
-  'Lotl',
-  'Olda',
-  'Bäwä',
-  'Brutto',
-]
-
-const product = [
-  'Weichelig',
-  'Sau Rauh',
-  'Bissl Sanft',
-  'Ganz ok',
-  'Flauschi'
-]
-
-const generateRandomName = () => `${market[Math.floor(Math.random() * market.length)]} ${product[Math.floor(Math.random() * product.length)]}`
-
-const randomName = useState('randomName', () => generateRandomName())
-
 const checkPrice = () => {
   if (!currentCard) return false
   if (currentCard.price.length === 0) return false
@@ -162,7 +138,6 @@ onMounted(() => {
     validFields.roles = true
     validFields.sheets = true
     validFields.layers = true
-    randomName.value = generateRandomName()
   })
 
   onClickOutside(wrapper, () => dialog.value?.close())
diff --git a/app/composables/navigation.ts b/app/composables/navigation.ts
deleted file mode 100644
index e54c6f6..0000000
--- a/app/composables/navigation.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ref } from 'vue'
-
-const isNavigationVisible = ref(false)
-
-export const useNavigation = () => {
-  const toggleNavigation = () => {
-    isNavigationVisible.value = !isNavigationVisible.value
-  }
-
-  const showNavigation = () => {
-    isNavigationVisible.value = true
-  }
-
-  const hideNavigation = () => {
-    isNavigationVisible.value = false
-  }
-
-  return {
-    isNavigationVisible,
-    toggleNavigation,
-    showNavigation,
-    hideNavigation
-  }
-}
\ No newline at end of file
diff --git a/app/layouts/default.vue b/app/layouts/default.vue
deleted file mode 100755
index cbd7b6c..0000000
--- a/app/layouts/default.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-    <div class="page-wrapper">
-      <PpHeader />
-      <div class="page">
-        <NuxtPage />
-      </div>
-      <PpFooter />
-    </div>
-</template>
-<script setup lang="ts">
-</script>
\ No newline at end of file
diff --git a/app/layouts/landingpage.vue b/app/layouts/landingpage.vue
deleted file mode 100644
index 3c91317..0000000
--- a/app/layouts/landingpage.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-    <div class="page-wrapper">
-      <PpHeader type="lp" />
-      <div class="page">
-        <NuxtPage />
-      </div>
-      <PpFooter />
-    </div>
-</template>
-<script setup lang="ts">
-</script>
\ No newline at end of file
diff --git a/app/pages/index.vue b/app/pages/index.vue
old mode 100644
new mode 100755
index e1813b9..a492a64
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -1,25 +1,154 @@
 <template>
-  <section class="Home flex-col content full">
-    <div class="home-hero">
-      <div class="text">
-        <h1>
-          Du zahlst zuviel fürs Papier?
-        </h1>
-        <NuxtLink to="/rechner">
-          <PpButton class="cta">Preise vergleichen</PpButton>
-        </NuxtLink>
-      </div>
-    </div>
-    <div class="home-text padding ">
-      <p>
-        Mit <strong>ProPapier</strong> vergleichst du schnell & unkompliziert Preise für Klo-, Küchen- und Haushaltspapier und sparst so bares Geld.
-      </p>
-    </div>
-  </section>
+  <div class="nuxt-page-wrapper flex-col">
+    <ClientOnly>
+      <PpDeleteDialog
+        ref="deleteModal"
+        :current-card-index="currentCardIndex"
+        @delete="removeCard(currentCardIndex)"
+      />
+      <PpPriceCardDialog
+          ref="modal"
+          :current-card="currentCard"
+          :current-card-index="currentCardIndex"
+          @update="updateCard()"
+      />
+      <section class="content flex-col">
+        <div class="content-text">
+          <h1>Mit ProPapier Preise vergleichen und sparen</h1>
+        </div>
+        <aside class="filter-bar">
+          <button v-for="(button, index) in filterButtons" @click="() => sort(index)" :class="{ 'active': button.active }">
+            {{ button.label }}
+          </button>
+        </aside>
+        <div class="flex-col" role="list" v-if="cards.length">
+          <PpPriceCard
+            ref="priceCard"
+            v-for="(card, index) in cards"
+            :key="card.uuid"
+            :deletable="cards.length > 1"
+            :card="card"
+            @update="openModal(false, index)"
+            @remove="openDeleteModal()"
+          />
+        </div>
+        <p class="info-text grow" v-else>
+          Du hast noch keinerlei Einträge angelegt.
+          <br />Aber das ist gar nicht schlimm!
+          <br />Tippe einfach unten auf "+ Hinzufügen" und leg los.
+        </p>
+      </section>
+      <PpToolbar>
+        <PpButton class="mini-button text-white transparent" @click="openModal(true, -1)">
+          <Icon class="icon" name="uil:plus" mode="svg" />
+          <span>Hinzufügen</span>
+        </PpButton>
+      </PpToolbar>
+    </ClientOnly>
+  </div>
 </template>
 
 <script setup lang="ts">
-definePageMeta({
-  layout: 'landingpage'
+import type { Card } from '../../shared/Card'
+import type { Button } from '../../shared/ButtonGroup'
+import { PpPriceCardDialog, PpDeleteDialog, PpPriceCard } from '#components'
+
+const cards = useLocalStorage<Card[]>('cards', [])
+const currentSort = useLocalStorage<number>('sort', 0)
+const currentCard = ref<Card>()
+const currentCardIndex = ref<number>(-1)
+const modal = useTemplateRef<typeof PpPriceCardDialog>('modal')
+const deleteModal = useTemplateRef<typeof PpDeleteDialog>('deleteModal')
+const priceCards = useTemplateRef<(typeof PpPriceCard)[]>('priceCard')
+
+const createCard = (uuid : string) : Card => ({
+  uuid,
+  name: '',
+  price: '',
+  roles: '',
+  sheets: '',
+  layers: '',
 })
-</script>
\ No newline at end of file
+
+
+const addCard = (card : Card) => {
+  cards.value.unshift({ ...card })
+  sort()
+}
+
+const removeCard = (index : number) => {
+  cards.value.splice(index, 1)
+  sort()
+}
+
+const updateCard = () => {
+  if (currentCardIndex.value === -1) {
+    addCard(currentCard.value!)
+    return
+  }
+
+  const newCard = { ...currentCard.value! }
+  cards.value.splice(currentCardIndex.value, 1, newCard)
+  sort()
+}
+
+const openModal = (createNew : boolean, index : number) => {
+  if (createNew) {
+    currentCardIndex.value = -1
+    currentCard.value = createCard(randomUUID())
+    modal.value?.$el.showModal()
+    return
+  }
+
+  currentCardIndex.value = index
+  currentCard.value = { ...cards.value[index]! }
+
+  modal.value?.$el.showModal()
+  return
+}
+
+const openDeleteModal = () => {
+  deleteModal.value?.$el.showModal()
+}
+
+const filterButtons = ref<Button[]>([
+  {
+    label: 'Rollen',
+    icon: 'uil:toilet-paper',
+    active: currentSort.value === 0,
+  },
+  {
+    label: 'Blatt',
+    icon: 'uil:file-landscape',
+    active: currentSort.value === 1,
+  },
+  {
+    label: 'Lagen',
+    icon: 'uil:layer-group',
+    active: currentSort.value === 2,
+  },
+])
+
+const sortBy = (key : 'ppr' | 'pps' | 'ppl') => {
+  cards.value.sort((a, b) => {
+    const aCard = priceCards.value?.find(card => card.uuid === a.uuid) || null
+    const bCard = priceCards.value?.find(card => card.uuid === b.uuid) || null
+    if (!aCard || !bCard) return 0
+    return aCard[key] - bCard[key]
+  })
+}
+
+const sort = async (index : number = currentSort.value) => {
+  currentSort.value = index
+  filterButtons.value.forEach(button => { button.active = false })
+  filterButtons.value[index]!.active = true
+
+  await nextTick()
+
+  switch (index) {
+    case 0: return sortBy('ppr')
+    case 1: return sortBy('pps')
+    case 2: return sortBy('ppl')
+  }
+}
+</script>
diff --git a/app/pages/rechner.vue b/app/pages/other.vue
old mode 100755
new mode 100644
similarity index 74%
rename from app/pages/rechner.vue
rename to app/pages/other.vue
index a492a64..bd60632
--- a/app/pages/rechner.vue
+++ b/app/pages/other.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="nuxt-page-wrapper flex-col">
+  <div>
     <ClientOnly>
       <PpDeleteDialog
-        ref="deleteModal"
-        :current-card-index="currentCardIndex"
-        @delete="removeCard(currentCardIndex)"
+          ref="deleteModal"
+          :current-card-index="currentCardIndex"
+          @delete="removeCard(currentCardIndex)"
       />
       <PpPriceCardDialog
           ref="modal"
@@ -12,33 +12,41 @@
           :current-card-index="currentCardIndex"
           @update="updateCard()"
       />
+      <div class="search-bar">
+        <PpFormSearch
+            v-model="search"
+            label="Suche nach Klopapier!"
+            id="search_field"
+        />
+      </div>
       <section class="content flex-col">
-        <div class="content-text">
-          <h1>Mit ProPapier Preise vergleichen und sparen</h1>
-        </div>
         <aside class="filter-bar">
           <button v-for="(button, index) in filterButtons" @click="() => sort(index)" :class="{ 'active': button.active }">
             {{ button.label }}
           </button>
         </aside>
-        <div class="flex-col" role="list" v-if="cards.length">
+        <div class="flex-col" role="list">
           <PpPriceCard
-            ref="priceCard"
-            v-for="(card, index) in cards"
-            :key="card.uuid"
-            :deletable="cards.length > 1"
-            :card="card"
-            @update="openModal(false, index)"
-            @remove="openDeleteModal()"
+              ref="priceCard"
+              v-for="(card, index) in cards"
+              :key="card.uuid"
+              :deletable="cards.length > 1"
+              :card="card"
+              @update="openModal(false, index)"
+              @remove="openDeleteModal()"
           />
         </div>
-        <p class="info-text grow" v-else>
-          Du hast noch keinerlei Einträge angelegt.
-          <br />Aber das ist gar nicht schlimm!
-          <br />Tippe einfach unten auf "+ Hinzufügen" und leg los.
-        </p>
       </section>
       <PpToolbar>
+        <PpButton class="mini-button text-white transparent" @click="sort(currentSort)">
+          <Icon class="icon" name="uil:refresh" mode="svg" />
+          <span>Neu sortieren</span>
+          <span
+              class="dot"
+              :class="{ visible : isDirty}"
+              aria-hidden="true"
+          />
+        </PpButton>
         <PpButton class="mini-button text-white transparent" @click="openModal(true, -1)">
           <Icon class="icon" name="uil:plus" mode="svg" />
           <span>Hinzufügen</span>
@@ -55,12 +63,15 @@ import { PpPriceCardDialog, PpDeleteDialog, PpPriceCard } from '#components'
 
 const cards = useLocalStorage<Card[]>('cards', [])
 const currentSort = useLocalStorage<number>('sort', 0)
+const isDirty = ref(false)
 const currentCard = ref<Card>()
 const currentCardIndex = ref<number>(-1)
 const modal = useTemplateRef<typeof PpPriceCardDialog>('modal')
 const deleteModal = useTemplateRef<typeof PpDeleteDialog>('deleteModal')
 const priceCards = useTemplateRef<(typeof PpPriceCard)[]>('priceCard')
 
+const search = ref('')
+
 const createCard = (uuid : string) : Card => ({
   uuid,
   name: '',
@@ -73,12 +84,12 @@ const createCard = (uuid : string) : Card => ({
 
 const addCard = (card : Card) => {
   cards.value.unshift({ ...card })
-  sort()
+  isDirty.value = true
 }
 
 const removeCard = (index : number) => {
   cards.value.splice(index, 1)
-  sort()
+  isDirty.value = true
 }
 
 const updateCard = () => {
@@ -89,7 +100,7 @@ const updateCard = () => {
 
   const newCard = { ...currentCard.value! }
   cards.value.splice(currentCardIndex.value, 1, newCard)
-  sort()
+  isDirty.value = true
 }
 
 const openModal = (createNew : boolean, index : number) => {
@@ -138,12 +149,12 @@ const sortBy = (key : 'ppr' | 'pps' | 'ppl') => {
   })
 }
 
-const sort = async (index : number = currentSort.value) => {
+const sort = (index : number) => {
   currentSort.value = index
   filterButtons.value.forEach(button => { button.active = false })
   filterButtons.value[index]!.active = true
 
-  await nextTick()
+  isDirty.value = false
 
   switch (index) {
     case 0: return sortBy('ppr')
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 20a9a15..302cd5c 100755
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -41,7 +41,6 @@ export default defineNuxtConfig({
   css : [
     './app/assets/styles/general.css',
     './app/assets/styles/header.css',
-    './app/assets/styles/navigation.css',
     './app/assets/styles/footer.css',
     './app/assets/styles/button.css',
     './app/assets/styles/buttonGroup.css',
@@ -51,7 +50,6 @@ export default defineNuxtConfig({
     './app/assets/styles/toolbar.css',
     './app/assets/styles/page.css',
     './app/assets/styles/dialog.css',
-    './app/assets/styles/landingpage.css',
   ],
 
   site: {
diff --git a/public/img/hero-image.webp b/public/img/hero-image.webp
deleted file mode 100644
index 062741b..0000000
Binary files a/public/img/hero-image.webp and /dev/null differ