diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index 05bc50f6..6e3d15d6 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -408,227 +408,212 @@
                   </span>
                 </v-expansion-panel-header>
                 <v-expansion-panel-content>
-                  <v-col cols="12">
-                    <div class="text-subtitle-1">
-                      {{ $ay.t("NotifyEventCustomerServiceImminent") }}
-                    </div>
-                  </v-col>
-                  <v-col cols="12" sm="6" lg="4" xl="3">
-                    <v-checkbox
-                      v-model="obj.customerAllowNotifyServiceImminent"
-                      :readonly="formState.readOnly"
-                      :label="$ay.t('Active')"
-                      ref="customerAllowNotifyServiceImminent"
-                      data-cy="customerAllowNotifyServiceImminent"
-                      :error-messages="
-                        form().serverErrors(
-                          this,
-                          'customerAllowNotifyServiceImminent'
-                        )
-                      "
-                      @change="
-                        fieldValueChanged('customerAllowNotifyServiceImminent')
-                      "
-                    ></v-checkbox>
-                  </v-col>
-                  <v-col cols="12" sm="6" lg="4">
-                    <gz-tag-picker
-                      v-model="obj.customerAllowNotifyServiceImminentInTags"
-                      :readonly="formState.readOnly"
-                      :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
-                      ref="customerAllowNotifyServiceImminentInTags"
-                      data-cy="customerAllowNotifyServiceImminentInTags"
-                      :error-messages="
-                        form().serverErrors(
-                          this,
-                          'customerAllowNotifyServiceImminentInTags'
-                        )
-                      "
-                      @input="
-                        fieldValueChanged(
-                          'customerAllowNotifyServiceImminentInTags'
-                        )
-                      "
-                    ></gz-tag-picker>
-                  </v-col>
+                  <v-row>
+                    <v-col cols="12" sm="6" lg="3">
+                      <v-checkbox
+                        v-model="obj.customerAllowNotifyServiceImminent"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('NotifyEventCustomerServiceImminent')"
+                        ref="customerAllowNotifyServiceImminent"
+                        data-cy="customerAllowNotifyServiceImminent"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerAllowNotifyServiceImminent'
+                          )
+                        "
+                        @change="
+                          fieldValueChanged(
+                            'customerAllowNotifyServiceImminent'
+                          )
+                        "
+                      ></v-checkbox>
+                    </v-col>
+                    <v-col cols="12" sm="6" lg="9">
+                      <gz-tag-picker
+                        v-model="obj.customerAllowNotifyServiceImminentInTags"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
+                        ref="customerAllowNotifyServiceImminentInTags"
+                        data-cy="customerAllowNotifyServiceImminentInTags"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerAllowNotifyServiceImminentInTags'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged(
+                            'customerAllowNotifyServiceImminentInTags'
+                          )
+                        "
+                      ></gz-tag-picker>
+                    </v-col>
 
-                  <!-- ######################################################## -->
-                  <v-col cols="12">
-                    <div class="text-subtitle-1">
-                      {{ $ay.t("NotifyEventCSRAccepted") }}
-                    </div>
-                  </v-col>
-                  <v-col cols="12" sm="6" lg="4" xl="3">
-                    <v-checkbox
-                      v-model="obj.customerAllowNotifyCSRAccepted"
-                      :readonly="formState.readOnly"
-                      :label="$ay.t('Active')"
-                      ref="customerAllowNotifyCSRAccepted"
-                      data-cy="customerAllowNotifyCSRAccepted"
-                      :error-messages="
-                        form().serverErrors(
-                          this,
-                          'customerAllowNotifyCSRAccepted'
-                        )
-                      "
-                      @change="
-                        fieldValueChanged('customerAllowNotifyCSRAccepted')
-                      "
-                    ></v-checkbox>
-                  </v-col>
-                  <v-col cols="12" sm="6" lg="4">
-                    <gz-tag-picker
-                      v-model="obj.customerAllowNotifyCSRAcceptedInTags"
-                      :readonly="formState.readOnly"
-                      :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
-                      ref="customerAllowNotifyCSRAcceptedInTags"
-                      data-cy="customerAllowNotifyCSRAcceptedInTags"
-                      :error-messages="
-                        form().serverErrors(
-                          this,
-                          'customerAllowNotifyCSRAcceptedInTags'
-                        )
-                      "
-                      @input="
-                        fieldValueChanged(
-                          'customerAllowNotifyCSRAcceptedInTags'
-                        )
-                      "
-                    ></gz-tag-picker>
-                  </v-col>
+                    <!-- ######################################################## -->
 
-                  <!-- ######################################################## -->
-                  <v-col cols="12">
-                    <div class="text-subtitle-1">
-                      {{ $ay.t("NotifyEventCSRRejected") }}
-                    </div>
-                  </v-col>
-                  <v-col cols="12" sm="6" lg="4" xl="3">
-                    <v-checkbox
-                      v-model="obj.customerAllowNotifyCSRRejected"
-                      :readonly="formState.readOnly"
-                      :label="$ay.t('Active')"
-                      ref="customerAllowNotifyCSRRejected"
-                      data-cy="customerAllowNotifyCSRRejected"
-                      :error-messages="
-                        form().serverErrors(
-                          this,
-                          'customerAllowNotifyCSRRejected'
-                        )
-                      "
-                      @change="
-                        fieldValueChanged('customerAllowNotifyCSRRejected')
-                      "
-                    ></v-checkbox>
-                  </v-col>
-                  <v-col cols="12" sm="6" lg="4">
-                    <gz-tag-picker
-                      v-model="obj.customerAllowNotifyCSRRejectedInTags"
-                      :readonly="formState.readOnly"
-                      :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
-                      ref="customerAllowNotifyCSRRejectedInTags"
-                      data-cy="customerAllowNotifyCSRRejectedInTags"
-                      :error-messages="
-                        form().serverErrors(
-                          this,
-                          'customerAllowNotifyCSRRejectedInTags'
-                        )
-                      "
-                      @input="
-                        fieldValueChanged(
-                          'customerAllowNotifyCSRRejectedInTags'
-                        )
-                      "
-                    ></gz-tag-picker>
-                  </v-col>
+                    <v-col cols="12" sm="6" lg="3">
+                      <v-checkbox
+                        v-model="obj.customerAllowNotifyCSRAccepted"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('NotifyEventCSRAccepted')"
+                        ref="customerAllowNotifyCSRAccepted"
+                        data-cy="customerAllowNotifyCSRAccepted"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerAllowNotifyCSRAccepted'
+                          )
+                        "
+                        @change="
+                          fieldValueChanged('customerAllowNotifyCSRAccepted')
+                        "
+                      ></v-checkbox>
+                    </v-col>
+                    <v-col cols="12" sm="6" lg="9">
+                      <gz-tag-picker
+                        v-model="obj.customerAllowNotifyCSRAcceptedInTags"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
+                        ref="customerAllowNotifyCSRAcceptedInTags"
+                        data-cy="customerAllowNotifyCSRAcceptedInTags"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerAllowNotifyCSRAcceptedInTags'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged(
+                            'customerAllowNotifyCSRAcceptedInTags'
+                          )
+                        "
+                      ></gz-tag-picker>
+                    </v-col>
 
-                  <!-- ######################################################## -->
-                  <v-col cols="12">
-                    <div class="text-subtitle-1">
-                      {{ $ay.t("NotifyEventWorkorderCreatedForCustomer") }}
-                    </div>
-                  </v-col>
-                  <v-col cols="12" sm="6" lg="4" xl="3">
-                    <v-checkbox
-                      v-model="obj.customerAllowNotifyWOCreated"
-                      :readonly="formState.readOnly"
-                      :label="$ay.t('Active')"
-                      ref="customerAllowNotifyWOCreated"
-                      data-cy="customerAllowNotifyWOCreated"
-                      :error-messages="
-                        form().serverErrors(
-                          this,
-                          'customerAllowNotifyWOCreated'
-                        )
-                      "
-                      @change="
-                        fieldValueChanged('customerAllowNotifyWOCreated')
-                      "
-                    ></v-checkbox>
-                  </v-col>
-                  <v-col cols="12" sm="6" lg="4">
-                    <gz-tag-picker
-                      v-model="obj.customerAllowNotifyWOCreatedInTags"
-                      :readonly="formState.readOnly"
-                      :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
-                      ref="customerAllowNotifyWOCreatedInTags"
-                      data-cy="customerAllowNotifyWOCreatedInTags"
-                      :error-messages="
-                        form().serverErrors(
-                          this,
-                          'customerAllowNotifyWOCreatedInTags'
-                        )
-                      "
-                      @input="
-                        fieldValueChanged('customerAllowNotifyWOCreatedInTags')
-                      "
-                    ></gz-tag-picker>
-                  </v-col>
+                    <!-- ######################################################## -->
 
-                  <!-- ######################################################## -->
-                  <v-col cols="12">
-                    <div class="text-subtitle-1">
-                      {{ $ay.t("NotifyEventWorkorderCompleted") }}
-                    </div>
-                  </v-col>
-                  <v-col cols="12" sm="6" lg="4" xl="3">
-                    <v-checkbox
-                      v-model="obj.customerAllowNotifyWOCompleted"
-                      :readonly="formState.readOnly"
-                      :label="$ay.t('Active')"
-                      ref="customerAllowNotifyWOCompleted"
-                      data-cy="customerAllowNotifyWOCompleted"
-                      :error-messages="
-                        form().serverErrors(
-                          this,
-                          'customerAllowNotifyWOCompleted'
-                        )
-                      "
-                      @change="
-                        fieldValueChanged('customerAllowNotifyWOCompleted')
-                      "
-                    ></v-checkbox>
-                  </v-col>
-                  <v-col cols="12" sm="6" lg="4">
-                    <gz-tag-picker
-                      v-model="obj.customerAllowNotifyWOCompletedInTags"
-                      :readonly="formState.readOnly"
-                      :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
-                      ref="customerAllowNotifyWOCompletedInTags"
-                      data-cy="customerAllowNotifyWOCompletedInTags"
-                      :error-messages="
-                        form().serverErrors(
-                          this,
-                          'customerAllowNotifyWOCompletedInTags'
-                        )
-                      "
-                      @input="
-                        fieldValueChanged(
-                          'customerAllowNotifyWOCompletedInTags'
-                        )
-                      "
-                    ></gz-tag-picker>
-                  </v-col>
+                    <v-col cols="12" sm="6" lg="3">
+                      <v-checkbox
+                        v-model="obj.customerAllowNotifyCSRRejected"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('NotifyEventCSRRejected')"
+                        ref="customerAllowNotifyCSRRejected"
+                        data-cy="customerAllowNotifyCSRRejected"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerAllowNotifyCSRRejected'
+                          )
+                        "
+                        @change="
+                          fieldValueChanged('customerAllowNotifyCSRRejected')
+                        "
+                      ></v-checkbox>
+                    </v-col>
+                    <v-col cols="12" sm="6" lg="9">
+                      <gz-tag-picker
+                        v-model="obj.customerAllowNotifyCSRRejectedInTags"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
+                        ref="customerAllowNotifyCSRRejectedInTags"
+                        data-cy="customerAllowNotifyCSRRejectedInTags"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerAllowNotifyCSRRejectedInTags'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged(
+                            'customerAllowNotifyCSRRejectedInTags'
+                          )
+                        "
+                      ></gz-tag-picker>
+                    </v-col>
+
+                    <!-- ######################################################## -->
+
+                    <v-col cols="12" sm="6" lg="3">
+                      <v-checkbox
+                        v-model="obj.customerAllowNotifyWOCreated"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('NotifyEventWorkorderCreatedForCustomer')"
+                        ref="customerAllowNotifyWOCreated"
+                        data-cy="customerAllowNotifyWOCreated"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerAllowNotifyWOCreated'
+                          )
+                        "
+                        @change="
+                          fieldValueChanged('customerAllowNotifyWOCreated')
+                        "
+                      ></v-checkbox>
+                    </v-col>
+                    <v-col cols="12" sm="6" lg="9">
+                      <gz-tag-picker
+                        v-model="obj.customerAllowNotifyWOCreatedInTags"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
+                        ref="customerAllowNotifyWOCreatedInTags"
+                        data-cy="customerAllowNotifyWOCreatedInTags"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerAllowNotifyWOCreatedInTags'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged(
+                            'customerAllowNotifyWOCreatedInTags'
+                          )
+                        "
+                      ></gz-tag-picker>
+                    </v-col>
+
+                    <!-- ######################################################## -->
+
+                    <v-col cols="12" sm="6" lg="3">
+                      <v-checkbox
+                        v-model="obj.customerAllowNotifyWOCompleted"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('NotifyEventWorkorderCompleted')"
+                        ref="customerAllowNotifyWOCompleted"
+                        data-cy="customerAllowNotifyWOCompleted"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerAllowNotifyWOCompleted'
+                          )
+                        "
+                        @change="
+                          fieldValueChanged('customerAllowNotifyWOCompleted')
+                        "
+                      ></v-checkbox>
+                    </v-col>
+                    <v-col cols="12" sm="6" lg="9">
+                      <gz-tag-picker
+                        v-model="obj.customerAllowNotifyWOCompletedInTags"
+                        :readonly="formState.readOnly"
+                        :label="$ay.t('ContactCustomerHeadOfficeTaggedWith')"
+                        ref="customerAllowNotifyWOCompletedInTags"
+                        data-cy="customerAllowNotifyWOCompletedInTags"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'customerAllowNotifyWOCompletedInTags'
+                          )
+                        "
+                        @input="
+                          fieldValueChanged(
+                            'customerAllowNotifyWOCompletedInTags'
+                          )
+                        "
+                      ></gz-tag-picker>
+                    </v-col>
+                  </v-row>
                 </v-expansion-panel-content>
               </v-expansion-panel>
             </v-expansion-panels>