diff --git a/src/components/Dashboard/Inventory/StockEvents.jsx b/src/components/Dashboard/Inventory/StockEvents.jsx
index 7ec6af7..54fd089 100644
--- a/src/components/Dashboard/Inventory/StockEvents.jsx
+++ b/src/components/Dashboard/Inventory/StockEvents.jsx
@@ -14,7 +14,7 @@ const StockEvents = () => {
   const [viewMode, setViewMode] = useViewMode('stockEvents')
 
   const [columnVisibility, setColumnVisibility] =
-    useColumnVisibility('stockEvents')
+    useColumnVisibility('stockEvent')
 
   const actionItems = {
     items: [
diff --git a/src/components/Dashboard/Management/AuditLogs.jsx b/src/components/Dashboard/Management/AuditLogs.jsx
index 2bec350..34b363c 100644
--- a/src/components/Dashboard/Management/AuditLogs.jsx
+++ b/src/components/Dashboard/Management/AuditLogs.jsx
@@ -11,7 +11,7 @@ const AuditLogs = () => {
   const tableRef = useRef()
 
   const [columnVisibility, updateColumnVisibility] =
-    useColumnVisibility('auditLogs')
+    useColumnVisibility('auditLog')
 
   const actionItems = {
     items: [
diff --git a/src/components/Dashboard/Management/CourierServices.jsx b/src/components/Dashboard/Management/CourierServices.jsx
index 6da21bf..28111d4 100644
--- a/src/components/Dashboard/Management/CourierServices.jsx
+++ b/src/components/Dashboard/Management/CourierServices.jsx
@@ -54,8 +54,8 @@ const CourierServices = () => {
             <ColumnViewButton
               type='courierService'
               loading={false}
-              collapseState={columnVisibility}
-              updateCollapseState={setColumnVisibility}
+              visibleState={columnVisibility}
+              updateVisibleState={setColumnVisibility}
             />
             <ExportListButton objectType='courierService' />
           </Space>
diff --git a/src/components/Dashboard/Management/Couriers.jsx b/src/components/Dashboard/Management/Couriers.jsx
index 0f40ab1..47d4f77 100644
--- a/src/components/Dashboard/Management/Couriers.jsx
+++ b/src/components/Dashboard/Management/Couriers.jsx
@@ -53,8 +53,8 @@ const Couriers = () => {
             <ColumnViewButton
               type='courier'
               loading={false}
-              collapseState={columnVisibility}
-              updateCollapseState={setColumnVisibility}
+              visibleState={columnVisibility}
+              updateVisibleState={setColumnVisibility}
             />
             <ExportListButton objectType='courier' />
           </Space>
diff --git a/src/components/Dashboard/Management/DocumentJobs.jsx b/src/components/Dashboard/Management/DocumentJobs.jsx
index d658b46..fc712f9 100644
--- a/src/components/Dashboard/Management/DocumentJobs.jsx
+++ b/src/components/Dashboard/Management/DocumentJobs.jsx
@@ -54,8 +54,8 @@ const DocumentJobs = () => {
             <ColumnViewButton
               type='documentJob'
               loading={false}
-              collapseState={columnVisibility}
-              updateCollapseState={setColumnVisibility}
+              visibleState={columnVisibility}
+              updateVisibleState={setColumnVisibility}
             />
             <ExportListButton objectType='documentJob' />
           </Space>
diff --git a/src/components/Dashboard/Management/DocumentPrinters.jsx b/src/components/Dashboard/Management/DocumentPrinters.jsx
index ccbdc5f..82d5418 100644
--- a/src/components/Dashboard/Management/DocumentPrinters.jsx
+++ b/src/components/Dashboard/Management/DocumentPrinters.jsx
@@ -53,8 +53,8 @@ const DocumentPrinters = () => {
             <ColumnViewButton
               type='documentPrinter'
               loading={false}
-              collapseState={columnVisibility}
-              updateCollapseState={setColumnVisibility}
+              visibleState={columnVisibility}
+              updateVisibleState={setColumnVisibility}
             />
             <ExportListButton objectType='documentPrinter' />
           </Space>
diff --git a/src/components/Dashboard/Management/DocumentTemplates.jsx b/src/components/Dashboard/Management/DocumentTemplates.jsx
index 888d72b..99e12a4 100644
--- a/src/components/Dashboard/Management/DocumentTemplates.jsx
+++ b/src/components/Dashboard/Management/DocumentTemplates.jsx
@@ -54,8 +54,8 @@ const DocumentTemplates = () => {
             <ColumnViewButton
               type='documentTemplate'
               loading={false}
-              collapseState={columnVisibility}
-              updateCollapseState={setColumnVisibility}
+              visibleState={columnVisibility}
+              updateVisibleState={setColumnVisibility}
             />
             <ExportListButton objectType='documentTemplate' />
           </Space>
diff --git a/src/components/Dashboard/Management/Files.jsx b/src/components/Dashboard/Management/Files.jsx
index 88aa92e..34986e8 100644
--- a/src/components/Dashboard/Management/Files.jsx
+++ b/src/components/Dashboard/Management/Files.jsx
@@ -42,8 +42,8 @@ const Files = () => {
             <ColumnViewButton
               type='file'
               loading={false}
-              collapseState={columnVisibility}
-              updateCollapseState={setColumnVisibility}
+              visibleState={columnVisibility}
+              updateVisibleState={setColumnVisibility}
             />
             <ExportListButton objectType='file' />
           </Space>
diff --git a/src/components/Dashboard/Management/NoteTypes.jsx b/src/components/Dashboard/Management/NoteTypes.jsx
index ffce61e..eb67c2f 100644
--- a/src/components/Dashboard/Management/NoteTypes.jsx
+++ b/src/components/Dashboard/Management/NoteTypes.jsx
@@ -54,8 +54,8 @@ const NoteTypes = () => {
             <ColumnViewButton
               type='noteType'
               loading={false}
-              collapseState={columnVisibility}
-              updateCollapseState={setColumnVisibility}
+              visibleState={columnVisibility}
+              updateVisibleState={setColumnVisibility}
             />
             <ExportListButton objectType='noteType' />
           </Space>
diff --git a/src/components/Dashboard/Management/Parts.jsx b/src/components/Dashboard/Management/Parts.jsx
index 036b831..707b54e 100644
--- a/src/components/Dashboard/Management/Parts.jsx
+++ b/src/components/Dashboard/Management/Parts.jsx
@@ -58,8 +58,8 @@ const Parts = (filter) => {
             <ColumnViewButton
               type='part'
               loading={false}
-              collapseState={columnVisibility}
-              updateCollapseState={setColumnVisibility}
+              visibleState={columnVisibility}
+              updateVisibleState={setColumnVisibility}
             />
             <ExportListButton objectType='part' />
           </Space>
diff --git a/src/components/Dashboard/Management/Products.jsx b/src/components/Dashboard/Management/Products.jsx
index 89f6e6c..2c78b62 100644
--- a/src/components/Dashboard/Management/Products.jsx
+++ b/src/components/Dashboard/Management/Products.jsx
@@ -231,7 +231,7 @@ const Products = () => {
   ]
 
   const [columnVisibility, updateColumnVisibility] = useColumnVisibility(
-    'Products',
+    'product',
     columns
   )
 
diff --git a/src/components/Dashboard/Management/TaxRates.jsx b/src/components/Dashboard/Management/TaxRates.jsx
index 29e4bc1..e343c0f 100644
--- a/src/components/Dashboard/Management/TaxRates.jsx
+++ b/src/components/Dashboard/Management/TaxRates.jsx
@@ -53,8 +53,8 @@ const TaxRates = () => {
             <ColumnViewButton
               type='taxRate'
               loading={false}
-              collapseState={columnVisibility}
-              updateCollapseState={setColumnVisibility}
+              visibleState={columnVisibility}
+              updateVisibleState={setColumnVisibility}
             />
             <ExportListButton objectType='taxRate' />
           </Space>
diff --git a/src/components/Dashboard/Management/Vendors.jsx b/src/components/Dashboard/Management/Vendors.jsx
index 200495b..aed85c4 100644
--- a/src/components/Dashboard/Management/Vendors.jsx
+++ b/src/components/Dashboard/Management/Vendors.jsx
@@ -53,8 +53,8 @@ const Vendors = () => {
             <ColumnViewButton
               type='vendor'
               loading={false}
-              collapseState={columnVisibility}
-              updateCollapseState={setColumnVisibility}
+              visibleState={columnVisibility}
+              updateVisibleState={setColumnVisibility}
             />
             <ExportListButton objectType='vendor' />
           </Space>
diff --git a/src/components/Dashboard/hooks/useColumnVisibility.jsx b/src/components/Dashboard/hooks/useColumnVisibility.jsx
index e3d49b1..7c4048c 100644
--- a/src/components/Dashboard/hooks/useColumnVisibility.jsx
+++ b/src/components/Dashboard/hooks/useColumnVisibility.jsx
@@ -1,13 +1,22 @@
 import { useState, useEffect } from 'react'
 import { getModelByName } from '../../../database/ObjectModels'
 
-const useColumnVisibility = (type) => {
+const useColumnVisibility = (type, customColumns) => {
   const getInitialVisibility = () => {
-    const stored = sessionStorage.getItem(`${type}_columnVisibility`)
+    const storageKey = `${type}_columnVisibility`
+    const stored = sessionStorage.getItem(storageKey)
     if (stored) {
       return JSON.parse(stored)
     }
     // Default visibility - all columns visible
+    if (customColumns && Array.isArray(customColumns)) {
+      return customColumns.reduce((acc, col) => {
+        if (col.key) {
+          acc[col.key] = true
+        }
+        return acc
+      }, {})
+    }
     const model = getModelByName(type)
     const columns = model.columns || []
     return columns.reduce((acc, columnName) => {