diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 73c980d0..b4cdd610 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -67,7 +67,7 @@ CURRENTLY DOING:
 			
 			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
+		
 			Report isn't tested yet
 			Migration code
 			
diff --git a/ayanova/src/views/svc-unit.vue b/ayanova/src/views/svc-unit.vue
index ce55d89f..59aed1e1 100644
--- a/ayanova/src/views/svc-unit.vue
+++ b/ayanova/src/views/svc-unit.vue
@@ -1,5 +1,6 @@
 <template>
-  <v-container fluid>
+  <!-- <v-container fluid> -->
+  <div>
     <gz-report-selector ref="reportSelector"></gz-report-selector>
     <div v-if="formState.ready">
       <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
@@ -10,7 +11,7 @@
           <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-tab-item class="mt-4 ml-2">
               <v-row>
                 <v-col cols="12" sm="6" lg="4" xl="3">
                   <v-text-field
@@ -406,44 +407,14 @@
                 ></v-col>
               </v-row>
             </v-tab-item>
-
-            <v-tab-item class="mt-4">
+            <!-- 
+                
+                ################################# ADDRESS TAB ######################### 
+            
+            -->
+            <v-tab-item class="mt-4 ml-2">
               <v-row>
                 <v-col cols="12">
-                  <v-menu offset-y v-if="rights.change">
-                    <template v-slot:activator="{ on, attrs }">
-                      <span class="text-h6">
-                        {{ $ay.t("AddressTypePhysical") }}</span
-                      ><v-btn icon v-bind="attrs" v-on="on">
-                        <v-icon small>$ayiEllipsisV</v-icon>
-                      </v-btn>
-                    </template>
-                    <v-list>
-                      <v-list-item @click="AddressCopyPhysicalToClipBoard()">
-                        <v-list-item-icon>
-                          <v-icon>$ayiCopy</v-icon>
-                        </v-list-item-icon>
-                        <v-list-item-title>{{
-                          $ay.t("CopyToClipboard")
-                        }}</v-list-item-title>
-                      </v-list-item>
-
-                      <v-list-item @click="GeoCapture">
-                        <v-list-item-icon>
-                          <v-icon>$ayiMapMarker</v-icon>
-                        </v-list-item-icon>
-                        <v-list-item-title>{{
-                          $ay.t("GeoCapture")
-                        }}</v-list-item-title>
-                      </v-list-item>
-                    </v-list>
-                  </v-menu>
-                  <span class="text-h6" v-else>
-                    {{ $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"
@@ -455,9 +426,42 @@
                     "
                     @change="fieldValueChanged('unitHasOwnAddress')"
                   ></v-checkbox>
+                  <v-col cols="12" v-if="obj.unitHasOwnAddress">
+                    <v-menu offset-y v-if="rights.change">
+                      <template v-slot:activator="{ on, attrs }">
+                        <span class="text-h6">
+                          {{ $ay.t("AddressTypePhysical") }}</span
+                        ><v-btn icon v-bind="attrs" v-on="on">
+                          <v-icon small>$ayiEllipsisV</v-icon>
+                        </v-btn>
+                      </template>
+                      <v-list>
+                        <v-list-item @click="AddressCopyPhysicalToClipBoard()">
+                          <v-list-item-icon>
+                            <v-icon>$ayiCopy</v-icon>
+                          </v-list-item-icon>
+                          <v-list-item-title>{{
+                            $ay.t("CopyToClipboard")
+                          }}</v-list-item-title>
+                        </v-list-item>
+
+                        <v-list-item @click="GeoCapture">
+                          <v-list-item-icon>
+                            <v-icon>$ayiMapMarker</v-icon>
+                          </v-list-item-icon>
+                          <v-list-item-title>{{
+                            $ay.t("GeoCapture")
+                          }}</v-list-item-title>
+                        </v-list-item>
+                      </v-list>
+                    </v-menu>
+                    <span class="text-h6" v-else>
+                      {{ $ay.t("AddressTypePhysical") }}</span
+                    >
+                  </v-col>
                 </v-col>
                 <v-col
-                  v-if="form().showMe(this, 'Address')"
+                  v-if="form().showMe(this, 'Address') && obj.unitHasOwnAddress"
                   cols="12"
                   sm="6"
                   lg="4"
@@ -475,7 +479,7 @@
                 </v-col>
 
                 <v-col
-                  v-if="form().showMe(this, 'City')"
+                  v-if="form().showMe(this, 'City') && obj.unitHasOwnAddress"
                   cols="12"
                   sm="6"
                   lg="4"
@@ -493,7 +497,7 @@
                 </v-col>
 
                 <v-col
-                  v-if="form().showMe(this, 'Region')"
+                  v-if="form().showMe(this, 'Region') && obj.unitHasOwnAddress"
                   cols="12"
                   sm="6"
                   lg="4"
@@ -511,7 +515,7 @@
                 </v-col>
 
                 <v-col
-                  v-if="form().showMe(this, 'Country')"
+                  v-if="form().showMe(this, 'Country') && obj.unitHasOwnAddress"
                   cols="12"
                   sm="6"
                   lg="4"
@@ -569,82 +573,94 @@
                 </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')
+            <!-- 
+                
+                ################################# WARRANTY TAB ######################### 
+            
+            -->
+            <v-tab-item class="mt-4  ml-2">
+              <v-row>
+                <v-col 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') &&
+                      obj.overrideModelWarranty
                   "
-                  @change="fieldValueChanged('overrideModelWarranty')"
-                ></v-checkbox>
-              </v-col>
+                  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, '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')
+                <v-col
+                  v-if="
+                    form().showMe(this, 'UnitOverrideLength') &&
+                      obj.overrideModelWarranty
                   "
-                  @change="fieldValueChanged('lifeTimeWarranty')"
-                ></v-checkbox>
-              </v-col>
+                  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, '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, 'UnitOverrideWarrantyTerms') &&
+                      obj.overrideModelWarranty
+                  "
+                  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-row>
             </v-tab-item>
           </v-tabs-items>
         </v-tabs>
@@ -657,7 +673,8 @@
         :size="60"
       ></v-progress-circular>
     </template>
-  </v-container>
+  </div>
+  <!-- </v-container> -->
 </template>
 
 <script>