diff --git a/messages/en.json b/messages/en.json
index 4b621d1..7db0a90 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -14,7 +14,6 @@
   "common_edit": "Edit…",
   "common_save": "Save",
   "common_saving": "Saving…",
-  "common_reset": "Reset",
   "common_copy": "Copy",
   "common_unavailable": "Unavailable",
   "common_loading": "Loading…",
@@ -155,7 +154,7 @@
   "network_configured_servers": "Configured servers",
   "network_no_servers": "No servers configured",
   "network_existing_connections_stop": ". Existing connections through this server may stop.",
-  "scene_all_puppets": "All puppets",
+  "scene_puppet_display": "Puppet display",
   "scene_scale": "Scale",
   "scene_opacity": "Opacity",
   "scene_hide_local_puppet_when_alone": "Hide my puppet when no friends are online",
diff --git a/messages/zh-CN.json b/messages/zh-CN.json
index 58b1937..c61a9bd 100644
--- a/messages/zh-CN.json
+++ b/messages/zh-CN.json
@@ -14,7 +14,6 @@
   "common_edit": "编辑…",
   "common_save": "保存",
   "common_saving": "正在保存…",
-  "common_reset": "重置",
   "common_copy": "复制",
   "common_unavailable": "不可用",
   "common_loading": "正在加载…",
@@ -155,7 +154,7 @@
   "network_configured_servers": "已配置的服务器",
   "network_no_servers": "尚未配置服务器",
   "network_existing_connections_stop": "”。经由该服务器建立的现有连接可能会中断。",
-  "scene_all_puppets": "所有玩偶",
+  "scene_puppet_display": "玩偶显示",
   "scene_scale": "缩放",
   "scene_opacity": "不透明度",
   "scene_hide_local_puppet_when_alone": "没有好友在线时隐藏我的玩偶",
diff --git a/src/lib/components/control-panel/scene-panel.svelte b/src/lib/components/control-panel/scene-panel.svelte
index 05d034a..76d0c57 100644
--- a/src/lib/components/control-panel/scene-panel.svelte
+++ b/src/lib/components/control-panel/scene-panel.svelte
@@ -70,12 +70,6 @@
     updateDirty();
   }
 
-  function resetSkin() {
-    clearSkinDraft();
-    pendingSkinReset = true;
-    updateDirty();
-  }
-
   function reset() {
     configurationDraft = { ...$sceneConfiguration };
     clearSkinDraft();
@@ -171,10 +165,12 @@
       </div>
     </div>
 
-    <div class="min-w-0 space-y-2">
-      <fieldset class="fieldset border border-base-300 bg-base-100 p-3 pt-1">
+    <div class="min-w-0 max-w-full space-y-2">
+      <fieldset
+        class="fieldset border border-base-300 bg-base-100 p-3 pt-1 max-w-full"
+      >
         <legend class="fieldset-legend px-1"
-          >{$messages.scene_all_puppets()}</legend
+          >{$messages.scene_puppet_display()}</legend
         >
         <div>
           <label class="fieldset-label" for="puppet-scale"
@@ -211,17 +207,6 @@
             aria-describedby="puppet-opacity-help"
           />
         </div>
-
-        <label class="label cursor-pointer justify-start gap-2">
-          <input
-            class="checkbox checkbox-sm checkbox-primary"
-            type="checkbox"
-            bind:checked={configurationDraft.hideLocalPuppetWhenAlone}
-            onchange={updateDirty}
-            disabled={busy}
-          />
-          <span>{$messages.scene_hide_local_puppet_when_alone()}</span>
-        </label>
       </fieldset>
       <div class="grid grid-cols-[minmax(0,1fr)_auto] gap-2">
         <button
@@ -232,14 +217,6 @@
         >
           {$messages.scene_choose_skin()}
         </button>
-        <button
-          class="btn"
-          type="button"
-          disabled={!$profile || busy || (!$profile.skinHash && !skinFile)}
-          onclick={resetSkin}
-        >
-          {$messages.common_reset()}
-        </button>
         <input
           id="skin-file"
           class="hidden"
@@ -252,6 +229,20 @@
       </div>
     </div>
   </div>
+  <div class="p-2">
+    <label class="label cursor-pointer justify-start gap-2">
+      <input
+        class="checkbox checkbox-sm checkbox-primary"
+        type="checkbox"
+        bind:checked={configurationDraft.hideLocalPuppetWhenAlone}
+        onchange={updateDirty}
+        disabled={busy}
+      />
+      <span class="text-wrap text-xs"
+        >{$messages.scene_hide_local_puppet_when_alone()}</span
+      >
+    </label>
+  </div>
   <fieldset class="fieldset border border-base-300 bg-base-100 p-3 pt-1">
     <legend class="fieldset-legend px-1">{$messages.puppet_movement()}</legend>
     <div class="grid grid-cols-2 gap-2">