diff --git a/webclient-vue/src/components/feedback/AppEmptyState.vue b/webclient-vue/src/components/feedback/AppEmptyState.vue
index e1b34a6..e7ac935 100644
--- a/webclient-vue/src/components/feedback/AppEmptyState.vue
+++ b/webclient-vue/src/components/feedback/AppEmptyState.vue
@@ -1,5 +1,9 @@
 <template>
-  <GnEmptyState :title="title" :text="message" icon="ph-package" />
+  <GnEmptyState :title="title" :text="message" icon="ph-package">
+    <template #actions>
+      <slot name="action" />
+    </template>
+  </GnEmptyState>
 </template>
 
 <script setup>
diff --git a/webclient-vue/src/composables/useAreaAssign.js b/webclient-vue/src/composables/useAreaAssign.js
index 986f4ae..2059797 100644
--- a/webclient-vue/src/composables/useAreaAssign.js
+++ b/webclient-vue/src/composables/useAreaAssign.js
@@ -22,7 +22,7 @@
     showAssignModal.value = true;
   }
 
-  async function submitAssign(itemId, assignFn) {
+  async function submitAssignCore(itemId, assignFn) {
     if (!itemId || !assignFn) {
       return;
     }
@@ -48,6 +48,6 @@
     assignLoading,
     assignError,
     openAssign,
-    submitAssign,
+    submitAssignCore,
   };
 }
diff --git a/webclient-vue/src/features/areas/pages/AreaDetailPage.vue b/webclient-vue/src/features/areas/pages/AreaDetailPage.vue
index 3d1cac2..ea131bf 100644
--- a/webclient-vue/src/features/areas/pages/AreaDetailPage.vue
+++ b/webclient-vue/src/features/areas/pages/AreaDetailPage.vue
@@ -114,7 +114,7 @@
           variant="primary"
           icon="ph-check"
           :loading="assignLoading"
-          @click="submitAssign"
+          @click="() => { console.log('Assign button clicked'); handleAssignSubmit(); }"
         >
           Assign
         </GnButton>
@@ -177,7 +177,7 @@
   assignLoading,
   assignError,
   openAssign: openAssignModal,
-  submitAssign: submitAssignCore,
+  submitAssignCore,
 } = useAreaAssign();
 
 const area = computed(() => areasStore.areasById[String(route.params.id)] || null);
@@ -288,10 +288,11 @@
 }
 
 function openAssign() {
+  console.log("[AreaDetailPage] openAssign called");
   openAssignModal(area.value?.parent_id > 0 ? area.value.parent_id : "");
 }
 
-async function submitAssign() {
+async function handleAssignSubmit() {
   const id = area.value?.id;
   const result = await submitAssignCore(id, (itemId, parentId) => areasStore.assignToArea(itemId, parentId));
   if (result?.ok) {
diff --git a/webclient-vue/src/features/devices/pages/DeviceDetailPage.vue b/webclient-vue/src/features/devices/pages/DeviceDetailPage.vue
index 59b89d8..c400dd3 100644
--- a/webclient-vue/src/features/devices/pages/DeviceDetailPage.vue
+++ b/webclient-vue/src/features/devices/pages/DeviceDetailPage.vue
@@ -140,7 +140,7 @@
           variant="primary"
           icon="ph-check"
           :loading="assignLoading"
-          @click="submitAssign"
+          @click="handleAssignSubmit"
         >
           Assign
         </GnButton>
@@ -203,7 +203,7 @@
   assignLoading,
   assignError,
   openAssign: openAssignModal,
-  submitAssign: submitAssignCore,
+  submitAssignCore,
 } = useAreaAssign();
 
 const deviceId = computed(() => route.params.id);
@@ -289,7 +289,7 @@
   openAssignModal(device.value?.area_id);
 }
 
-async function submitAssign() {
+async function handleAssignSubmit() {
   const result = await submitAssignCore(deviceId.value, devicesStore.assignToArea.bind(devicesStore));
   if (result?.ok) {
     toast.success({ title: "Assigned", text: "Device assigned to area successfully" });
diff --git a/webclient-vue/src/features/scripts/pages/ScriptDetailPage.vue b/webclient-vue/src/features/scripts/pages/ScriptDetailPage.vue
index e8d178d..5557bc0 100644
--- a/webclient-vue/src/features/scripts/pages/ScriptDetailPage.vue
+++ b/webclient-vue/src/features/scripts/pages/ScriptDetailPage.vue
@@ -143,7 +143,7 @@
           variant="primary"
           icon="ph-check"
           :loading="assignLoading"
-          @click="submitAssign"
+          @click="handleAssignSubmit"
         >
           Assign
         </GnButton>
@@ -191,7 +191,7 @@
   assignLoading,
   assignError,
   openAssign: openAssignModal,
-  submitAssign: submitAssignCore,
+  submitAssignCore,
 } = useAreaAssign();
 
 const scriptType = computed(() => route.params.type);
@@ -335,7 +335,7 @@
   openAssignModal(script.value?.area_id);
 }
 
-async function submitAssign() {
+async function handleAssignSubmit() {
   const id = script.value?.id;
   const result = await submitAssignCore(id, scriptsStore.assignToArea.bind(scriptsStore));
   if (result?.ok) {