diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index b8ba54b1..6375e699 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -381,6 +381,7 @@ TODO: V7 features on wo I haven't coded yet
 bugbug: empty collection, save, add new item but don't save then click on delete and save and it all goes weird
 	on save, it seems to be trying to save the newly added but deleted record when it should just remove it and get on with it
 
+todo: Outside services list section header only one with word "List" in it instead of plural form outside services
 todo: workorderitemlabor new record stop date sb +1 hour
 
 todo: stop hiding one line tables in wo form, need them for the extra ui stuff they bring
diff --git a/ayanova/src/components/work-order-item-expenses.vue b/ayanova/src/components/work-order-item-expenses.vue
index 01e11b29..8cfb044b 100644
--- a/ayanova/src/components/work-order-item-expenses.vue
+++ b/ayanova/src/components/work-order-item-expenses.vue
@@ -72,7 +72,8 @@
             </template>
           </v-data-table>
         </v-col>
-
+      </template>
+      <template v-if="hasData && hasSelection">
         <v-btn
           v-if="canDelete && isDeleted"
           large
@@ -507,7 +508,10 @@ export default {
     },
     setDefaultView: function() {
       //if only one record left then display it otherwise just let the datatable show what the user can click on
-      if (this.value.items[this.activeWoItemIndex].expenses.length == 1) {
+      if (
+        this.hasData &&
+        this.value.items[this.activeWoItemIndex].expenses.length == 1
+      ) {
         this.selectedRow = [{ index: 0 }];
         this.activeItemIndex = 0;
       } else {
@@ -722,9 +726,11 @@ export default {
       return this.pvm.formCustomTemplateKey;
     },
     hasData: function() {
+      return this.value.items[this.activeWoItemIndex].expenses.length > 0;
+    },
+    hasSelection: function() {
       return this.activeItemIndex != null;
     },
-
     canAdd: function() {
       return this.pvm.rights.change && this.pvm.subRights.expenses.create;
     },
diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue
index 16821cb6..db4a3f86 100644
--- a/ayanova/src/components/work-order-item-labors.vue
+++ b/ayanova/src/components/work-order-item-labors.vue
@@ -59,7 +59,8 @@
           >
           </v-data-table>
         </v-col>
-
+      </template>
+      <template v-if="hasData && hasSelection">
         <v-btn
           v-if="canDelete && isDeleted"
           large
@@ -799,6 +800,9 @@ export default {
       return this.pvm.formCustomTemplateKey;
     },
     hasData: function() {
+      return this.value.items[this.activeWoItemIndex].labors.length > 0;
+    },
+    hasSelection: function() {
       return this.activeItemIndex != null;
     },
     canAdd: function() {
diff --git a/ayanova/src/components/work-order-item-loans.vue b/ayanova/src/components/work-order-item-loans.vue
index 8147a5c5..fdc069c9 100644
--- a/ayanova/src/components/work-order-item-loans.vue
+++ b/ayanova/src/components/work-order-item-loans.vue
@@ -59,7 +59,8 @@
           >
           </v-data-table>
         </v-col>
-
+      </template>
+      <template v-if="hasData && hasSelection">
         <v-btn
           v-if="canDelete && isDeleted"
           large
@@ -822,6 +823,9 @@ export default {
       return this.pvm.formCustomTemplateKey;
     },
     hasData: function() {
+      return this.value.items[this.activeWoItemIndex].loans.length > 0;
+    },
+    hasSelection: function() {
       return this.activeItemIndex != null;
     },
     canAdd: function() {
diff --git a/ayanova/src/components/work-order-item-outside-services.vue b/ayanova/src/components/work-order-item-outside-services.vue
index 25242e36..7a2875bb 100644
--- a/ayanova/src/components/work-order-item-outside-services.vue
+++ b/ayanova/src/components/work-order-item-outside-services.vue
@@ -59,7 +59,8 @@
           >
           </v-data-table>
         </v-col>
-
+      </template>
+      <template v-if="hasData && hasSelection">
         <v-btn
           v-if="canDelete && isDeleted"
           large
@@ -1025,6 +1026,11 @@ export default {
       return this.pvm.formCustomTemplateKey;
     },
     hasData: function() {
+      return (
+        this.value.items[this.activeWoItemIndex].outsideServices.length > 0
+      );
+    },
+    hasSelection: function() {
       return this.activeItemIndex != null;
     },
     canAdd: function() {
diff --git a/ayanova/src/components/work-order-item-part-requests.vue b/ayanova/src/components/work-order-item-part-requests.vue
index c6d4a110..cd7f04ac 100644
--- a/ayanova/src/components/work-order-item-part-requests.vue
+++ b/ayanova/src/components/work-order-item-part-requests.vue
@@ -59,7 +59,8 @@
             </template>
           </v-data-table>
         </v-col>
-
+      </template>
+      <template v-if="hasData && hasSelection">
         <v-btn
           v-if="canDelete && isDeleted"
           large
@@ -380,6 +381,9 @@ export default {
       return this.pvm.formCustomTemplateKey;
     },
     hasData: function() {
+      return this.value.items[this.activeWoItemIndex].partRequests.length > 0;
+    },
+    hasSelection: function() {
       return this.activeItemIndex != null;
     },
     // canAdd: function() {
diff --git a/ayanova/src/components/work-order-item-parts.vue b/ayanova/src/components/work-order-item-parts.vue
index 74887cfe..00b08f1f 100644
--- a/ayanova/src/components/work-order-item-parts.vue
+++ b/ayanova/src/components/work-order-item-parts.vue
@@ -59,7 +59,8 @@
           >
           </v-data-table>
         </v-col>
-
+      </template>
+      <template v-if="hasData && hasSelection">
         <v-btn
           v-if="canDelete && isDeleted"
           large
@@ -684,6 +685,9 @@ export default {
       return this.pvm.formCustomTemplateKey;
     },
     hasData: function() {
+      return this.value.items[this.activeWoItemIndex].parts.length > 0;
+    },
+    hasSelection: function() {
       return this.activeItemIndex != null;
     },
     canAdd: function() {
diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue
index 10ce5f49..b4f17a14 100644
--- a/ayanova/src/components/work-order-item-scheduled-users.vue
+++ b/ayanova/src/components/work-order-item-scheduled-users.vue
@@ -59,7 +59,8 @@
           >
           </v-data-table>
         </v-col>
-
+      </template>
+      <template v-if="hasData && hasSelection">
         <v-btn
           v-if="canDelete && isDeleted"
           large
@@ -522,6 +523,9 @@ export default {
       return this.pvm.formCustomTemplateKey;
     },
     hasData: function() {
+      return this.value.items[this.activeWoItemIndex].scheduledUsers.length > 0;
+    },
+    hasSelection: function() {
       return this.activeItemIndex != null;
     },
     canAdd: function() {
diff --git a/ayanova/src/components/work-order-item-tasks.vue b/ayanova/src/components/work-order-item-tasks.vue
index 1b0917dc..1927f4a8 100644
--- a/ayanova/src/components/work-order-item-tasks.vue
+++ b/ayanova/src/components/work-order-item-tasks.vue
@@ -66,7 +66,8 @@
           >
           </v-data-table>
         </v-col>
-
+      </template>
+      <template v-if="hasData && hasSelection">
         <v-btn
           v-if="canDelete && isDeleted"
           large
@@ -581,6 +582,9 @@ export default {
       return this.pvm.formCustomTemplateKey;
     },
     hasData: function() {
+      return this.value.items[this.activeWoItemIndex].tasks.length > 0;
+    },
+    hasSelection: function() {
       return this.activeItemIndex != null;
     },
     canAdd: function() {
diff --git a/ayanova/src/components/work-order-item-travels.vue b/ayanova/src/components/work-order-item-travels.vue
index 5db8ea34..c40e3a5e 100644
--- a/ayanova/src/components/work-order-item-travels.vue
+++ b/ayanova/src/components/work-order-item-travels.vue
@@ -59,7 +59,8 @@
           >
           </v-data-table>
         </v-col>
-
+      </template>
+      <template v-if="hasData && hasSelection">
         <v-btn
           v-if="canDelete && isDeleted"
           large
@@ -799,6 +800,9 @@ export default {
       return this.pvm.formCustomTemplateKey;
     },
     hasData: function() {
+      return this.value.items[this.activeWoItemIndex].travels.length > 0;
+    },
+    hasSelection: function() {
       return this.activeItemIndex != null;
     },
     canAdd: function() {
diff --git a/ayanova/src/components/work-order-item-units.vue b/ayanova/src/components/work-order-item-units.vue
index 78ee6ae8..ad62e82e 100644
--- a/ayanova/src/components/work-order-item-units.vue
+++ b/ayanova/src/components/work-order-item-units.vue
@@ -59,7 +59,8 @@
           >
           </v-data-table>
         </v-col>
-
+      </template>
+      <template v-if="hasData && hasSelection">
         <v-btn
           v-if="canDelete && isDeleted"
           large
@@ -452,6 +453,9 @@ export default {
       return this.pvm.formCustomTemplateKey;
     },
     hasData: function() {
+      return this.value.items[this.activeWoItemIndex].units.length > 0;
+    },
+    hasSelection: function() {
       return this.activeItemIndex != null;
     },
     canAdd: function() {
diff --git a/ayanova/src/main.js b/ayanova/src/main.js
index 3fd373bf..b45201eb 100644
--- a/ayanova/src/main.js
+++ b/ayanova/src/main.js
@@ -68,7 +68,7 @@ import chartBarHorizontalControl from "./components/chart-bar-horizontal-control
 //DEVELOPMENT MODE
 //THIS SHOULD BE FALSE IN RELEASE
 //************************************************************
-const DEV_MODE = false;
+const DEV_MODE = true;
 //************************************************************
 //**************************************************************
 //**************************************************************