diff --git a/ayanova/src/components/work-order-header.vue b/ayanova/src/components/work-order-header.vue
index f9c72168..1b0630de 100644
--- a/ayanova/src/components/work-order-header.vue
+++ b/ayanova/src/components/work-order-header.vue
@@ -222,6 +222,49 @@
           @change="fieldValueChanged('onsite')"
         ></v-checkbox>
       </v-col>
+
+      <v-col v-if="form().showMe(this, 'Tags')" cols="12">
+        <gz-tag-picker
+          v-model="value.tags"
+          :readonly="formState.readOnly"
+          ref="tags"
+          data-cy="tags"
+          :error-messages="form().serverErrors(this, 'tags')"
+          @input="fieldValueChanged('tags')"
+        ></gz-tag-picker>
+      </v-col>
+
+      <v-col cols="12">
+        <gz-custom-fields
+          v-model="value.customFields"
+          :form-key="formCustomTemplateKey"
+          :readonly="formState.readOnly"
+          :parent-v-m="this"
+          ref="customFields"
+          data-cy="customFields"
+          :error-messages="form().serverErrors(this, 'customFields')"
+          @input="fieldValueChanged('customFields')"
+        ></gz-custom-fields>
+      </v-col>
+
+      <v-col v-if="form().showMe(this, 'Wiki')" cols="12">
+        <gz-wiki
+          :aya-type="pvm.ayaType"
+          :aya-id="value.id"
+          ref="wiki"
+          v-model="value.wiki"
+          :readonly="formState.readOnly"
+          @input="fieldValueChanged('wiki')"
+        ></gz-wiki
+      ></v-col>
+
+      <v-col v-if="form().showMe(this, 'Attachments') && value.id" cols="12">
+        <gz-attachments
+          :readonly="formState.readOnly"
+          :aya-type="pvm.ayaType"
+          :aya-id="value.id"
+        ></gz-attachments
+      ></v-col>
     </v-row>
   </div>
 </template>
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index 334c0c1c..7ef0f85a 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -20,6 +20,7 @@
           :pvm="this"
           data-cy="woItems"
           @change="setDirty()"
+          class="mt-16"
         />
       </v-form>
     </div>