diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 0ae88cc..4fb1957 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,6 +1,6 @@
 {
-    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=ba0468b2a7b3ddd0a861",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=1b0d17349d40abecc170",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=da887fb2dfe98868a044",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=662467cf65cdd52ce013"
+    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=debe5c0904ec24cfe30f",
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=1ec961066abc3199652a",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=65d0eb056bc9f22c762a",
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=e26294d6e0c6bab80aad"
 }
diff --git a/resources/js/Global/store/modules/modal/actions.js b/resources/js/Global/store/modules/modal/actions.js
index dd676ab..73168b3 100644
--- a/resources/js/Global/store/modules/modal/actions.js
+++ b/resources/js/Global/store/modules/modal/actions.js
@@ -7,13 +7,6 @@ export default {
             rootState.modal[modalArray[0]] = true;
         }
     },
-    async $_openModalCallback ({ dispatch }, data) {
-        dispatch(data.module + '/openModal' + data.type.charAt(0).toUpperCase() + data.type.slice(1), data, { root: true });
-    },
-    $_closeModalCallback: ({ dispatch }, data) => {
-        dispatch(data.module + '/closeModal' + data.type.charAt(0).toUpperCase() + data.type.slice(1) , data, { root: true });
-    },
-
     $_closeModal: ({ state, rootState }, modal) => {
         let modalArray = modal.split("/");
         if (modalArray.length == 2) {
@@ -24,14 +17,24 @@ export default {
         state.properties = null;
     },
 
+    
+    $_openModalCallback ({ dispatch }, data) {
+        dispatch(data.module + '/openModal' + data.type.charAt(0).toUpperCase() + data.type.slice(1), data, { root: true });
+    },
+    $_closeModalCallback: ({ dispatch }, data) => {
+        dispatch(data.module + '/closeModal' + data.type.charAt(0).toUpperCase() + data.type.slice(1) , data, { root: true });
+    },
+
+
     $_openModalStack({ state, rootState }, data) { // data: {name, rel, model, form_data, data, modal_pop_data, type}
+        data.name = 'modal_' + data.name;
         if (state.modals.findIndex(x => x.name == data.name) == -1) {
             state.modals.push(data);
             let module = data.name.split("_");
-
-            rootState[module[0]].relation = data.rel ? data.rel : {};
-            rootState[module[0]].currentModel = data.model ? data.model : {};
-            rootState[module[0]].page_type = data.page_type ? data.page_type : '';
+            
+            rootState[module[1]].relation = data.rel ? data.rel : {};
+            rootState[module[1]].currentModel = data.model ? data.model : {};
+            rootState[module[1]].page_type = data.page_type ? data.page_type : 'modal';
         }
     },
     $_closeModalStack({ state, rootState }) {
@@ -41,9 +44,9 @@ export default {
                 state.modals[state.modals.length - 2]['last_modal_data'] = last_data;
             }
             let module = last_data.name.split("_");
-            rootState[module[0]].relation = {};
-            rootState[module[0]].currentModel =  {};
-            rootState[module[0]].page_type = '';
+            rootState[module[1]].relation = {};
+            rootState[module[1]].currentModel =  {};
+            rootState[module[1]].page_type = '';
             state.modals.pop();
         }
     },
diff --git a/resources/js/Global/store/modules/modal/getters.js b/resources/js/Global/store/modules/modal/getters.js
index 30563ff..7dbdde5 100644
--- a/resources/js/Global/store/modules/modal/getters.js
+++ b/resources/js/Global/store/modules/modal/getters.js
@@ -9,12 +9,18 @@ export default {
     },
     getDialogProperties:(state) => state.dialogProperties,
     getDialogType:(state) => state.dialogType,
-
-    getActiveModal:(state) => state.modals[state.modals.length],
-    getModalsName:(state) => state.modals.map(x => x.name),
-    getModals:(state) => state.modals.map(x => x.name),
+    
+    isModalStack: (state) => (...names) => {
+        for (const name of names) {
+            if (state.modals.findIndex(x => x.name == name) != -1) {
+                return true;
+            }
+        }
+        return false;
+    },
     getModal:(state) => (name) => state.modals[state.modals.findIndex(x => x.name == name)],
+    
+    getModals:(state) => state.modals,
+    getActiveModal:(state) => state.modals[state.modals.length],
     isActiveModal:(state) => (name) => state.modals[state.modals.length].name == name,
-    isInModals:(state) => (name) => state.modals.findIndex(x => x.name == name) != -1 ,
-
 };