diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index a6c0414d..73c980d0 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -64,7 +64,7 @@ todo: actual customer reports so can figure out datalist for bringing other name
 
 CURRENTLY DOING: 	
 		Unit - front end	
-			Move unit has own address to address tab obvs.
+			
 			put warranty override in tab of it's own		
 				override warranty checkbox should gray out override terms
 			Look at layout and re-arrange as necessary
diff --git a/ayanova/src/views/svc-unit.vue b/ayanova/src/views/svc-unit.vue
index 71525888..ce55d89f 100644
--- a/ayanova/src/views/svc-unit.vue
+++ b/ayanova/src/views/svc-unit.vue
@@ -8,6 +8,7 @@
         <v-tabs mobile-breakpoint="100" v-model="tab">
           <v-tab>{{ $ay.t("Unit") }}</v-tab>
           <v-tab>{{ $ay.t("Address") }}</v-tab>
+          <v-tab>{{ $ay.t("UnitOverrideWarranty") }}</v-tab>
           <v-tabs-items v-model="tab">
             <v-tab-item class="mt-4">
               <v-row>
@@ -136,20 +137,6 @@
                   ></gz-pick-list>
                 </v-col>
 
-                <v-col cols="12" sm="6" lg="4" xl="3">
-                  <v-checkbox
-                    v-model="obj.unitHasOwnAddress"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('UnitUnitHasOwnAddress')"
-                    ref="unitHasOwnAddress"
-                    data-cy="unitHasOwnAddress"
-                    :error-messages="
-                      form().serverErrors(this, 'unitHasOwnAddress')
-                    "
-                    @change="fieldValueChanged('unitHasOwnAddress')"
-                  ></v-checkbox>
-                </v-col>
-
                 <v-col
                   v-if="form().showMe(this, 'UsesBanking')"
                   cols="12"
@@ -286,84 +273,6 @@
                   ></v-text-field>
                 </v-col>
 
-                <v-col
-                  v-if="form().showMe(this, 'UnitOverrideWarranty')"
-                  cols="12"
-                  sm="6"
-                  lg="4"
-                  xl="3"
-                >
-                  <v-checkbox
-                    v-model="obj.overrideModelWarranty"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('UnitOverrideWarranty')"
-                    ref="overrideModelWarranty"
-                    data-cy="overrideModelWarranty"
-                    :error-messages="
-                      form().serverErrors(this, 'overrideModelWarranty')
-                    "
-                    @change="fieldValueChanged('overrideModelWarranty')"
-                  ></v-checkbox>
-                </v-col>
-
-                <v-col
-                  v-if="form().showMe(this, 'UnitOverrideLifeTime')"
-                  cols="12"
-                  sm="6"
-                  lg="4"
-                  xl="3"
-                >
-                  <v-checkbox
-                    v-model="obj.lifeTimeWarranty"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('UnitOverrideLifeTime')"
-                    ref="lifeTimeWarranty"
-                    data-cy="lifeTimeWarranty"
-                    :error-messages="
-                      form().serverErrors(this, 'lifeTimeWarranty')
-                    "
-                    @change="fieldValueChanged('lifeTimeWarranty')"
-                  ></v-checkbox>
-                </v-col>
-
-                <v-col
-                  v-if="form().showMe(this, 'UnitOverrideLength')"
-                  cols="12"
-                  sm="6"
-                  lg="4"
-                  xl="3"
-                >
-                  <v-text-field
-                    v-model="obj.warrantyLength"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('UnitOverrideLength')"
-                    ref="warrantyLength"
-                    data-cy="warrantyLength"
-                    :rules="[form().integerValid(this, 'warrantyLength')]"
-                    :error-messages="
-                      form().serverErrors(this, 'warrantyLength')
-                    "
-                    @input="fieldValueChanged('warrantyLength')"
-                    type="number"
-                  ></v-text-field>
-                </v-col>
-
-                <v-col
-                  v-if="form().showMe(this, 'UnitOverrideWarrantyTerms')"
-                  cols="12"
-                >
-                  <v-textarea
-                    v-model="obj.warrantyTerms"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('UnitOverrideWarrantyTerms')"
-                    :error-messages="form().serverErrors(this, 'warrantyTerms')"
-                    ref="warrantyTerms"
-                    data-cy="warrantyTerms"
-                    @input="fieldValueChanged('warrantyTerms')"
-                    auto-grow
-                  ></v-textarea>
-                </v-col>
-
                 <v-col
                   v-if="form().showMe(this, 'UnitText1')"
                   cols="12"
@@ -497,6 +406,7 @@
                 ></v-col>
               </v-row>
             </v-tab-item>
+
             <v-tab-item class="mt-4">
               <v-row>
                 <v-col cols="12">
@@ -532,6 +442,20 @@
                     {{ $ay.t("AddressTypePhysical") }}</span
                   >
                 </v-col>
+
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-checkbox
+                    v-model="obj.unitHasOwnAddress"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('UnitUnitHasOwnAddress')"
+                    ref="unitHasOwnAddress"
+                    data-cy="unitHasOwnAddress"
+                    :error-messages="
+                      form().serverErrors(this, 'unitHasOwnAddress')
+                    "
+                    @change="fieldValueChanged('unitHasOwnAddress')"
+                  ></v-checkbox>
+                </v-col>
                 <v-col
                   v-if="form().showMe(this, 'Address')"
                   cols="12"
@@ -645,6 +569,83 @@
                 </v-col>
               </v-row>
             </v-tab-item>
+            <v-tab-item class="mt-4">
+              <v-col
+                v-if="form().showMe(this, 'UnitOverrideWarranty')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <v-checkbox
+                  v-model="obj.overrideModelWarranty"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('UnitOverrideWarranty')"
+                  ref="overrideModelWarranty"
+                  data-cy="overrideModelWarranty"
+                  :error-messages="
+                    form().serverErrors(this, 'overrideModelWarranty')
+                  "
+                  @change="fieldValueChanged('overrideModelWarranty')"
+                ></v-checkbox>
+              </v-col>
+
+              <v-col
+                v-if="form().showMe(this, 'UnitOverrideLifeTime')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <v-checkbox
+                  v-model="obj.lifeTimeWarranty"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('UnitOverrideLifeTime')"
+                  ref="lifeTimeWarranty"
+                  data-cy="lifeTimeWarranty"
+                  :error-messages="
+                    form().serverErrors(this, 'lifeTimeWarranty')
+                  "
+                  @change="fieldValueChanged('lifeTimeWarranty')"
+                ></v-checkbox>
+              </v-col>
+
+              <v-col
+                v-if="form().showMe(this, 'UnitOverrideLength')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <v-text-field
+                  v-model="obj.warrantyLength"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('UnitOverrideLength')"
+                  ref="warrantyLength"
+                  data-cy="warrantyLength"
+                  :rules="[form().integerValid(this, 'warrantyLength')]"
+                  :error-messages="form().serverErrors(this, 'warrantyLength')"
+                  @input="fieldValueChanged('warrantyLength')"
+                  type="number"
+                ></v-text-field>
+              </v-col>
+
+              <v-col
+                v-if="form().showMe(this, 'UnitOverrideWarrantyTerms')"
+                cols="12"
+              >
+                <v-textarea
+                  v-model="obj.warrantyTerms"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('UnitOverrideWarrantyTerms')"
+                  :error-messages="form().serverErrors(this, 'warrantyTerms')"
+                  ref="warrantyTerms"
+                  data-cy="warrantyTerms"
+                  @input="fieldValueChanged('warrantyTerms')"
+                  auto-grow
+                ></v-textarea>
+              </v-col>
+            </v-tab-item>
           </v-tabs-items>
         </v-tabs>
       </v-form>