diff --git a/ayanova/src/views/vendor.vue b/ayanova/src/views/vendor.vue
index bcddb21f..c1c0effe 100644
--- a/ayanova/src/views/vendor.vue
+++ b/ayanova/src/views/vendor.vue
@@ -78,6 +78,24 @@
                   ></gz-url>
                 </v-col>
 
+                <v-col
+                  v-if="form().showMe(this, 'Contact')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    v-model="obj.contact"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('VendorContact')"
+                    ref="contact"
+                    data-cy="contact"
+                    :error-messages="form().serverErrors(this, 'contact')"
+                    @input="fieldValueChanged('contact')"
+                  ></v-text-field>
+                </v-col>
+
                 <v-col
                   v-if="form().showMe(this, 'EmailAddress')"
                   cols="12"
@@ -186,130 +204,6 @@
                   ></gz-phone>
                 </v-col>
 
-                <v-col
-                  v-if="form().showMe(this, 'DefaultServiceTemplateId')"
-                  cols="12"
-                  sm="6"
-                  lg="4"
-                  xl="3"
-                >
-                  <gz-pick-list
-                    :ayaType="ayaTypes().WorkOrderTemplate"
-                    :showEditIcon="true"
-                    v-model="obj.defaultServiceTemplatedId"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('WorkOrderTemplate')"
-                    ref="defaultServiceTemplateId"
-                    data-cy="defaultServiceTemplateId"
-                    :error-messages="
-                      form().serverErrors(this, 'defaultServiceTemplateId')
-                    "
-                    @input="fieldValueChanged('defaultServiceTemplateId')"
-                  ></gz-pick-list>
-                </v-col>
-
-                <v-col
-                  v-if="form().showMe(this, 'BillHeadOffice')"
-                  cols="12"
-                  sm="6"
-                  lg="4"
-                  xl="3"
-                >
-                  <v-checkbox
-                    v-model="obj.billHeadOffice"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('VendorBillHeadOffice')"
-                    ref="billHeadOffice"
-                    data-cy="billHeadOffice"
-                    :error-messages="
-                      form().serverErrors(this, 'billHeadOffice')
-                    "
-                    @change="fieldValueChanged('billHeadOffice')"
-                  ></v-checkbox>
-                </v-col>
-
-                <v-col
-                  v-if="
-                    form().showMe(this, 'HeadOfficeId') && obj.billHeadOffice
-                  "
-                  cols="12"
-                  sm="6"
-                  lg="4"
-                  xl="3"
-                >
-                  <gz-pick-list
-                    :ayaType="ayaTypes().HeadOffice"
-                    :showEditIcon="true"
-                    v-model="obj.headOfficeId"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('HeadOffice')"
-                    ref="headOfficeId"
-                    data-cy="headOfficeId"
-                    :error-messages="form().serverErrors(this, 'headOfficeId')"
-                    @input="fieldValueChanged('headOfficeId')"
-                  ></gz-pick-list>
-                </v-col>
-
-                <v-col
-                  v-if="form().showMe(this, 'ContractId')"
-                  cols="12"
-                  sm="6"
-                  lg="4"
-                  xl="3"
-                >
-                  <gz-pick-list
-                    :ayaType="ayaTypes().Contract"
-                    :showEditIcon="true"
-                    v-model="obj.contractId"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('Contract')"
-                    ref="contractId"
-                    data-cy="contractId"
-                    :error-messages="form().serverErrors(this, 'contractId')"
-                    @input="fieldValueChanged('contractId')"
-                  ></gz-pick-list>
-                </v-col>
-
-                <v-col
-                  v-if="
-                    form().showMe(this, 'ContractExpires') && obj.contractId
-                  "
-                  cols="12"
-                  sm="6"
-                  lg="4"
-                  xl="3"
-                >
-                  <gz-date-time-picker
-                    :label="$ay.t('ContractExpires')"
-                    v-model="obj.contractExpires"
-                    :readonly="formState.readOnly"
-                    ref="contractExpires"
-                    testId="contractExpires"
-                    :error-messages="
-                      form().serverErrors(this, 'contractExpires')
-                    "
-                    @input="fieldValueChanged('contractExpires')"
-                  ></gz-date-time-picker>
-                </v-col>
-
-                <v-col
-                  v-if="form().showMe(this, 'UsesBanking')"
-                  cols="12"
-                  sm="6"
-                  lg="4"
-                  xl="3"
-                >
-                  <v-checkbox
-                    v-model="obj.usesBanking"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('UsesBanking')"
-                    ref="usesBanking"
-                    data-cy="usesBanking"
-                    :error-messages="form().serverErrors(this, 'usesBanking')"
-                    @change="fieldValueChanged('usesBanking')"
-                  ></v-checkbox>
-                </v-col>
-
                 <!-- --------------------------------- -->
                 <v-col v-if="form().showMe(this, 'Notes')" cols="12">
                   <v-textarea
@@ -324,17 +218,17 @@
                   ></v-textarea>
                 </v-col>
 
-                <v-col v-if="form().showMe(this, 'TechNotes')" cols="12">
+                <v-col v-if="form().showMe(this, 'ContactNotes')" cols="12">
                   <v-textarea
-                    v-model="obj.techNotes"
+                    v-model="obj.contactNotes"
                     :readonly="formState.readOnly"
-                    :label="$ay.t('VendorTechNotes')"
-                    :error-messages="form().serverErrors(this, 'techNotes')"
-                    ref="techNotes"
-                    data-cy="techNotes"
-                    @input="fieldValueChanged('techNotes')"
+                    :label="$ay.t('VendorContactNotes')"
+                    :error-messages="form().serverErrors(this, 'contactNotes')"
+                    ref="contactNotes"
+                    data-cy="contactNotes"
+                    @input="fieldValueChanged('contactNotes')"
                     auto-grow
-                    prepend-icon="$ayiTools"
+                    prepend-icon="$ayiUser"
                   ></v-textarea>
                 </v-col>