diff --git a/ayanova/src/views/ay-evaluate.vue b/ayanova/src/views/ay-evaluate.vue
index ac2b480b..a164a824 100644
--- a/ayanova/src/views/ay-evaluate.vue
+++ b/ayanova/src/views/ay-evaluate.vue
@@ -1,75 +1,159 @@
 <template>
-  <v-row v-if="formState.ready">
-    <v-col>
-      <v-form ref="form">
-        <v-row>
-          <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
-          <v-col cols="12" offset-md="3">
-            <v-col cols="12">
-              <div class="text-h4 text-md-h2 mb-2">{{ $ay.t("Welcome") }}</div>
-            </v-col>
-            <v-col cols="12">
-              <v-btn @click="helpEvaluate()" class="my-8 mr-16">{{
-                $ay.t("EvaluationGuide")
-              }}</v-btn>
-              <v-btn :href="supportLink()" target="_blank" class="my-8 mr-12">{{
-                $ay.t("HelpTechSupport")
-              }}</v-btn>
-            </v-col>
-            <v-col cols="12">
-              <div class="text-h5 mt-8 mb-2">
-                {{ $ay.t("GenerateSampleData") }}
-              </div>
-              <v-col cols="12" sm="6" v-if="formState.readOnly">
-                <div class="text-h6 mt-8 warning--text">
-                  {{ $ay.t("ErrorSecurityAdministratorOnlyMessage") }}
+  <v-container fluid>
+    <v-row justify="center">
+      <v-dialog v-model="seedDialog" persistent max-width="600px">
+        <v-card>
+          <v-card-title>
+            <span class="headline">{{ $ay.t("TestSMTPSettings") }}</span>
+          </v-card-title>
+          <v-card-text>
+            <v-container>
+              <v-row>
+                <v-col cols="12">
+                  <div class="text-h5 mt-8 mb-2">
+                    {{ $ay.t("GenerateSampleData") }}
+                  </div>
+                  <v-col cols="12" sm="6" v-if="formState.readOnly">
+                    <div class="text-h6 mt-8 warning--text">
+                      {{ $ay.t("ErrorSecurityAdministratorOnlyMessage") }}
+                    </div>
+                  </v-col>
+                  <v-col cols="12" sm="6">
+                    <v-select
+                      v-model="obj.seedLevel"
+                      :items="selectLists.seedLevels"
+                      :rules="[form().required(this, 'seedLevel')]"
+                      @input="fieldValueChanged('seedLevel')"
+                      ref="seedLevel"
+                      item-text="name"
+                      item-value="id"
+                      :readonly="formState.readOnly"
+                      :disabled="formState.readOnly"
+                      :label="$ay.t('SeedLevel')"
+                    ></v-select>
+                  </v-col>
+                  <v-col cols="12" sm="6">
+                    <v-text-field
+                      v-model="obj.timeZoneOffset"
+                      :readonly="formState.readOnly"
+                      :disabled="formState.readOnly"
+                      :rules="[
+                        form().decimalValid(this, 'timeZoneOffset'),
+                        form().required(this, 'timeZoneOffset')
+                      ]"
+                      :label="$ay.t('UserTimeZoneOffset')"
+                      type="number"
+                      ref="timeZoneOffset"
+                      @input="fieldValueChanged('timeZoneOffset')"
+                    ></v-text-field>
+                  </v-col>
+
+                  <v-col cols="12">
+                    <v-btn
+                      :loading="seedingJobActive"
+                      :disabled="formState.readOnly"
+                      @click="generate()"
+                      class="my-8 mr-4"
+                      >{{ $ay.t("StartJob") }}</v-btn
+                    >
+                  </v-col>
+                </v-col>
+              </v-row>
+            </v-container>
+          </v-card-text>
+          <v-card-actions>
+            <v-spacer></v-spacer>
+            <v-btn color="blue darken-1" text @click="seedDialog = false">{{
+              $ay.t("Cancel")
+            }}</v-btn>
+            <v-btn
+              color="blue darken-1"
+              text
+              @click="generate()"
+              :disabled="formState.readOnly"
+              >{{ $ay.t("OK") }}</v-btn
+            >
+          </v-card-actions>
+        </v-card>
+      </v-dialog>
+    </v-row>
+    <v-row v-if="formState.ready">
+      <v-col>
+        <v-form ref="form">
+          <v-row>
+            <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
+            <v-col cols="12" offset-md="3">
+              <v-col cols="12">
+                <div class="text-h4 text-md-h2 mb-2">
+                  {{ $ay.t("Welcome") }}
                 </div>
               </v-col>
-              <v-col cols="12" sm="6">
-                <v-select
-                  v-model="obj.seedLevel"
-                  :items="selectLists.seedLevels"
-                  :rules="[form().required(this, 'seedLevel')]"
-                  @input="fieldValueChanged('seedLevel')"
-                  ref="seedLevel"
-                  item-text="name"
-                  item-value="id"
-                  :readonly="formState.readOnly"
-                  :disabled="formState.readOnly"
-                  :label="$ay.t('SeedLevel')"
-                ></v-select>
-              </v-col>
-              <v-col cols="12" sm="6">
-                <v-text-field
-                  v-model="obj.timeZoneOffset"
-                  :readonly="formState.readOnly"
-                  :disabled="formState.readOnly"
-                  :rules="[
-                    form().decimalValid(this, 'timeZoneOffset'),
-                    form().required(this, 'timeZoneOffset')
-                  ]"
-                  :label="$ay.t('UserTimeZoneOffset')"
-                  type="number"
-                  ref="timeZoneOffset"
-                  @input="fieldValueChanged('timeZoneOffset')"
-                ></v-text-field>
-              </v-col>
-
               <v-col cols="12">
+                <v-btn @click="helpEvaluate()" class="my-8 mr-16">{{
+                  $ay.t("EvaluationGuide")
+                }}</v-btn>
                 <v-btn
-                  :loading="seedingJobActive"
-                  :disabled="formState.readOnly"
-                  @click="generate()"
-                  class="my-8 mr-4"
-                  >{{ $ay.t("StartJob") }}</v-btn
+                  :href="supportLink()"
+                  target="_blank"
+                  class="my-8 mr-12"
+                  >{{ $ay.t("HelpTechSupport") }}</v-btn
                 >
               </v-col>
+              <!-- <v-col cols="12">
+                <div class="text-h5 mt-8 mb-2">
+                  {{ $ay.t("GenerateSampleData") }}
+                </div>
+                <v-col cols="12" sm="6" v-if="formState.readOnly">
+                  <div class="text-h6 mt-8 warning--text">
+                    {{ $ay.t("ErrorSecurityAdministratorOnlyMessage") }}
+                  </div>
+                </v-col>
+                <v-col cols="12" sm="6">
+                  <v-select
+                    v-model="obj.seedLevel"
+                    :items="selectLists.seedLevels"
+                    :rules="[form().required(this, 'seedLevel')]"
+                    @input="fieldValueChanged('seedLevel')"
+                    ref="seedLevel"
+                    item-text="name"
+                    item-value="id"
+                    :readonly="formState.readOnly"
+                    :disabled="formState.readOnly"
+                    :label="$ay.t('SeedLevel')"
+                  ></v-select>
+                </v-col>
+                <v-col cols="12" sm="6">
+                  <v-text-field
+                    v-model="obj.timeZoneOffset"
+                    :readonly="formState.readOnly"
+                    :disabled="formState.readOnly"
+                    :rules="[
+                      form().decimalValid(this, 'timeZoneOffset'),
+                      form().required(this, 'timeZoneOffset')
+                    ]"
+                    :label="$ay.t('UserTimeZoneOffset')"
+                    type="number"
+                    ref="timeZoneOffset"
+                    @input="fieldValueChanged('timeZoneOffset')"
+                  ></v-text-field>
+                </v-col>
+
+                <v-col cols="12">
+                  <v-btn
+                    :loading="seedingJobActive"
+                    :disabled="formState.readOnly"
+                    @click="generate()"
+                    class="my-8 mr-4"
+                    >{{ $ay.t("StartJob") }}</v-btn
+                  >
+                </v-col>
+              </v-col> -->
             </v-col>
-          </v-col>
-        </v-row>
-      </v-form>
-    </v-col>
-  </v-row>
+          </v-row>
+        </v-form>
+      </v-col>
+    </v-row>
+  </v-container>
 </template>
 
 <script>
@@ -106,6 +190,7 @@ export default {
   components: {},
   data() {
     return {
+      seedDialog: false,
       formCustomTemplateKey: null,
       selectLists: {
         seedLevels: []