diff --git a/src/frontend/src/components/buttons/ActionButton.tsx b/src/frontend/src/components/buttons/ActionButton.tsx
index b9bfa90898..148c0f2102 100644
--- a/src/frontend/src/components/buttons/ActionButton.tsx
+++ b/src/frontend/src/components/buttons/ActionButton.tsx
@@ -20,8 +20,10 @@ export type ActionButtonProps = {
  * Construct a simple action button with consistent styling
  */
 export function ActionButton(props: ActionButtonProps) {
+  const hidden = props.hidden ?? false;
+
   return (
-    !props.hidden && (
+    !hidden && (
       <Tooltip
         key={`tooltip-${props.key}`}
         disabled={!props.tooltip && !props.text}
diff --git a/src/frontend/src/components/nav/SearchDrawer.tsx b/src/frontend/src/components/nav/SearchDrawer.tsx
index 521b57ce7a..3a810b1f1d 100644
--- a/src/frontend/src/components/nav/SearchDrawer.tsx
+++ b/src/frontend/src/components/nav/SearchDrawer.tsx
@@ -234,7 +234,6 @@ export function SearchDrawer({
 
   // Re-fetch data whenever the search term is updated
   useEffect(() => {
-    // TODO: Implement search functionality
     searchQuery.refetch();
   }, [searchText]);
 
diff --git a/src/frontend/src/components/render/Part.tsx b/src/frontend/src/components/render/Part.tsx
index 48af44aef6..fe9d9562ee 100644
--- a/src/frontend/src/components/render/Part.tsx
+++ b/src/frontend/src/components/render/Part.tsx
@@ -1,3 +1,4 @@
+import { t } from '@lingui/macro';
 import { ReactNode } from 'react';
 
 import { RenderInlineModel } from './Instance';
@@ -6,10 +7,13 @@ import { RenderInlineModel } from './Instance';
  * Inline rendering of a single Part instance
  */
 export function RenderPart({ instance }: { instance: any }): ReactNode {
+  const stock = t`Stock` + `: ${instance.in_stock}`;
+
   return (
     <RenderInlineModel
       primary={instance.name}
       secondary={instance.description}
+      suffix={stock}
       image={instance.thumnbnail || instance.image}
     />
   );
diff --git a/src/frontend/src/components/tables/InvenTreeTable.tsx b/src/frontend/src/components/tables/InvenTreeTable.tsx
index cf8684b311..3409b0e319 100644
--- a/src/frontend/src/components/tables/InvenTreeTable.tsx
+++ b/src/frontend/src/components/tables/InvenTreeTable.tsx
@@ -46,8 +46,8 @@ const defaultPageSize: number = 25;
  * @param enableRefresh : boolean - Enable refresh actions
  * @param pageSize : number - Number of records per page
  * @param barcodeActions : any[] - List of barcode actions
- * @param customFilters : TableFilter[] - List of custom filters
- * @param customActionGroups : any[] - List of custom action groups
+ * @param tableFilters : TableFilter[] - List of custom filters
+ * @param tableActions : any[] - List of custom action groups
  * @param printingActions : any[] - List of printing actions
  * @param dataFormatter : (data: any) => any - Callback function to reformat data returned by server (if not in default format)
  * @param rowActions : (record: any) => RowAction[] - Callback function to generate row actions
@@ -66,8 +66,8 @@ export type InvenTreeTableProps<T = any> = {
   enableRefresh?: boolean;
   pageSize?: number;
   barcodeActions?: any[];
-  customFilters?: TableFilter[];
-  customActionGroups?: React.ReactNode[];
+  tableFilters?: TableFilter[];
+  tableActions?: React.ReactNode[];
   printingActions?: any[];
   idAccessor?: string;
   dataFormatter?: (data: T) => any;
@@ -91,8 +91,8 @@ const defaultInvenTreeTableProps: InvenTreeTableProps = {
   defaultSortColumn: '',
   printingActions: [],
   barcodeActions: [],
-  customFilters: [],
-  customActionGroups: [],
+  tableFilters: [],
+  tableActions: [],
   idAccessor: 'pk',
   onRowClick: (record: any, index: number, event: any) => {}
 };
@@ -425,9 +425,9 @@ export function InvenTreeTable<T = any>({
   return (
     <>
       {tableProps.enableFilters &&
-        (tableProps.customFilters?.length ?? 0) > 0 && (
+        (tableProps.tableFilters?.length ?? 0) > 0 && (
           <FilterSelectDrawer
-            availableFilters={tableProps.customFilters ?? []}
+            availableFilters={tableProps.tableFilters ?? []}
             tableState={tableState}
             opened={filtersVisible}
             onClose={() => setFiltersVisible(false)}
@@ -436,7 +436,7 @@ export function InvenTreeTable<T = any>({
       <Stack spacing="sm">
         <Group position="apart">
           <Group position="left" key="custom-actions" spacing={5}>
-            {tableProps.customActionGroups?.map((group, idx) => (
+            {tableProps.tableActions?.map((group, idx) => (
               <Fragment key={idx}>{group}</Fragment>
             ))}
             {(tableProps.barcodeActions?.length ?? 0 > 0) && (
@@ -490,7 +490,7 @@ export function InvenTreeTable<T = any>({
               />
             )}
             {tableProps.enableFilters &&
-              (tableProps.customFilters?.length ?? 0 > 0) && (
+              (tableProps.tableFilters?.length ?? 0 > 0) && (
                 <Indicator
                   size="xs"
                   label={tableState.activeFilters.length}
diff --git a/src/frontend/src/components/tables/bom/BomTable.tsx b/src/frontend/src/components/tables/bom/BomTable.tsx
index 95139857d6..9b86d5b4bf 100644
--- a/src/frontend/src/components/tables/bom/BomTable.tsx
+++ b/src/frontend/src/components/tables/bom/BomTable.tsx
@@ -363,7 +363,7 @@ export function BomTable({
           part_detail: true,
           sub_part_detail: true
         },
-        customFilters: tableFilters,
+        tableFilters: tableFilters,
         onRowClick: (row) => navigate(`/part/${row.sub_part}`),
         rowActions: rowActions
       }}
diff --git a/src/frontend/src/components/tables/bom/UsedInTable.tsx b/src/frontend/src/components/tables/bom/UsedInTable.tsx
index 439af13954..6d2bc496ac 100644
--- a/src/frontend/src/components/tables/bom/UsedInTable.tsx
+++ b/src/frontend/src/components/tables/bom/UsedInTable.tsx
@@ -116,7 +116,7 @@ export function UsedInTable({
           part_detail: true,
           sub_part_detail: true
         },
-        customFilters: tableFilters,
+        tableFilters: tableFilters,
         onRowClick: (row) => navigate(`/part/${row.part}`)
       }}
     />
diff --git a/src/frontend/src/components/tables/build/BuildOrderTable.tsx b/src/frontend/src/components/tables/build/BuildOrderTable.tsx
index b10ebc685e..0b9c885266 100644
--- a/src/frontend/src/components/tables/build/BuildOrderTable.tsx
+++ b/src/frontend/src/components/tables/build/BuildOrderTable.tsx
@@ -155,7 +155,7 @@ export function BuildOrderTable({ params = {} }: { params?: any }) {
           ...params,
           part_detail: true
         },
-        customFilters: tableFilters,
+        tableFilters: tableFilters,
         onRowClick: (row) => navigate(`/build/${row.pk}`)
       }}
     />
diff --git a/src/frontend/src/components/tables/company/AddressTable.tsx b/src/frontend/src/components/tables/company/AddressTable.tsx
index 35e0cbdeab..5b1f8ae373 100644
--- a/src/frontend/src/components/tables/company/AddressTable.tsx
+++ b/src/frontend/src/components/tables/company/AddressTable.tsx
@@ -185,7 +185,7 @@ export function AddressTable({
       columns={columns}
       props={{
         rowActions: rowActions,
-        customActionGroups: tableActions,
+        tableActions: tableActions,
         params: {
           ...params,
           company: companyId
diff --git a/src/frontend/src/components/tables/company/ContactTable.tsx b/src/frontend/src/components/tables/company/ContactTable.tsx
index 7005abea09..4d4d746bb9 100644
--- a/src/frontend/src/components/tables/company/ContactTable.tsx
+++ b/src/frontend/src/components/tables/company/ContactTable.tsx
@@ -133,7 +133,7 @@ export function ContactTable({
       columns={columns}
       props={{
         rowActions: rowActions,
-        customActionGroups: tableActions,
+        tableActions: tableActions,
         params: {
           ...params,
           company: companyId
diff --git a/src/frontend/src/components/tables/general/AttachmentTable.tsx b/src/frontend/src/components/tables/general/AttachmentTable.tsx
index d48c99957c..5338f4993f 100644
--- a/src/frontend/src/components/tables/general/AttachmentTable.tsx
+++ b/src/frontend/src/components/tables/general/AttachmentTable.tsx
@@ -178,7 +178,7 @@ export function AttachmentTable({
     });
   }
 
-  const customActionGroups: ReactNode[] = useMemo(() => {
+  const tableActions: ReactNode[] = useMemo(() => {
     let actions = [];
 
     if (allowEdit) {
@@ -235,7 +235,7 @@ export function AttachmentTable({
           props={{
             noRecordsText: t`No attachments found`,
             enableSelection: true,
-            customActionGroups: customActionGroups,
+            tableActions: tableActions,
             rowActions: allowEdit && allowDelete ? rowActions : undefined,
             params: {
               [model]: pk
diff --git a/src/frontend/src/components/tables/part/PartCategoryTable.tsx b/src/frontend/src/components/tables/part/PartCategoryTable.tsx
index 78b984014b..30d731d7bc 100644
--- a/src/frontend/src/components/tables/part/PartCategoryTable.tsx
+++ b/src/frontend/src/components/tables/part/PartCategoryTable.tsx
@@ -1,23 +1,30 @@
 import { t } from '@lingui/macro';
-import { useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { useNavigate } from 'react-router-dom';
 
 import { ApiPaths } from '../../../enums/ApiEndpoints';
+import { UserRoles } from '../../../enums/Roles';
+import { partCategoryFields } from '../../../forms/PartForms';
+import { openCreateApiForm, openEditApiForm } from '../../../functions/forms';
 import { useTable } from '../../../hooks/UseTable';
 import { apiUrl } from '../../../states/ApiState';
+import { useUserState } from '../../../states/UserState';
+import { AddItemButton } from '../../buttons/AddItemButton';
 import { YesNoButton } from '../../items/YesNoButton';
 import { TableColumn } from '../Column';
 import { DescriptionColumn } from '../ColumnRenderers';
 import { TableFilter } from '../Filter';
 import { InvenTreeTable } from '../InvenTreeTable';
+import { RowEditAction } from '../RowActions';
 
 /**
  * PartCategoryTable - Displays a table of part categories
  */
-export function PartCategoryTable({ params = {} }: { params?: any }) {
+export function PartCategoryTable({ parentId }: { parentId?: any }) {
   const navigate = useNavigate();
 
   const table = useTable('partcategory');
+  const user = useUserState();
 
   const tableColumns: TableColumn[] = useMemo(() => {
     return [
@@ -64,6 +71,62 @@ export function PartCategoryTable({ params = {} }: { params?: any }) {
     ];
   }, []);
 
+  const addCategory = useCallback(() => {
+    let fields = partCategoryFields({});
+
+    if (parentId) {
+      fields['parent'].value = parentId;
+    }
+
+    openCreateApiForm({
+      url: apiUrl(ApiPaths.category_list),
+      title: t`Add Part Category`,
+      fields: fields,
+      onFormSuccess(data: any) {
+        if (data.pk) {
+          navigate(`/part/category/${data.pk}`);
+        } else {
+          table.refreshTable();
+        }
+      }
+    });
+  }, [parentId]);
+
+  const tableActions = useMemo(() => {
+    let can_add = user.hasAddRole(UserRoles.part_category);
+
+    return [
+      <AddItemButton
+        tooltip={t`Add Part Category`}
+        onClick={addCategory}
+        disabled={!can_add}
+      />
+    ];
+  }, [user]);
+
+  const rowActions = useCallback(
+    (record: any) => {
+      let can_edit = user.hasChangeRole(UserRoles.part_category);
+
+      return [
+        RowEditAction({
+          hidden: !can_edit,
+          onClick: () => {
+            openEditApiForm({
+              url: ApiPaths.category_list,
+              pk: record.pk,
+              title: t`Edit Part Category`,
+              fields: partCategoryFields({}),
+              successMessage: t`Part category updated`,
+              onFormSuccess: table.refreshTable
+            });
+          }
+        })
+      ];
+    },
+    [user]
+  );
+
   return (
     <InvenTreeTable
       url={apiUrl(ApiPaths.category_list)}
@@ -71,11 +134,12 @@ export function PartCategoryTable({ params = {} }: { params?: any }) {
       columns={tableColumns}
       props={{
         enableDownload: true,
-        enableSelection: true,
         params: {
-          ...params
+          parent: parentId ?? 'null'
         },
-        customFilters: tableFilters,
+        tableFilters: tableFilters,
+        tableActions: tableActions,
+        rowActions: rowActions,
         onRowClick: (record, index, event) => {
           navigate(`/part/category/${record.pk}`);
         }
diff --git a/src/frontend/src/components/tables/part/PartParameterTable.tsx b/src/frontend/src/components/tables/part/PartParameterTable.tsx
index 4a04964521..09fe305410 100644
--- a/src/frontend/src/components/tables/part/PartParameterTable.tsx
+++ b/src/frontend/src/components/tables/part/PartParameterTable.tsx
@@ -180,8 +180,8 @@ export function PartParameterTable({ partId }: { partId: any }) {
       columns={tableColumns}
       props={{
         rowActions: rowActions,
-        customActionGroups: tableActions,
-        customFilters: [
+        tableActions: tableActions,
+        tableFilters: [
           {
             name: 'include_variants',
             label: t`Include Variants`,
diff --git a/src/frontend/src/components/tables/part/PartParameterTemplateTable.tsx b/src/frontend/src/components/tables/part/PartParameterTemplateTable.tsx
index 2e7df5db99..e1d8781f0e 100644
--- a/src/frontend/src/components/tables/part/PartParameterTemplateTable.tsx
+++ b/src/frontend/src/components/tables/part/PartParameterTemplateTable.tsx
@@ -131,8 +131,8 @@ export default function PartParameterTemplateTable() {
       columns={tableColumns}
       props={{
         rowActions: rowActions,
-        customFilters: tableFilters,
-        customActionGroups: tableActions
+        tableFilters: tableFilters,
+        tableActions: tableActions
       }}
     />
   );
diff --git a/src/frontend/src/components/tables/part/PartTable.tsx b/src/frontend/src/components/tables/part/PartTable.tsx
index 9f612e4c11..1bff34b1b3 100644
--- a/src/frontend/src/components/tables/part/PartTable.tsx
+++ b/src/frontend/src/components/tables/part/PartTable.tsx
@@ -275,7 +275,7 @@ export function PartListTable({ props }: { props: InvenTreeTableProps }) {
       props={{
         ...props,
         enableDownload: true,
-        customFilters: tableFilters,
+        tableFilters: tableFilters,
         params: {
           ...props.params,
           category_detail: true
diff --git a/src/frontend/src/components/tables/part/PartTestTemplateTable.tsx b/src/frontend/src/components/tables/part/PartTestTemplateTable.tsx
index 488b502cd8..4ba26e6d6e 100644
--- a/src/frontend/src/components/tables/part/PartTestTemplateTable.tsx
+++ b/src/frontend/src/components/tables/part/PartTestTemplateTable.tsx
@@ -140,8 +140,8 @@ export default function PartTestTemplateTable({ partId }: { partId: number }) {
         params: {
           part: partId
         },
-        customFilters: tableFilters,
-        customActionGroups: tableActions,
+        tableFilters: tableFilters,
+        tableActions: tableActions,
         rowActions: rowActions
       }}
     />
diff --git a/src/frontend/src/components/tables/part/PartVariantTable.tsx b/src/frontend/src/components/tables/part/PartVariantTable.tsx
index 7477b6bc2e..a8c8df2251 100644
--- a/src/frontend/src/components/tables/part/PartVariantTable.tsx
+++ b/src/frontend/src/components/tables/part/PartVariantTable.tsx
@@ -37,7 +37,7 @@ export function PartVariantTable({ partId }: { partId: string }) {
     <PartListTable
       props={{
         enableDownload: false,
-        customFilters: tableFilters,
+        tableFilters: tableFilters,
         params: {
           ancestor: partId
         }
diff --git a/src/frontend/src/components/tables/part/RelatedPartTable.tsx b/src/frontend/src/components/tables/part/RelatedPartTable.tsx
index 1a35f82fac..b89324b7f5 100644
--- a/src/frontend/src/components/tables/part/RelatedPartTable.tsx
+++ b/src/frontend/src/components/tables/part/RelatedPartTable.tsx
@@ -133,7 +133,7 @@ export function RelatedPartTable({ partId }: { partId: number }): ReactNode {
           category_detail: true
         },
         rowActions: rowActions,
-        customActionGroups: customActions
+        tableActions: customActions
       }}
     />
   );
diff --git a/src/frontend/src/components/tables/plugin/PluginListTable.tsx b/src/frontend/src/components/tables/plugin/PluginListTable.tsx
index 4690a8c555..2cae6cd705 100644
--- a/src/frontend/src/components/tables/plugin/PluginListTable.tsx
+++ b/src/frontend/src/components/tables/plugin/PluginListTable.tsx
@@ -493,8 +493,8 @@ export function PluginListTable({ props }: { props: InvenTreeTableProps }) {
           },
           rowActions: rowActions,
           onRowClick: (plugin) => navigate(`${plugin.pk}/`),
-          customActionGroups: tableActions,
-          customFilters: [
+          tableActions: tableActions,
+          tableFilters: [
             {
               name: 'active',
               label: t`Active`,
diff --git a/src/frontend/src/components/tables/purchasing/ManufacturerPartTable.tsx b/src/frontend/src/components/tables/purchasing/ManufacturerPartTable.tsx
index 17276977ba..2b2d03c758 100644
--- a/src/frontend/src/components/tables/purchasing/ManufacturerPartTable.tsx
+++ b/src/frontend/src/components/tables/purchasing/ManufacturerPartTable.tsx
@@ -5,9 +5,11 @@ import { ApiPaths } from '../../../enums/ApiEndpoints';
 import { UserRoles } from '../../../enums/Roles';
 import { useManufacturerPartFields } from '../../../forms/CompanyForms';
 import { openDeleteApiForm, openEditApiForm } from '../../../functions/forms';
+import { notYetImplemented } from '../../../functions/notifications';
 import { useTable } from '../../../hooks/UseTable';
 import { apiUrl } from '../../../states/ApiState';
 import { useUserState } from '../../../states/UserState';
+import { AddItemButton } from '../../buttons/AddItemButton';
 import { Thumbnail } from '../../images/Thumbnail';
 import { TableColumn } from '../Column';
 import { DescriptionColumn, LinkColumn, PartColumn } from '../ColumnRenderers';
@@ -57,9 +59,22 @@ export function ManufacturerPartTable({ params }: { params: any }): ReactNode {
     ];
   }, [params]);
 
+  const addManufacturerPart = useCallback(() => {
+    notYetImplemented();
+  }, []);
+
   const tableActions = useMemo(() => {
-    // TODO: Custom actions
-    return [];
+    let can_add =
+      user.hasAddRole(UserRoles.purchase_order) &&
+      user.hasAddRole(UserRoles.part);
+
+    return [
+      <AddItemButton
+        tooltip={t`Add Manufacturer Part`}
+        onClick={addManufacturerPart}
+        hidden={!can_add}
+      />
+    ];
   }, [user]);
 
   const editManufacturerPartFields = useManufacturerPartFields();
@@ -112,7 +127,7 @@ export function ManufacturerPartTable({ params }: { params: any }): ReactNode {
           manufacturer_detail: true
         },
         rowActions: rowActions,
-        customActionGroups: tableActions
+        tableActions: tableActions
       }}
     />
   );
diff --git a/src/frontend/src/components/tables/purchasing/PurchaseOrderLineItemTable.tsx b/src/frontend/src/components/tables/purchasing/PurchaseOrderLineItemTable.tsx
index 3596bc04f9..7cd81218f1 100644
--- a/src/frontend/src/components/tables/purchasing/PurchaseOrderLineItemTable.tsx
+++ b/src/frontend/src/components/tables/purchasing/PurchaseOrderLineItemTable.tsx
@@ -260,7 +260,7 @@ export function PurchaseOrderLineItemTable({
           part_detail: true
         },
         rowActions: rowActions,
-        customActionGroups: tableActions
+        tableActions: tableActions
       }}
     />
   );
diff --git a/src/frontend/src/components/tables/purchasing/PurchaseOrderTable.tsx b/src/frontend/src/components/tables/purchasing/PurchaseOrderTable.tsx
index 4582dbec13..7416b24434 100644
--- a/src/frontend/src/components/tables/purchasing/PurchaseOrderTable.tsx
+++ b/src/frontend/src/components/tables/purchasing/PurchaseOrderTable.tsx
@@ -1,11 +1,15 @@
 import { t } from '@lingui/macro';
-import { useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { useNavigate } from 'react-router-dom';
 
 import { ApiPaths } from '../../../enums/ApiEndpoints';
 import { ModelType } from '../../../enums/ModelType';
+import { UserRoles } from '../../../enums/Roles';
+import { notYetImplemented } from '../../../functions/notifications';
 import { useTable } from '../../../hooks/UseTable';
 import { apiUrl } from '../../../states/ApiState';
+import { useUserState } from '../../../states/UserState';
+import { AddItemButton } from '../../buttons/AddItemButton';
 import { Thumbnail } from '../../images/Thumbnail';
 import {
   CreationDateColumn,
@@ -33,6 +37,7 @@ export function PurchaseOrderTable({ params }: { params?: any }) {
   const navigate = useNavigate();
 
   const table = useTable('purchase-order');
+  const user = useUserState();
 
   const tableFilters: TableFilter[] = useMemo(() => {
     return [
@@ -94,6 +99,20 @@ export function PurchaseOrderTable({ params }: { params?: any }) {
     ];
   }, []);
 
+  const addPurchaseOrder = useCallback(() => {
+    notYetImplemented();
+  }, []);
+
+  const tableActions = useMemo(() => {
+    return [
+      <AddItemButton
+        tooltip={t`Add Purchase Order`}
+        onClick={addPurchaseOrder}
+        hidden={!user.hasAddRole(UserRoles.purchase_order)}
+      />
+    ];
+  }, [user]);
+
   return (
     <InvenTreeTable
       url={apiUrl(ApiPaths.purchase_order_list)}
@@ -104,7 +123,8 @@ export function PurchaseOrderTable({ params }: { params?: any }) {
           ...params,
           supplier_detail: true
         },
-        customFilters: tableFilters,
+        tableFilters: tableFilters,
+        tableActions: tableActions,
         onRowClick: (row: any) => {
           if (row.pk) {
             navigate(`/purchasing/purchase-order/${row.pk}`);
diff --git a/src/frontend/src/components/tables/purchasing/SupplierPartTable.tsx b/src/frontend/src/components/tables/purchasing/SupplierPartTable.tsx
index af8000378e..c0b7272668 100644
--- a/src/frontend/src/components/tables/purchasing/SupplierPartTable.tsx
+++ b/src/frontend/src/components/tables/purchasing/SupplierPartTable.tsx
@@ -229,7 +229,7 @@ export function SupplierPartTable({ params }: { params: any }): ReactNode {
             manufacturer_detail: true
           },
           rowActions: rowActions,
-          customActionGroups: tableActions
+          tableActions: tableActions
         }}
       />
     </>
diff --git a/src/frontend/src/components/tables/sales/ReturnOrderTable.tsx b/src/frontend/src/components/tables/sales/ReturnOrderTable.tsx
index 6d0b7420dc..4dfad75c28 100644
--- a/src/frontend/src/components/tables/sales/ReturnOrderTable.tsx
+++ b/src/frontend/src/components/tables/sales/ReturnOrderTable.tsx
@@ -1,11 +1,15 @@
 import { t } from '@lingui/macro';
-import { useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { useNavigate } from 'react-router-dom';
 
 import { ApiPaths } from '../../../enums/ApiEndpoints';
 import { ModelType } from '../../../enums/ModelType';
+import { UserRoles } from '../../../enums/Roles';
+import { notYetImplemented } from '../../../functions/notifications';
 import { useTable } from '../../../hooks/UseTable';
 import { apiUrl } from '../../../states/ApiState';
+import { useUserState } from '../../../states/UserState';
+import { AddItemButton } from '../../buttons/AddItemButton';
 import { Thumbnail } from '../../images/Thumbnail';
 import {
   CreationDateColumn,
@@ -27,6 +31,7 @@ import { InvenTreeTable } from '../InvenTreeTable';
 
 export function ReturnOrderTable({ params }: { params?: any }) {
   const table = useTable('return-orders');
+  const user = useUserState();
 
   const navigate = useNavigate();
 
@@ -90,6 +95,20 @@ export function ReturnOrderTable({ params }: { params?: any }) {
     ];
   }, []);
 
+  const addReturnOrder = useCallback(() => {
+    notYetImplemented();
+  }, []);
+
+  const tableActions = useMemo(() => {
+    return [
+      <AddItemButton
+        tooltip={t`Add Return Order`}
+        onClick={addReturnOrder}
+        hidden={!user.hasAddRole(UserRoles.sales_order)}
+      />
+    ];
+  }, [user]);
+
   return (
     <InvenTreeTable
       url={apiUrl(ApiPaths.return_order_list)}
@@ -100,7 +119,8 @@ export function ReturnOrderTable({ params }: { params?: any }) {
           ...params,
           customer_detail: true
         },
-        customFilters: tableFilters,
+        tableFilters: tableFilters,
+        tableActions: tableActions,
         onRowClick: (row: any) => {
           if (row.pk) {
             navigate(`/sales/return-order/${row.pk}/`);
diff --git a/src/frontend/src/components/tables/sales/SalesOrderTable.tsx b/src/frontend/src/components/tables/sales/SalesOrderTable.tsx
index f510c8c5e2..69427ca259 100644
--- a/src/frontend/src/components/tables/sales/SalesOrderTable.tsx
+++ b/src/frontend/src/components/tables/sales/SalesOrderTable.tsx
@@ -1,11 +1,15 @@
 import { t } from '@lingui/macro';
-import { useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { useNavigate } from 'react-router-dom';
 
 import { ApiPaths } from '../../../enums/ApiEndpoints';
 import { ModelType } from '../../../enums/ModelType';
+import { UserRoles } from '../../../enums/Roles';
+import { notYetImplemented } from '../../../functions/notifications';
 import { useTable } from '../../../hooks/UseTable';
 import { apiUrl } from '../../../states/ApiState';
+import { useUserState } from '../../../states/UserState';
+import { AddItemButton } from '../../buttons/AddItemButton';
 import { Thumbnail } from '../../images/Thumbnail';
 import {
   CreationDateColumn,
@@ -28,6 +32,7 @@ import { InvenTreeTable } from '../InvenTreeTable';
 
 export function SalesOrderTable({ params }: { params?: any }) {
   const table = useTable('sales-order');
+  const user = useUserState();
 
   const navigate = useNavigate();
 
@@ -91,6 +96,20 @@ export function SalesOrderTable({ params }: { params?: any }) {
     ];
   }, []);
 
+  const addSalesOrder = useCallback(() => {
+    notYetImplemented();
+  }, []);
+
+  const tableActions = useMemo(() => {
+    return [
+      <AddItemButton
+        tooltip={t`Add Sales Order`}
+        onClick={addSalesOrder}
+        hidden={!user.hasAddRole(UserRoles.sales_order)}
+      />
+    ];
+  }, [user]);
+
   return (
     <InvenTreeTable
       url={apiUrl(ApiPaths.sales_order_list)}
@@ -101,7 +120,8 @@ export function SalesOrderTable({ params }: { params?: any }) {
           ...params,
           customer_detail: true
         },
-        customFilters: tableFilters,
+        tableFilters: tableFilters,
+        tableActions: tableActions,
         onRowClick: (row: any) => {
           if (row.pk) {
             navigate(`/sales/sales-order/${row.pk}/`);
diff --git a/src/frontend/src/components/tables/settings/CurrencyTable.tsx b/src/frontend/src/components/tables/settings/CurrencyTable.tsx
index 2a63634e27..cda269b096 100644
--- a/src/frontend/src/components/tables/settings/CurrencyTable.tsx
+++ b/src/frontend/src/components/tables/settings/CurrencyTable.tsx
@@ -66,7 +66,7 @@ export function CurrencyTable() {
       tableState={table}
       columns={columns}
       props={{
-        customActionGroups: tableActions,
+        tableActions: tableActions,
         dataFormatter: (data) => {
           let rates = data?.exchange_rates ?? {};
 
diff --git a/src/frontend/src/components/tables/settings/CustomUnitsTable.tsx b/src/frontend/src/components/tables/settings/CustomUnitsTable.tsx
index e4a7b6206f..98ce9f4bad 100644
--- a/src/frontend/src/components/tables/settings/CustomUnitsTable.tsx
+++ b/src/frontend/src/components/tables/settings/CustomUnitsTable.tsx
@@ -117,7 +117,7 @@ export default function CustomUnitsTable() {
       columns={columns}
       props={{
         rowActions: rowActions,
-        customActionGroups: tableActions
+        tableActions: tableActions
       }}
     />
   );
diff --git a/src/frontend/src/components/tables/settings/GroupTable.tsx b/src/frontend/src/components/tables/settings/GroupTable.tsx
index 9baba7b65e..b16d03ce09 100644
--- a/src/frontend/src/components/tables/settings/GroupTable.tsx
+++ b/src/frontend/src/components/tables/settings/GroupTable.tsx
@@ -166,7 +166,7 @@ export function GroupTable() {
         columns={columns}
         props={{
           rowActions: rowActions,
-          customActionGroups: tableActions,
+          tableActions: tableActions,
           onRowClick: (record) => openDetailDrawer(record.pk)
         }}
       />
diff --git a/src/frontend/src/components/tables/settings/ProjectCodeTable.tsx b/src/frontend/src/components/tables/settings/ProjectCodeTable.tsx
index 9afadbe99e..536afe5461 100644
--- a/src/frontend/src/components/tables/settings/ProjectCodeTable.tsx
+++ b/src/frontend/src/components/tables/settings/ProjectCodeTable.tsx
@@ -106,7 +106,7 @@ export default function ProjectCodeTable() {
       columns={columns}
       props={{
         rowActions: rowActions,
-        customActionGroups: tableActions
+        tableActions: tableActions
       }}
     />
   );
diff --git a/src/frontend/src/components/tables/settings/UserTable.tsx b/src/frontend/src/components/tables/settings/UserTable.tsx
index 68a0f79fec..c7f8823de7 100644
--- a/src/frontend/src/components/tables/settings/UserTable.tsx
+++ b/src/frontend/src/components/tables/settings/UserTable.tsx
@@ -261,7 +261,7 @@ export function UserTable() {
         columns={columns}
         props={{
           rowActions: rowActions,
-          customActionGroups: tableActions,
+          tableActions: tableActions,
           onRowClick: (record) => openDetailDrawer(record.pk)
         }}
       />
diff --git a/src/frontend/src/components/tables/stock/StockItemTable.tsx b/src/frontend/src/components/tables/stock/StockItemTable.tsx
index c2ab5bedb0..62365eeaf3 100644
--- a/src/frontend/src/components/tables/stock/StockItemTable.tsx
+++ b/src/frontend/src/components/tables/stock/StockItemTable.tsx
@@ -344,7 +344,7 @@ export function StockItemTable({ params = {} }: { params?: any }) {
       props={{
         enableDownload: true,
         enableSelection: true,
-        customFilters: tableFilters,
+        tableFilters: tableFilters,
         onRowClick: (record) => navigate(`/stock/item/${record.pk}`),
         params: {
           ...params,
diff --git a/src/frontend/src/components/tables/stock/StockLocationTable.tsx b/src/frontend/src/components/tables/stock/StockLocationTable.tsx
index 285f6d917a..e6d3b29457 100644
--- a/src/frontend/src/components/tables/stock/StockLocationTable.tsx
+++ b/src/frontend/src/components/tables/stock/StockLocationTable.tsx
@@ -1,21 +1,28 @@
 import { t } from '@lingui/macro';
-import { useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { useNavigate } from 'react-router-dom';
 
 import { ApiPaths } from '../../../enums/ApiEndpoints';
+import { UserRoles } from '../../../enums/Roles';
+import { stockLocationFields } from '../../../forms/StockForms';
+import { openCreateApiForm, openEditApiForm } from '../../../functions/forms';
 import { useTable } from '../../../hooks/UseTable';
 import { apiUrl } from '../../../states/ApiState';
+import { useUserState } from '../../../states/UserState';
+import { AddItemButton } from '../../buttons/AddItemButton';
 import { YesNoButton } from '../../items/YesNoButton';
 import { TableColumn } from '../Column';
 import { DescriptionColumn } from '../ColumnRenderers';
 import { TableFilter } from '../Filter';
 import { InvenTreeTable } from '../InvenTreeTable';
+import { RowEditAction } from '../RowActions';
 
 /**
  * Stock location table
  */
-export function StockLocationTable({ params = {} }: { params?: any }) {
+export function StockLocationTable({ parentId }: { parentId?: any }) {
   const table = useTable('stocklocation');
+  const user = useUserState();
 
   const navigate = useNavigate();
 
@@ -85,7 +92,63 @@ export function StockLocationTable({ params = {} }: { params?: any }) {
         render: (record: any) => record.location_type_detail?.name
       }
     ];
-  }, [params]);
+  }, []);
+
+  const addLocation = useCallback(() => {
+    let fields = stockLocationFields({});
+
+    if (parentId) {
+      fields['parent'].value = parentId;
+    }
+
+    openCreateApiForm({
+      url: apiUrl(ApiPaths.stock_location_list),
+      title: t`Add Stock Location`,
+      fields: fields,
+      onFormSuccess(data: any) {
+        if (data.pk) {
+          navigate(`/stock/location/${data.pk}`);
+        } else {
+          table.refreshTable();
+        }
+      }
+    });
+  }, [parentId]);
+
+  const tableActions = useMemo(() => {
+    let can_add = user.hasAddRole(UserRoles.stock_location);
+
+    return [
+      <AddItemButton
+        tooltip={t`Add Stock Location`}
+        onClick={addLocation}
+        disabled={!can_add}
+      />
+    ];
+  }, [user]);
+
+  const rowActions = useCallback(
+    (record: any) => {
+      let can_edit = user.hasChangeRole(UserRoles.stock_location);
+
+      return [
+        RowEditAction({
+          hidden: !can_edit,
+          onClick: () => {
+            openEditApiForm({
+              url: ApiPaths.stock_location_list,
+              pk: record.pk,
+              title: t`Edit Stock Location`,
+              fields: stockLocationFields({}),
+              successMessage: t`Stock location updated`,
+              onFormSuccess: table.refreshTable
+            });
+          }
+        })
+      ];
+    },
+    [user]
+  );
 
   return (
     <InvenTreeTable
@@ -94,8 +157,12 @@ export function StockLocationTable({ params = {} }: { params?: any }) {
       columns={tableColumns}
       props={{
         enableDownload: true,
-        params: params,
-        customFilters: tableFilters,
+        params: {
+          parent: parentId ?? 'null'
+        },
+        tableFilters: tableFilters,
+        tableActions: tableActions,
+        rowActions: rowActions,
         onRowClick: (record) => {
           navigate(`/stock/location/${record.pk}`);
         }
diff --git a/src/frontend/src/forms/StockForms.tsx b/src/frontend/src/forms/StockForms.tsx
index d1113ffe8a..3f1cd269ca 100644
--- a/src/frontend/src/forms/StockForms.tsx
+++ b/src/frontend/src/forms/StockForms.tsx
@@ -133,3 +133,19 @@ export function useEditStockItem({
     onFormSuccess: callback
   });
 }
+
+export function stockLocationFields({}: {}): ApiFormFieldSet {
+  let fields: ApiFormFieldSet = {
+    parent: {
+      description: t`Parent stock location`,
+      required: false
+    },
+    name: {},
+    description: {},
+    structural: {},
+    external: {},
+    location_type: {}
+  };
+
+  return fields;
+}
diff --git a/src/frontend/src/pages/part/CategoryDetail.tsx b/src/frontend/src/pages/part/CategoryDetail.tsx
index 6a8e07d011..d119406e1d 100644
--- a/src/frontend/src/pages/part/CategoryDetail.tsx
+++ b/src/frontend/src/pages/part/CategoryDetail.tsx
@@ -64,13 +64,7 @@ export default function CategoryDetail({}: {}) {
         name: 'subcategories',
         label: t`Part Categories`,
         icon: <IconSitemap />,
-        content: (
-          <PartCategoryTable
-            params={{
-              parent: id
-            }}
-          />
-        )
+        content: <PartCategoryTable parentId={id} />
       },
       {
         name: 'parameters',
diff --git a/src/frontend/src/pages/stock/LocationDetail.tsx b/src/frontend/src/pages/stock/LocationDetail.tsx
index 8a40a57a06..d065b1a14a 100644
--- a/src/frontend/src/pages/stock/LocationDetail.tsx
+++ b/src/frontend/src/pages/stock/LocationDetail.tsx
@@ -53,13 +53,7 @@ export default function Stock() {
         name: 'sublocations',
         label: t`Stock Locations`,
         icon: <IconSitemap />,
-        content: (
-          <StockLocationTable
-            params={{
-              parent: id
-            }}
-          />
-        )
+        content: <StockLocationTable parentId={id} />
       }
     ];
   }, [location, id]);
diff --git a/tasks.py b/tasks.py
index 547b7d7e82..0634a8cfc5 100644
--- a/tasks.py
+++ b/tasks.py
@@ -978,6 +978,7 @@ def frontend_dev(c):
         c: Context variable
     """
     print('Starting frontend development server')
+    yarn(c, 'yarn run compile')
     yarn(c, 'yarn run dev')