diff --git a/src/lib/components/ComfyApp.svelte b/src/lib/components/ComfyApp.svelte
index b13a927..8f711da 100644
--- a/src/lib/components/ComfyApp.svelte
+++ b/src/lib/components/ComfyApp.svelte
@@ -169,7 +169,12 @@
         </Button>
         <Checkbox label="Lock Nodes" bind:value={$uiState.nodesLocked}/>
         <Checkbox label="Disable Interaction" bind:value={$uiState.graphLocked}/>
-        <Checkbox label="Enable UI Editing" bind:value={$uiState.unlocked}/>
+        <label for="enable-ui-editing">Enable UI Editing</label>
+        <select id="enable-ui-editing" name="enable-ui-editing" bind:value={$uiState.uiEditMode}>
+            <option value="disabled">Disabled</option>
+            <option value="widgets">Widgets</option>
+            <option value="containers">Containers</option>
+        </select>
     </div>
     <LightboxModal />
 </div>
diff --git a/src/lib/components/ComfyUIPane.svelte b/src/lib/components/ComfyUIPane.svelte
index c06972d..dd0cf7d 100644
--- a/src/lib/components/ComfyUIPane.svelte
+++ b/src/lib/components/ComfyUIPane.svelte
@@ -53,8 +53,4 @@
 
  }
 
- #comfy-ui-panes > :global(.root-container > .block) {
-     padding: 0px;
- }
-
 </style>
diff --git a/src/lib/components/WidgetContainer.svelte b/src/lib/components/WidgetContainer.svelte
index ce554a1..65b51ea 100644
--- a/src/lib/components/WidgetContainer.svelte
+++ b/src/lib/components/WidgetContainer.svelte
@@ -14,14 +14,15 @@
  import { getComponentForWidgetState } from "$lib/utils"
 
  export let dragItem: IDragItem | null = null;
- export let zIndex: number = 100;
+ export let zIndex: number = 0;
  export let classes: string[] = [];
+ export let isRoot: boolean = false;
+ let dragDisabled: boolean = false;
  let container: ContainerLayout | null = null;
  let widget: WidgetLayout | null = null;
  let widgetState: WidgetUIState | null = null;
  let children: IDragItem[] | null = null;
- let dragDisabled = true;
- const flipDurationMs = 200;
+ const flipDurationMs = 100;
 
  $: if (dragItem) {
      if (dragItem.type === "container") {
@@ -37,8 +38,6 @@
      }
  }
 
- $: dragDisabled = !$uiState.unlocked;
-
  function handleConsider(evt: any) {
      children = layoutState.updateChildren(dragItem, evt.detail.items)
      // console.log(dragItems);
@@ -47,18 +46,13 @@
  function handleFinalize(evt: any) {
      children = layoutState.updateChildren(dragItem, evt.detail.items)
      // Ensure dragging is stopped on drag finish
-     // dragDisabled = true;
  };
 
  const startDrag = () => {
-     if (!$uiState.unlocked)
-         return
-     // dragDisabled = false;
+     return
  };
  const stopDrag = () => {
-     if (!$uiState.unlocked)
-         return
-     // dragDisabled = true;
+     return
  };
 
  $: if ($queueState && widget) {
@@ -70,12 +64,14 @@
 
 {#if container && children}
     {@const id = container.id}
-    <div class="container {container.attrs.direction} {container.attrs.classes} {classes.join(' ')}">
+    <div class="container {container.attrs.direction} {container.attrs.classes} {classes.join(' ')}"
+         class:root-container={isRoot}
+         class:container-edit-outline={$uiState.uiEditMode === "containers" && zIndex > 1}>
         <Block>
             {#if container.attrs.showTitle}
-                <label for={String(id)} class={$uiState.unlocked ? "edit-title-label" : ""}>
+                <label for={String(id)} class={$uiState.uiEditMode === "containers" ? "edit-title-label" : ""}>
                     <BlockTitle>
-                        {#if $uiState.unlocked}
+                        {#if $uiState.uiEditMode === "containers"}
                             <input class="edit-title" bind:value={container.attrs.title} type="text" minlength="1" />
                         {:else}
                             {container.attrs.title}
@@ -85,12 +81,22 @@
             {/if}
             <div class="v-pane"
                  class:empty={children.length === 0}
-                 use:dndzone="{{ items: children, dragDisabled, flipDurationMs }}"
+                 class:edit={$uiState.uiEditMode === "containers" && zIndex > 1}
+                 use:dndzone="{{
+                              items: children,
+                              flipDurationMs,
+                              morphDisabled: true,
+                              dropFromOthersDisabled: zIndex === 0,
+                              dragDisabled: zIndex === 0
+                              }}"
                  on:consider="{handleConsider}"
                  on:finalize="{handleFinalize}"
             >
                 {#each children.filter(item => item.id !== SHADOW_PLACEHOLDER_ITEM_ID) as item(item.id)}
-                    <div class="animation-wrapper" class:is-executing={item.isNodeExecuting} animate:flip={{duration:flipDurationMs}}>
+                    <div class="animation-wrapper"
+                         class:edit={$uiState.unlocked}
+                         class:is-executing={item.isNodeExecuting}
+                         animate:flip={{duration:flipDurationMs}}>
                         <svelte:self dragItem={item} zIndex={zIndex+1} />
                         {#if item[SHADOW_ITEM_MARKER_PROPERTY_NAME]}
                             <div in:fade={{duration:200, easing: cubicIn}} class='drag-item-shadow'/>
@@ -98,15 +104,17 @@
                     </div>
                 {/each}
             </div>
-            {#if $uiState.unlocked}
-                <div class="handle handle-container" style="z-index: {zIndex}" on:mousedown={startDrag} on:touchstart={startDrag} on:mouseup={stopDrag} on:touchend={stopDrag}/>
+            {#if $uiState.uiEditMode === "containers" && zIndex > 1}
+                <div class="handle handle-container" style="z-index: {zIndex+100}" on:mousedown={startDrag} on:touchstart={startDrag} on:mouseup={stopDrag} on:touchend={stopDrag}/>
             {/if}
         </Block>
     </div>
 {:else if widget}
-    <svelte:component this={getComponentForWidgetState(widgetState)} item={widgetState} />
-    {#if $uiState.unlocked}
-        <div class="handle handle-widget" style="z-index: {zIndex}" on:mousedown={startDrag} on:touchstart={startDrag} on:mouseup={stopDrag} on:touchend={stopDrag}/>
+    <div class:widget-edit-outline={$uiState.uiEditMode === "widgets" && zIndex > 1}>
+        <svelte:component this={getComponentForWidgetState(widgetState)} item={widgetState} />
+    </div>
+    {#if $uiState.uiEditMode ==="widgets" && zIndex > 1}
+        <div class="handle handle-widget" style="z-index: {zIndex+100}" on:mousedown={startDrag} on:touchstart={startDrag} on:mouseup={stopDrag} on:touchend={stopDrag}/>
     {/if}
 {/if}
 
@@ -117,12 +125,16 @@
      overflow: visible;
      display: flex;
 
+     .edit {
+         min-width: 200px;
+     }
+
      &.empty {
          border-width: 3px;
          border-color: var(--color-grey-400);
          border-radius: var(--block-radius);
          background: var(--color-grey-300);
-         min-height: 50px;
+         min-height: 200px;
          border-style: dashed;
      }
  }
@@ -134,6 +146,10 @@
          height: fit-content;
      }
 
+     &.container-edit-outline {
+         /* width: 20rem; */
+     }
+
      &.horizontal {
          flex-wrap: wrap;
          gap: var(--layout-gap);
@@ -169,7 +185,10 @@
 
  .animation-wrapper {
      position: relative;
-     flex-grow: 1;
+
+     &:not(.edit) {
+         flex-grow: 1;
+     }
  }
 
  .handle {
@@ -235,4 +254,22 @@
  .edit-title::placeholder {
      color: var(--input-placeholder-color);
  }
+
+ .container-edit-outline > :global(.block) {
+     border-color: var(--color-pink-500);
+     border-width: 2px;
+     border-style: dashed !important;
+     margin: 0.2em;
+     padding: 1.2em;
+ }
+
+ .widget-edit-outline {
+     border: 2px dashed var(--color-blue-400);
+     margin: 0.2em;
+     padding: 0.2em;
+ }
+
+ .root-container > :global(.block) {
+     padding: 0px;
+ }
 </style>
diff --git a/src/lib/stores/layoutState.ts b/src/lib/stores/layoutState.ts
index 86f8ead..4ff3c59 100644
--- a/src/lib/stores/layoutState.ts
+++ b/src/lib/stores/layoutState.ts
@@ -4,6 +4,7 @@ import type ComfyApp from "$lib/components/ComfyApp"
 import type { LGraphNode, IWidget } from "@litegraph-ts/core"
 import nodeState from "$lib/state/nodeState";
 import type { NodeStateStore } from './nodeState';
+ import { dndzone, SHADOW_PLACEHOLDER_ITEM_ID } from 'svelte-dnd-action';
 
 type DragItemEntry = {
     dragItem: IDragItem,
@@ -136,6 +137,8 @@ function updateChildren(parent: IDragItem, children: IDragItem[]): IDragItem[] {
     const state = get(store);
     state.allItems[parent.id].children = children;
     for (const child of children) {
+        if (child.id === SHADOW_PLACEHOLDER_ITEM_ID)
+            continue;
         state.allItems[child.id].parent = parent;
     }
     store.set(state)
diff --git a/src/lib/stores/uiState.ts b/src/lib/stores/uiState.ts
index 43cd4d8..4045f9b 100644
--- a/src/lib/stores/uiState.ts
+++ b/src/lib/stores/uiState.ts
@@ -2,11 +2,13 @@ import { writable } from 'svelte/store';
 import type { Readable, Writable } from 'svelte/store';
 import type ComfyApp from "$lib/components/ComfyApp"
 
+export type UIEditMode = "disabled" | "widgets" | "containers" | "layout";
+
 export type UIState = {
     app: ComfyApp,
     nodesLocked: boolean,
     graphLocked: boolean,
-    unlocked: boolean,
+    uiEditMode: UIEditMode
 }
 
 export type WritableUIStateStore = Writable<UIState>;
@@ -14,7 +16,7 @@ const store: WritableUIStateStore = writable(
     {
         graphLocked: true,
         nodesLocked: false,
-        unlocked: false,
+        uiEditMode: "disabled",
     })
 
 const uiStateStore: WritableUIStateStore =