diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 04276dbb..d468d082 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -54,6 +54,41 @@
     "description": ""
   },
 
+  "customPrompts_btnSave": {
+    "message": "Save All",
+    "description": ""
+  },
+
+  "customPrompts_btnNew": {
+    "message": "Add New",
+    "description": ""
+  },
+
+  "customPrompts_btnAddNewCommit": {
+    "message": "Add the Prompt",
+    "description": ""
+  },
+
+  "customPrompts_add_to_menu": {
+    "message": "Add to menu",
+    "description": ""
+  },
+
+  "customPrompts_add_to_menu_always": {
+    "message": "Always",
+    "description": ""
+  },
+
+  "customPrompts_add_to_menu_reading": {
+    "message": "Reading an email",
+    "description": ""
+  },
+
+  "customPrompts_add_to_menu_composing": {
+    "message": "Composing an email",
+    "description": ""
+  },
+
   "chatgpt_win_working": {
     "message": "Work in progress...",
     "description": ""
diff --git a/customprompts/mzta-custom-prompts.html b/customprompts/mzta-custom-prompts.html
index 5ced4648..a05d9077 100644
--- a/customprompts/mzta-custom-prompts.html
+++ b/customprompts/mzta-custom-prompts.html
@@ -15,17 +15,20 @@
       <button id="btnNew">__MSG_customPrompts_btnNew__</button>
     </div>
     <div id="formNew">
+        <label for="txtIdNew">ID:</label>
+        <input type="text" id="txtIdNew" name="id"> [Must be unique and without spaces]
+        <br>
         <label for="txtNameNew">Name:</label>
         <input type="text" id="txtNameNew" name="name">
         <br>
         <label for="txtTextNew">Text:</label>
         <textarea id="txtTextNew" name="text"></textarea>
         <br>
-        <label for="selectTypeNew">Type:</label>
+        <label for="selectTypeNew">__MSG_customPrompts_add_to_menu__:</label>
         <select id="selectTypeNew" name="type">
-          <option value="0">Always show</option>
-          <option value="1">When reading an email</option>
-          <option value="2">When composing a mail</option>
+          <option value="0">__MSG_customPrompts_add_to_menu_always__</option>
+          <option value="1">__MSG_customPrompts_add_to_menu_reading__</option>
+          <option value="2">__MSG_customPrompts_add_to_menu_composing__</option>
         </select>
         <br>
         <label for="selectActionNew">Action:</label>
diff --git a/customprompts/mzta-custom-prompts.js b/customprompts/mzta-custom-prompts.js
index f509c611..53e9937b 100644
--- a/customprompts/mzta-custom-prompts.js
+++ b/customprompts/mzta-custom-prompts.js
@@ -19,10 +19,11 @@
 import { getPrompts } from "../js/mzta-prompts.js";
 
 var somethingChanged = false;
+var positionMax = 0;
 
 document.addEventListener('DOMContentLoaded', async () => {
     let options = {
-        valueNames: [ { data: ['idnum'] }, 'id', 'name', 'text', 'type', 'action', { name: 'need_selected', attr: 'checked_val'}, { name: 'need_signature', attr: 'checked_val'}, { name: 'need_custom_text', attr: 'checked_val'}, { name: 'is_default', attr: 'is_default_val'}, { name: 'enabled', attr: 'checked_val'} ],
+        valueNames: [ { data: ['idnum'] }, 'id', 'name', 'text', 'type', 'action', 'position', { name: 'need_selected', attr: 'checked_val'}, { name: 'need_signature', attr: 'checked_val'}, { name: 'need_custom_text', attr: 'checked_val'}, { name: 'is_default', attr: 'is_default_val'}, { name: 'enabled', attr: 'checked_val'} ],
         // item: `<tr>
         //     <td class="id"></td>
         //     <td class="name"></td>
@@ -45,6 +46,10 @@ document.addEventListener('DOMContentLoaded', async () => {
                 <td class="name"></td>
                 <td class="text"></td>
                 <td class="properties">
+                    Type: ` + values.type + `
+                    <br>
+                    Action: ` + values.action + `
+                    <br>
                     <input type="checkbox" class="need_selected"` + ((values.is_default == 1) ? 'disabled':'') + `> Need Select
                     <br>
                     <input type="checkbox" class="need_signature" ` + ((values.is_default == 1) ? 'disabled':'') + `> Need Signature
@@ -59,6 +64,7 @@ document.addEventListener('DOMContentLoaded', async () => {
                </td>
             </tr>`;
             //console.log('>>>>>>>> values.name: ' + JSON.stringify(values.name));
+            positionMax = Math.max(positionMax, values.position);
             return output;
         }
     };
@@ -74,8 +80,9 @@ document.addEventListener('DOMContentLoaded', async () => {
 
     const btnSave = document.getElementById('btnSave');
     btnSave.disabled = true;
-    btnSave.addEventListener('click', (e) => {      //TODO
+    btnSave.addEventListener('click', (e) => {
         e.preventDefault();
+        saveAll();
     });
 
     const btnNew = document.getElementById('btnNew');
@@ -84,11 +91,6 @@ document.addEventListener('DOMContentLoaded', async () => {
         document.getElementById('formNew').style.display = 'block';
     });
 
-    const btnAddNew = document.getElementById('btnNew');
-    btnAddNew.addEventListener('click', (e) => {    //TODO
-        e.preventDefault();
-    });
-
     document.querySelectorAll('input').forEach(element => {
         element.addEventListener('change', (e) => {
             e.preventDefault();
@@ -109,16 +111,64 @@ document.addEventListener('DOMContentLoaded', async () => {
     }
 
     i18n.updateDocument();
+
+    //To add a new item
+    var txtIdNew = document.getElementById('txtIdNew');
+    var txtNameNew = document.getElementById('txtNameNew');
+    var txtTextNew = document.getElementById('txtTextNew');
+    var selectTypeNew = document.getElementById('selectTypeNew');
+    var selectActionNew = document.getElementById('selectActionNew');
+    var selectNeedSelectedNew = document.getElementById('selectNeedSelectedNew');
+    var selectNeedSignatureNew = document.getElementById('selectNeedSignatureNew');
+    var selectNeedCustomTextNew = document.getElementById('selectNeedCustomTextNew');
+
+    const btnAddNew = document.getElementById('btnAddNew');
+    btnAddNew.addEventListener('click', (e) => {    //TODO
+        e.preventDefault();
+        //TODO check the id must be unique and without spaces
+        promptsList.add({
+            id: txtIdNew.value,
+            name: txtNameNew.value,
+            text: txtTextNew.value,
+            type: selectTypeNew.value,
+            action: selectActionNew.value,
+            need_selected: selectNeedSelectedNew.value,
+            need_signature: selectNeedSignatureNew.value,
+            need_custom_text: selectNeedCustomTextNew.value,
+            enabled: 1,
+            position: positionMax + 1,
+            is_default: 0,
+        });
+        //checkSelectedBoxes([selectTypeNew, selectActionNew, selectNeedSelectedNew, selectNeedSignatureNew, selectNeedCustomTextNew]);
+        checkSelectedBoxes();
+        clearFields();
+    });
+
+
 }, { once: true });
   
 
-function checkSelectedBoxes() {
-    const checkboxes = [
-        ...document.querySelectorAll('.need_selected[type="checkbox"]'),
-        ...document.querySelectorAll('.need_signature[type="checkbox"]'),
-        ...document.querySelectorAll('.need_custom_text[type="checkbox"]'),
-        ...document.querySelectorAll('.enabled[type="checkbox"]'),
-    ];
+function clearFields() {
+    document.getElementById('txtIdNew').value = '';
+    document.getElementById('txtNameNew').value = '';
+    document.getElementById('txtTextNew').value = '';
+    document.getElementById('selectTypeNew').value = '0';
+    document.getElementById('selectActionNew').value = '0';
+    document.getElementById('selectNeedSelectedNew').value = '0';
+    document.getElementById('selectNeedSignatureNew').value = '0';
+    document.getElementById('selectNeedCustomTextNew').value = '0';
+    document.getElementById('formNew').style.display = 'none';
+}
+
+function checkSelectedBoxes(checkboxes = null) {
+    if(checkboxes == null){
+        checkboxes = [
+            ...document.querySelectorAll('.need_selected[type="checkbox"]'),
+            ...document.querySelectorAll('.need_signature[type="checkbox"]'),
+            ...document.querySelectorAll('.need_custom_text[type="checkbox"]'),
+            ...document.querySelectorAll('.enabled[type="checkbox"]'),
+        ];
+    }
 
     // Iterate through the checkboxes
     checkboxes.forEach(checkbox => {
@@ -132,9 +182,14 @@ function checkSelectedBoxes() {
     });
 }
 
-window.addEventListener('beforeunload', function (event) {
-    // Check if any changes have been made
-    if (somethingChanged) {
-        event.preventDefault();
-    }
-});
\ No newline at end of file
+//Save all prompts
+function saveAll() {
+    //TODO
+}
+
+// window.addEventListener('beforeunload', function (event) {
+//     // Check if any changes have been made
+//     if (somethingChanged) {
+//         event.preventDefault();
+//     }
+// });
\ No newline at end of file