diff --git a/ng-app/src-tauri/src/lib.rs b/ng-app/src-tauri/src/lib.rs
index 18ff0f4..873d008 100644
--- a/ng-app/src-tauri/src/lib.rs
+++ b/ng-app/src-tauri/src/lib.rs
@@ -572,7 +572,9 @@ impl AppBuilder {
 
     pub fn run(self) {
         let setup = self.setup;
-        let builder = tauri::Builder::default()
+
+        #[allow(unused_mut)]
+        let mut builder = tauri::Builder::default()
             .setup(move |app| {
                 if let Some(setup) = setup {
                     (setup)(app)?;
@@ -592,7 +594,7 @@ impl AppBuilder {
 
         #[cfg(mobile)]
         {
-            let builder = builder.plugin(tauri_plugin_barcode_scanner::init());
+            builder = builder.plugin(tauri_plugin_barcode_scanner::init());
         }
 
         builder
diff --git a/ng-app/src/api.ts b/ng-app/src/api.ts
index 05e13d2..f6eaecc 100644
--- a/ng-app/src/api.ts
+++ b/ng-app/src/api.ts
@@ -106,6 +106,11 @@ const handler = {
                 };
                 //console.log(info,res);
                 return res;
+            } else if (path[0] === "get_device_name") {
+                let tauri_platform = import.meta.env.TAURI_PLATFORM;
+                if (tauri_platform == 'android') return "Android Phone";
+                else if (tauri_platform == 'ios') return "iPhone";
+                else return await tauri.invoke(path[0],{});
             } else if (path[0] === "locales") {
                 let from_rust = await tauri.invoke("locales",{});
                 let from_js = window.navigator.languages;
diff --git a/ng-app/src/lib/components/PasswordInput.svelte b/ng-app/src/lib/components/PasswordInput.svelte
index 6ed9c88..80a9569 100644
--- a/ng-app/src/lib/components/PasswordInput.svelte
+++ b/ng-app/src/lib/components/PasswordInput.svelte
@@ -40,6 +40,7 @@
 </script>
 
 <div class="relative">
+  <!-- svelte-ignore a11y-autofocus -->
   <input
     bind:this={input}
     {value}
diff --git a/ng-app/src/routes/WalletInfo.svelte b/ng-app/src/routes/WalletInfo.svelte
index 5375abd..25d6751 100644
--- a/ng-app/src/routes/WalletInfo.svelte
+++ b/ng-app/src/routes/WalletInfo.svelte
@@ -576,75 +576,64 @@
           </div>
         {/if}
       {:else if sub_menu === "text_code"}
-        <Sidebar {nonActiveClass}>
-          <SidebarWrapper
-              divClass="mb-10 bg-gray-60 overflow-y-auto py-4 px-3 rounded dark:bg-gray-800"
-          >
-            <SidebarGroup ulClass="space-y-2" role="menu">
-              <li>
-                <h2 class="text-xl mb-6">
-                  {$t("pages.wallet_info.gen_text_code.title")}
-                </h2>
-              </li>
+        <div
+          class="flex flex-col justify-center max-w-md mx-6 mb-20 bg-gray-60 overflow-y-auto py-4 dark:bg-gray-800"
+        >
+          <div>
+            <h2 class="text-xl mb-6">
+              {$t("pages.wallet_info.gen_text_code.title")}
+            </h2>
+          </div>
 
-              <!-- Go Back -->
-              <li
-                tabindex="0"
-                role="menuitem"
-                class="text-left flex items-center p-2 text-base font-normal text-gray-900 clickable rounded-lg dark:text-white hover:bg-gray-200 dark:hover:bg-gray-700"
-                on:keypress={to_main_menu}
-                on:click={to_main_menu}
-              >
-                <ArrowLeft
-                  tabindex="-1"
-                  class="w-7 h-7 text-black transition duration-75 dark:text-white group-hover:text-gray-900 dark:group-hover:text-white"
-                />
-                <span class="ml-3">{$t("buttons.back")}</span>
-              </li>
+          <!-- Go Back -->
+          <button
+            on:click={to_main_menu}
+            class="w-full text-gray-500 dark:text-gray-400 focus:ring-4 focus:ring-primary-100/50 rounded-lg text-lg px-5 py-2.5 text-center inline-flex items-center dark:focus:ring-primary-700/55"
+            ><ArrowLeft
+              tabindex="-1"
+              class="w-8 h-8 mr-2 -ml-1 transition duration-75 focus:outline-none  group-hover:text-gray-900 dark:group-hover:text-white"
+            />{$t("buttons.back")}</button
+          >
 
-              <!-- Warning to prefer QR codes or wallet downloads -->
-              {#if generation_state === "before_start"}
-                <div class="text-left my-4">
-                  <Alert color="yellow">
-                    {@html $t("wallet_sync.textcode.usage_warning")}
-                  </Alert>
-                </div>
-              {/if}
-              <!-- Warning if offline -->
-              {#if !$online}
-                <li class="text-left my-4">
-                  <Alert color="red">
-                    {@html $t("wallet_sync.offline_warning")}
-                  </Alert>
-                </li>
-              {:else}
-                <li class="text-left my-4">
-                  {@html $t("wallet_sync.expiry")}
-                </li>
-              {/if}
+          <!-- Warning to prefer QR codes or wallet downloads -->
+          {#if generation_state === "before_start"}
+            <div class="text-left my-4">
+              <Alert color="yellow">
+                {@html $t("wallet_sync.textcode.usage_warning")}
+              </Alert>
+            </div>
+          {/if}
+          <!-- Warning if offline -->
+          <div class="text-left my-4">
+            {#if !$online}
+              <Alert color="red">
+                {@html $t("wallet_sync.offline_warning")}
+              </Alert>
+            {:else}
+              {@html $t("wallet_sync.expiry")}
+            {/if}
+          </div>
 
-              <div class="mt-4">
-                {#if generation_state === "before_start"}
-                  <Button
-                    on:click={generate_text_code}
-                    disabled={!$online}
-                    class="my-4 w-full text-white bg-primary-700 hover:bg-primary-700/90 focus:ring-4 focus:ring-primary-100/50 rounded-lg text-lg px-5 py-2.5 text-center inline-flex items-center dark:focus:ring-primary-700/55"
-                  >
-                    {$t("pages.wallet_info.gen_text_code.gen_btn")}
-                  </Button>
-                {:else if generation_state == "loading"}
-                  <Spinner class="mx-auto" size="6" />
-                {:else}
-                  <!-- TextCode Code -->
-                  <span>{$t("pages.wallet_info.gen_text_code.label")}</span>
-                  <div>
-                    <CopyToClipboard rows={8} value={generated_text_code} />
-                  </div>
-                {/if}
+          <div class="mt-4">
+            {#if generation_state === "before_start"}
+              <Button
+                on:click={generate_text_code}
+                disabled={!$online}
+                class="my-4 w-full text-white bg-primary-700 hover:bg-primary-700/90 focus:ring-4 focus:ring-primary-100/50 rounded-lg text-lg px-5 py-2.5 text-center inline-flex items-center dark:focus:ring-primary-700/55"
+              >
+                {$t("pages.wallet_info.gen_text_code.gen_btn")}
+              </Button>
+            {:else if generation_state == "loading"}
+              <Spinner class="mx-auto" size="6" />
+            {:else}
+              <!-- TextCode Code -->
+              <span>{$t("pages.wallet_info.gen_text_code.label")}</span>
+              <div>
+                <CopyToClipboard rows={8} value={generated_text_code} />
               </div>
-            </SidebarGroup>
-          </SidebarWrapper>
-        </Sidebar>
+            {/if}
+          </div>
+        </div>
       {/if}  
     </div>
     {#if error}