diff --git a/src/views/biz-license.vue b/src/views/biz-license.vue
index 882413e..911fbcf 100644
--- a/src/views/biz-license.vue
+++ b/src/views/biz-license.vue
@@ -210,64 +210,57 @@
               <!-- WBI V7 LICENSE ITEM -->
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
-                  <v-col cols="6">
-                    <v-checkbox
-                      ref="wbi"
-                      v-model="obj.wbi"
-                      dense
-                      :readonly="formState.readOnly"
-                      label="WBI"
-                      data-cy="wbi"
-                      :error-messages="form().serverErrors(this, 'wbi')"
-                      @change="fieldValueChanged('wbi')"
-                    ></v-checkbox>
-                  </v-col>
+                  <v-checkbox
+                    class="mr-2"
+                    ref="wbi"
+                    v-model="obj.wbi"
+                    dense
+                    :readonly="formState.readOnly"
+                    label="WBI"
+                    data-cy="wbi"
+                    :error-messages="form().serverErrors(this, 'wbi')"
+                    @change="fieldValueChanged('wbi')"
+                  ></v-checkbox>
                   <template v-if="obj.wbi">
                     <template v-if="!formState.readOnly">
-                      <v-col cols="1">
-                        <v-menu offset-y>
-                          <template v-slot:activator="{ on, attrs }">
-                            <v-btn icon v-bind="attrs" v-on="on">
-                              <v-icon small>$sockiPlus</v-icon>
-                            </v-btn>
-                          </template>
-                          <v-list>
-                            <v-list-item @click="dtAddOneWeek('wbiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One week</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneMonth('wbiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One month</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneYear('wbiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One year</v-list-item-title>
-                            </v-list-item>
-                          </v-list>
-                        </v-menu>
-                      </v-col>
+                      <v-menu offset-y>
+                        <template v-slot:activator="{ on, attrs }">
+                          <v-btn icon v-bind="attrs" v-on="on">
+                            <v-icon small>$sockiPlus</v-icon>
+                          </v-btn>
+                        </template>
+                        <v-list>
+                          <v-list-item @click="dtAddOneWeek('wbiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One week</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneMonth('wbiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One month</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneYear('wbiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One year</v-list-item-title>
+                          </v-list-item>
+                        </v-list>
+                      </v-menu>
                     </template>
-                    <v-col>
-                      <gz-date-picker
-                        ref="wbiExpires"
-                        v-model="obj.wbiExpires"
-                        :rules="[form().required(this, 'wbiExpires')]"
-                        label="Expires"
-                        :readonly="formState.readOnly"
-                        :error-messages="
-                          form().serverErrors(this, 'wbiExpires')
-                        "
-                        data-cy="wbiExpires"
-                        @input="fieldValueChanged('wbiExpires')"
-                      ></gz-date-picker>
-                    </v-col>
+                    <gz-date-picker
+                      ref="wbiExpires"
+                      v-model="obj.wbiExpires"
+                      :rules="[form().required(this, 'wbiExpires')]"
+                      label="Expires"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'wbiExpires')"
+                      data-cy="wbiExpires"
+                      @input="fieldValueChanged('wbiExpires')"
+                    ></gz-date-picker>
                   </template>
                 </v-row>
               </v-col>
@@ -276,62 +269,57 @@
               <!-- RI V7 LICENSE ITEM -->
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
-                  <v-col cols="6">
-                    <v-checkbox
-                      ref="ri"
-                      v-model="obj.ri"
-                      dense
-                      :readonly="formState.readOnly"
-                      label="RI"
-                      data-cy="ri"
-                      :error-messages="form().serverErrors(this, 'ri')"
-                      @change="fieldValueChanged('ri')"
-                    ></v-checkbox>
-                  </v-col>
+                  <v-checkbox
+                    class="mr-2"
+                    ref="ri"
+                    v-model="obj.ri"
+                    dense
+                    :readonly="formState.readOnly"
+                    label="RI"
+                    data-cy="ri"
+                    :error-messages="form().serverErrors(this, 'ri')"
+                    @change="fieldValueChanged('ri')"
+                  ></v-checkbox>
                   <template v-if="obj.ri">
                     <template v-if="!formState.readOnly">
-                      <v-col cols="1">
-                        <v-menu offset-y>
-                          <template v-slot:activator="{ on, attrs }">
-                            <v-btn icon v-bind="attrs" v-on="on">
-                              <v-icon small>$sockiPlus</v-icon>
-                            </v-btn>
-                          </template>
-                          <v-list>
-                            <v-list-item @click="dtAddOneWeek('riExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One week</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneMonth('riExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One month</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneYear('riExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One year</v-list-item-title>
-                            </v-list-item>
-                          </v-list>
-                        </v-menu>
-                      </v-col>
+                      <v-menu offset-y>
+                        <template v-slot:activator="{ on, attrs }">
+                          <v-btn icon v-bind="attrs" v-on="on">
+                            <v-icon small>$sockiPlus</v-icon>
+                          </v-btn>
+                        </template>
+                        <v-list>
+                          <v-list-item @click="dtAddOneWeek('riExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One week</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneMonth('riExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One month</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneYear('riExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One year</v-list-item-title>
+                          </v-list-item>
+                        </v-list>
+                      </v-menu>
                     </template>
-                    <v-col>
-                      <gz-date-picker
-                        ref="riExpires"
-                        v-model="obj.riExpires"
-                        :rules="[form().required(this, 'riExpires')]"
-                        label="Expires"
-                        :readonly="formState.readOnly"
-                        :error-messages="form().serverErrors(this, 'riExpires')"
-                        data-cy="riExpires"
-                        @input="fieldValueChanged('riExpires')"
-                      ></gz-date-picker>
-                    </v-col>
+                    <gz-date-picker
+                      ref="riExpires"
+                      v-model="obj.riExpires"
+                      :rules="[form().required(this, 'riExpires')]"
+                      label="Expires"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'riExpires')"
+                      data-cy="riExpires"
+                      @input="fieldValueChanged('riExpires')"
+                    ></gz-date-picker>
                   </template>
                 </v-row>
               </v-col>
@@ -340,64 +328,58 @@
               <!-- MBI V7 LICENSE ITEM -->
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
-                  <v-col cols="6">
-                    <v-checkbox
-                      ref="mbi"
-                      v-model="obj.mbi"
-                      dense
-                      :readonly="formState.readOnly"
-                      label="MBI"
-                      data-cy="mbi"
-                      :error-messages="form().serverErrors(this, 'mbi')"
-                      @change="fieldValueChanged('mbi')"
-                    ></v-checkbox>
-                  </v-col>
+                  <v-checkbox
+                    ref="mbi"
+                    v-model="obj.mbi"
+                    dense
+                    :readonly="formState.readOnly"
+                    label="MBI"
+                    data-cy="mbi"
+                    :error-messages="form().serverErrors(this, 'mbi')"
+                    @change="fieldValueChanged('mbi')"
+                  ></v-checkbox>
+
                   <template v-if="obj.mbi">
                     <template v-if="!formState.readOnly">
-                      <v-col cols="1">
-                        <v-menu offset-y>
-                          <template v-slot:activator="{ on, attrs }">
-                            <v-btn icon v-bind="attrs" v-on="on">
-                              <v-icon small>$sockiPlus</v-icon>
-                            </v-btn>
-                          </template>
-                          <v-list>
-                            <v-list-item @click="dtAddOneWeek('mbiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One week</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneMonth('mbiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One month</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneYear('mbiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One year</v-list-item-title>
-                            </v-list-item>
-                          </v-list>
-                        </v-menu>
-                      </v-col>
+                      <v-menu offset-y>
+                        <template v-slot:activator="{ on, attrs }">
+                          <v-btn icon v-bind="attrs" v-on="on">
+                            <v-icon small>$sockiPlus</v-icon>
+                          </v-btn>
+                        </template>
+                        <v-list>
+                          <v-list-item @click="dtAddOneWeek('mbiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One week</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneMonth('mbiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One month</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneYear('mbiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One year</v-list-item-title>
+                          </v-list-item>
+                        </v-list>
+                      </v-menu>
                     </template>
-                    <v-col>
-                      <gz-date-picker
-                        ref="mbiExpires"
-                        v-model="obj.mbiExpires"
-                        :rules="[form().required(this, 'mbiExpires')]"
-                        label="Expires"
-                        :readonly="formState.readOnly"
-                        :error-messages="
-                          form().serverErrors(this, 'mbiExpires')
-                        "
-                        data-cy="mbiExpires"
-                        @input="fieldValueChanged('mbiExpires')"
-                      ></gz-date-picker>
-                    </v-col>
+
+                    <gz-date-picker
+                      ref="mbiExpires"
+                      v-model="obj.mbiExpires"
+                      :rules="[form().required(this, 'mbiExpires')]"
+                      label="Expires"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'mbiExpires')"
+                      data-cy="mbiExpires"
+                      @input="fieldValueChanged('mbiExpires')"
+                    ></gz-date-picker>
                   </template>
                 </v-row>
               </v-col>
@@ -406,64 +388,57 @@
               <!-- QBI V7 LICENSE ITEM -->
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
-                  <v-col cols="6">
-                    <v-checkbox
-                      ref="qbi"
-                      v-model="obj.qbi"
-                      dense
-                      :readonly="formState.readOnly"
-                      label="QBI"
-                      data-cy="qbi"
-                      :error-messages="form().serverErrors(this, 'qbi')"
-                      @change="fieldValueChanged('qbi')"
-                    ></v-checkbox>
-                  </v-col>
+                  <v-checkbox
+                    class="mr-2"
+                    ref="qbi"
+                    v-model="obj.qbi"
+                    dense
+                    :readonly="formState.readOnly"
+                    label="QBI"
+                    data-cy="qbi"
+                    :error-messages="form().serverErrors(this, 'qbi')"
+                    @change="fieldValueChanged('qbi')"
+                  ></v-checkbox>
                   <template v-if="obj.qbi">
                     <template v-if="!formState.readOnly">
-                      <v-col cols="1">
-                        <v-menu offset-y>
-                          <template v-slot:activator="{ on, attrs }">
-                            <v-btn icon v-bind="attrs" v-on="on">
-                              <v-icon small>$sockiPlus</v-icon>
-                            </v-btn>
-                          </template>
-                          <v-list>
-                            <v-list-item @click="dtAddOneWeek('qbiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One week</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneMonth('qbiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One month</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneYear('qbiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One year</v-list-item-title>
-                            </v-list-item>
-                          </v-list>
-                        </v-menu>
-                      </v-col>
+                      <v-menu offset-y>
+                        <template v-slot:activator="{ on, attrs }">
+                          <v-btn icon v-bind="attrs" v-on="on">
+                            <v-icon small>$sockiPlus</v-icon>
+                          </v-btn>
+                        </template>
+                        <v-list>
+                          <v-list-item @click="dtAddOneWeek('qbiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One week</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneMonth('qbiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One month</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneYear('qbiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One year</v-list-item-title>
+                          </v-list-item>
+                        </v-list>
+                      </v-menu>
                     </template>
-                    <v-col>
-                      <gz-date-picker
-                        ref="qbiExpires"
-                        v-model="obj.qbiExpires"
-                        :rules="[form().required(this, 'qbiExpires')]"
-                        label="Expires"
-                        :readonly="formState.readOnly"
-                        :error-messages="
-                          form().serverErrors(this, 'qbiExpires')
-                        "
-                        data-cy="qbiExpires"
-                        @input="fieldValueChanged('qbiExpires')"
-                      ></gz-date-picker>
-                    </v-col>
+                    <gz-date-picker
+                      ref="qbiExpires"
+                      v-model="obj.qbiExpires"
+                      :rules="[form().required(this, 'qbiExpires')]"
+                      label="Expires"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'qbiExpires')"
+                      data-cy="qbiExpires"
+                      @input="fieldValueChanged('qbiExpires')"
+                    ></gz-date-picker>
                   </template>
                 </v-row>
               </v-col>
@@ -472,88 +447,82 @@
               <!-- Import Export CSV Duplicate V7 LICENSE ITEM -->
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
-                  <v-col cols="6">
-                    <v-checkbox
-                      ref="importExportCSVDuplicate"
-                      v-model="obj.importExportCSVDuplicate"
-                      dense
-                      :readonly="formState.readOnly"
-                      label="Import Export CSV Duplicate"
-                      data-cy="importExportCSVDuplicate"
-                      :error-messages="
-                        form().serverErrors(this, 'importExportCSVDuplicate')
-                      "
-                      @change="fieldValueChanged('importExportCSVDuplicate')"
-                    ></v-checkbox>
-                  </v-col>
+                  <v-checkbox
+                    class="mr-2"
+                    ref="importExportCSVDuplicate"
+                    v-model="obj.importExportCSVDuplicate"
+                    dense
+                    :readonly="formState.readOnly"
+                    label="CSV Duplicate "
+                    data-cy="importExportCSVDuplicate"
+                    :error-messages="
+                      form().serverErrors(this, 'importExportCSVDuplicate')
+                    "
+                    @change="fieldValueChanged('importExportCSVDuplicate')"
+                  ></v-checkbox>
+
                   <template v-if="obj.importExportCSVDuplicate">
                     <template v-if="!formState.readOnly">
-                      <v-col cols="1">
-                        <v-menu offset-y>
-                          <template v-slot:activator="{ on, attrs }">
-                            <v-btn icon v-bind="attrs" v-on="on">
-                              <v-icon small>$sockiPlus</v-icon>
-                            </v-btn>
-                          </template>
-                          <v-list>
-                            <v-list-item
-                              @click="
-                                dtAddOneWeek('importExportCSVDuplicateExpires')
-                              "
-                            >
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One week</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item
-                              @click="
-                                dtAddOneMonth('importExportCSVDuplicateExpires')
-                              "
-                            >
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One month</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item
-                              @click="
-                                dtAddOneYear('importExportCSVDuplicateExpires')
-                              "
-                            >
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One year</v-list-item-title>
-                            </v-list-item>
-                          </v-list>
-                        </v-menu>
-                      </v-col>
+                      <v-menu offset-y>
+                        <template v-slot:activator="{ on, attrs }">
+                          <v-btn icon v-bind="attrs" v-on="on">
+                            <v-icon small>$sockiPlus</v-icon>
+                          </v-btn>
+                        </template>
+                        <v-list>
+                          <v-list-item
+                            @click="
+                              dtAddOneWeek('importExportCSVDuplicateExpires')
+                            "
+                          >
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One week</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item
+                            @click="
+                              dtAddOneMonth('importExportCSVDuplicateExpires')
+                            "
+                          >
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One month</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item
+                            @click="
+                              dtAddOneYear('importExportCSVDuplicateExpires')
+                            "
+                          >
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One year</v-list-item-title>
+                          </v-list-item>
+                        </v-list>
+                      </v-menu>
                     </template>
-                    <v-col>
-                      <gz-date-picker
-                        ref="importExportCSVDuplicateExpires"
-                        v-model="obj.importExportCSVDuplicateExpires"
-                        :rules="[
-                          form().required(
-                            this,
-                            'importExportCSVDuplicateExpires'
-                          )
-                        ]"
-                        label="Expires"
-                        :readonly="formState.readOnly"
-                        :error-messages="
-                          form().serverErrors(
-                            this,
-                            'importExportCSVDuplicateExpires'
-                          )
-                        "
-                        data-cy="importExportCSVDuplicateExpires"
-                        @input="
-                          fieldValueChanged('importExportCSVDuplicateExpires')
-                        "
-                      ></gz-date-picker>
-                    </v-col>
+
+                    <gz-date-picker
+                      ref="importExportCSVDuplicateExpires"
+                      v-model="obj.importExportCSVDuplicateExpires"
+                      :rules="[
+                        form().required(this, 'importExportCSVDuplicateExpires')
+                      ]"
+                      label="Expires"
+                      :readonly="formState.readOnly"
+                      :error-messages="
+                        form().serverErrors(
+                          this,
+                          'importExportCSVDuplicateExpires'
+                        )
+                      "
+                      data-cy="importExportCSVDuplicateExpires"
+                      @input="
+                        fieldValueChanged('importExportCSVDuplicateExpires')
+                      "
+                    ></gz-date-picker>
                   </template>
                 </v-row>
               </v-col>
@@ -562,74 +531,69 @@
               <!-- Quick Notification V7 LICENSE ITEM -->
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
-                  <v-col cols="6">
-                    <v-checkbox
-                      ref="quickNotification"
-                      v-model="obj.quickNotification"
-                      dense
-                      :readonly="formState.readOnly"
-                      label="Quick Notification"
-                      data-cy="quickNotification"
-                      :error-messages="
-                        form().serverErrors(this, 'quickNotification')
-                      "
-                      @change="fieldValueChanged('quickNotification')"
-                    ></v-checkbox>
-                  </v-col>
+                  <v-checkbox
+                    class="mr-2"
+                    ref="quickNotification"
+                    v-model="obj.quickNotification"
+                    dense
+                    :readonly="formState.readOnly"
+                    label="Quick Notification"
+                    data-cy="quickNotification"
+                    :error-messages="
+                      form().serverErrors(this, 'quickNotification')
+                    "
+                    @change="fieldValueChanged('quickNotification')"
+                  ></v-checkbox>
                   <template v-if="obj.quickNotification">
                     <template v-if="!formState.readOnly">
-                      <v-col cols="1">
-                        <v-menu offset-y>
-                          <template v-slot:activator="{ on, attrs }">
-                            <v-btn icon v-bind="attrs" v-on="on">
-                              <v-icon small>$sockiPlus</v-icon>
-                            </v-btn>
-                          </template>
-                          <v-list>
-                            <v-list-item
-                              @click="dtAddOneWeek('quickNotificationExpires')"
-                            >
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One week</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item
-                              @click="dtAddOneMonth('quickNotificationExpires')"
-                            >
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One month</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item
-                              @click="dtAddOneYear('quickNotificationExpires')"
-                            >
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One year</v-list-item-title>
-                            </v-list-item>
-                          </v-list>
-                        </v-menu>
-                      </v-col>
+                      <v-menu offset-y>
+                        <template v-slot:activator="{ on, attrs }">
+                          <v-btn icon v-bind="attrs" v-on="on">
+                            <v-icon small>$sockiPlus</v-icon>
+                          </v-btn>
+                        </template>
+                        <v-list>
+                          <v-list-item
+                            @click="dtAddOneWeek('quickNotificationExpires')"
+                          >
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One week</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item
+                            @click="dtAddOneMonth('quickNotificationExpires')"
+                          >
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One month</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item
+                            @click="dtAddOneYear('quickNotificationExpires')"
+                          >
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One year</v-list-item-title>
+                          </v-list-item>
+                        </v-list>
+                      </v-menu>
                     </template>
-                    <v-col>
-                      <gz-date-picker
-                        ref="quickNotificationExpires"
-                        v-model="obj.quickNotificationExpires"
-                        :rules="[
-                          form().required(this, 'quickNotificationExpires')
-                        ]"
-                        label="Expires"
-                        :readonly="formState.readOnly"
-                        :error-messages="
-                          form().serverErrors(this, 'quickNotificationExpires')
-                        "
-                        data-cy="quickNotificationExpires"
-                        @input="fieldValueChanged('quickNotificationExpires')"
-                      ></gz-date-picker>
-                    </v-col>
+                    <gz-date-picker
+                      ref="quickNotificationExpires"
+                      v-model="obj.quickNotificationExpires"
+                      :rules="[
+                        form().required(this, 'quickNotificationExpires')
+                      ]"
+                      label="Expires"
+                      :readonly="formState.readOnly"
+                      :error-messages="
+                        form().serverErrors(this, 'quickNotificationExpires')
+                      "
+                      data-cy="quickNotificationExpires"
+                      @input="fieldValueChanged('quickNotificationExpires')"
+                    ></gz-date-picker>
                   </template>
                 </v-row>
               </v-col>
@@ -638,70 +602,65 @@
               <!-- Export to XLS V7 LICENSE ITEM -->
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
-                  <v-col cols="6">
-                    <v-checkbox
-                      ref="exportToXLS"
-                      v-model="obj.exportToXLS"
-                      dense
-                      :readonly="formState.readOnly"
-                      label="Export to XLS"
-                      data-cy="exportToXLS"
-                      :error-messages="form().serverErrors(this, 'exportToXLS')"
-                      @change="fieldValueChanged('exportToXLS')"
-                    ></v-checkbox>
-                  </v-col>
+                  <v-checkbox
+                    class="mr-2"
+                    ref="exportToXLS"
+                    v-model="obj.exportToXLS"
+                    dense
+                    :readonly="formState.readOnly"
+                    label="Export to XLS"
+                    data-cy="exportToXLS"
+                    :error-messages="form().serverErrors(this, 'exportToXLS')"
+                    @change="fieldValueChanged('exportToXLS')"
+                  ></v-checkbox>
                   <template v-if="obj.exportToXLS">
                     <template v-if="!formState.readOnly">
-                      <v-col cols="1">
-                        <v-menu offset-y>
-                          <template v-slot:activator="{ on, attrs }">
-                            <v-btn icon v-bind="attrs" v-on="on">
-                              <v-icon small>$sockiPlus</v-icon>
-                            </v-btn>
-                          </template>
-                          <v-list>
-                            <v-list-item
-                              @click="dtAddOneWeek('exportToXLSExpires')"
-                            >
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One week</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item
-                              @click="dtAddOneMonth('exportToXLSExpires')"
-                            >
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One month</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item
-                              @click="dtAddOneYear('exportToXLSExpires')"
-                            >
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One year</v-list-item-title>
-                            </v-list-item>
-                          </v-list>
-                        </v-menu>
-                      </v-col>
+                      <v-menu offset-y>
+                        <template v-slot:activator="{ on, attrs }">
+                          <v-btn icon v-bind="attrs" v-on="on">
+                            <v-icon small>$sockiPlus</v-icon>
+                          </v-btn>
+                        </template>
+                        <v-list>
+                          <v-list-item
+                            @click="dtAddOneWeek('exportToXLSExpires')"
+                          >
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One week</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item
+                            @click="dtAddOneMonth('exportToXLSExpires')"
+                          >
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One month</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item
+                            @click="dtAddOneYear('exportToXLSExpires')"
+                          >
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One year</v-list-item-title>
+                          </v-list-item>
+                        </v-list>
+                      </v-menu>
                     </template>
-                    <v-col>
-                      <gz-date-picker
-                        ref="exportToXLSExpires"
-                        v-model="obj.exportToXLSExpires"
-                        :rules="[form().required(this, 'exportToXLSExpires')]"
-                        label="Expires"
-                        :readonly="formState.readOnly"
-                        :error-messages="
-                          form().serverErrors(this, 'exportToXLSExpires')
-                        "
-                        data-cy="exportToXLSExpires"
-                        @input="fieldValueChanged('exportToXLSExpires')"
-                      ></gz-date-picker>
-                    </v-col>
+                    <gz-date-picker
+                      ref="exportToXLSExpires"
+                      v-model="obj.exportToXLSExpires"
+                      :rules="[form().required(this, 'exportToXLSExpires')]"
+                      label="Expires"
+                      :readonly="formState.readOnly"
+                      :error-messages="
+                        form().serverErrors(this, 'exportToXLSExpires')
+                      "
+                      data-cy="exportToXLSExpires"
+                      @input="fieldValueChanged('exportToXLSExpires')"
+                    ></gz-date-picker>
                   </template>
                 </v-row>
               </v-col>
@@ -710,74 +669,67 @@
               <!-- Outlook schedule V7 LICENSE ITEM -->
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
-                  <v-col cols="6">
-                    <v-checkbox
-                      ref="outlookSchedule"
-                      v-model="obj.outlookSchedule"
-                      dense
-                      :readonly="formState.readOnly"
-                      label="Outlook schedule"
-                      data-cy="outlookSchedule"
-                      :error-messages="
-                        form().serverErrors(this, 'outlookSchedule')
-                      "
-                      @change="fieldValueChanged('outlookSchedule')"
-                    ></v-checkbox>
-                  </v-col>
+                  <v-checkbox
+                    class="mr-2"
+                    ref="outlookSchedule"
+                    v-model="obj.outlookSchedule"
+                    dense
+                    :readonly="formState.readOnly"
+                    label="Outlook schedule"
+                    data-cy="outlookSchedule"
+                    :error-messages="
+                      form().serverErrors(this, 'outlookSchedule')
+                    "
+                    @change="fieldValueChanged('outlookSchedule')"
+                  ></v-checkbox>
                   <template v-if="obj.outlookSchedule">
                     <template v-if="!formState.readOnly">
-                      <v-col cols="1">
-                        <v-menu offset-y>
-                          <template v-slot:activator="{ on, attrs }">
-                            <v-btn icon v-bind="attrs" v-on="on">
-                              <v-icon small>$sockiPlus</v-icon>
-                            </v-btn>
-                          </template>
-                          <v-list>
-                            <v-list-item
-                              @click="dtAddOneWeek('outlookScheduleExpires')"
-                            >
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One week</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item
-                              @click="dtAddOneMonth('outlookScheduleExpires')"
-                            >
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One month</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item
-                              @click="dtAddOneYear('outlookScheduleExpires')"
-                            >
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One year</v-list-item-title>
-                            </v-list-item>
-                          </v-list>
-                        </v-menu>
-                      </v-col>
+                      <v-menu offset-y>
+                        <template v-slot:activator="{ on, attrs }">
+                          <v-btn icon v-bind="attrs" v-on="on">
+                            <v-icon small>$sockiPlus</v-icon>
+                          </v-btn>
+                        </template>
+                        <v-list>
+                          <v-list-item
+                            @click="dtAddOneWeek('outlookScheduleExpires')"
+                          >
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One week</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item
+                            @click="dtAddOneMonth('outlookScheduleExpires')"
+                          >
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One month</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item
+                            @click="dtAddOneYear('outlookScheduleExpires')"
+                          >
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One year</v-list-item-title>
+                          </v-list-item>
+                        </v-list>
+                      </v-menu>
                     </template>
-                    <v-col>
-                      <gz-date-picker
-                        ref="outlookScheduleExpires"
-                        v-model="obj.outlookScheduleExpires"
-                        :rules="[
-                          form().required(this, 'outlookScheduleExpires')
-                        ]"
-                        label="Expires"
-                        :readonly="formState.readOnly"
-                        :error-messages="
-                          form().serverErrors(this, 'outlookScheduleExpires')
-                        "
-                        data-cy="outlookScheduleExpires"
-                        @input="fieldValueChanged('outlookScheduleExpires')"
-                      ></gz-date-picker>
-                    </v-col>
+                    <gz-date-picker
+                      ref="outlookScheduleExpires"
+                      v-model="obj.outlookScheduleExpires"
+                      :rules="[form().required(this, 'outlookScheduleExpires')]"
+                      label="Expires"
+                      :readonly="formState.readOnly"
+                      :error-messages="
+                        form().serverErrors(this, 'outlookScheduleExpires')
+                      "
+                      data-cy="outlookScheduleExpires"
+                      @input="fieldValueChanged('outlookScheduleExpires')"
+                    ></gz-date-picker>
                   </template>
                 </v-row>
               </v-col>
@@ -786,64 +738,57 @@
               <!-- QBOI V7 LICENSE ITEM -->
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
-                  <v-col cols="6">
-                    <v-checkbox
-                      ref="qboi"
-                      v-model="obj.qboi"
-                      dense
-                      :readonly="formState.readOnly"
-                      label="QBOI"
-                      data-cy="qboi"
-                      :error-messages="form().serverErrors(this, 'qboi')"
-                      @change="fieldValueChanged('qboi')"
-                    ></v-checkbox>
-                  </v-col>
+                  <v-checkbox
+                    class="mr-2"
+                    ref="qboi"
+                    v-model="obj.qboi"
+                    dense
+                    :readonly="formState.readOnly"
+                    label="QBOI"
+                    data-cy="qboi"
+                    :error-messages="form().serverErrors(this, 'qboi')"
+                    @change="fieldValueChanged('qboi')"
+                  ></v-checkbox>
                   <template v-if="obj.qboi">
                     <template v-if="!formState.readOnly">
-                      <v-col cols="1">
-                        <v-menu offset-y>
-                          <template v-slot:activator="{ on, attrs }">
-                            <v-btn icon v-bind="attrs" v-on="on">
-                              <v-icon small>$sockiPlus</v-icon>
-                            </v-btn>
-                          </template>
-                          <v-list>
-                            <v-list-item @click="dtAddOneWeek('qboiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One week</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneMonth('qboiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One month</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneYear('qboiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One year</v-list-item-title>
-                            </v-list-item>
-                          </v-list>
-                        </v-menu>
-                      </v-col>
+                      <v-menu offset-y>
+                        <template v-slot:activator="{ on, attrs }">
+                          <v-btn icon v-bind="attrs" v-on="on">
+                            <v-icon small>$sockiPlus</v-icon>
+                          </v-btn>
+                        </template>
+                        <v-list>
+                          <v-list-item @click="dtAddOneWeek('qboiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One week</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneMonth('qboiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One month</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneYear('qboiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One year</v-list-item-title>
+                          </v-list-item>
+                        </v-list>
+                      </v-menu>
                     </template>
-                    <v-col>
-                      <gz-date-picker
-                        ref="qboiExpires"
-                        v-model="obj.qboiExpires"
-                        :rules="[form().required(this, 'qboiExpires')]"
-                        label="Expires"
-                        :readonly="formState.readOnly"
-                        :error-messages="
-                          form().serverErrors(this, 'qboiExpires')
-                        "
-                        data-cy="qboiExpires"
-                        @input="fieldValueChanged('qboiExpires')"
-                      ></gz-date-picker>
-                    </v-col>
+                    <gz-date-picker
+                      ref="qboiExpires"
+                      v-model="obj.qboiExpires"
+                      :rules="[form().required(this, 'qboiExpires')]"
+                      label="Expires"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'qboiExpires')"
+                      data-cy="qboiExpires"
+                      @input="fieldValueChanged('qboiExpires')"
+                    ></gz-date-picker>
                   </template>
                 </v-row>
               </v-col>
@@ -852,64 +797,57 @@
               <!-- PTI V7 LICENSE ITEM -->
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
-                  <v-col cols="6">
-                    <v-checkbox
-                      ref="pti"
-                      v-model="obj.pti"
-                      dense
-                      :readonly="formState.readOnly"
-                      label="PTI"
-                      data-cy="pti"
-                      :error-messages="form().serverErrors(this, 'pti')"
-                      @change="fieldValueChanged('pti')"
-                    ></v-checkbox>
-                  </v-col>
+                  <v-checkbox
+                    class="mr-2"
+                    ref="pti"
+                    v-model="obj.pti"
+                    dense
+                    :readonly="formState.readOnly"
+                    label="PTI"
+                    data-cy="pti"
+                    :error-messages="form().serverErrors(this, 'pti')"
+                    @change="fieldValueChanged('pti')"
+                  ></v-checkbox>
                   <template v-if="obj.pti">
                     <template v-if="!formState.readOnly">
-                      <v-col cols="1">
-                        <v-menu offset-y>
-                          <template v-slot:activator="{ on, attrs }">
-                            <v-btn icon v-bind="attrs" v-on="on">
-                              <v-icon small>$sockiPlus</v-icon>
-                            </v-btn>
-                          </template>
-                          <v-list>
-                            <v-list-item @click="dtAddOneWeek('ptiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One week</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneMonth('ptiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One month</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneYear('ptiExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One year</v-list-item-title>
-                            </v-list-item>
-                          </v-list>
-                        </v-menu>
-                      </v-col>
+                      <v-menu offset-y>
+                        <template v-slot:activator="{ on, attrs }">
+                          <v-btn icon v-bind="attrs" v-on="on">
+                            <v-icon small>$sockiPlus</v-icon>
+                          </v-btn>
+                        </template>
+                        <v-list>
+                          <v-list-item @click="dtAddOneWeek('ptiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One week</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneMonth('ptiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One month</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneYear('ptiExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One year</v-list-item-title>
+                          </v-list-item>
+                        </v-list>
+                      </v-menu>
                     </template>
-                    <v-col>
-                      <gz-date-picker
-                        ref="ptiExpires"
-                        v-model="obj.ptiExpires"
-                        :rules="[form().required(this, 'ptiExpires')]"
-                        label="Expires"
-                        :readonly="formState.readOnly"
-                        :error-messages="
-                          form().serverErrors(this, 'ptiExpires')
-                        "
-                        data-cy="ptiExpires"
-                        @input="fieldValueChanged('ptiExpires')"
-                      ></gz-date-picker>
-                    </v-col>
+                    <gz-date-picker
+                      ref="ptiExpires"
+                      v-model="obj.ptiExpires"
+                      :rules="[form().required(this, 'ptiExpires')]"
+                      label="Expires"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'ptiExpires')"
+                      data-cy="ptiExpires"
+                      @input="fieldValueChanged('ptiExpires')"
+                    ></gz-date-picker>
                   </template>
                 </v-row>
               </v-col>
@@ -918,64 +856,57 @@
               <!-- OLI V7 LICENSE ITEM -->
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
-                  <v-col cols="6">
-                    <v-checkbox
-                      ref="oli"
-                      v-model="obj.oli"
-                      dense
-                      :readonly="formState.readOnly"
-                      label="OLI"
-                      data-cy="oli"
-                      :error-messages="form().serverErrors(this, 'oli')"
-                      @change="fieldValueChanged('oli')"
-                    ></v-checkbox>
-                  </v-col>
+                  <v-checkbox
+                    class="mr-2"
+                    ref="oli"
+                    v-model="obj.oli"
+                    dense
+                    :readonly="formState.readOnly"
+                    label="OLI"
+                    data-cy="oli"
+                    :error-messages="form().serverErrors(this, 'oli')"
+                    @change="fieldValueChanged('oli')"
+                  ></v-checkbox>
                   <template v-if="obj.oli">
                     <template v-if="!formState.readOnly">
-                      <v-col cols="1">
-                        <v-menu offset-y>
-                          <template v-slot:activator="{ on, attrs }">
-                            <v-btn icon v-bind="attrs" v-on="on">
-                              <v-icon small>$sockiPlus</v-icon>
-                            </v-btn>
-                          </template>
-                          <v-list>
-                            <v-list-item @click="dtAddOneWeek('oliExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One week</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneMonth('oliExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One month</v-list-item-title>
-                            </v-list-item>
-                            <v-list-item @click="dtAddOneYear('oliExpires')">
-                              <v-list-item-icon>
-                                <v-icon>$sockiPlus</v-icon>
-                              </v-list-item-icon>
-                              <v-list-item-title>One year</v-list-item-title>
-                            </v-list-item>
-                          </v-list>
-                        </v-menu>
-                      </v-col>
+                      <v-menu offset-y>
+                        <template v-slot:activator="{ on, attrs }">
+                          <v-btn icon v-bind="attrs" v-on="on">
+                            <v-icon small>$sockiPlus</v-icon>
+                          </v-btn>
+                        </template>
+                        <v-list>
+                          <v-list-item @click="dtAddOneWeek('oliExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One week</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneMonth('oliExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One month</v-list-item-title>
+                          </v-list-item>
+                          <v-list-item @click="dtAddOneYear('oliExpires')">
+                            <v-list-item-icon>
+                              <v-icon>$sockiPlus</v-icon>
+                            </v-list-item-icon>
+                            <v-list-item-title>One year</v-list-item-title>
+                          </v-list-item>
+                        </v-list>
+                      </v-menu>
                     </template>
-                    <v-col>
-                      <gz-date-picker
-                        ref="oliExpires"
-                        v-model="obj.oliExpires"
-                        :rules="[form().required(this, 'oliExpires')]"
-                        label="Expires"
-                        :readonly="formState.readOnly"
-                        :error-messages="
-                          form().serverErrors(this, 'oliExpires')
-                        "
-                        data-cy="oliExpires"
-                        @input="fieldValueChanged('oliExpires')"
-                      ></gz-date-picker>
-                    </v-col>
+                    <gz-date-picker
+                      ref="oliExpires"
+                      v-model="obj.oliExpires"
+                      :rules="[form().required(this, 'oliExpires')]"
+                      label="Expires"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'oliExpires')"
+                      data-cy="oliExpires"
+                      @input="fieldValueChanged('oliExpires')"
+                    ></gz-date-picker>
                   </template>
                 </v-row>
               </v-col>
@@ -1167,12 +1098,12 @@ export default {
         fetchEmail: null,
         fetchedOn: null, //here, non null fetchedOn is read only
         dbId: null,
-        licenseExpire: null,//what is is in v8, "lockdate" in v7
+        licenseExpire: null, //what is is in v8, "lockdate" in v7
         maintenanceExpire: null,
         wiki: null,
         tags: [],
         //dto only props
-        trialMode:false,//v8
+        trialMode: false, //v8
         customerUsers: 250,
         maxDataGB: 20,
         users: 1,