diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue
index 0c4c9eaf..ac6643a3 100644
--- a/ayanova/src/components/work-order-item-scheduled-users.vue
+++ b/ayanova/src/components/work-order-item-scheduled-users.vue
@@ -1,219 +1,256 @@
 <template>
   <div v-if="value != null">
-    <v-col cols="12">
-      <v-menu offset-y>
-        <template v-slot:activator="{ on, attrs }">
-          <div class="text-subtitle-1">
-            <v-icon color="primary">$ayiUserClock</v-icon>
-            {{ $ay.t("WorkOrderItemScheduledUserList") }}
-            <v-btn v-if="!parentDeleted" large icon v-bind="attrs" v-on="on">
-              <v-icon small color="primary">$ayiEllipsisV</v-icon>
-            </v-btn>
-          </div>
-        </template>
-        <v-list>
-          <v-list-item v-if="canAdd" @click="newItem">
-            <v-list-item-icon>
-              <v-icon>$ayiPlus</v-icon>
-            </v-list-item-icon>
-            <v-list-item-title>{{ $ay.t("New") }}</v-list-item-title>
-          </v-list-item>
-          <v-list-item v-if="canDelete && !isDeleted" @click="deleteItem">
-            <v-list-item-icon>
-              <v-icon>$ayiTrashAlt</v-icon>
-            </v-list-item-icon>
-            <v-list-item-title>{{ $ay.t("SoftDelete") }}</v-list-item-title>
-          </v-list-item>
-          <v-list-item v-if="canDelete && isDeleted" @click="unDeleteItem">
-            <v-list-item-icon>
-              <v-icon>$ayiTrashRestoreAlt</v-icon>
-            </v-list-item-icon>
-            <v-list-item-title>{{ $ay.t("Undelete") }}</v-list-item-title>
-          </v-list-item>
-        </v-list>
-      </v-menu>
-    </v-col>
+    <v-row>
+      <v-col cols="12">
+        <v-menu offset-y>
+          <template v-slot:activator="{ on, attrs }">
+            <div class="text-subtitle-1">
+              <v-icon color="primary">$ayiUserClock</v-icon>
+              {{ $ay.t("WorkOrderItemScheduledUserList") }}
+              <v-btn v-if="!parentDeleted" large icon v-bind="attrs" v-on="on">
+                <v-icon small color="primary">$ayiEllipsisV</v-icon>
+              </v-btn>
+            </div>
+          </template>
+          <v-list>
+            <v-list-item v-if="canAdd" @click="newItem">
+              <v-list-item-icon>
+                <v-icon>$ayiPlus</v-icon>
+              </v-list-item-icon>
+              <v-list-item-title>{{ $ay.t("New") }}</v-list-item-title>
+            </v-list-item>
+            <v-list-item v-if="canDelete && !isDeleted" @click="deleteItem">
+              <v-list-item-icon>
+                <v-icon>$ayiTrashAlt</v-icon>
+              </v-list-item-icon>
+              <v-list-item-title>{{ $ay.t("SoftDelete") }}</v-list-item-title>
+            </v-list-item>
+            <v-list-item v-if="canDelete && isDeleted" @click="unDeleteItem">
+              <v-list-item-icon>
+                <v-icon>$ayiTrashRestoreAlt</v-icon>
+              </v-list-item-icon>
+              <v-list-item-title>{{ $ay.t("Undelete") }}</v-list-item-title>
+            </v-list-item>
+          </v-list>
+        </v-menu>
+      </v-col>
 
-    <template v-if="showTable">
-      <!-- ################################ SCHEDULED USERS TABLE ############################### -->
-      <v-col cols="12" class="mb-10">
-        <v-data-table
-          :headers="headerList"
-          :items="itemList"
-          item-key="index"
-          v-model="selectedRow"
-          class="elevation-1"
-          disable-pagination
-          disable-filtering
-          disable-sort
-          hide-default-footer
-          data-cy="scheduledUsersTable"
-          dense
-          :item-class="itemRowClasses"
-          @click:row="handleRowClick"
-          :show-select="$vuetify.breakpoint.xs"
-          single-select
+      <template v-if="showTable">
+        <!-- ################################ SCHEDULED USERS TABLE ############################### -->
+        <v-col cols="12" class="mb-10">
+          <v-data-table
+            :headers="headerList"
+            :items="itemList"
+            item-key="index"
+            v-model="selectedRow"
+            class="elevation-1"
+            disable-pagination
+            disable-filtering
+            disable-sort
+            hide-default-footer
+            data-cy="scheduledUsersTable"
+            dense
+            :item-class="itemRowClasses"
+            @click:row="handleRowClick"
+            :show-select="$vuetify.breakpoint.xs"
+            single-select
+          >
+          </v-data-table>
+        </v-col>
+      </template>
+      <template v-if="activeItemIndex != null">
+        <v-btn
+          v-if="canDelete && isDeleted"
+          large
+          @click="unDeleteItem"
+          color="primary"
+          >{{ $ay.t("Undelete")
+          }}<v-icon right large>$ayiTrashRestoreAlt</v-icon></v-btn
         >
-        </v-data-table>
-      </v-col>
-    </template>
-    <template v-if="activeItemIndex != null">
-      <v-btn
-        v-if="canDelete && isDeleted"
-        large
-        @click="unDeleteItem"
-        color="primary"
-        >{{ $ay.t("Undelete")
-        }}<v-icon right large>$ayiTrashRestoreAlt</v-icon></v-btn
-      >
 
-      <v-col
-        v-if="form().showMe(this, 'WorkOrderItemScheduledUserStartDate')"
-        cols="12"
-        sm="6"
-        lg="4"
-        xl="3"
-      >
-        <gz-date-time-picker
-          :label="$ay.t('WorkOrderItemScheduledUserStartDate')"
-          v-model="
-            value.items[activeWoItemIndex].scheduledUsers[activeItemIndex]
-              .startDate
-          "
-          :readonly="formState.readOnly"
-          :disabled="isDeleted"
-          :ref="
-            `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].startDate`
-          "
-          data-cy="startDate"
-          :error-messages="
-            form().serverErrors(
-              this,
+        <v-col
+          v-if="form().showMe(this, 'WorkOrderItemScheduledUserStartDate')"
+          cols="12"
+          sm="6"
+          lg="4"
+          xl="3"
+        >
+          <gz-date-time-picker
+            :label="$ay.t('WorkOrderItemScheduledUserStartDate')"
+            v-model="
+              value.items[activeWoItemIndex].scheduledUsers[activeItemIndex]
+                .startDate
+            "
+            :readonly="formState.readOnly"
+            :disabled="isDeleted"
+            :ref="
               `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].startDate`
-            )
-          "
-          @input="
-            fieldValueChanged(
-              `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].startDate`
-            )
-          "
-        ></gz-date-time-picker>
-      </v-col>
+            "
+            data-cy="startDate"
+            :error-messages="
+              form().serverErrors(
+                this,
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].startDate`
+              )
+            "
+            @input="
+              fieldValueChanged(
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].startDate`
+              )
+            "
+          ></gz-date-time-picker>
+        </v-col>
 
-      <v-col
-        v-if="form().showMe(this, 'WorkOrderItemScheduledUserStopDate')"
-        cols="12"
-        sm="6"
-        lg="4"
-        xl="3"
-      >
-        <gz-date-time-picker
-          :label="$ay.t('WorkOrderItemScheduledUserStopDate')"
-          v-model="
-            value.items[activeWoItemIndex].scheduledUsers[activeItemIndex]
-              .stopDate
-          "
-          :readonly="formState.readOnly"
-          :disabled="isDeleted"
-          :ref="
-            `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].stopDate`
-          "
-          data-cy="stopDate"
-          :error-messages="
-            form().serverErrors(
-              this,
+        <v-col
+          v-if="form().showMe(this, 'WorkOrderItemScheduledUserStopDate')"
+          cols="12"
+          sm="6"
+          lg="4"
+          xl="3"
+        >
+          <gz-date-time-picker
+            :label="$ay.t('WorkOrderItemScheduledUserStopDate')"
+            v-model="
+              value.items[activeWoItemIndex].scheduledUsers[activeItemIndex]
+                .stopDate
+            "
+            :readonly="formState.readOnly"
+            :disabled="isDeleted"
+            :ref="
               `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].stopDate`
-            )
-          "
-          @input="
-            fieldValueChanged(
-              `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].stopDate`
-            )
-          "
-        ></gz-date-time-picker>
-      </v-col>
+            "
+            data-cy="stopDate"
+            :error-messages="
+              form().serverErrors(
+                this,
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].stopDate`
+              )
+            "
+            @input="
+              fieldValueChanged(
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].stopDate`
+              )
+            "
+          ></gz-date-time-picker>
+        </v-col>
 
-      <v-col
-        v-if="
-          form().showMe(this, 'WorkOrderItemScheduledUserEstimatedQuantity')
-        "
-        cols="12"
-        sm="6"
-        lg="4"
-        xl="3"
-      >
-        <gz-decimal
-          v-model="
-            value.items[activeWoItemIndex].scheduledUsers[activeItemIndex]
-              .estimatedQuantity
+        <v-col
+          v-if="
+            form().showMe(this, 'WorkOrderItemScheduledUserEstimatedQuantity')
           "
-          :readonly="formState.readOnly || isDeleted"
-          :disabled="isDeleted"
-          :label="$ay.t('WorkOrderItemScheduledUserEstimatedQuantity')"
-          :ref="
-            `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].estimatedQuantity`
-          "
-          data-cy="scheduledUsers.EstimatedQuantity"
-          :error-messages="
-            form().serverErrors(
-              this,
+          cols="12"
+          sm="6"
+          lg="4"
+          xl="3"
+        >
+          <gz-decimal
+            v-model="
+              value.items[activeWoItemIndex].scheduledUsers[activeItemIndex]
+                .estimatedQuantity
+            "
+            :readonly="formState.readOnly || isDeleted"
+            :disabled="isDeleted"
+            :label="$ay.t('WorkOrderItemScheduledUserEstimatedQuantity')"
+            :ref="
               `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].estimatedQuantity`
-            )
-          "
-          :rules="[
-            form().decimalValid(
-              this,
-              `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].estimatedQuantity`
-            ),
-            form().required(
-              this,
-              `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].estimatedQuantity`
-            )
-          ]"
-          @input="
-            fieldValueChanged(`Items[${activeWoItemIndex}].scheduledUsers[
+            "
+            data-cy="scheduledUsers.EstimatedQuantity"
+            :error-messages="
+              form().serverErrors(
+                this,
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].estimatedQuantity`
+              )
+            "
+            :rules="[
+              form().decimalValid(
+                this,
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].estimatedQuantity`
+              ),
+              form().required(
+                this,
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].estimatedQuantity`
+              )
+            ]"
+            @input="
+              fieldValueChanged(`Items[${activeWoItemIndex}].scheduledUsers[
               ${activeItemIndex}
             ].estimatedQuantity`)
-          "
-        ></gz-decimal>
-      </v-col>
+            "
+          ></gz-decimal>
+        </v-col>
 
-      <v-col
-        v-if="form().showMe(this, 'WorkOrderItemScheduledUserUserID')"
-        cols="12"
-        sm="6"
-        lg="4"
-        xl="3"
-      >
-        <gz-pick-list
-          :aya-type="$ay.ayt().User"
-          variant="tech"
-          :show-edit-icon="true"
-          v-model="
-            value.items[activeWoItemIndex].scheduledUsers[activeItemIndex]
-              .userId
-          "
-          :readonly="formState.readOnly || isDeleted"
-          :disabled="isDeleted"
-          :label="$ay.t('WorkOrderItemScheduledUserUserID')"
-          :ref="
-            `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].userId`
-          "
-          data-cy="scheduledUsers.userid"
-          :error-messages="
-            form().serverErrors(
-              this,
+        <v-col
+          v-if="form().showMe(this, 'WorkOrderItemScheduledUserUserID')"
+          cols="12"
+          sm="6"
+          lg="4"
+          xl="3"
+        >
+          <gz-pick-list
+            :aya-type="$ay.ayt().User"
+            variant="tech"
+            :show-edit-icon="true"
+            v-model="
+              value.items[activeWoItemIndex].scheduledUsers[activeItemIndex]
+                .userId
+            "
+            :readonly="formState.readOnly || isDeleted"
+            :disabled="isDeleted"
+            :label="$ay.t('WorkOrderItemScheduledUserUserID')"
+            :ref="
               `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].userId`
-            )
-          "
-          @input="
-            fieldValueChanged(
-              `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].userId`
-            )
-          "
-        ></gz-pick-list>
-      </v-col>
-    </template>
+            "
+            data-cy="scheduledUsers.userid"
+            :error-messages="
+              form().serverErrors(
+                this,
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].userId`
+              )
+            "
+            @input="
+              fieldValueChanged(
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].userId`
+              )
+            "
+          ></gz-pick-list>
+        </v-col>
+
+        <v-col
+          v-if="form().showMe(this, 'WorkOrderItemScheduledUserServiceRateID')"
+          cols="12"
+          sm="6"
+          lg="4"
+          xl="3"
+        >
+          <gz-pick-list
+            :aya-type="$ay.ayt().ServiceRate"
+            :show-edit-icon="true"
+            v-model="
+              value.items[activeWoItemIndex].scheduledUsers[activeItemIndex]
+                .serviceRateId
+            "
+            :readonly="formState.readOnly || isDeleted"
+            :disabled="isDeleted"
+            :label="$ay.t('WorkOrderItemScheduledUserServiceRateID')"
+            :ref="
+              `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].serviceRateId`
+            "
+            data-cy="scheduledUsers.serviceRateId"
+            :error-messages="
+              form().serverErrors(
+                this,
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].serviceRateId`
+              )
+            "
+            @input="
+              fieldValueChanged(
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].serviceRateId`
+              )
+            "
+          ></gz-pick-list>
+        </v-col>
+      </template>
+    </v-row>
   </div>
 </template>
 <script>
@@ -456,7 +493,7 @@ export default {
               this.pvm.languageName
             ),
             userViz: x.userViz,
-            rateViz: x.rateViz
+            rateViz: x.serviceRateViz
           };
         }
       );