diff --git a/src/database/models/DocumentJob.js b/src/database/models/DocumentJob.js
index 386f607..35c864f 100644
--- a/src/database/models/DocumentJob.js
+++ b/src/database/models/DocumentJob.js
@@ -37,8 +37,8 @@ export const DocumentJob = {
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
       }
-    }
-,    {
+    },
+    {
       name: 'cancelEdit',
       label: 'Cancel Edits',
       type: 'page',
diff --git a/src/database/models/DocumentPrinter.js b/src/database/models/DocumentPrinter.js
index 09fd245..9ee3105 100644
--- a/src/database/models/DocumentPrinter.js
+++ b/src/database/models/DocumentPrinter.js
@@ -36,8 +36,8 @@ export const DocumentPrinter = {
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
       }
-    }
-,    {
+    },
+    {
       name: 'cancelEdit',
       label: 'Cancel Edits',
       type: 'page',
diff --git a/src/database/models/DocumentSize.js b/src/database/models/DocumentSize.js
index 2cffc22..f1d7465 100644
--- a/src/database/models/DocumentSize.js
+++ b/src/database/models/DocumentSize.js
@@ -36,8 +36,8 @@ export const DocumentSize = {
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
       }
-    }
-,    {
+    },
+    {
       name: 'cancelEdit',
       label: 'Cancel Edits',
       type: 'page',
diff --git a/src/database/models/DocumentTemplate.js b/src/database/models/DocumentTemplate.js
index c292c77..79a8590 100644
--- a/src/database/models/DocumentTemplate.js
+++ b/src/database/models/DocumentTemplate.js
@@ -45,8 +45,8 @@ export const DocumentTemplate = {
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
       }
-    }
-,    {
+    },
+    {
       name: 'cancelEdit',
       label: 'Cancel Edits',
       type: 'page',
diff --git a/src/database/models/FilamentProfile.js b/src/database/models/FilamentProfile.js
index 6c5b06a..1276365 100644
--- a/src/database/models/FilamentProfile.js
+++ b/src/database/models/FilamentProfile.js
@@ -34,7 +34,9 @@ export const FilamentProfile = {
       label: 'Edit',
       row: true,
       icon: EditIcon,
-      visible: (objectData) => !objectData?._isEditing
+      visible: (objectData) => {
+        return !(objectData?._isEditing && objectData?._isEditing == true)
+      }
     },
     {
       name: 'cancelEdit',
diff --git a/src/database/models/FilamentStock.js b/src/database/models/FilamentStock.js
index 3ab9f27..473d202 100644
--- a/src/database/models/FilamentStock.js
+++ b/src/database/models/FilamentStock.js
@@ -5,6 +5,9 @@ const FilamentStockInfo = lazy(
 )
 import FilamentStockIcon from '../../components/Icons/FilamentStockIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import EditIcon from '../../components/Icons/EditIcon'
+import CheckIcon from '../../components/Icons/CheckIcon'
+import XMarkIcon from '../../components/Icons/XMarkIcon'
 
 export const FilamentStock = {
   name: 'filamentStock',
@@ -22,7 +25,38 @@ export const FilamentStock = {
       default: true,
       row: true,
       icon: InfoCircleIcon
-    }
+    },
+    {
+      name: 'edit',
+      type: 'page',
+      pageName: 'info',
+      label: 'Edit',
+      row: true,
+      icon: EditIcon,
+      visible: (objectData) => {
+        return !(objectData?._isEditing && objectData?._isEditing == true)
+      }
+    },
+    {
+      name: 'cancelEdit',
+      label: 'Cancel Edits',
+      type: 'page',
+      pageName: 'info',
+      icon: XMarkIcon,
+      visible: (objectData) => {
+        return objectData?._isEditing && objectData?._isEditing == true
+      }
+    },
+    {
+      name: 'finishEdit',
+      label: 'Save Edits',
+      type: 'page',
+      pageName: 'info',
+      icon: CheckIcon,
+      visible: (objectData) => {
+        return objectData?._isEditing && objectData?._isEditing == true
+      }
+    },
   ],
   pages: [
     {
diff --git a/src/database/models/GCodeFile.js b/src/database/models/GCodeFile.js
index 24dc3ef..54221a2 100644
--- a/src/database/models/GCodeFile.js
+++ b/src/database/models/GCodeFile.js
@@ -54,8 +54,8 @@ export const GCodeFile = {
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
       }
-    }
-,    {
+    },
+    {
       name: 'cancelEdit',
       label: 'Cancel Edits',
       type: 'page',
diff --git a/src/database/models/Invoice.js b/src/database/models/Invoice.js
index d9ec180..b0dceae 100644
--- a/src/database/models/Invoice.js
+++ b/src/database/models/Invoice.js
@@ -42,6 +42,7 @@ export const Invoice = {
       type: 'page',
       pageName: 'info',
       label: 'Edit',
+      row: true,
       icon: EditIcon,
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
diff --git a/src/database/models/Job.js b/src/database/models/Job.js
index 87a9a23..19bb645 100644
--- a/src/database/models/Job.js
+++ b/src/database/models/Job.js
@@ -36,6 +36,7 @@ export const Job = {
       type: 'page',
       pageName: 'info',
       label: 'Edit',
+      row: true,
       icon: EditIcon,
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
diff --git a/src/database/models/Note.js b/src/database/models/Note.js
index 4c9297a..b7ce4c4 100644
--- a/src/database/models/Note.js
+++ b/src/database/models/Note.js
@@ -1,5 +1,8 @@
 import NoteIcon from '../../components/Icons/NoteIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import EditIcon from '../../components/Icons/EditIcon'
+import CheckIcon from '../../components/Icons/CheckIcon'
+import XMarkIcon from '../../components/Icons/XMarkIcon'
 
 export const Note = {
   name: 'note',
@@ -15,6 +18,30 @@ export const Note = {
       row: true,
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/management/notes/info?noteId=${_id}`
+    },
+    {
+      name: 'edit',
+      label: 'Edit',
+      icon: EditIcon,
+      visible: (objectData) => {
+        return !(objectData?._isEditing && objectData?._isEditing == true)
+      }
+    },
+    {
+      name: 'cancelEdit',
+      label: 'Cancel Edits',
+      icon: XMarkIcon,
+      visible: (objectData) => {
+        return objectData?._isEditing && objectData?._isEditing == true
+      }
+    },
+    {
+      name: 'finishEdit',
+      label: 'Save Edits',
+      icon: CheckIcon,
+      visible: (objectData) => {
+        return objectData?._isEditing && objectData?._isEditing == true
+      }
     }
   ],
   properties: [
diff --git a/src/database/models/NoteType.js b/src/database/models/NoteType.js
index abb7ad8..66c3d22 100644
--- a/src/database/models/NoteType.js
+++ b/src/database/models/NoteType.js
@@ -36,8 +36,8 @@ export const NoteType = {
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
       }
-    }
-,    {
+    },
+    {
       name: 'cancelEdit',
       label: 'Cancel Edits',
       type: 'page',
diff --git a/src/database/models/OrderItem.js b/src/database/models/OrderItem.js
index 5d65f99..c089e52 100644
--- a/src/database/models/OrderItem.js
+++ b/src/database/models/OrderItem.js
@@ -32,6 +32,7 @@ export const OrderItem = {
       type: 'page',
       pageName: 'info',
       label: 'Edit',
+      row: true,
       icon: EditIcon,
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
diff --git a/src/database/models/PartStock.js b/src/database/models/PartStock.js
index ecffb66..1c52afa 100644
--- a/src/database/models/PartStock.js
+++ b/src/database/models/PartStock.js
@@ -5,6 +5,9 @@ const PartStockInfo = lazy(
 )
 import PartStockIcon from '../../components/Icons/PartStockIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import EditIcon from '../../components/Icons/EditIcon'
+import CheckIcon from '../../components/Icons/CheckIcon'
+import XMarkIcon from '../../components/Icons/XMarkIcon'
 
 export const PartStock = {
   name: 'partStock',
@@ -22,7 +25,38 @@ export const PartStock = {
       default: true,
       row: true,
       icon: InfoCircleIcon
-    }
+    },
+    {
+      name: 'edit',
+      type: 'page',
+      pageName: 'info',
+      label: 'Edit',
+      row: true,
+      icon: EditIcon,
+      visible: (objectData) => {
+        return !(objectData?._isEditing && objectData?._isEditing == true)
+      }
+    },
+    {
+      name: 'cancelEdit',
+      label: 'Cancel Edits',
+      type: 'page',
+      pageName: 'info',
+      icon: XMarkIcon,
+      visible: (objectData) => {
+        return objectData?._isEditing && objectData?._isEditing == true
+      }
+    },
+    {
+      name: 'finishEdit',
+      label: 'Save Edits',
+      type: 'page',
+      pageName: 'info',
+      icon: CheckIcon,
+      visible: (objectData) => {
+        return objectData?._isEditing && objectData?._isEditing == true
+      }
+    },
   ],
   pages: [
     {
diff --git a/src/database/models/Payment.js b/src/database/models/Payment.js
index e55d0d9..2dc321e 100644
--- a/src/database/models/Payment.js
+++ b/src/database/models/Payment.js
@@ -44,6 +44,7 @@ export const Payment = {
       type: 'page',
       pageName: 'info',
       label: 'Edit',
+      row: true,
       icon: EditIcon,
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
diff --git a/src/database/models/PrinterProfile.js b/src/database/models/PrinterProfile.js
index 3319fe1..eba63e2 100644
--- a/src/database/models/PrinterProfile.js
+++ b/src/database/models/PrinterProfile.js
@@ -299,7 +299,9 @@ export const PrinterProfile = {
       label: 'Edit',
       row: true,
       icon: EditIcon,
-      visible: (objectData) => !objectData?._isEditing
+      visible: (objectData) => {
+        return !(objectData?._isEditing && objectData?._isEditing == true)
+      }
     },
     {
       name: 'cancelEdit',
diff --git a/src/database/models/ProductStock.js b/src/database/models/ProductStock.js
index 088d459..5613136 100644
--- a/src/database/models/ProductStock.js
+++ b/src/database/models/ProductStock.js
@@ -35,6 +35,7 @@ export const ProductStock = {
       type: 'page',
       pageName: 'info',
       label: 'Edit',
+      row: true,
       icon: EditIcon,
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
diff --git a/src/database/models/PurchaseOrder.js b/src/database/models/PurchaseOrder.js
index fdd9349..6a89adf 100644
--- a/src/database/models/PurchaseOrder.js
+++ b/src/database/models/PurchaseOrder.js
@@ -51,6 +51,7 @@ export const PurchaseOrder = {
       type: 'page',
       pageName: 'info',
       label: 'Edit',
+      row: true,
       icon: EditIcon,
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
diff --git a/src/database/models/SalesOrder.js b/src/database/models/SalesOrder.js
index d6e5563..ef0e5a7 100644
--- a/src/database/models/SalesOrder.js
+++ b/src/database/models/SalesOrder.js
@@ -51,6 +51,7 @@ export const SalesOrder = {
       type: 'page',
       pageName: 'info',
       label: 'Edit',
+      row: true,
       icon: EditIcon,
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
diff --git a/src/database/models/Shipment.js b/src/database/models/Shipment.js
index a7e1a23..484824e 100644
--- a/src/database/models/Shipment.js
+++ b/src/database/models/Shipment.js
@@ -41,6 +41,7 @@ export const Shipment = {
       type: 'page',
       pageName: 'info',
       label: 'Edit',
+      row: true,
       icon: EditIcon,
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
diff --git a/src/database/models/StockAudit.js b/src/database/models/StockAudit.js
index 4640d46..9e54c58 100644
--- a/src/database/models/StockAudit.js
+++ b/src/database/models/StockAudit.js
@@ -5,6 +5,9 @@ const StockAuditInfo = lazy(
 )
 import StockAuditIcon from '../../components/Icons/StockAuditIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import EditIcon from '../../components/Icons/EditIcon'
+import CheckIcon from '../../components/Icons/CheckIcon'
+import XMarkIcon from '../../components/Icons/XMarkIcon'
 
 export const StockAudit = {
   name: 'stockAudit',
@@ -22,7 +25,38 @@ export const StockAudit = {
       default: true,
       row: true,
       icon: InfoCircleIcon
-    }
+    },
+    {
+      name: 'edit',
+      type: 'page',
+      pageName: 'info',
+      label: 'Edit',
+      row: true,
+      icon: EditIcon,
+      visible: (objectData) => {
+        return !(objectData?._isEditing && objectData?._isEditing == true)
+      }
+    },
+    {
+      name: 'cancelEdit',
+      label: 'Cancel Edits',
+      type: 'page',
+      pageName: 'info',
+      icon: XMarkIcon,
+      visible: (objectData) => {
+        return objectData?._isEditing && objectData?._isEditing == true
+      }
+    },
+    {
+      name: 'finishEdit',
+      label: 'Save Edits',
+      type: 'page',
+      pageName: 'info',
+      icon: CheckIcon,
+      visible: (objectData) => {
+        return objectData?._isEditing && objectData?._isEditing == true
+      }
+    },
   ],
   pages: [
     {
diff --git a/src/database/models/StockLocation.js b/src/database/models/StockLocation.js
index d44d38d..0fe6d8c 100644
--- a/src/database/models/StockLocation.js
+++ b/src/database/models/StockLocation.js
@@ -5,6 +5,9 @@ const StockLocationInfo = lazy(
 )
 import StockLocationIcon from '../../components/Icons/StockLocationIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import EditIcon from '../../components/Icons/EditIcon'
+import CheckIcon from '../../components/Icons/CheckIcon'
+import XMarkIcon from '../../components/Icons/XMarkIcon'
 
 export const StockLocation = {
   name: 'stockLocation',
@@ -22,7 +25,38 @@ export const StockLocation = {
       default: true,
       row: true,
       icon: InfoCircleIcon
-    }
+    },
+    {
+      name: 'edit',
+      type: 'page',
+      pageName: 'info',
+      label: 'Edit',
+      row: true,
+      icon: EditIcon,
+      visible: (objectData) => {
+        return !(objectData?._isEditing && objectData?._isEditing == true)
+      }
+    },
+    {
+      name: 'cancelEdit',
+      label: 'Cancel Edits',
+      type: 'page',
+      pageName: 'info',
+      icon: XMarkIcon,
+      visible: (objectData) => {
+        return objectData?._isEditing && objectData?._isEditing == true
+      }
+    },
+    {
+      name: 'finishEdit',
+      label: 'Save Edits',
+      type: 'page',
+      pageName: 'info',
+      icon: CheckIcon,
+      visible: (objectData) => {
+        return objectData?._isEditing && objectData?._isEditing == true
+      }
+    },
   ],
   pages: [
     {
diff --git a/src/database/models/StockTransfer.js b/src/database/models/StockTransfer.js
index 230cf97..6137cfc 100644
--- a/src/database/models/StockTransfer.js
+++ b/src/database/models/StockTransfer.js
@@ -35,6 +35,7 @@ export const StockTransfer = {
       type: 'page',
       pageName: 'info',
       label: 'Edit',
+      row: true,
       icon: EditIcon,
       visible: (objectData) => {
         return !(objectData?._isEditing && objectData?._isEditing == true)
diff --git a/src/database/models/SubJob.js b/src/database/models/SubJob.js
index 45e61a8..4129b5e 100644
--- a/src/database/models/SubJob.js
+++ b/src/database/models/SubJob.js
@@ -61,7 +61,7 @@ export const SubJob = {
     'createdAt',
     'updatedAt'
   ],
-  sorters: ['createdAt','state','updatedAt'],
+  sorters: ['createdAt', 'state', 'updatedAt'],
   group: ['job'],
   properties: [
     {