diff --git a/infrastructure/eid-wallet/src/routes/(app)/settings/+page.svelte b/infrastructure/eid-wallet/src/routes/(app)/settings/+page.svelte
index 8559d46d..70a671c1 100644
--- a/infrastructure/eid-wallet/src/routes/(app)/settings/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(app)/settings/+page.svelte
@@ -146,59 +146,63 @@ $effect(() => {
 </main>
 
 <!-- First Confirmation Drawer -->
-<Drawer bind:isPaneOpen={isDeleteConfirmationOpen}>
-    <div class="text-center">
-        <h4 class="mt-[2.3svh] mb-[0.5svh] text-red-600">
-            ⚠️ Delete Account Warning
-        </h4>
-        <p class="text-black-700 mb-4">
-            Are you sure you want to delete your account? This action will:
-        </p>
-        <ul class="text-left text-black-700 mb-6 space-y-2">
-            <li>• Permanently delete all your personal data</li>
-            <li>• Remove your ePassport and eVault access</li>
-            <li>• Delete your eName and all associated credentials</li>
-            <li>• Make your data inaccessible within 24 hours</li>
-            <li>• This action cannot be undone</li>
-        </ul>
-        <div class="flex gap-3">
-            <ButtonAction class="flex-1" callback={cancelDelete}
-                >Cancel</ButtonAction
-            >
-            <ButtonAction
-                class="flex-1 bg-red-600 hover:bg-red-700"
-                callback={confirmDelete}>Continue</ButtonAction
-            >
+{#if isDeleteConfirmationOpen}
+    <Drawer bind:isPaneOpen={isDeleteConfirmationOpen}>
+        <div class="text-center">
+            <h4 class="mt-[2.3svh] mb-[0.5svh] text-red-600">
+                ⚠️ Delete Account Warning
+            </h4>
+            <p class="text-black-700 mb-4">
+                Are you sure you want to delete your account? This action will:
+            </p>
+            <ul class="text-left text-black-700 mb-6 space-y-2">
+                <li>• Permanently delete all your personal data</li>
+                <li>• Remove your ePassport and eVault access</li>
+                <li>• Delete your eName and all associated credentials</li>
+                <li>• Make your data inaccessible within 24 hours</li>
+                <li>• This action cannot be undone</li>
+            </ul>
+            <div class="flex gap-3">
+                <ButtonAction class="flex-1" callback={cancelDelete}
+                    >Cancel</ButtonAction
+                >
+                <ButtonAction
+                    class="flex-1 bg-red-600 hover:bg-red-700"
+                    callback={confirmDelete}>Continue</ButtonAction
+                >
+            </div>
         </div>
-    </div>
-</Drawer>
+    </Drawer>
+{/if}
 
 <!-- Final Confirmation Drawer -->
-<Drawer bind:isPaneOpen={isFinalConfirmationOpen}>
-    <div class="text-center">
-        <h4 class="mt-[2.3svh] mb-[0.5svh] text-red-600">
-            🚨 Final Confirmation
-        </h4>
-        <p class="text-black-700 mb-4">
-            This is your final warning. Once you confirm:
-        </p>
-        <div class="bg-red-50 border border-red-200 rounded-md p-4 mb-6">
-            <p class="text-red-800 font-medium">
-                All your data will be permanently deleted and you will lose
-                access to your ePassport, eVault, and eName forever.
+{#if isFinalConfirmationOpen}
+    <Drawer bind:isPaneOpen={isFinalConfirmationOpen}>
+        <div class="text-center">
+            <h4 class="mt-[2.3svh] mb-[0.5svh] text-red-600">
+                🚨 Final Confirmation
+            </h4>
+            <p class="text-black-700 mb-4">
+                This is your final warning. Once you confirm:
             </p>
+            <div class="bg-red-50 border border-red-200 rounded-md p-4 mb-6">
+                <p class="text-red-800 font-medium">
+                    All your data will be permanently deleted and you will lose
+                    access to your ePassport, eVault, and eName forever.
+                </p>
+            </div>
+            <p class="text-black-700 mb-6">
+                Are you absolutely certain you want to proceed?
+            </p>
+            <div class="flex gap-3">
+                <ButtonAction class="flex-1" callback={cancelDelete}
+                    >Cancel</ButtonAction
+                >
+                <ButtonAction
+                    class="flex-1 bg-red-600 hover:bg-red-700"
+                    callback={nukeWallet}>Delete</ButtonAction
+                >
+            </div>
         </div>
-        <p class="text-black-700 mb-6">
-            Are you absolutely certain you want to proceed?
-        </p>
-        <div class="flex gap-3">
-            <ButtonAction class="flex-1" callback={cancelDelete}
-                >Cancel</ButtonAction
-            >
-            <ButtonAction
-                class="flex-1 bg-red-600 hover:bg-red-700"
-                callback={nukeWallet}>Delete</ButtonAction
-            >
-        </div>
-    </div>
-</Drawer>
+    </Drawer>
+{/if}
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
index cbbb7e2a..d2f784c9 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
@@ -302,8 +302,8 @@ onMount(async () => {
             >
         </p>
         <div class="flex justify-center whitespace-nowrap mt-1">
-            <ButtonAction 
-                class="w-full" 
+            <ButtonAction
+                class="w-full"
                 callback={handleGetStarted}
                 disabled={checkingHardware}
             >
@@ -349,8 +349,11 @@ onMount(async () => {
                 placeholder="Enter your demo name for ePassport"
             />
             <div class="flex justify-center whitespace-nowrap my-[2.3svh]">
-                <ButtonAction class="w-full" callback={handleFinalSubmit}
-                    >Continue</ButtonAction
+                <ButtonAction
+                    variant={demoName.length === 0 ? "soft" : "solid"}
+                    disabled={demoName.length === 0}
+                    class="w-full"
+                    callback={handleFinalSubmit}>Continue</ButtonAction
                 >
             </div>
         {:else}
@@ -365,69 +368,70 @@ onMount(async () => {
                 placeholder="Enter verification code"
             />
             <div class="flex justify-center whitespace-nowrap my-[2.3svh]">
-                <ButtonAction class="w-full" callback={handleContinue}
-                    >Next</ButtonAction
+                <ButtonAction
+                    variant={verificationId.length === 0 ? "soft" : "solid"}
+                    disabled={verificationId.length === 0}
+                    class="w-full"
+                    callback={handleContinue}>Next</ButtonAction
                 >
             </div>
         {/if}
-    {:else}
-        {#if checkingHardware}
-            <div class="my-20">
-                <div
-                    class="align-center flex w-full flex-col items-center justify-center gap-6"
-                >
-                    <Shadow size={40} color="rgb(142, 82, 255);" />
-                    <h4>Checking device capabilities...</h4>
-                </div>
+    {:else if checkingHardware}
+        <div class="my-20">
+            <div
+                class="align-center flex w-full flex-col items-center justify-center gap-6"
+            >
+                <Shadow size={40} color="rgb(142, 82, 255);" />
+                <h4>Checking device capabilities...</h4>
             </div>
-        {:else if showHardwareError}
-            <h4 class="mt-[2.3svh] mb-[0.5svh] text-red-600">
-                Hardware Security Not Available
-            </h4>
-            <p class="text-black-700 mb-4">
-                Your phone doesn't support hardware crypto keys, which is a requirement for verified IDs.
-            </p>
-            <p class="text-black-700 mb-4">
-                Please use the pre-verification code option to create a demo account instead.
-            </p>
-            <div class="flex justify-center whitespace-nowrap my-[2.3svh]">
-                <ButtonAction 
-                    class="w-full" 
-                    callback={() => {
-                        isPaneOpen = false;
-                        handlePreVerified();
-                    }}
-                >
-                    Use Pre-Verification Code
-                </ButtonAction>
+        </div>
+    {:else if showHardwareError}
+        <h4 class="mt-[2.3svh] mb-[0.5svh] text-red-600">
+            Hardware Security Not Available
+        </h4>
+        <p class="text-black-700 mb-4">
+            Your phone doesn't support hardware crypto keys, which is a
+            requirement for verified IDs.
+        </p>
+        <p class="text-black-700 mb-4">
+            Please use the pre-verification code option to create a demo account
+            instead.
+        </p>
+        <div class="flex justify-center whitespace-nowrap my-[2.3svh]">
+            <ButtonAction
+                class="w-full"
+                callback={() => {
+                    isPaneOpen = false;
+                    handlePreVerified();
+                }}
+            >
+                Use Pre-Verification Code
+            </ButtonAction>
+        </div>
+    {:else if loading}
+        <div class="my-20">
+            <div
+                class="align-center flex w-full flex-col items-center justify-center gap-6"
+            >
+                <Shadow size={40} color="rgb(142, 82, 255);" />
+                <h4>Initializing security keys...</h4>
             </div>
-        {:else}
-            {#if loading}
-                <div class="my-20">
-                    <div
-                        class="align-center flex w-full flex-col items-center justify-center gap-6"
-                    >
-                        <Shadow size={40} color="rgb(142, 82, 255);" />
-                        <h4>Initializing security keys...</h4>
-                    </div>
-                </div>
-            {:else}
-                <h4 class="mt-[2.3svh] mb-[0.5svh]">
-                    Your Digital Self begins with the Real You
-                </h4>
-                <p class="text-black-700">
-                    In the Web 3.0 Data Space, identity is linked to reality. We begin
-                    by verifying your real-world passport, which serves as the
-                    foundation for issuing your secure ePassport. At the same time, we
-                    generate your eName – a unique digital identifier – and create your
-                    eVault to store and protect your personal data.
-                </p>
-                <div class="flex justify-center whitespace-nowrap my-[2.3svh]">
-                    <ButtonAction class="w-full" callback={handleNext}
-                        >Next</ButtonAction
-                    >
-                </div>
-            {/if}
-        {/if}
+        </div>
+    {:else}
+        <h4 class="mt-[2.3svh] mb-[0.5svh]">
+            Your Digital Self begins with the Real You
+        </h4>
+        <p class="text-black-700">
+            In the Web 3.0 Data Space, identity is linked to reality. We begin
+            by verifying your real-world passport, which serves as the
+            foundation for issuing your secure ePassport. At the same time, we
+            generate your eName – a unique digital identifier – and create your
+            eVault to store and protect your personal data.
+        </p>
+        <div class="flex justify-center whitespace-nowrap my-[2.3svh]">
+            <ButtonAction class="w-full" callback={handleNext}
+                >Next</ButtonAction
+            >
+        </div>
     {/if}
 </Drawer>
diff --git a/platforms/blabsy/src/components/input/image-preview.tsx b/platforms/blabsy/src/components/input/image-preview.tsx
index e35afc91..6ecf5c33 100644
--- a/platforms/blabsy/src/components/input/image-preview.tsx
+++ b/platforms/blabsy/src/components/input/image-preview.tsx
@@ -67,9 +67,9 @@ export function ImagePreview({
                 type: img.type
             }))
         });
-        
+
         const processed = combineBase64Images(imagesPreview);
-        
+
         console.log('[ImagePreview] Processed images:', {
             originalCount: imagesPreview?.length || 0,
             processedCount: processed.length,
@@ -82,7 +82,7 @@ export function ImagePreview({
                 type: img.type
             }))
         });
-        
+
         return processed;
     }, [imagesPreview]);
 
diff --git a/platforms/blabsy/src/lib/utils/image-utils.ts b/platforms/blabsy/src/lib/utils/image-utils.ts
index 70128f6f..7f4ab678 100644
--- a/platforms/blabsy/src/lib/utils/image-utils.ts
+++ b/platforms/blabsy/src/lib/utils/image-utils.ts
@@ -42,7 +42,10 @@ export function combineBase64Images(
         } else {
             // Handle odd number of images (last item)
             if (dataPart) {
-                if (dataPart.src.startsWith('data:') && !dataPart.src.includes(',')) {
+                if (
+                    dataPart.src.startsWith('data:') &&
+                    !dataPart.src.includes(',')
+                ) {
                     // Incomplete base64 image, skip it
                 } else {
                     result.push(dataPart);