diff --git a/src-tauri/src/services/app_menu.rs b/src-tauri/src/services/app_menu.rs
index 6eb547a..5da95cb 100644
--- a/src-tauri/src/services/app_menu.rs
+++ b/src-tauri/src/services/app_menu.rs
@@ -22,6 +22,7 @@ pub fn open_app_menu_window() {
     .title("Friendolls")
     .inner_size(400.0, 550.0)
     .resizable(true)
+    .maximizable(false)
     .decorations(true)
     .transparent(false)
     .shadow(true)
diff --git a/src-tauri/src/services/client_config_manager.rs b/src-tauri/src/services/client_config_manager.rs
index 18bc80f..a48c72c 100644
--- a/src-tauri/src/services/client_config_manager.rs
+++ b/src-tauri/src/services/client_config_manager.rs
@@ -187,8 +187,10 @@ fn open_config_manager_window_inner(
         CLIENT_CONFIG_MANAGER_WINDOW_LABEL,
         tauri::WebviewUrl::App("/client-config-manager".into()),
     )
-    .title("Friendolls Client Config Manager")
-    .inner_size(600.0, 500.0)
+    .title("Advanced Configuration")
+    .inner_size(300.0, 420.0)
+    .resizable(false)
+    .maximizable(false)
     .visible(false)
     .build()
     {
diff --git a/src-tauri/src/services/doll_editor.rs b/src-tauri/src/services/doll_editor.rs
index 19aedb5..721b3cc 100644
--- a/src-tauri/src/services/doll_editor.rs
+++ b/src-tauri/src/services/doll_editor.rs
@@ -109,6 +109,7 @@ pub async fn open_doll_editor_window(doll_id: Option<String>) {
         .title("Doll Editor")
         .inner_size(300.0, 400.0)
         .resizable(false)
+        .maximizable(false)
         .decorations(true)
         .transparent(false)
         .shadow(true)
diff --git a/src-tauri/src/services/welcome.rs b/src-tauri/src/services/welcome.rs
index 2eca6d9..7876bd5 100644
--- a/src-tauri/src/services/welcome.rs
+++ b/src-tauri/src/services/welcome.rs
@@ -32,6 +32,7 @@ pub fn open_welcome_window() {
     .title("Welcome to Friendolls")
     .inner_size(420.0, 420.0)
     .resizable(false)
+    .maximizable(false)
     .decorations(true)
     .transparent(false)
     .shadow(true)
diff --git a/src/routes/app-menu/tabs/your-dolls/doll-editor-window.svelte b/src/routes/app-menu/tabs/your-dolls/doll-editor-window.svelte
index 68f3e89..56e3029 100644
--- a/src/routes/app-menu/tabs/your-dolls/doll-editor-window.svelte
+++ b/src/routes/app-menu/tabs/your-dolls/doll-editor-window.svelte
@@ -104,12 +104,16 @@
       <button class="btn btn-sm mt-4" on:click={handleCancel}>Close</button>
     </div>
   {:else}
-    <div class="h-full w-full p-4 flex flex-col">
+    <div class="h-full w-full p-4 gap-4 flex flex-col">
+      <div class="flex justify-center mt-4">
+        <DollPreview {bodyColor} {outlineColor} />
+      </div>
       <div class="form-control w-full">
-        <label class="label">
+        <label class="label" for="name-input">
           <span class="label-text">Name</span>
         </label>
         <input
+          id="name-input"
           type="text"
           placeholder="Doll Name"
           class="input input-bordered w-full"
@@ -117,17 +121,15 @@
           disabled={saving}
         />
       </div>
-      <div class="flex justify-center mt-4">
-        <DollPreview {bodyColor} {outlineColor} />
-      </div>
-      <div class="form-control w-full mt-2">
-        <label class="label">
+      <div class="form-control w-full">
+        <label class="label" for="body-color-input">
           <span class="label-text">Body Color</span>
         </label>
         <div class="flex gap-2">
           <input
+            id="body-color-input"
             type="color"
-            class="input input-bordered w-12 p-1 h-10"
+            class="input input-bordered w-10 p-0"
             bind:value={bodyColor}
             disabled={saving}
           />
@@ -139,14 +141,15 @@
           />
         </div>
       </div>
-      <div class="form-control w-full mt-2">
-        <label class="label">
+      <div class="form-control w-full">
+        <label class="label" for="outline-color-input">
           <span class="label-text">Outline Color</span>
         </label>
         <div class="flex gap-2">
           <input
+            id="outline-color-input"
             type="color"
-            class="input input-bordered w-12 p-1 h-10"
+            class="input input-bordered w-10 p-0"
             bind:value={outlineColor}
             disabled={saving}
           />
@@ -158,8 +161,10 @@
           />
         </div>
       </div>
-      <div class="mt-auto pt-4 flex justify-end gap-2">
-        <button class="btn" on:click={handleCancel} disabled={saving}>Cancel</button>
+      <div class="mt-auto flex justify-end gap-2">
+        <button class="btn" on:click={handleCancel} disabled={saving}
+          >Cancel</button
+        >
         <button
           class="btn btn-primary"
           on:click={handleSave}
diff --git a/src/routes/client-config-manager/+page.svelte b/src/routes/client-config-manager/+page.svelte
index 1a68bce..95eca8c 100644
--- a/src/routes/client-config-manager/+page.svelte
+++ b/src/routes/client-config-manager/+page.svelte
@@ -60,7 +60,7 @@
         const parsed = new URL(
           form.api_base_url.trim().startsWith("http")
             ? form.api_base_url.trim()
-            : `https://${form.api_base_url.trim()}`
+            : `https://${form.api_base_url.trim()}`,
         );
         if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
           return "API base URL must start with http or https";
@@ -93,7 +93,7 @@
         },
       });
 
-      successMessage = "Configuration saved. Restart to apply changes.";
+      successMessage = "Success. Restart to apply changes.";
     } catch (err) {
       errorMessage = `Failed to save config: ${err}`;
     } finally {
@@ -113,42 +113,45 @@
   onMount(loadConfig);
 </script>
 
-<div class="p-6 flex flex-col gap-4">
-  <div class="flex flex-col gap-1">
-    <p class="text-xl font-semibold">Client Configuration</p>
-    <p class="opacity-70 text-sm">Set custom API and auth endpoints.</p>
+<div class="p-6 flex flex-col gap-4 w-full h-full justify-between">
+  <div class="flex flex-col gap-4 w-full">
+    <div class="flex flex-col gap-1">
+      <p class="text-xl font-semibold">Client Configuration</p>
+      <p class="opacity-70 text-sm">Set custom API and auth endpoints.</p>
+    </div>
+
+    <div class="flex flex-col gap-3">
+      <label class="flex flex-col gap-1">
+        <span class="text-sm">API Base URL</span>
+        <input
+          class="input input-bordered"
+          bind:value={form.api_base_url}
+          placeholder="https://api.fdolls.adamcv.com"
+        />
+      </label>
+      <label class="flex flex-col gap-1">
+        <span class="text-sm">Auth URL</span>
+        <input class="input input-bordered" bind:value={form.auth.auth_url} />
+      </label>
+      <label class="flex flex-col gap-1">
+        <span class="text-sm">JWT Audience</span>
+        <input class="input input-bordered" bind:value={form.auth.audience} />
+      </label>
+    </div>
+
+    {#if errorMessage}
+      <p class="text-sm text-error">{errorMessage}</p>
+    {/if}
+    {#if successMessage}
+      <p class="text-sm text-success">{successMessage}</p>
+    {/if}
+    {#if restartError}
+      <p class="text-sm text-error">{restartError}</p>
+    {/if}
   </div>
 
-  <div class="flex flex-col gap-3">
-    <label class="flex flex-col gap-1">
-      <span class="text-sm">API Base URL</span>
-      <input
-        class="input input-bordered"
-        bind:value={form.api_base_url}
-        placeholder="https://api.fdolls.adamcv.com"
-      />
-    </label>
-    <label class="flex flex-col gap-1">
-      <span class="text-sm">Auth URL</span>
-      <input class="input input-bordered" bind:value={form.auth.auth_url} />
-    </label>
-    <label class="flex flex-col gap-1">
-      <span class="text-sm">JWT Audience</span>
-      <input class="input input-bordered" bind:value={form.auth.audience} />
-    </label>
-  </div>
-
-  {#if errorMessage}
-    <p class="text-sm text-error">{errorMessage}</p>
-  {/if}
-  {#if successMessage}
-    <p class="text-sm text-success">{successMessage}</p>
-  {/if}
-  {#if restartError}
-    <p class="text-sm text-error">{restartError}</p>
-  {/if}
- 
-  <div class="flex flex-row gap-2">
+  <div class="flex flex-row gap-2 w-full justify-end">
+    <button class="btn btn-outline" on:click={restart}> Restart app </button>
     <button
       class="btn"
       class:btn-disabled={saving}
@@ -157,9 +160,5 @@
     >
       {saving ? "Saving..." : "Save"}
     </button>
-    <button class="btn btn-outline" on:click={restart}>
-      Restart app
-    </button>
   </div>
 </div>
-
diff --git a/src/routes/welcome/+page.svelte b/src/routes/welcome/+page.svelte
index 19c5828..4f3a8ca 100644
--- a/src/routes/welcome/+page.svelte
+++ b/src/routes/welcome/+page.svelte
@@ -27,11 +27,13 @@
   };
 </script>
 
-<div class="size-full relative bg-linear-to-br from-base-100 to-[#b7f2ff77]">
+<div
+  class="size-full max-w-full max-h-full overflow-hidden relative bg-linear-to-br from-base-100 to-[#b7f2ff77]"
+>
   <div class="flex flex-row gap-2 justify-between size-full p-6">
     <div class="flex flex-col justify-between">
-      <div class="flex flex-col gap-2 h-full pt-4">
-        <div class="flex flex-col gap-8 mb-18">
+      <div class="flex flex-col gap-2 h-full">
+        <div class="flex flex-col gap-6">
           <div class="flex flex-col gap-2">
             <div class="flex flex-row gap-2">
               <p class="text-xl font-light">meow? nyaaa!!</p>
@@ -40,25 +42,28 @@
               a cute passive socialization layer!
             </p>
           </div>
-           <div class="flex flex-col gap-2">
-             <button
-               class="btn btn-primary"
-               onclick={handleContinue}
-               disabled={isContinuing}
-             >
-               {#if isContinuing}
-                 Loading...
-               {:else}
-                 <div class="scale-70">
-                   <ExternalLink />
-                 </div>
-                 Sign in with browser
-               {/if}
-             </button>
-             <button class="btn btn-outline" onclick={openClientConfigManager}>
-               Advanced options
-             </button>
-           </div>
+          <div class="flex flex-col gap-4 *:w-max">
+            <button
+              class="btn btn-primary btn-xl"
+              onclick={handleContinue}
+              disabled={isContinuing}
+            >
+              {#if isContinuing}
+                Loading...
+              {:else}
+                <div class="scale-70">
+                  <ExternalLink />
+                </div>
+                Sign in
+              {/if}
+            </button>
+            <button
+              class="btn btn-link p-0 btn-sm text-base-content"
+              onclick={openClientConfigManager}
+            >
+              Advanced options
+            </button>
+          </div>
 
           <p class="text-xs opacity-50 max-w-60">
             An account is needed to identify you for connecting with friends.
@@ -70,7 +75,9 @@
       </div>
     </div>
   </div>
-  <div class="absolute bottom-6 right-6 flex flex-col gap-1 justify-between">
+  <div
+    class="absolute pointer-events-none bottom-6 right-6 flex flex-col gap-1 justify-between"
+  >
     <div></div>
     <div class="flex flex-col scale-200 origin-bottom-right">
       <DollPreview bodyColor="b7f2ff" outlineColor="496065" />