diff --git a/dist/digitaler-frieden-41eb229f6c516288.js b/dist/digitaler-frieden-6ccedcde5d939437.js
similarity index 100%
rename from dist/digitaler-frieden-41eb229f6c516288.js
rename to dist/digitaler-frieden-6ccedcde5d939437.js
diff --git a/dist/digitaler-frieden-41eb229f6c516288_bg.wasm b/dist/digitaler-frieden-6ccedcde5d939437_bg.wasm
similarity index 88%
rename from dist/digitaler-frieden-41eb229f6c516288_bg.wasm
rename to dist/digitaler-frieden-6ccedcde5d939437_bg.wasm
index 8e69c2a..3cc1e80 100644
Binary files a/dist/digitaler-frieden-41eb229f6c516288_bg.wasm and b/dist/digitaler-frieden-6ccedcde5d939437_bg.wasm differ
diff --git a/dist/index.html b/dist/index.html
index bb3acae..e9c35e3 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -6,15 +6,15 @@
     <link rel="icon" href="/favicon-928ba63f33046eed.ico" integrity="sha384-Neq57jnFrTfqAN1JvKAVVVcH1EW3//cZHmK2NRXRlNrxAZR6ErTvXzbOLSyHzkA4">
      
   
-<link rel="preload" href="/digitaler-frieden-41eb229f6c516288_bg.wasm" crossorigin="anonymous" integrity="sha384-Q0T2T56iiwSG02s/4mtEOdpxvjBQbyYxts2yi95aI8YYmrLSsFL7e/o4rGVHjMSm" as="fetch" type="application/wasm">
-<link rel="modulepreload" href="/digitaler-frieden-41eb229f6c516288.js" crossorigin="anonymous" integrity="sha384-5owiTz49KdxhXPCnfR2GokkJnFqa++HeraekuGgskT+OizWrNTANvcXzigi62YCH"></head>
+<link rel="preload" href="/digitaler-frieden-6ccedcde5d939437_bg.wasm" crossorigin="anonymous" integrity="sha384-4ifYi1pq8Ih1mVjDI+GTtnXXbMv7C3BjH7mTEpcg7Qk+P/pU0vfUZgVbb1zBmslJ" as="fetch" type="application/wasm">
+<link rel="modulepreload" href="/digitaler-frieden-6ccedcde5d939437.js" crossorigin="anonymous" integrity="sha384-5owiTz49KdxhXPCnfR2GokkJnFqa++HeraekuGgskT+OizWrNTANvcXzigi62YCH"></head>
   <body class="bg-black text-white ">
   
 
 
 <script type="module">
-import init, * as bindings from '/digitaler-frieden-41eb229f6c516288.js';
-init('/digitaler-frieden-41eb229f6c516288_bg.wasm');
+import init, * as bindings from '/digitaler-frieden-6ccedcde5d939437.js';
+init('/digitaler-frieden-6ccedcde5d939437_bg.wasm');
 window.wasmBindings = bindings;
 
 </script><script>"use strict";
diff --git a/src/pages/clues.rs b/src/pages/clues.rs
index 23785bd..87061ab 100644
--- a/src/pages/clues.rs
+++ b/src/pages/clues.rs
@@ -8,8 +8,8 @@ pub fn Clues() -> Html {
     html! {
         <div class="flex flex-col justify-center items-center h-full space-y-16 px-8 m-0">
             <section id="navigation" class="mb-12">
-            <h3
-                class="text-primary
+                <h3
+                    class="text-primary
                 hover:bg-text-dark 
                 hover:text-white 
                 hover:-translate-y-1 
@@ -22,158 +22,159 @@ pub fn Clues() -> Html {
                 top-4
                 left-4
             "
-            >
-                <Link<Route> to={Route::Deceased}>
-                    <div class="flex items-center">
-                        <svg
-                            class="w-8 "
-                            xmlns="http://www.w3.org/2000/svg"
-                            viewBox="0 0 24 24"
-                            fill="currentColor"
-                        >
-                            <path d="M0 0h24v24H0z" fill="none" />
-                            <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" />
-                        </svg>
-                        { "Zurück" }
-                    </div>
-                </Link<Route>>
-            </h3>
-            <img
-                src="public/digitaler-frieden_logo.jpg"
-                alt="logo digitaler frieden"
-                class="absolute top-4 right-4 md:min-w-56 md:w-56 w-0"
-            />
+                >
+                    <Link<Route> to={Route::Deceased}>
+                        <div class="flex items-center">
+                            <svg
+                                class="w-8 "
+                                xmlns="http://www.w3.org/2000/svg"
+                                viewBox="0 0 24 24"
+                                fill="currentColor"
+                            >
+                                <path d="M0 0h24v24H0z" fill="none" />
+                                <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" />
+                            </svg>
+                            { "Zurück" }
+                        </div>
+                    </Link<Route>>
+                </h3>
+                <img
+                    src="public/digitaler-frieden_logo.jpg"
+                    alt="logo digitaler frieden"
+                    class="absolute top-4 right-4 md:min-w-56 md:w-56 w-0"
+                />
             </section>
             <section class="fade-in w-full max-w-lg" id="content">
-            <div class="flex flex-col items-center justify-between">
-                <div class="flex flex-col items-start">
-                    <h3 class="text-3xl font-bold mb-4">{ "Spurhinweise hinzufügen" }</h3>
-                    <p class="mb-6">
-                        { "Füge alle dir bekannten E-Mail Adressen und Telefonnummern hinzu." }
-                    </p>
-                    <div
-                        class="flex flex-col justify-between items-center w-full mb-10 space-y-4 md:space-y-4"
-                    >
-                        <div class="flex justify-between w-full relative">
-                            <h3 class="font-bold text-2xl ">{ "E-Mail Adressen" }</h3>
-                            <svg
-                                class="text-primary w-10 absolute right-4"
-                                xmlns="http://www.w3.org/2000/svg"
-                                viewBox="0 0 24 24"
-                                fill="currentColor"
-                            >
-                                <path d="M0 0h24v24H0z" fill="none" />
-                                <path
-                                    d="M13 7h-2v4H7v2h4v4h2v-4h4v-2h-4V7zm-1-5C6.49 2 2 6.49 2 12s4.49 10 10 10 10-4.49 10-10S17.51 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"
-                                />
-                            </svg>
+                <div class="flex flex-col items-center justify-between">
+                    <div class="flex flex-col items-start">
+                        <h3 class="text-3xl font-bold mb-4">{ "Spurhinweise hinzufügen" }</h3>
+                        <p class="mb-6">
+                            { "Füge alle dir bekannten E-Mail Adressen und Telefonnummern hinzu." }
+                        </p>
+                        <div
+                            class="flex flex-col justify-between items-center w-full mb-10 space-y-4 md:space-y-4"
+                        >
+                            <div class="flex justify-between w-full relative">
+                                <h3 class="font-bold text-2xl ">{ "E-Mail Adressen" }</h3>
+                                <svg
+                                    class="text-primary w-10 absolute right-4"
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    viewBox="0 0 24 24"
+                                    fill="currentColor"
+                                >
+                                    <path d="M0 0h24v24H0z" fill="none" />
+                                    <path
+                                        d="M13 7h-2v4H7v2h4v4h2v-4h4v-2h-4V7zm-1-5C6.49 2 2 6.49 2 12s4.49 10 10 10 10-4.49 10-10S17.51 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"
+                                    />
+                                </svg>
+                            </div>
+                            <div class="flex justify-start items-center space-x-4 w-full">
+                                <svg
+                                    class="w-10 text-danger"
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    viewBox="0 0 24 24"
+                                    fill="currentColor"
+                                >
+                                    <path d="M0 0h24v24H0z" fill="none" />
+                                    <path
+                                        d="M7 11v2h10v-2H7zm5-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"
+                                    />
+                                </svg>
+                                <p class="text-md">{ "max.mustermann@example.com" }</p>
+                            </div>
+                            <div class="flex justify-start items-center w-full space-x-4">
+                                <svg
+                                    class="w-10 text-danger"
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    viewBox="0 0 24 24"
+                                    fill="currentColor"
+                                >
+                                    <path d="M0 0h24v24H0z" fill="none" />
+                                    <path
+                                        d="M7 11v2h10v-2H7zm5-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"
+                                    />
+                                </svg>
+                                <p class="text-md">{ "jon.doe@blub.com" }</p>
+                            </div>
                         </div>
-                        <div class="flex justify-start items-center space-x-4 w-full">
-                            <svg
-                                class="w-10 text-danger"
-                                xmlns="http://www.w3.org/2000/svg"
-                                viewBox="0 0 24 24"
-                                fill="currentColor"
-                            >
-                                <path d="M0 0h24v24H0z" fill="none" />
-                                <path
-                                    d="M7 11v2h10v-2H7zm5-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"
-                                />
-                            </svg>
-                            <p class="text-md">{ "max.mustermann@example.com" }</p>
-                        </div>
-                        <div class="flex justify-start items-center w-full space-x-4">
-                            <svg
-                                class="w-10 text-danger"
-                                xmlns="http://www.w3.org/2000/svg"
-                                viewBox="0 0 24 24"
-                                fill="currentColor"
-                            >
-                                <path d="M0 0h24v24H0z" fill="none" />
-                                <path
-                                    d="M7 11v2h10v-2H7zm5-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"
-                                />
-                            </svg>
-                            <p class="text-md">{ "jon.doe@blub.com" }</p>
-                        </div>
-                    </div>
-                    <div
-                        class="flex flex-col justify-center items-center w-full mb-6 space-y-4 md:space-y-4"
-                    >
-                        <div class="flex justify-between w-full relative">
-                            <h3 class="font-bold text-2xl ">{ "Telefonnummern" }</h3>
-                            <svg
-                                class="text-primary w-10 absolute right-4"
-                                xmlns="http://www.w3.org/2000/svg"
-                                viewBox="0 0 24 24"
-                                fill="currentColor"
-                            >
-                                <path d="M0 0h24v24H0z" fill="none" />
-                                <path
-                                    d="M13 7h-2v4H7v2h4v4h2v-4h4v-2h-4V7zm-1-5C6.49 2 2 6.49 2 12s4.49 10 10 10 10-4.49 10-10S17.51 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"
-                                />
-                            </svg>
-                        </div>
-                        <div class="flex justify-start items-center space-x-4 w-full">
-                            <svg
-                                class="w-10 text-danger"
-                                xmlns="http://www.w3.org/2000/svg"
-                                viewBox="0 0 24 24"
-                                fill="currentColor"
-                            >
-                                <path d="M0 0h24v24H0z" fill="none" />
-                                <path
-                                    d="M7 11v2h10v-2H7zm5-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"
-                                />
-                            </svg>
-                            <p class="text-md">{ "+49 1234 567 890" }</p>
-                        </div>
-                        <div class="flex justify-start items-center w-full space-x-4">
-                            <svg
-                                class="w-10 text-danger"
-                                xmlns="http://www.w3.org/2000/svg"
-                                viewBox="0 0 24 24"
-                                fill="currentColor"
-                            >
-                                <path d="M0 0h24v24H0z" fill="none" />
-                                <path
-                                    d="M7 11v2h10v-2H7zm5-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"
-                                />
-                            </svg>
-                            <p class="text-md">{ "+49 9876 543 210" }</p>
+                        <div
+                            class="flex flex-col justify-center items-center w-full mb-6 space-y-4 md:space-y-4"
+                        >
+                            <div class="flex justify-between w-full relative">
+                                <h3 class="font-bold text-2xl ">{ "Telefonnummern" }</h3>
+                                <svg
+                                    class="text-primary w-10 absolute right-4"
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    viewBox="0 0 24 24"
+                                    fill="currentColor"
+                                >
+                                    <path d="M0 0h24v24H0z" fill="none" />
+                                    <path
+                                        d="M13 7h-2v4H7v2h4v4h2v-4h4v-2h-4V7zm-1-5C6.49 2 2 6.49 2 12s4.49 10 10 10 10-4.49 10-10S17.51 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"
+                                    />
+                                </svg>
+                            </div>
+                            <div class="flex justify-start items-center space-x-4 w-full">
+                                <svg
+                                    class="w-10 text-danger"
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    viewBox="0 0 24 24"
+                                    fill="currentColor"
+                                >
+                                    <path d="M0 0h24v24H0z" fill="none" />
+                                    <path
+                                        d="M7 11v2h10v-2H7zm5-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"
+                                    />
+                                </svg>
+                                <p class="text-md">{ "+49 1234 567 890" }</p>
+                            </div>
+                            <div class="flex justify-start items-center w-full space-x-4">
+                                <svg
+                                    class="w-10 text-danger"
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    viewBox="0 0 24 24"
+                                    fill="currentColor"
+                                >
+                                    <path d="M0 0h24v24H0z" fill="none" />
+                                    <path
+                                        d="M7 11v2h10v-2H7zm5-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"
+                                    />
+                                </svg>
+                                <p class="text-md">{ "+49 9876 543 210" }</p>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
             </section>
             <section id="next" class="fade-in w-full flex justify-center max-w-lg mb-4">
-                        <Link<Route>
-                            to={Route::Relationship}
-                            classes={classes!("bg-primary",
-                "hover:bg-primary-dark",
-                "hover:text-white",
-                "hover:-translate-y-1",
-                "hover:cursor-pointer",
-                "transition",
-                "duration-150",
-                "font-bold",
-                "text-xl",
-                "max-w-xl",
-                "rounded-md",
-                "text-black",
-                "text-center",
-                "w-full",
-                "min-h-16",
-                "h-16",
-                "flex",
-                "justify-center",
-                "items-center",
-                "mb-12",
-                                    )}
-                        >
-                            { "Weiter" }
-                        </Link<Route>>
-                    </section>
+                <Link<Route>
+                    to={Route::Relationship}
+                    classes={classes!(
+                        "bg-primary",
+                        "hover:bg-primary-dark",
+                        "hover:text-white",
+                        "hover:-translate-y-1",
+                        "hover:cursor-pointer",
+                        "transition",
+                        "duration-150",
+                        "font-bold",
+                        "text-xl",
+                        "max-w-xl",
+                        "rounded-md",
+                        "text-black",
+                        "text-center",
+                        "w-full",
+                        "min-h-16",
+                        "h-16",
+                        "flex",
+                        "justify-center",
+                        "items-center",
+                        "mb-12",
+                    )}
+                >
+                    { "Weiter" }
+                </Link<Route>>
+            </section>
         </div>
     }
 }
diff --git a/src/pages/deceased.rs b/src/pages/deceased.rs
index a77371f..0b01906 100644
--- a/src/pages/deceased.rs
+++ b/src/pages/deceased.rs
@@ -116,7 +116,7 @@ pub fn Deceased() -> Html {
                     </div>
                 </div>
             </section>
-            <section id="next" class="w-full fade-in flex justify-center max-w-lg ">
+            <section id="next" class="w-full fade-in flex justify-center max-w-lg mb-6">
                 <Link<Route>
                     to={Route::Clues}
                     classes={yew::classes!(
diff --git a/src/pages/register.rs b/src/pages/register.rs
index d6a2762..5d12315 100644
--- a/src/pages/register.rs
+++ b/src/pages/register.rs
@@ -9,7 +9,7 @@ pub fn Register() -> Html {
         <div class="flex flex-col justify-center items-center h-full space-y-16 px-8 m-0">
             <section id="navigation" class="mb-2 md:mb-12 lg:mb-0">
                 <h3
-                class="text-primary
+                    class="text-primary
                 hover:bg-text-dark 
                 hover:text-white 
                 hover:-translate-y-1 
@@ -22,91 +22,94 @@ pub fn Register() -> Html {
                 top-4
                 left-4
             "
-            >
-                <Link<Route> to={Route::SignUp}>
-                    <div class="flex items-center">
-                        <svg
-                            class="w-8 "
-                            xmlns="http://www.w3.org/2000/svg"
-                            viewBox="0 0 24 24"
-                            fill="currentColor"
-                        >
-                            <path d="M0 0h24v24H0z" fill="none" />
-                            <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" />
-                        </svg>
-                        { "Zurück" }
-                    </div>
-                </Link<Route>>
-            </h3>
-            <img
-                src="public/digitaler-frieden_logo.jpg"
-                alt="logo digitaler frieden"
-                class="absolute top-4 right-4 md:-w-56 md:w-56 md:h-auto w-0 h-0"
-            />
+                >
+                    <Link<Route> to={Route::SignUp}>
+                        <div class="flex items-center">
+                            <svg
+                                class="w-8 "
+                                xmlns="http://www.w3.org/2000/svg"
+                                viewBox="0 0 24 24"
+                                fill="currentColor"
+                            >
+                                <path d="M0 0h24v24H0z" fill="none" />
+                                <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" />
+                            </svg>
+                            { "Zurück" }
+                        </div>
+                    </Link<Route>>
+                </h3>
+                <img
+                    src="public/digitaler-frieden_logo.jpg"
+                    alt="logo digitaler frieden"
+                    class="absolute top-4 right-4 md:-w-56 md:w-56 md:h-auto w-0 h-0"
+                />
             </section>
             <section id="content" class="fade-in w-full max-w-lg">
-            <div class="flex flex-col items-start">
-                <h3 class="text-3xl font-bold mb-6">{ "Registrierung abschließen" }</h3>
-                <div class="group max-w-xl w-full mb-4">
-                    <p class="text-start text-md mb-1">{ "Vorname" }</p>
-                    <input
-                        class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2]  active:bg-[#33d9b2] border-b text-center focus-within:text-black w-full h-10 rounded-md"
-                        type="text"
-                    />
-                </div>
-                <div class="group max-w-xl w-full mb-4">
-                    <p class="text-start text-md mb-1">{ "Nachname" }</p>
-                    <input
-                        class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
-                        type="text"
-                    />
-                </div>
-                <div class="group max-w-xl w-full mb-4">
-                    <div class="flex justify-between space-x-4">
-                        <div class="w-full">
-                            <p class="text-start text-md mb-1">{ "Straße" }</p>
-                            <input
-                                class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
-                                type="text"
-                            />
-                        </div>
-                        <div class="w-24">
-                            <p class="text-start text-md mb-1 w-16">{ "Nr." }</p>
-                            <input
-                                class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
-                                type="text"
-                            />
+                <div class="flex flex-col items-start">
+                    <h3 class="text-3xl font-bold mb-6">{ "Registrierung abschließen" }</h3>
+                    <div class="group max-w-xl w-full mb-4">
+                        <p class="text-start text-md mb-1">{ "Vorname" }</p>
+                        <input
+                            class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2]  active:bg-[#33d9b2] border-b text-center focus-within:text-black w-full h-10 rounded-md"
+                            type="text"
+                        />
+                    </div>
+                    <div class="group max-w-xl w-full mb-4">
+                        <p class="text-start text-md mb-1">{ "Nachname" }</p>
+                        <input
+                            class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
+                            type="text"
+                        />
+                    </div>
+                    <div class="group max-w-xl w-full mb-4">
+                        <div class="flex justify-between space-x-4">
+                            <div class="w-full">
+                                <p class="text-start text-md mb-1">{ "Straße" }</p>
+                                <input
+                                    class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
+                                    type="text"
+                                />
+                            </div>
+                            <div class="w-24">
+                                <p class="text-start text-md mb-1 w-16">{ "Nr." }</p>
+                                <input
+                                    class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
+                                    type="text"
+                                />
+                            </div>
                         </div>
                     </div>
+                    <div class="group max-w-xl w-full mb-4">
+                        <p class="text-start text-md mb-1">{ "Postleitzahl" }</p>
+                        <input
+                            class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
+                            type="text"
+                        />
+                    </div>
+                    <div class="group max-w-xl w-full mb-4">
+                        <p class="text-start text-md mb-1">{ "Ort" }</p>
+                        <input
+                            class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
+                            type="text"
+                        />
+                    </div>
+                    <div class="group max-w-xl w-full mb-4">
+                        <p class="text-start text-md mb-1">{ "Telefonnummer" }</p>
+                        <input
+                            class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
+                            type="text"
+                        />
+                    </div>
+                    <div class="group max-w-xl w-full mb-4">
+                        <p class="text-start text-md mb-1">{ "Geburtsort" }</p>
+                        <input
+                            class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
+                            type="text"
+                        />
+                    </div>
                 </div>
-                <div class="group max-w-xl w-full mb-4">
-                    <p class="text-start text-md mb-1">{ "Postleitzahl" }</p>
-                    <input
-                        class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
-                        type="text"
-                    />
-                </div>
-                <div class="group max-w-xl w-full mb-4">
-                    <p class="text-start text-md mb-1">{ "Ort" }</p>
-                    <input
-                        class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
-                        type="text"
-                    />
-                </div>
-                <div class="group max-w-xl w-full mb-4">
-                    <p class="text-start text-md mb-1">{ "Telefonnummer" }</p>
-                    <input
-                        class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
-                        type="text"
-                    />
-                </div>
-                <div class="group max-w-xl w-full mb-4">
-                    <p class="text-start text-md mb-1">{ "Geburtsort" }</p>
-                    <input
-                        class="duration-700 font-bold text-md transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-b text-center  focus-within:text-black w-full h-10 rounded-md"
-                        type="text"
-                    />
-                </div>
+            </section>
+            <section id="next" class="fade-in mb-6 w-full flex justify-center items-center">
                 <Link<Route>
                     to={Route::Deceased}
                     classes={classes!(
@@ -123,12 +126,11 @@ pub fn Register() -> Html {
                 "text-center",
                 "w-full",
                 "h-16",
-                "mt-20", "flex", "justify-center", "items-center",
+                "mb-12","flex", "justify-center", "items-center",
                             )}
                 >
                     { "Weiter" }
                 </Link<Route>>
-            </div>
             </section>
         </div>
     }
diff --git a/src/pages/relationship.rs b/src/pages/relationship.rs
index 85536da..6c06ce2 100644
--- a/src/pages/relationship.rs
+++ b/src/pages/relationship.rs
@@ -10,9 +10,9 @@ pub fn Relationship() -> Html {
     html! {
         <div class="flex flex-col justify-center items-center h-full space-y-16 px-8 m-0">
             <section id="navigation" class="mb-2 md:mb-32">
-            <div class="flex justify-between">
-                <h3
-                    class="text-primary
+                <div class="flex justify-between">
+                    <h3
+                        class="text-primary
                 hover:bg-text-dark 
                 hover:text-white 
                 hover:-translate-y-1 
@@ -26,81 +26,81 @@ pub fn Relationship() -> Html {
                 top-4
                 left-4
             "
-                >
-                    <Link<Route> to={Route::Clues}>
-                        <div class="flex items-center">
-                            <svg
-                                class="w-8 "
-                                xmlns="http://www.w3.org/2000/svg"
-                                viewBox="0 0 24 24"
-                                fill="currentColor"
-                            >
-                                <path d="M0 0h24v24H0z" fill="none" />
-                                <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" />
-                            </svg>
-                            { "Zurück" }
-                        </div>
-                    </Link<Route>>
-                </h3>
-                <img
-                    src="public/digitaler-frieden_logo.jpg"
-                    alt="logo digitaler frieden"
-                    class="absolute top-4 right-4 md:min-w-56 md:w-56 w-0"
-                />
-            </div>
+                    >
+                        <Link<Route> to={Route::Clues}>
+                            <div class="flex items-center">
+                                <svg
+                                    class="w-8 "
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    viewBox="0 0 24 24"
+                                    fill="currentColor"
+                                >
+                                    <path d="M0 0h24v24H0z" fill="none" />
+                                    <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" />
+                                </svg>
+                                { "Zurück" }
+                            </div>
+                        </Link<Route>>
+                    </h3>
+                    <img
+                        src="public/digitaler-frieden_logo.jpg"
+                        alt="logo digitaler frieden"
+                        class="absolute top-4 right-4 md:min-w-56 md:w-56 w-0"
+                    />
+                </div>
             </section>
             <section id="content" class={classes}>
-            <div class="flex flex-col items-center ">
-                <h3 class="text-3xl font-bold mb-6 text-center">
-                    { "In welcher Beziehung stehst du zu der verstorbenen Person?" }
-                </h3>
-                <div class="flex flex-col items-start min-w-72 md:w-auto mb-32">
-                    <div class="flex items-center mb-4">
-                        <input
-                            id="relationship-widow"
-                            type="radio"
-                            value=""
-                            name="relationship"
-                            class="w-4 h-4 accent-primary"
-                        />
-                        <label for="relationship-widow" class="ms-2 ">
-                            { "Ich bin die Witwe / der Witwer der verstorbenen Person" }
-                        </label>
+                <div class="flex flex-col items-center ">
+                    <h3 class="text-3xl font-bold mb-6 text-center">
+                        { "In welcher Beziehung stehst du zu der verstorbenen Person?" }
+                    </h3>
+                    <div class="flex flex-col items-start min-w-72 md:w-auto mb-32">
+                        <div class="flex items-center mb-4">
+                            <input
+                                id="relationship-widow"
+                                type="radio"
+                                value=""
+                                name="relationship"
+                                class="w-4 h-4 accent-primary"
+                            />
+                            <label for="relationship-widow" class="ms-2 ">
+                                { "Ich bin die Witwe / der Witwer der verstorbenen Person" }
+                            </label>
+                        </div>
+                        <div class="flex items-center mb-4">
+                            <input
+                                id="relationship-soleheir"
+                                type="radio"
+                                value=""
+                                name="relationship"
+                                class="w-4 h-4 text-primary accent-primary"
+                            />
+                            <label for="relationship-soleheir" class="ms-2">
+                                <p>
+                                    { "Ich bin notarielle(r) " }
+                                    <u>
+                                        <strong>{ "Alleinerbin / Alleinerbe" }</strong>
+                                    </u>
+                                </p>
+                            </label>
+                        </div>
+                        <div class="flex items-center mb-4">
+                            <input
+                                id="relationship-child"
+                                type="radio"
+                                value=""
+                                name="relationship"
+                                class="w-4 h-4 accent-primary"
+                            />
+                            <label for="relationship-child" class="ms-2">
+                                { "Ich bin ein Kind der verstorbenen Person" }
+                            </label>
+                        </div>
                     </div>
-                    <div class="flex items-center mb-4">
-                        <input
-                            id="relationship-soleheir"
-                            type="radio"
-                            value=""
-                            name="relationship"
-                            class="w-4 h-4 text-primary accent-primary"
-                        />
-                        <label for="relationship-soleheir" class="ms-2">
-                            <p>
-                                { "Ich bin notarielle(r) " }
-                                <u>
-                                    <strong>{ "Alleinerbin / Alleinerbe" }</strong>
-                                </u>
-                            </p>
-                        </label>
-                    </div>
-                    <div class="flex items-center mb-4">
-                        <input
-                            id="relationship-child"
-                            type="radio"
-                            value=""
-                            name="relationship"
-                            class="w-4 h-4 accent-primary"
-                        />
-                        <label for="relationship-child" class="ms-2">
-                            { "Ich bin ein Kind der verstorbenen Person" }
-                        </label>
-                    </div>
-                </div>
-                <div class="flex justify-center max-w-xl w-full mb-6">
-                    <Link<Route>
-                        to={Route::Relationship}
-                        classes={classes!("bg-primary",
+                    <div class="flex justify-center max-w-xl w-full mb-6">
+                        <Link<Route>
+                            to={Route::Relationship}
+                            classes={classes!("bg-primary",
                 "hover:bg-primary-dark",
                 "hover:text-white",
                 "hover:-translate-y-1",
@@ -119,12 +119,13 @@ pub fn Relationship() -> Html {
                 "flex",
                 "justify-center",
                 "items-center",
+                "mb-12",
                                         )}
-                    >
-                        { "Weiter" }
-                    </Link<Route>>
+                        >
+                            { "Weiter" }
+                        </Link<Route>>
+                    </div>
                 </div>
-            </div>
             </section>
         </div>
     }
diff --git a/src/pages/signup.rs b/src/pages/signup.rs
index cd30a54..19102d3 100644
--- a/src/pages/signup.rs
+++ b/src/pages/signup.rs
@@ -6,11 +6,10 @@ use crate::router::Route;
 #[function_component]
 pub fn SignUp() -> Html {
     html! {
-            <div class="flex flex-col justify-center items-center h-full space-y-16 px-8 m-0">
+        <div class="flex flex-col justify-center items-center h-full space-y-16 px-8 m-0">
             <section id="navigation" class="mb-12">
-
-            <h3
-                class="text-primary
+                <h3
+                    class="text-primary
                 hover:bg-text-dark 
                 hover:text-white 
                 hover:-translate-y-1 
@@ -23,48 +22,48 @@ pub fn SignUp() -> Html {
                 left-4
                 absolute
             "
-            >
-                <Link<Route> to={Route::Home}>
-                    <div class="flex items-center">
-                        <svg
-                            class="w-8 "
-                            xmlns="http://www.w3.org/2000/svg"
-                            viewBox="0 0 24 24"
-                            fill="currentColor"
-                        >
-                            <path d="M0 0h24v24H0z" fill="none" />
-                            <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" />
-                        </svg>
-                        { "Zurück" }
-                    </div>
-                </Link<Route>>
-            </h3>
-            <img
-                src="public/digitaler-frieden_logo.jpg"
-                alt="logo digitaler frieden"
-                class="top-4 right-4 absolute md:min-w-56 md:w-56 w-0"
-            />
+                >
+                    <Link<Route> to={Route::Home}>
+                        <div class="flex items-center">
+                            <svg
+                                class="w-8 "
+                                xmlns="http://www.w3.org/2000/svg"
+                                viewBox="0 0 24 24"
+                                fill="currentColor"
+                            >
+                                <path d="M0 0h24v24H0z" fill="none" />
+                                <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" />
+                            </svg>
+                            { "Zurück" }
+                        </div>
+                    </Link<Route>>
+                </h3>
+                <img
+                    src="public/digitaler-frieden_logo.jpg"
+                    alt="logo digitaler frieden"
+                    class="top-4 right-4 absolute md:min-w-56 md:w-56 w-0"
+                />
             </section>
             <section id="content" class="w-full fade-in">
-            <div class="min-height mt-64 md:flex md:flex-col md:items-center">
-                <h3 class="text-3xl font-bold mb-6">{ "Jetzt registrieren" }</h3>
-                <p>{ "Gib deine E-Mail Adresse ein." }</p>
-                <div class="group max-w-xl w-full mb-4">
-                    <input
-                        class="duration-700 font-bold text-lg transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-2 text-center text-primary focus-within:text-black w-full h-16 mt-4 rounded-md"
-                        type="text"
-                    />
-                </div>
-                <div class="flex justify-between max-w-xl w-full">
-                    <div
-                        class="text-primary hover:text-white
+                <div class="min-height mt-64 md:flex md:flex-col md:items-center">
+                    <h3 class="text-3xl font-bold mb-6">{ "Jetzt registrieren" }</h3>
+                    <p>{ "Gib deine E-Mail Adresse ein." }</p>
+                    <div class="group max-w-xl w-full mb-4">
+                        <input
+                            class="duration-700 font-bold text-lg transition group-hover:cursor-pointer bg-transparent border-white hover:border-[#33d9b2] hover:curser-pointer focus-within:bg-[#33d9b2] active:bg-[#33d9b2] border-2 text-center text-primary focus-within:text-black w-full h-16 mt-4 rounded-md"
+                            type="text"
+                        />
+                    </div>
+                    <div class="flex justify-between max-w-xl w-full">
+                        <div
+                            class="text-primary hover:text-white
                 hover:-translate-y-1 
                 hover:cursor-pointer
                 transition duration-150 
                 "
-                    >
-                        <Link<Route> to={Route::SignUp}>{ "Stattdessen anmelden" }</Link<Route>>
-                    </div>
+                        >
+                            <Link<Route> to={Route::SignUp}>{ "Stattdessen anmelden" }</Link<Route>>
+                        </div>
                         <Link<Route>
                             to={Route::Verify}
                             classes={classes!(
@@ -82,13 +81,14 @@ pub fn SignUp() -> Html {
                 "w-full",
                 "min-h-12",
                 "h-12",
-                "flex", "justify-center", "items-center",
+                "flex", "justify-center", "items-center","mb-12"
                                 )}
                         >
                             { "Weiter" }
                         </Link<Route>>
+                    </div>
                 </div>
-            </div>
-        </section></div>
+            </section>
+        </div>
     }
 }
diff --git a/src/pages/verify.rs b/src/pages/verify.rs
index 1a12d2a..4c6797a 100644
--- a/src/pages/verify.rs
+++ b/src/pages/verify.rs
@@ -6,10 +6,10 @@ use crate::router::Route;
 #[function_component]
 pub fn Verify() -> Html {
     html! {
-            <div class="flex flex-col justify-center items-center h-full space-y-16 px-8 m-0">
+        <div class="flex flex-col justify-center items-center h-full space-y-16 px-8 m-0">
             <section id="navigation" class="mb-2 md:mb-12 lg:mb-0">
-                    <h3
-                        class="text-primary
+                <h3
+                    class="text-primary
                 hover:bg-text-dark 
                 hover:text-white 
                 hover:-translate-y-1 
@@ -22,37 +22,45 @@ pub fn Verify() -> Html {
                 top-4
                 left-4
             "
-                    >
-                        <Link<Route> to={Route::SignUp}>
-                            <div class="flex items-center">
-                                <svg
-                                    class="w-8 "
-                                    xmlns="http://www.w3.org/2000/svg"
-                                    viewBox="0 0 24 24"
-                                    fill="currentColor"
-                                >
-                                    <path d="M0 0h24v24H0z" fill="none" />
-                                    <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" />
-                                </svg>
-                                { "Zurück" }
-                            </div>
-                        </Link<Route>>
-                    </h3>
-                    <img
-                        src="public/digitaler-frieden_logo.jpg"
-                        alt="logo digitaler frieden"
-                        class="absolute top-4 right-4 md:min-w-56 md:w-56 w-0"
-                    />
-                    </section>
-                    <section id="content" class="fade-in">
+                >
+                    <Link<Route> to={Route::SignUp}>
+                        <div class="flex items-center">
+                            <svg
+                                class="w-8 "
+                                xmlns="http://www.w3.org/2000/svg"
+                                viewBox="0 0 24 24"
+                                fill="currentColor"
+                            >
+                                <path d="M0 0h24v24H0z" fill="none" />
+                                <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" />
+                            </svg>
+                            { "Zurück" }
+                        </div>
+                    </Link<Route>>
+                </h3>
+                <img
+                    src="public/digitaler-frieden_logo.jpg"
+                    alt="logo digitaler frieden"
+                    class="absolute top-4 right-4 md:min-w-56 md:w-56 w-0"
+                />
+            </section>
+            <section id="content" class="fade-in">
                 <div class="flex flex-col items-center">
                     <h3 class="text-3xl font-bold mb-6">{ "Verifizieren" }</h3>
                     <div class="flex flex-col items-start min-w-72 md:w-auto">
                         <p class="mb-3">{ "Bitte verifiziere deine E-Mail Adresse." }</p>
                         <p class="mb-8">{ "Wir haben dir eine E-Mail geschickt." }</p>
-    <div class="h-24 w-full">
-    <svg class="mail-animation mb-12 w-16 text-primary" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M0 0h24v24H0z" fill="none"/><path d="M2.01 21L23 12 2.01 3 2 10l15 2-15 2z"/></svg>
-    </div>
+                        <div class="h-24 w-full">
+                            <svg
+                                class="mail-animation mb-12 w-16 text-primary"
+                                xmlns="http://www.w3.org/2000/svg"
+                                viewBox="0 0 24 24"
+                                fill="currentColor"
+                            >
+                                <path d="M0 0h24v24H0z" fill="none" />
+                                <path d="M2.01 21L23 12 2.01 3 2 10l15 2-15 2z" />
+                            </svg>
+                        </div>
                         <p class="mb-8">{ "Dann geht es hier weiter." }</p>
                     </div>
                     <div class="flex justify-center max-w-56 w-full mb-6">
@@ -73,7 +81,7 @@ pub fn Verify() -> Html {
                         "w-full",
                         "min-h-12",
                         "h-12",
-                        "flex", "justify-center", "items-center",
+                        "flex", "justify-center", "items-center","mb-12"
                                     )}
                         >
                             { "Weiter" }
@@ -94,6 +102,6 @@ pub fn Verify() -> Html {
                     </div>
                 </div>
             </section>
-                </div>
-        }
+        </div>
+    }
 }
