diff --git a/src/components/DashboardComponent.svelte b/src/components/DashboardComponent.svelte
index dc5326a..d3607db 100644
--- a/src/components/DashboardComponent.svelte
+++ b/src/components/DashboardComponent.svelte
@@ -37,13 +37,9 @@
     <p>{t("status.loading")}</p>
 {:then user}
     <UserInfo {user} />
-    <hr>
-
-    <div class="flex flex-col justify-center">
-        <SWButton on:click={() => uploadOpen = true}>
-            {t("dashboard.schematic.upload")}
-        </SWButton>
-    </div>
+    <SWButton onclick={() => uploadOpen = true}>
+        {t("dashboard.schematic.upload")}
+    </SWButton>
 {:catch error}
     <p>error: {error.message}</p>
 {/await}
diff --git a/src/components/styled/SWButton.svelte b/src/components/styled/SWButton.svelte
index ea4bced..a624614 100644
--- a/src/components/styled/SWButton.svelte
+++ b/src/components/styled/SWButton.svelte
@@ -18,19 +18,17 @@
   -->
 
 <script lang="ts">
-  import { createBubbler } from 'svelte/legacy';
-
-  const bubble = createBubbler();
     import "@styles/button.css"
 
-  interface Props {
-    type?: "primary" | "ghost" | "gray";
-    children?: import('svelte').Snippet;
-  }
+    interface Props {
+        type?: "primary" | "ghost" | "gray";
+        children: import('svelte').Snippet;
+        onclick: () => void;
+    }
 
-  let { type = "primary", children }: Props = $props();
+    let { type = "primary", onclick, children }: Props = $props();
 </script>
 
-<button onclick={bubble('click')} class="btn" class:btn-gray={type === "gray"} class:btn-text={type === "ghost"}>
-    {@render children?.()}
+<button onclick={onclick} class="btn" class:btn-gray={type === "gray"} class:btn-text={type === "ghost"}>
+    {@render children()}
 </button>
\ No newline at end of file
diff --git a/src/components/styled/SWModal.svelte b/src/components/styled/SWModal.svelte
index 9c5a5d4..f145ff7 100644
--- a/src/components/styled/SWModal.svelte
+++ b/src/components/styled/SWModal.svelte
@@ -18,28 +18,28 @@
   -->
 
 <script lang="ts">
-  import { run, createBubbler, stopPropagation } from 'svelte/legacy';
-
-  const bubble = createBubbler();
-    import {createEventDispatcher, onMount} from "svelte";
+    import {onMount} from "svelte";
 
   interface Props {
     title: string;
     open: boolean;
     children?: import('svelte').Snippet;
     footer?: import('svelte').Snippet;
+    onclose?: () => void;
+    onclick?: () => void;
+
   }
 
   let {
     title,
     open = $bindable(),
     children,
-    footer
+    footer,
+      onclose = () => {},
+      onclick = () => {}
   }: Props = $props();
     let internalOpen = $state(open);
 
-    const dispatch = createEventDispatcher();
-
 
     let dialog: HTMLDialogElement = $state();
 
@@ -53,52 +53,30 @@
     function close() {
         open = false;
         internalOpen = false;
-        dispatch("close");
+        onclose()
     }
-    run(() => {
-    if (open && !internalOpen) {
-          dialog.showModal();
-          internalOpen = true;
-      } else if (!open && internalOpen) {
-          dialog.close();
-          internalOpen = false;
-      }
-  });
+
+    $effect(() => {
+        if (open && !internalOpen) {
+            dialog.showModal();
+            internalOpen = true;
+        } else if (!open && internalOpen) {
+            dialog.close();
+            internalOpen = false;
+        }
+    })
 </script>
 
-<dialog bind:this={dialog} onclose={close} oncancel={close} onclick={() => dialog.close()} aria-hidden="true">
-    <div onclick={stopPropagation(bubble('click'))} aria-hidden="true">
-        <div class="spaced bordered">
-            <h1>{title}</h1>
+<dialog bind:this={dialog} onclose={close} oncancel={close} onclick={() => dialog.close()} aria-hidden="true" class="max-h-full max-w-md w-full rounded-lg shadow-lg dark:bg-neutral-800 dark:text-neutral-100">
+    <div onclick={onclick} aria-hidden="true">
+        <div class="p-6 border-b border-neutral-200 dark:border-neutral-700">
+            <h1 class="text-4xl font-bold">{title}</h1>
         </div>
-        <div class="spaced main bordered">
+        <div class="p-6 main border-b border-neutral-200 dark:border-neutral-700">
             {@render children?.()}
         </div>
-        <div class="footer spaced" onclick={() => dialog.close()} aria-hidden="true">
+        <div class="flex mx-4 my-2 p-6" onclick={() => dialog.close()} aria-hidden="true">
             {@render footer?.()}
         </div>
     </div>
 </dialog>
-
-<style lang="scss">
-  h1 {
-    @apply text-4xl font-bold;
-  }
-
-  dialog {
-    @apply max-h-full max-w-md w-full rounded-lg shadow-lg
-        dark:bg-neutral-800 dark:text-neutral-100;
-  }
-
-  .spaced {
-    @apply p-6;
-  }
-
-  .bordered {
-    @apply border-b border-neutral-200 dark:border-neutral-700;
-  }
-
-  .footer {
-    @apply flex mx-4 my-2;
-  }
-</style>
\ No newline at end of file
diff --git a/src/pages/index.astro b/src/pages/index.astro
index eedd62c..56567c4 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -168,7 +168,7 @@ const prefixColorMap: {
                         <Card extraClasses={`pt-8 pb-10 px-8 w-fit shadow-md ${prefixColorMap[prefix]}`} client:idle>
                             <figure class="flex flex-col items-center" style="width: 150px">
                                 <figcaption class="text-center mb-4 text-2xl">{v.name}</figcaption>
-                                <Image src={`${import.meta.env.PUBLIC_API_SERVER}/data/skin/${v.uuid}`}
+                                <Image src={`https://vzge.me/bust/150/${v.uuid}`}
                                     class="transition duration-300 ease-in-out hover:scale-110 hover:backdrop-blur-lg hover:drop-shadow-2xl"
                                     alt={v.name + "s bust"} width="150" height="150"/>
                             </figure>