diff --git a/src/views/biz-license.vue b/src/views/biz-license.vue
index ac6b7e3..4eae346 100644
--- a/src/views/biz-license.vue
+++ b/src/views/biz-license.vue
@@ -76,17 +76,6 @@
 
           <v-col cols="12" sm="6" lg="4" xl="3">
             <v-row dense no-gutters>
-              <v-col>
-                <gz-date-time-picker
-                  ref="licenseExpire"
-                  v-model="obj.licenseExpire"
-                  :label="$sock.t('LicenseExpiration')"
-                  :readonly="formState.readOnly"
-                  :error-messages="form().serverErrors(this, 'licenseExpire')"
-                  data-cy="licenseExpire"
-                  @input="fieldValueChanged('licenseExpire')"
-                ></gz-date-time-picker>
-              </v-col>
               <template v-if="!formState.readOnly">
                 <v-col cols="1">
                   <v-menu offset-y>
@@ -118,25 +107,22 @@
                   </v-menu>
                 </v-col>
               </template>
+              <v-col>
+                <gz-date-picker
+                  ref="licenseExpire"
+                  v-model="obj.licenseExpire"
+                  :label="$sock.t('LicenseExpiration')"
+                  :readonly="formState.readOnly"
+                  :error-messages="form().serverErrors(this, 'licenseExpire')"
+                  data-cy="licenseExpire"
+                  @input="fieldValueChanged('licenseExpire')"
+                ></gz-date-picker>
+              </v-col>
             </v-row>
           </v-col>
 
           <v-col cols="12" sm="6" lg="4" xl="3">
             <v-row dense no-gutters>
-              <v-col>
-                <gz-date-time-picker
-                  ref="maintenanceExpire"
-                  v-model="obj.maintenanceExpire"
-                  :label="$sock.t('LicenseMaintenanceExpire')"
-                  :rules="[form().required(this, 'maintenanceExpire')]"
-                  :readonly="formState.readOnly"
-                  :error-messages="
-                    form().serverErrors(this, 'maintenanceExpire')
-                  "
-                  data-cy="maintenanceExpire"
-                  @input="fieldValueChanged('maintenanceExpire')"
-                ></gz-date-time-picker>
-              </v-col>
               <template v-if="!formState.readOnly">
                 <v-col cols="1">
                   <v-menu offset-y>
@@ -168,6 +154,20 @@
                   </v-menu>
                 </v-col>
               </template>
+              <v-col>
+                <gz-date-picker
+                  ref="maintenanceExpire"
+                  v-model="obj.maintenanceExpire"
+                  :label="$sock.t('LicenseMaintenanceExpire')"
+                  :rules="[form().required(this, 'maintenanceExpire')]"
+                  :readonly="formState.readOnly"
+                  :error-messages="
+                    form().serverErrors(this, 'maintenanceExpire')
+                  "
+                  data-cy="maintenanceExpire"
+                  @input="fieldValueChanged('maintenanceExpire')"
+                ></gz-date-picker>
+              </v-col>
             </v-row>
           </v-col>
 
@@ -193,6 +193,13 @@
           </template>
 
           <template v-if="obj.pGroup == 1">
+
+
+
+
+
+
+            <!-- WBI V7 LICENSE ITEM -->
             <v-col cols="12" sm="6" lg="4" xl="3">
               <v-row dense no-gutters>
                 <v-col cols="2">
@@ -208,17 +215,6 @@
                   ></v-checkbox>
                 </v-col>
                 <template v-if="obj.wbi">
-                  <v-col>
-                    <gz-date-time-picker
-                      ref="wbiExpires"
-                      v-model="obj.wbiExpires"
-                      :rules="[form().required(this, 'wbiExpires')]"
-                      :readonly="formState.readOnly"
-                      :error-messages="form().serverErrors(this, 'wbiExpires')"
-                      data-cy="wbiExpires"
-                      @input="fieldValueChanged('wbiExpires')"
-                    ></gz-date-time-picker>
-                  </v-col>
                   <template v-if="!formState.readOnly">
                     <v-col cols="1">
                       <v-menu offset-y>
@@ -250,11 +246,428 @@
                       </v-menu>
                     </v-col>
                   </template>
+                  <v-col>
+                    <gz-date-picker
+                      ref="wbiExpires"
+                      v-model="obj.wbiExpires"
+                      :rules="[form().required(this, 'wbiExpires')]"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'wbiExpires')"
+                      data-cy="wbiExpires"
+                      @input="fieldValueChanged('wbiExpires')"
+                    ></gz-date-picker>
+                  </v-col>
                 </template>
               </v-row>
             </v-col>
+            <!-- /wbi v7 license item -->
+
+
+
+             <!-- RI V7 LICENSE ITEM -->
+            <v-col cols="12" sm="6" lg="4" xl="3">
+              <v-row dense no-gutters>
+                <v-col cols="2">
+                  <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>
+                <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>
+                  </template>
+                  <v-col>
+                    <gz-date-picker
+                      ref="riExpires"
+                      v-model="obj.riExpires"
+                      :rules="[form().required(this, 'riExpires')]"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'riExpires')"
+                      data-cy="riExpires"
+                      @input="fieldValueChanged('riExpires')"
+                    ></gz-date-picker>
+                  </v-col>
+                </template>
+              </v-row>
+            </v-col>
+            <!-- /ri v7 license item -->
+
+
+            <!-- MBI V7 LICENSE ITEM -->
+            <v-col cols="12" sm="6" lg="4" xl="3">
+              <v-row dense no-gutters>
+                <v-col cols="2">
+                  <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>
+                <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>
+                  </template>
+                  <v-col>
+                    <gz-date-picker
+                      ref="mbiExpires"
+                      v-model="obj.mbiExpires"
+                      :rules="[form().required(this, 'mbiExpires')]"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'mbiExpires')"
+                      data-cy="mbiExpires"
+                      @input="fieldValueChanged('mbiExpires')"
+                    ></gz-date-picker>
+                  </v-col>
+                </template>
+              </v-row>
+            </v-col>
+            <!-- /mbi v7 license item -->
+
+WBI
+            <!-- QBI V7 LICENSE ITEM -->
+            <v-col cols="12" sm="6" lg="4" xl="3">
+              <v-row dense no-gutters>
+                <v-col cols="2">
+                  <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>
+                <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>
+                  </template>
+                  <v-col>
+                    <gz-date-picker
+                      ref="qbiExpires"
+                      v-model="obj.qbiExpires"
+                      :rules="[form().required(this, 'qbiExpires')]"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'qbiExpires')"
+                      data-cy="qbiExpires"
+                      @input="fieldValueChanged('qbiExpires')"
+                    ></gz-date-picker>
+                  </v-col>
+                </template>
+              </v-row>
+            </v-col>
+            <!-- /qbi v7 license item -->
+
+
+            <!-- QBOI V7 LICENSE ITEM -->
+            <v-col cols="12" sm="6" lg="4" xl="3">
+              <v-row dense no-gutters>
+                <v-col cols="2">
+                  <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>
+                <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>
+                  </template>
+                  <v-col>
+                    <gz-date-picker
+                      ref="qboiExpires"
+                      v-model="obj.qboiExpires"
+                      :rules="[form().required(this, 'qboiExpires')]"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'qboiExpires')"
+                      data-cy="qboiExpires"
+                      @input="fieldValueChanged('qboiExpires')"
+                    ></gz-date-picker>
+                  </v-col>
+                </template>
+              </v-row>
+            </v-col>
+            <!-- /qboi v7 license item -->
+
+
+            <!-- PTI V7 LICENSE ITEM -->
+            <v-col cols="12" sm="6" lg="4" xl="3">
+              <v-row dense no-gutters>
+                <v-col cols="2">
+                  <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>
+                <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>
+                  </template>
+                  <v-col>
+                    <gz-date-picker
+                      ref="ptiExpires"
+                      v-model="obj.ptiExpires"
+                      :rules="[form().required(this, 'ptiExpires')]"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'ptiExpires')"
+                      data-cy="ptiExpires"
+                      @input="fieldValueChanged('ptiExpires')"
+                    ></gz-date-picker>
+                  </v-col>
+                </template>
+              </v-row>
+            </v-col>
+            <!-- /pti v7 license item -->
+
+
+            <!-- Quick Notification V7 LICENSE ITEM -->
+            <v-col cols="12" sm="6" lg="4" xl="3">
+              <v-row dense no-gutters>
+                <v-col cols="2">
+                  <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>
+                <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>
+                  </template>
+                  <v-col>
+                    <gz-date-picker
+                      ref="quickNotificationExpires"
+                      v-model="obj.quickNotificationExpires"
+                      :rules="[form().required(this, 'quickNotificationExpires')]"
+                      :readonly="formState.readOnly"
+                      :error-messages="form().serverErrors(this, 'quickNotificationExpires')"
+                      data-cy="quickNotificationExpires"
+                      @input="fieldValueChanged('quickNotificationExpires')"
+                    ></gz-date-picker>
+                  </v-col>
+                </template>
+              </v-row>
+            </v-col>
+            <!-- /quickNotification v7 license item -->
+
+
+
+
+
+
+            <!-- ayanova 7 group items -->
           </template>
 
+
+
+
+
+
+
+
+
+
+
+
+
+
           <template v-if="obj.pGroup == 2">
             <v-col cols="12" sm="6" lg="4" xl="3">
               <v-text-field