diff --git a/ayanova/src/components/sign.vue b/ayanova/src/components/sign.vue
index 949cd8b3..39814129 100644
--- a/ayanova/src/components/sign.vue
+++ b/ayanova/src/components/sign.vue
@@ -3,8 +3,6 @@
     <vueSignature
       ref="signature"
       :sig-option="option"
-      :w="'800px'"
-      :h="'400px'"
       :disabled="!enabled"
       :default-url="dataUrl"
     ></vueSignature>
@@ -15,6 +13,8 @@
     <button @click="addWaterMark">addWaterMark</button>
     <button @click="handleDisabled">disabled</button>
     <button @click="test">TEST</button>
+    <!-- :w="'800px'"
+      :h="'400px'" -->
   </div>
 </template>
 <script>
diff --git a/ayanova/src/components/work-order-address.vue b/ayanova/src/components/work-order-address.vue
index 355abcd1..820cfdc5 100644
--- a/ayanova/src/components/work-order-address.vue
+++ b/ayanova/src/components/work-order-address.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="mb-8">
     <div class="mb-n2 ml-10">
       <span class="text-caption">{{ $ay.t("Address") }}</span>
     </div>
diff --git a/ayanova/src/components/work-order-header.vue b/ayanova/src/components/work-order-header.vue
index 75d34907..53ba0749 100644
--- a/ayanova/src/components/work-order-header.vue
+++ b/ayanova/src/components/work-order-header.vue
@@ -37,6 +37,22 @@
           @input="fieldValueChanged('customerId')"
         ></gz-pick-list>
       </v-col>
+      <v-col
+        v-if="form().showMe(this, 'CustomerSignature')"
+        cols="12"
+        sm="6"
+        lg="4"
+        xl="3"
+      >
+        <GzWoSignature
+          v-model="value"
+          :form-key="formCustomTemplateKey"
+          :readonly="formState.readOnly"
+          :pvm="pvm"
+          variant="customer"
+          data-cy="customerSignature"
+        />
+      </v-col>
       <v-col cols="12" sm="6" lg="4" xl="3">
         <GzWoState
           v-if="
@@ -64,26 +80,14 @@
         />
       </v-col>
 
-      <v-col cols="12" sm="6" lg="4" xl="3">
+      <v-col
+        v-if="form().showMe(this, 'TechSignature')"
+        cols="12"
+        sm="6"
+        lg="4"
+        xl="3"
+      >
         <GzWoSignature
-          v-if="
-            pvm.subRights.states.visible &&
-              form().showMe(this, 'CustomerSignature')
-          "
-          v-model="value"
-          :form-key="formCustomTemplateKey"
-          :readonly="formState.readOnly"
-          :pvm="pvm"
-          variant="customer"
-          data-cy="customerSignature"
-        />
-      </v-col>
-
-      <v-col cols="12" sm="6" lg="4" xl="3">
-        <GzWoSignature
-          v-if="
-            pvm.subRights.states.visible && form().showMe(this, 'TechSignature')
-          "
           v-model="value"
           :form-key="formCustomTemplateKey"
           :readonly="formState.readOnly"