diff --git a/ng-app/src/routes/WalletCreate.svelte b/ng-app/src/routes/WalletCreate.svelte
index 052bfe8..80b528d 100644
--- a/ng-app/src/routes/WalletCreate.svelte
+++ b/ng-app/src/routes/WalletCreate.svelte
@@ -197,8 +197,8 @@
     options = {
       trusted: true,
       cloud: false,
-      bootstrap: true,
-      pdf: true,
+      bootstrap: false,
+      pdf: false,
     };
     console.log("saved");
     await tick();
@@ -963,7 +963,9 @@
       {/if}
 
       <div class="row mt-5">
-        <button
+        <Button
+          disabled
+          style="justify-content: left;"
           on:click|once={enterINVITE}
           class="choice-button text-primary-700 bg-primary-100 hover:bg-primary-100/90 focus:ring-4 focus:outline-none focus:ring-primary-100/50 font-medium rounded-lg text-lg px-5 py-2.5 text-center inline-flex items-center dark:focus:ring-primary-100/55 mb-2"
         >
@@ -984,9 +986,9 @@
           </svg>
 
           Enter an invitation link
-        </button>
+        </Button>
       </div>
-      {#if mobile}
+      {#if false && mobile}
         <div class="row mt-5">
           <button
             on:click|once={enterQRcode}
@@ -1349,7 +1351,7 @@
             >Terms of Service of our cloud</a
           >.
           <br />
-          <Toggle class="mt-3" bind:checked={options.cloud}
+          <Toggle disabled class="mt-3" bind:checked={options.cloud}
             >Save my wallet in the cloud?</Toggle
           >
         </p>
@@ -1361,7 +1363,7 @@
           all the information to regenerate your wallet in case you lost access to
           it.
           <br />
-          <Toggle class="mt-3" bind:checked={options.pdf}
+          <Toggle disabled class="mt-3" bind:checked={options.pdf}
             >Create a PDF of my wallet?</Toggle
           >
         </p>
@@ -1380,14 +1382,14 @@
               >Terms of Service of our cloud</a
             >.
             <br />
-            <Toggle class="mt-3" bind:checked={options.bootstrap}
+            <Toggle disabled class="mt-3" bind:checked={options.bootstrap}
               >Create a link to my wallet?</Toggle
             >
           </p>
         {/if}
         <button
           on:click|once={do_wallet}
-          class="mt-10 mb-8 text-white bg-primary-700 hover:bg-primary-700/90 focus:ring-4 focus:outline-none focus:ring-primary-700/50 font-medium rounded-lg text-lg px-5 py-2.5 text-center inline-flex items-center dark:focus:ring-primary-700/55"
+          class="mt-10 mb-20 text-white bg-primary-700 hover:bg-primary-700/90 focus:ring-4 focus:outline-none focus:ring-primary-700/50 font-medium rounded-lg text-lg px-5 py-2.5 text-center inline-flex items-center dark:focus:ring-primary-700/55"
         >
           <svg
             class="w-8 h-8 mr-2 -ml-1"
diff --git a/ng-app/src/routes/WalletLogin.svelte b/ng-app/src/routes/WalletLogin.svelte
index 5f07b7d..ae3bdb7 100644
--- a/ng-app/src/routes/WalletLogin.svelte
+++ b/ng-app/src/routes/WalletLogin.svelte
@@ -14,7 +14,7 @@
   import { link, push } from "svelte-spa-router";
   import Login from "../lib/Login.svelte";
   import ng from "../api";
-  import { Fileupload } from "flowbite-svelte";
+  import { Fileupload, Button } from "flowbite-svelte";
   // @ts-ignore
   import Logo from "../assets/nextgraph.svg?component";
   import {
@@ -196,8 +196,7 @@
         >
           <span class="securitytxt"
             >{wallet_entry[1].wallet.V0.content.security_txt}
-            {wallet_entry[0]}</span
-          >
+          </span>
           <img
             alt={wallet_entry[1].wallet.V0.content.security_txt}
             class="securityimg"
@@ -240,8 +239,10 @@
           </svg>
           Import a Wallet File
         </button>
-        <button
-          class="mt-1 text-primary-700 bg-primary-100 hover:bg-primary-100/90 focus:ring-4 focus:outline-none focus:ring-primary-700/50 font-medium rounded-lg text-lg px-5 py-2.5 text-center inline-flex items-center dark:focus:ring-primary-100/55 mb-2"
+        <Button
+          style="min-width: 250px;justify-content: left;"
+          disabled
+          class="disabled mt-1 text-primary-700 bg-primary-100 hover:bg-primary-100/90 focus:ring-4 focus:outline-none focus:ring-primary-700/50 font-medium rounded-lg text-lg px-5 py-2.5 text-center inline-flex items-center justify-center dark:focus:ring-primary-100/55 mb-2"
         >
           <svg
             class="w-8 h-8 mr-2 -ml-1"
@@ -264,8 +265,10 @@
             />
           </svg>
           Import with QRcode
-        </button>
-        <button
+        </Button>
+        <Button
+          style="min-width: 250px;justify-content: left;"
+          disabled
           class="mt-1 text-primary-700 bg-primary-100 hover:bg-primary-100/90 focus:ring-4 focus:outline-none focus:ring-primary-700/50 font-medium rounded-lg text-lg px-5 py-2.5 text-center inline-flex items-center dark:focus:ring-primary-100/55 mb-2"
         >
           <svg
@@ -285,7 +288,7 @@
           </svg>
 
           Enter a Wallet Link
-        </button>
+        </Button>
         <a href="/wallet/create" use:link>
           <button
             tabindex="-1"