diff --git a/src/components/designer/modeling/CodeGenerator.vue b/src/components/designer/modeling/CodeGenerator.vue
index 82407dcc..49f94c22 100644
--- a/src/components/designer/modeling/CodeGenerator.vue
+++ b/src/components/designer/modeling/CodeGenerator.vue
@@ -4136,13 +4136,15 @@ jobs:
                         // }
                         if (!set.has(item.code)) {
                             codeBag.push("# "+ item.name + ": \n" + item.code);
-                            if(option.keyword == "si" && item.name.includes("Test.java") && item.template === "https://github.com/msa-ez/topping-unit-test"){
-                                me.testFileList.push(item)
-                            }
-                            if(option.keyword == "si"){
-                                me.selectedCodeList[item.name] = item.code
-                            } else {
-                                set.add(item.code);
+                            if(option){
+                                if(option.keyword == "si" && item.name.includes("Test.java") && item.template === "https://github.com/msa-ez/topping-unit-test"){
+                                    me.testFileList.push(item)
+                                }
+                                if(option.keyword == "si"){
+                                    me.selectedCodeList[item.name] = item.code
+                                } else {
+                                    set.add(item.code);
+                                }
                             }
                         }
                         //me.$refs.codeViewer.$refs.collectedCodes = me.gptCodes   /// Very BAD
diff --git a/src/components/designer/modeling/generators/BMDialoger.vue b/src/components/designer/modeling/generators/BMDialoger.vue
index bbab825a..6047b3fc 100644
--- a/src/components/designer/modeling/generators/BMDialoger.vue
+++ b/src/components/designer/modeling/generators/BMDialoger.vue
@@ -6,13 +6,13 @@
         <div v-if="value.modelList && value.modelList.length > 0"
              class="auto-modeling-message-card"
              style="margin-top:25px; height: 100%; width: 20%;">
-            <v-col v-if="value && value.modelList && value.modelList.length > 0"
+            <!-- <v-col v-if="value && value.modelList && value.modelList.length > 0"
                    style="height: 100%; align-items: center; margin: 2px; width: 100%;"
             >
                 <div v-for="id in value.modelList" :key="id">
                     <jump-to-model-lists-card :id="id" path="business-model-canvas" @deleteModel="deleteModel" ></jump-to-model-lists-card>
                 </div>
-            </v-col>
+            </v-col> -->
         </div>
     </div>
 </template>
diff --git a/src/components/designer/modeling/generators/CJMDialoger.vue b/src/components/designer/modeling/generators/CJMDialoger.vue
index b038a640..e1adb1fd 100644
--- a/src/components/designer/modeling/generators/CJMDialoger.vue
+++ b/src/components/designer/modeling/generators/CJMDialoger.vue
@@ -28,8 +28,8 @@
                                     <div>
                                         <div style="padding-bottom:20px;">
                                             <div>
-                                                <v-icon small v-if="selectedEditPersona != persona.scenario" style="margin: 5px; float:right;" @click="editPersona(persona)">mdi-pencil</v-icon>
-                                                <v-icon small v-if="selectedEditPersona === persona.scenario" style="margin: 5px; float:right;" @click="savePersona()">mdi-content-save</v-icon>
+                                                <v-icon small v-if="!personaEditMode && selectedEditPersona != persona.scenario || selectedEditPersona != persona.scenario " style="margin: 5px; float:right;" @click="editPersona(persona)">mdi-pencil</v-icon>
+                                                <v-icon small v-if="personaEditMode && selectedEditPersona === persona.scenario" style="margin: 5px; float:right;" @click="savePersona()">mdi-content-save</v-icon>
                                             </div>
                                             <v-card-title v-if="selectedEditPersona === persona.scenario">
                                                 <v-textarea no-resize rows="1" row-height="15" v-model="persona.persona" ></v-textarea>
@@ -86,7 +86,7 @@
                         <v-btn color="primary" style="float:right; margin-top:5px;" @click="jump()">Create Model<v-icon>mdi-arrow-right</v-icon></v-btn>
                     </v-card-text>
                 </v-card>
-                <div
+                <!-- <div
                     class="auto-modeling-message-card"
                     style="margin-top:25px; height: 200px; max-width: 300%; width: 100%; overflow-y: overlay;">
                     <v-col v-if="state && state.modelList && state.modelList.length > 0"
@@ -96,7 +96,7 @@
                             <jump-to-model-lists-card :id="id" path="cjm" @deleteModel="deleteModel" ></jump-to-model-lists-card>
                         </div>
                     </v-col>
-                </div>
+                </div> -->
             </v-col>
         </div>
     </div>
@@ -166,6 +166,7 @@
                     scenario: null,
                 },
                 generator: null,
+                personaEditMode: false,
             }
         },
         methods: {
@@ -276,9 +277,11 @@
             },
             editPersona(persona){
                 this.selectedEditPersona = persona.scenario
+                this.personaEditMode = true;
             },
             savePersona(){
                 this.selectedEditPersona = null;
+                this.personaEditMode = false;
             }
         }
     }
diff --git a/src/components/designer/modeling/generators/ESDialoger.vue b/src/components/designer/modeling/generators/ESDialoger.vue
index eae862b6..3fe00449 100644
--- a/src/components/designer/modeling/generators/ESDialoger.vue
+++ b/src/components/designer/modeling/generators/ESDialoger.vue
@@ -32,6 +32,9 @@
         </div>
         <v-card v-if="!state.secondMessageIsTyping" class="auto-modeling-user-story-card">
             <v-card-subtitle>{{$t('autoModeling.explanation')}}</v-card-subtitle>
+            <v-card-actions v-if="!done" class="auto-modeling-btn-box">
+                <v-btn class="auto-modeling-btn" @click="stop()"><v-progress-circular class="auto-modeling-stop-loading-icon" indeterminate></v-progress-circular>Stop generating</v-btn>
+            </v-card-actions>
             <v-card-text class="auto-modling-textarea">
                 <v-textarea
                         v-model="value.userStory"
@@ -52,9 +55,6 @@
                 <v-btn class="auto-modeling-btn" @click="generate()"><v-icon class="auto-modeling-btn-icon">mdi-refresh</v-icon>Try again</v-btn>
                 <v-btn class="auto-modeling-btn" color="primary" @click="jump()">Create Model<v-icon class="auto-modeling-btn-icon">mdi-arrow-right</v-icon></v-btn>
             </v-card-actions>
-            <v-card-actions v-else class="auto-modeling-btn-box">
-                <v-btn class="auto-modeling-btn" @click="stop()"><v-progress-circular class="auto-modeling-stop-loading-icon" indeterminate></v-progress-circular>Stop generating</v-btn>
-            </v-card-actions>
         </v-card>
         <div
              class="auto-modeling-message-card"