diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index aff27744..2bd3bb40 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -233,7 +233,8 @@ todo: both rates need contract checkbox so they only appear in conjunction with
 			As non contract scenario is just all items
 			Contract may or may not be all items plus contract or just contract (different queries) 
 			But it all needs to go through same picklist code for client simplicity
-		
+
+todo: test error handling from server, correctly displays in table (narrator: "It didn't")
 todo: help docs
 	
 
diff --git a/ayanova/src/views/svc-contract.vue b/ayanova/src/views/svc-contract.vue
index 3b285411..b381371e 100644
--- a/ayanova/src/views/svc-contract.vue
+++ b/ayanova/src/views/svc-contract.vue
@@ -197,7 +197,7 @@
 
                 <tbody>
                   <tr
-                    v-for="item in obj.contractPartOverrideItems"
+                    v-for="(item, index) in obj.contractPartOverrideItems"
                     :key="item.Id"
                   >
                     <td class="text-right">{{ item.overridePct }}%</td>
@@ -215,7 +215,7 @@
                       <v-btn
                         large
                         icon
-                        @click="editContractPartOverrideItem(item)"
+                        @click="editContractPartOverrideItem(index)"
                         class="ml-4"
                       >
                         <v-icon small>
@@ -256,7 +256,8 @@
 
                 <tbody>
                   <tr
-                    v-for="item in obj.contractServiceRateOverrideItems"
+                    v-for="(item,
+                    index) in obj.contractServiceRateOverrideItems"
                     :key="item.Id"
                   >
                     <td class="text-right">{{ item.overridePct }}%</td>
@@ -274,7 +275,7 @@
                       <v-btn
                         large
                         icon
-                        @click="editContractServiceRateOverrideItem(item)"
+                        @click="editContractServiceRateOverrideItem(index)"
                         class="ml-4"
                       >
                         <v-icon small>
@@ -315,7 +316,7 @@
 
                 <tbody>
                   <tr
-                    v-for="item in obj.contractTravelRateOverrideItems"
+                    v-for="(item, index) in obj.contractTravelRateOverrideItems"
                     :key="item.Id"
                   >
                     <td class="text-right">{{ item.overridePct }}%</td>
@@ -333,7 +334,7 @@
                       <v-btn
                         large
                         icon
-                        @click="editContractTravelRateOverrideItem(item)"
+                        @click="editContractTravelRateOverrideItem(index)"
                         class="ml-4"
                       >
                         <v-icon small>
@@ -639,22 +640,10 @@
                 <v-btn
                   color="red darken-1"
                   text
-                  @click="
-                    deleteContractPartOverrideItem(
-                      obj.contractPartOverrideItems[
-                        editContractPartOverrideItemIndex
-                      ]
-                    )
-                  "
+                  @click="deleteContractPartOverrideItem()"
                   >{{ $ay.t("Delete") }}</v-btn
                 >
                 <v-spacer></v-spacer>
-                <v-btn
-                  color="blue darken-1"
-                  text
-                  @click="editContractPartOverrideItemDialog = false"
-                  >{{ $ay.t("Close") }}</v-btn
-                >
 
                 <v-btn
                   color="blue darken-1"
@@ -697,13 +686,7 @@
                     block
                     text
                     color="red darken-1"
-                    @click="
-                      deleteContractPartOverrideItem(
-                        obj.contractPartOverrideItems[
-                          editContractPartOverrideItemIndex
-                        ]
-                      )
-                    "
+                    @click="deleteContractPartOverrideItem()"
                     >{{ $ay.t("Delete") }}</v-btn
                   >
                 </v-row>
@@ -833,22 +816,10 @@
                 <v-btn
                   color="red darken-1"
                   text
-                  @click="
-                    deleteContractServiceRateOverrideItem(
-                      obj.contractServiceRateOverrideItems[
-                        editContractServiceRateOverrideItemIndex
-                      ]
-                    )
-                  "
+                  @click="deleteContractServiceRateOverrideItem()"
                   >{{ $ay.t("Delete") }}</v-btn
                 >
                 <v-spacer></v-spacer>
-                <v-btn
-                  color="blue darken-1"
-                  text
-                  @click="editContractServiceRateOverrideItemDialog = false"
-                  >{{ $ay.t("Close") }}</v-btn
-                >
 
                 <v-btn
                   color="blue darken-1"
@@ -891,13 +862,7 @@
                     block
                     text
                     color="red darken-1"
-                    @click="
-                      deleteContractServiceRateOverrideItem(
-                        obj.contractServiceRateOverrideItems[
-                          editContractServiceRateOverrideItemIndex
-                        ]
-                      )
-                    "
+                    @click="deleteContractServiceRateOverrideItem()"
                     >{{ $ay.t("Delete") }}</v-btn
                   >
                 </v-row>
@@ -1027,22 +992,10 @@
                 <v-btn
                   color="red darken-1"
                   text
-                  @click="
-                    deleteContractTravelRateOverrideItem(
-                      obj.contractTravelRateOverrideItems[
-                        editContractTravelRateOverrideItemIndex
-                      ]
-                    )
-                  "
+                  @click="deleteContractTravelRateOverrideItem()"
                   >{{ $ay.t("Delete") }}</v-btn
                 >
                 <v-spacer></v-spacer>
-                <v-btn
-                  color="blue darken-1"
-                  text
-                  @click="editContractTravelRateOverrideItemDialog = false"
-                  >{{ $ay.t("Close") }}</v-btn
-                >
 
                 <v-btn
                   color="blue darken-1"
@@ -1085,13 +1038,7 @@
                     block
                     text
                     color="red darken-1"
-                    @click="
-                      deleteContractTravelRateOverrideItem(
-                        obj.contractTravelRateOverrideItems[
-                          editContractTravelRateOverrideItemIndex
-                        ]
-                      )
-                    "
+                    @click="deleteContractTravelRateOverrideItem()"
                     >{{ $ay.t("Delete") }}</v-btn
                   >
                 </v-row>
@@ -1218,7 +1165,7 @@
     </template>
 
     <!-- #########################################################################################################-->
-    <!-- ########################## SERVICE RATE ITEM EDIT FORM  ###############################-->
+    <!-- ########################## TRAVEL RATE ITEM EDIT FORM  ###############################-->
     <!-- #########################################################################################################-->
     <template
       v-if="obj.travelRateItems.length && editTravelRateItemIndex != -1"
@@ -1490,10 +1437,8 @@ export default {
     }
   },
   methods: {
-    editContractPartOverrideItem: function(item) {
-      this.editContractPartOverrideItemIndex = this.obj.contractPartOverrideItems.findIndex(
-        z => z.id == item.id
-      );
+    editContractPartOverrideItem: function(index) {
+      this.editContractPartOverrideItemIndex = index;
       if (this.editContractPartOverrideItemIndex != -1) {
         this.editContractPartOverrideItemDialog = true;
       }
@@ -1522,10 +1467,8 @@ export default {
       this.formState.dirty = true;
     },
 
-    editContractServiceRateOverrideItem: function(item) {
-      this.editContractServiceRateOverrideItemIndex = this.obj.contractServiceRateOverrideItems.findIndex(
-        z => z.id == item.id
-      );
+    editContractServiceRateOverrideItem: function(index) {
+      this.editContractServiceRateOverrideItemIndex = index;
       if (this.editContractServiceRateOverrideItemIndex != -1) {
         this.editContractServiceRateOverrideItemDialog = true;
       }
@@ -1554,10 +1497,8 @@ export default {
       this.formState.dirty = true;
     },
 
-    editContractTravelRateOverrideItem: function(item) {
-      this.editContractTravelRateOverrideItemIndex = this.obj.contractTravelRateOverrideItems.findIndex(
-        z => z.id == item.id
-      );
+    editContractTravelRateOverrideItem: function(index) {
+      this.editContractTravelRateOverrideItemIndex = index;
       if (this.editContractTravelRateOverrideItemIndex != -1) {
         this.editContractTravelRateOverrideItemDialog = true;
       }