diff --git a/src/components/04_product-service/FormServiceWork.vue b/src/components/04_product-service/FormServiceWork.vue
index bbbba391..f1f20db9 100644
--- a/src/components/04_product-service/FormServiceWork.vue
+++ b/src/components/04_product-service/FormServiceWork.vue
@@ -7,7 +7,7 @@ import WorkManagementComponent from './WorkManagementComponent.vue';
 import AddButton from '../button/AddButton.vue';
 import { ServiceCreate, WorkItems } from 'stores/product-service/types';
 import TreeView from '../shared/TreeView.vue';
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
 
 const { t } = useI18n();
 
@@ -37,16 +37,33 @@ defineEmits<{
 const nodes = ref([
   {
     title: props.service?.name,
-    subtitle: props.service?.code,
+    subtitle: props.service?.code || ' ',
     selected: false,
-    children: workItems.value.map((v) => ({
-      title: v.name,
-      subtitle: ' ',
-      children: v.product.map((x) => ({
-        title: x.name,
-        subtitle: x.code,
-      })),
-    })),
+    opened: true,
+    children: (function () {
+      const noNameObjects = workItems.value
+        .filter((v) => !v.name)
+        .flatMap((v) =>
+          v.product.map((x) => ({
+            title: x.name,
+            subtitle: x.code || ' ',
+            icon: 'mdi-shopping-outline',
+            bg: 'hsla(var(--teal-10-hsl)/0.1)',
+            fg: 'var(--teal-10)',
+          })),
+        );
+      const withNameObjects = workItems.value
+        .filter((v) => v.name)
+        .flatMap((v) => ({
+          title: v.name,
+          subtitle: ' ',
+          children: v.product.map((x) => ({
+            title: x.name,
+            subtitle: x.code || ' ',
+          })),
+        }));
+      return noNameObjects.concat(withNameObjects);
+    })(),
   },
 ]);
 
@@ -72,6 +89,45 @@ function confirmDelete(items: unknown[], index: number) {
     cancel: () => {},
   });
 }
+
+watch(
+  () => workItems,
+  () => {
+    nodes.value = [
+      {
+        title: props.service?.name,
+        subtitle: props.service?.code || ' ',
+        selected: false,
+        opened: true,
+        children: (function () {
+          const noNameObjects = workItems.value
+            .filter((v) => !v.name)
+            .flatMap((v) =>
+              v.product.map((x) => ({
+                title: x.name,
+                subtitle: x.code || ' ',
+                icon: 'mdi-shopping-outline',
+                bg: 'hsla(var(--teal-10-hsl)/0.1)',
+                fg: 'var(--teal-10)',
+              })),
+            );
+          const withNameObjects = workItems.value
+            .filter((v) => v.name)
+            .flatMap((v) => ({
+              title: v.name,
+              subtitle: ' ',
+              children: v.product.map((x) => ({
+                title: x.name,
+                subtitle: x.code || ' ',
+              })),
+            }));
+          return noNameObjects.concat(withNameObjects);
+        })(),
+      },
+    ];
+  },
+  { deep: true },
+);
 </script>
 
 <template>
diff --git a/src/components/shared/TreeView.vue b/src/components/shared/TreeView.vue
index 3db88a5d..23d2066c 100644
--- a/src/components/shared/TreeView.vue
+++ b/src/components/shared/TreeView.vue
@@ -6,6 +6,9 @@ type Node = {
   [key: string]: any;
   opened?: boolean;
   selected?: boolean;
+  bg?: string;
+  fg?: string;
+  icon?: string;
   children?: Node[];
 };
 
@@ -86,7 +89,7 @@ function toggleExpand(node: Node) {
           <div
             v-if="level !== maxLevel"
             class="q-mr-md"
-            style="color: var(--stone-4)"
+            :style="`color: ${node.children?.length === 0 || !node.children ? 'transparent' : 'var(--stone-4)'}`"
           >
             <q-icon
               name="mdi-chevron-down-circle"
@@ -109,14 +112,14 @@ function toggleExpand(node: Node) {
 
           <div
             class="item__icon flex items-center justify-center"
-            :style="`background: ${dec?.bg}; color: ${dec?.fg}; height: ${iconSize}; width: ${iconSize}`"
+            :style="`background: ${node.bg || dec?.bg}; color: ${node.fg || dec?.fg}; height: ${iconSize}; width: ${iconSize}`"
           >
             <div
               :style="`height: calc(${iconSize} - 40%); width: calc(${iconSize} - 40%)`"
             >
               <Icon
-                v-if="dec && dec.icon"
-                :icon="dec.icon"
+                v-if="(node.icon && dec && dec.icon) || (dec && dec.icon)"
+                :icon="node.icon || dec.icon"
                 class="full-width full-height"
               />
             </div>
diff --git a/src/css/app.scss b/src/css/app.scss
index d0ea4d2c..8d8395ca 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -20,7 +20,7 @@ html {
   --surface-tab: var(--gray-2);
 
   --text-mute: var(--stone-7-hsl);
-  --text-mute-2: var(--stone-8-hsl);
+  --text-mute-2: var(--stone-9-hsl);
 
   --info-fg: 0 0% 100%;
   --info-bg: var(--blue-6-hsl);
diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue
index ff658d54..d1d4c942 100644
--- a/src/pages/04_product-service/MainPage.vue
+++ b/src/pages/04_product-service/MainPage.vue
@@ -3802,6 +3802,50 @@ watch(
         :class="$q.screen.xs ? 'q-pl-md' : 'q-pl-sm'"
         style="height: 100%; max-height: 100%; overflow-y: auto"
       >
+        <div
+          class="surface-1 rounded q-my-md q-mx-lg row items-center"
+          style="position: absolute; z-index: 999; top: 0; right: 0"
+          v-if="actionDisplay && !currentNoAction"
+        >
+          <div class="bordered rounded q-mr-md" v-if="serviceTab === 2">
+            <q-btn
+              icon="mdi-file-tree-outline"
+              flat
+              square
+              :class="{
+                ' surface-3': serviceTreeView,
+                'app-text-muted-2': serviceTreeView,
+                'app-text-muted': !serviceTreeView,
+              }"
+              size="sm"
+              padding="6px 10px"
+              title="Tree"
+              style="
+                border-top-left-radius: var(--radius-2);
+                border-bottom-left-radius: var(--radius-2);
+              "
+              @click="serviceTreeView = true"
+            />
+            <q-btn
+              icon="mdi-view-list-outline"
+              flat
+              square
+              :class="{
+                ' surface-3': !serviceTreeView,
+                'app-text-muted-2': !serviceTreeView,
+                'app-text-muted': serviceTreeView,
+              }"
+              size="sm"
+              padding="6px 10px"
+              title="List"
+              style="
+                border-top-right-radius: var(--radius-2);
+                border-bottom-right-radius: var(--radius-2);
+              "
+              @click="serviceTreeView = false"
+            />
+          </div>
+        </div>
         <BasicInformation
           v-if="serviceTab === 1"
           dense
@@ -3814,6 +3858,8 @@ watch(
         <FormServiceWork
           v-if="serviceTab === 2"
           v-model:work-items="workItems"
+          :tree-view="serviceTreeView"
+          :service="formDataProductService"
           dense
           @addProduct="
             async (index) => {