diff --git a/src/frontend/package.json b/src/frontend/package.json
index 6abad83d32..54dad53cc2 100644
--- a/src/frontend/package.json
+++ b/src/frontend/package.json
@@ -52,7 +52,7 @@
         "dayjs": "^1.11.10",
         "embla-carousel-react": "^8.1.6",
         "html5-qrcode": "^2.3.8",
-        "mantine-datatable": "^7.11.1",
+        "mantine-datatable": "^7.11.2",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-grid-layout": "^1.4.4",
diff --git a/src/frontend/src/components/forms/ApiForm.tsx b/src/frontend/src/components/forms/ApiForm.tsx
index d7585d69f8..797862c0f3 100644
--- a/src/frontend/src/components/forms/ApiForm.tsx
+++ b/src/frontend/src/components/forms/ApiForm.tsx
@@ -249,6 +249,31 @@ export function ApiForm({
     [props.url, props.pk, props.pathParams]
   );
 
+  // Define function to process API response
+  const processFields = (fields: ApiFormFieldSet, data: NestedDict) => {
+    const res: NestedDict = {};
+
+    for (const [k, field] of Object.entries(fields)) {
+      const dataValue = data[k];
+
+      if (
+        field.field_type === 'nested object' &&
+        field.children &&
+        typeof dataValue === 'object'
+      ) {
+        res[k] = processFields(field.children, dataValue);
+      } else {
+        res[k] = dataValue;
+
+        if (field.onValueChange) {
+          field.onValueChange(dataValue, data);
+        }
+      }
+    }
+
+    return res;
+  };
+
   // Query manager for retrieving initial data from the server
   const initialDataQuery = useQuery({
     enabled: false,
@@ -261,79 +286,51 @@ export function ApiForm({
       props.pathParams
     ],
     queryFn: async () => {
-      try {
-        // Await API call
-        let response = await api.get(url);
+      return await api
+        .get(url)
+        .then((response: any) => {
+          // Process API response
+          const fetchedData: any = processFields(fields, response.data);
 
-        // Define function to process API response
-        const processFields = (fields: ApiFormFieldSet, data: NestedDict) => {
-          const res: NestedDict = {};
-
-          // TODO: replace with .map()
-          for (const [k, field] of Object.entries(fields)) {
-            const dataValue = data[k];
-
-            if (
-              field.field_type === 'nested object' &&
-              field.children &&
-              typeof dataValue === 'object'
-            ) {
-              res[k] = processFields(field.children, dataValue);
-            } else {
-              res[k] = dataValue;
-
-              if (field.onValueChange) {
-                field.onValueChange(dataValue, data);
-              }
-            }
-          }
-
-          return res;
-        };
-
-        // Process API response
-        const initialData: any = processFields(fields, response.data);
-
-        // Update form values, but only for the fields specified for this form
-        form.reset(initialData);
-
-        // Update the field references, too
-        Object.keys(fields).forEach((fieldName) => {
-          if (fieldName in initialData) {
-            let field = fields[fieldName] ?? {};
-            fields[fieldName] = {
-              ...field,
-              value: initialData[fieldName]
-            };
-          }
+          // Update form values, but only for the fields specified for this form
+          form.reset(fetchedData);
+          return fetchedData;
+        })
+        .catch(() => {
+          return {};
         });
-
-        return response;
-      } catch (error) {
-        console.error('ERR: Error fetching initial data:', error);
-        // Re-throw error to allow react-query to handle error
-        return {};
-      }
     }
   });
 
   useEffect(() => {
-    let _fields = props.fields ?? {};
+    let _fields: any = props.fields || {};
+    let _initialData: any = props.initialData || {};
+    let _fetchedData: any = initialDataQuery.data || {};
 
-    // Ensure default values override initial field spec
     for (const k of Object.keys(_fields)) {
+      // Ensure default values override initial field spec
       if (defaultValues[k]) {
         _fields[k].value = defaultValues[k];
       }
+
+      // Ensure initial data overrides default values
+      if (_initialData && _initialData[k]) {
+        _fields[k].value = _initialData[k];
+      }
+
+      // Ensure fetched data overrides also
+      if (_fetchedData && _fetchedData[k]) {
+        _fields[k].value = _fetchedData[k];
+      }
     }
 
     setFields(_fields);
-  }, [props.fields, defaultValues, initialDataQuery.data]);
+  }, [props.fields, props.initialData, defaultValues, initialDataQuery.data]);
 
   // Fetch initial data on form load
   useEffect(() => {
     // Fetch initial data if the fetchInitialData property is set
-    if (props.fetchInitialData) {
+    if (!optionsLoading && props.fetchInitialData) {
       queryClient.removeQueries({
         queryKey: [
           'form-initial-data',
@@ -346,22 +343,16 @@ export function ApiForm({
       });
       initialDataQuery.refetch();
     }
-  }, [props.fetchInitialData]);
+  }, [props.fetchInitialData, optionsLoading]);
 
-  const isLoading = useMemo(
+  const isLoading: boolean = useMemo(
     () =>
       isFormLoading ||
       initialDataQuery.isFetching ||
       optionsLoading ||
       isSubmitting ||
       !fields,
-    [
-      isFormLoading,
-      initialDataQuery.isFetching,
-      isSubmitting,
-      fields,
-      optionsLoading
-    ]
+    [isFormLoading, initialDataQuery, isSubmitting, fields, optionsLoading]
   );
 
   const [initialFocus, setInitialFocus] = useState<string>('');
@@ -381,7 +372,7 @@ export function ApiForm({
       });
     }
 
-    if (isLoading || initialFocus == focusField) {
+    if (isLoading) {
       return;
     }
 
@@ -533,6 +524,14 @@ export function ApiForm({
     props.onFormError?.();
   }, [props.onFormError]);
 
+  if (optionsLoading || initialDataQuery.isFetching) {
+    return (
+      <Paper mah={'65vh'}>
+        <LoadingOverlay visible zIndex={1010} />
+      </Paper>
+    );
+  }
+
   return (
     <Stack>
       <Boundary label={`ApiForm-${id}`}>
@@ -546,13 +545,15 @@ export function ApiForm({
             {/* Form Fields */}
             <Stack gap="sm">
               {(!isValid || nonFieldErrors.length > 0) && (
-                <Alert radius="sm" color="red" title={t`Error`}>
-                  {nonFieldErrors.length > 0 && (
+                <Alert radius="sm" color="red" title={t`Form Error`}>
+                  {nonFieldErrors.length > 0 ? (
                     <Stack gap="xs">
                       {nonFieldErrors.map((message) => (
                         <Text key={message}>{message}</Text>
                       ))}
                     </Stack>
+                  ) : (
+                    <Text>{t`Errors exist for one or more form fields`}</Text>
                   )}
                 </Alert>
               )}
@@ -570,23 +571,22 @@ export function ApiForm({
                 )}
               </Boundary>
               <Boundary label={`ApiForm-${id}-FormContent`}>
-                {!isLoading && (
-                  <FormProvider {...form}>
-                    <Stack gap="xs">
-                      {!optionsLoading &&
-                        Object.entries(fields).map(([fieldName, field]) => (
-                          <ApiFormField
-                            key={fieldName}
-                            fieldName={fieldName}
-                            definition={field}
-                            control={form.control}
-                            url={url}
-                            setFields={setFields}
-                          />
-                        ))}
-                    </Stack>
-                  </FormProvider>
-                )}
+                <FormProvider {...form}>
+                  <Stack gap="xs">
+                    {Object.entries(fields).map(([fieldName, field]) => {
+                      return (
+                        <ApiFormField
+                          key={fieldName}
+                          fieldName={fieldName}
+                          definition={field}
+                          control={form.control}
+                          url={url}
+                          setFields={setFields}
+                        />
+                      );
+                    })}
+                  </Stack>
+                </FormProvider>
               </Boundary>
               <Boundary label={`ApiForm-${id}-PostFormContent`}>
                 {props.postFormContent}
diff --git a/src/frontend/src/components/forms/fields/ChoiceField.tsx b/src/frontend/src/components/forms/fields/ChoiceField.tsx
index 7407edf4b0..10e860aedd 100644
--- a/src/frontend/src/components/forms/fields/ChoiceField.tsx
+++ b/src/frontend/src/components/forms/fields/ChoiceField.tsx
@@ -1,6 +1,6 @@
 import { Select } from '@mantine/core';
 import { useId } from '@mantine/hooks';
-import { useCallback, useMemo } from 'react';
+import { useCallback, useEffect, useMemo } from 'react';
 import { FieldValues, UseControllerReturn } from 'react-hook-form';
 
 import { ApiFormFieldType } from './ApiFormField';
@@ -10,7 +10,8 @@ import { ApiFormFieldType } from './ApiFormField';
  */
 export function ChoiceField({
   controller,
-  definition
+  definition,
+  fieldName
 }: {
   controller: UseControllerReturn<FieldValues, any>;
   definition: ApiFormFieldType;
@@ -23,6 +24,8 @@ export function ChoiceField({
     fieldState: { error }
   } = controller;
 
+  const { value } = field;
+
   // Build a set of choices for the field
   const choices: any[] = useMemo(() => {
     let choices = definition.choices ?? [];
@@ -48,6 +51,14 @@ export function ChoiceField({
     [field.onChange, definition]
   );
 
+  const choiceValue = useMemo(() => {
+    if (!value) {
+      return '';
+    } else {
+      return value.toString();
+    }
+  }, [value]);
+
   return (
     <Select
       id={fieldId}
@@ -57,7 +68,7 @@ export function ChoiceField({
       {...field}
       onChange={onChange}
       data={choices}
-      value={field.value}
+      value={choiceValue}
       label={definition.label}
       description={definition.description}
       placeholder={definition.placeholder}
diff --git a/src/frontend/src/components/forms/fields/TextField.tsx b/src/frontend/src/components/forms/fields/TextField.tsx
index ddb9e8843f..513f71e63f 100644
--- a/src/frontend/src/components/forms/fields/TextField.tsx
+++ b/src/frontend/src/components/forms/fields/TextField.tsx
@@ -56,6 +56,9 @@ export default function TextField({
       error={error?.message}
       radius="sm"
       onChange={(event) => onTextChange(event.currentTarget.value)}
+      onBlur={(event) => {
+        onChange(event.currentTarget.value);
+      }}
       rightSection={
         value && !definition.required ? (
           <IconX size="1rem" color="red" onClick={() => onTextChange('')} />
diff --git a/src/frontend/src/forms/PartForms.tsx b/src/frontend/src/forms/PartForms.tsx
index 570bb1ba20..f536f7cee0 100644
--- a/src/frontend/src/forms/PartForms.tsx
+++ b/src/frontend/src/forms/PartForms.tsx
@@ -183,6 +183,7 @@ export function usePartParameterFields(): ApiFormFieldSet {
         }
       },
       data: {
+        type: fieldType,
         field_type: fieldType,
         choices: fieldType === 'choice' ? choices : undefined,
         adjustValue: (value: any) => {
diff --git a/src/frontend/src/pages/stock/StockDetail.tsx b/src/frontend/src/pages/stock/StockDetail.tsx
index 63abe0d829..3774012cd9 100644
--- a/src/frontend/src/pages/stock/StockDetail.tsx
+++ b/src/frontend/src/pages/stock/StockDetail.tsx
@@ -152,6 +152,12 @@ export default function StockDetail() {
         name: 'available_stock',
         label: t`Available`,
         icon: 'quantity'
+      },
+      {
+        type: 'text',
+        name: 'batch',
+        label: t`Batch Code`,
+        hidden: !stockitem.batch
       }
       // TODO: allocated_to_sales_orders
       // TODO: allocated_to_build_orders
diff --git a/src/frontend/src/tables/part/PartCategoryTable.tsx b/src/frontend/src/tables/part/PartCategoryTable.tsx
index 3809e499e4..f41a09b5ab 100644
--- a/src/frontend/src/tables/part/PartCategoryTable.tsx
+++ b/src/frontend/src/tables/part/PartCategoryTable.tsx
@@ -77,6 +77,7 @@ export function PartCategoryTable({ parentId }: { parentId?: any }) {
     url: ApiEndpoints.category_list,
     title: t`New Part Category`,
     fields: partCategoryFields(),
+    focus: 'name',
     initialData: {
       parent: parentId
     },
diff --git a/src/frontend/src/tables/stock/StockLocationTable.tsx b/src/frontend/src/tables/stock/StockLocationTable.tsx
index f4ce6bec30..3b6c61ec4e 100644
--- a/src/frontend/src/tables/stock/StockLocationTable.tsx
+++ b/src/frontend/src/tables/stock/StockLocationTable.tsx
@@ -98,6 +98,7 @@ export function StockLocationTable({ parentId }: { parentId?: any }) {
     url: ApiEndpoints.stock_location_list,
     title: t`Add Stock Location`,
     fields: stockLocationFields(),
+    focus: 'name',
     initialData: {
       parent: parentId
     },
diff --git a/src/frontend/tests/baseFixtures.ts b/src/frontend/tests/baseFixtures.ts
index feb00f6558..d164da1acc 100644
--- a/src/frontend/tests/baseFixtures.ts
+++ b/src/frontend/tests/baseFixtures.ts
@@ -64,6 +64,8 @@ export const test = baseTest.extend({
           .indexOf(
             'Support for defaultProps will be removed from function components in a future major release'
           ) < 0 &&
+        msg.text() !=
+          'Failed to load resource: the server responded with a status of 400 (Bad Request)' &&
         url != 'http://localhost:8000/api/user/me/' &&
         url != 'http://localhost:8000/api/user/token/' &&
         url != 'http://localhost:8000/api/barcode/' &&
diff --git a/src/frontend/tests/pages/pui_part.spec.ts b/src/frontend/tests/pages/pui_part.spec.ts
index f6901ef5bf..025bcc73b9 100644
--- a/src/frontend/tests/pages/pui_part.spec.ts
+++ b/src/frontend/tests/pages/pui_part.spec.ts
@@ -203,7 +203,7 @@ test('PUI - Pages - Part - Parameters', async ({ page }) => {
 
   // Select the "Color" parameter template (should create a "choice" field)
   await page.getByLabel('related-field-template').fill('Color');
-  await page.getByText('Part color').click();
+  await page.getByRole('option', { name: 'Color Part color' }).click();
   await page.getByLabel('choice-field-data').click();
   await page.getByRole('option', { name: 'Green' }).click();
 
diff --git a/src/frontend/tests/pages/pui_scan.spec.ts b/src/frontend/tests/pages/pui_scan.spec.ts
index 66acaf514b..000aada917 100644
--- a/src/frontend/tests/pages/pui_scan.spec.ts
+++ b/src/frontend/tests/pages/pui_scan.spec.ts
@@ -128,5 +128,4 @@ test('PUI - Pages - Index - Scan (General)', async ({ page }) => {
   await page.getByRole('button', { name: 'Toggle Fullscreen' }).click();
   await page.waitForTimeout(1000);
   await page.getByRole('button', { name: 'Toggle Fullscreen' }).click();
-  await page.waitForTimeout(1000);
 });
diff --git a/src/frontend/tests/pui_general.spec.ts b/src/frontend/tests/pui_general.spec.ts
index 5c891b339a..24a56d91f7 100644
--- a/src/frontend/tests/pui_general.spec.ts
+++ b/src/frontend/tests/pui_general.spec.ts
@@ -195,4 +195,16 @@ test('PUI - Company', async ({ page }) => {
   await page.getByRole('cell', { name: 'Carla Tunnel' }).waitFor();
   await page.getByRole('tab', { name: 'Attachments' }).click();
   await page.getByRole('tab', { name: 'Notes' }).click();
+
+  // Let's edit the company details
+  await page.getByLabel('action-menu-company-actions').click();
+  await page.getByLabel('action-menu-company-actions-edit').click();
+
+  await page.getByLabel('text-field-name').fill('');
+  await page.getByLabel('text-field-website').fill('invalid-website');
+  await page.getByRole('button', { name: 'Submit' }).click();
+
+  await page.getByText('This field may not be blank.').waitFor();
+  await page.getByText('Enter a valid URL.').waitFor();
+  await page.getByRole('button', { name: 'Cancel' }).click();
 });
diff --git a/src/frontend/tests/pui_settings.spec.ts b/src/frontend/tests/pui_settings.spec.ts
index ba5deef57d..7091272fc8 100644
--- a/src/frontend/tests/pui_settings.spec.ts
+++ b/src/frontend/tests/pui_settings.spec.ts
@@ -1,4 +1,4 @@
-import { test } from './baseFixtures.js';
+import { expect, test } from './baseFixtures.js';
 import { baseUrl } from './defaults.js';
 import { doQuickLogin } from './login.js';
 
@@ -48,7 +48,42 @@ test('PUI - Admin', async ({ page }) => {
   await page.getByRole('tab', { name: 'Label Templates' }).click();
   await page.getByRole('tab', { name: 'Report Templates' }).click();
   await page.getByRole('tab', { name: 'Plugins' }).click();
-  await page.getByRole('tab', { name: 'Machines' }).click();
+
+  // Adjust some "location type" items
+  await page.getByRole('tab', { name: 'Location Types' }).click();
+
+  // Edit first item
+  await page.getByLabel('row-action-menu-0').click();
+  await page.getByRole('menuitem', { name: 'Edit' }).click();
+  await expect(page.getByLabel('text-field-name')).toHaveValue('Room');
+  await expect(page.getByLabel('text-field-description')).toHaveValue('A room');
+  await page.getByLabel('text-field-name').fill('Large Room');
+  await page.waitForTimeout(500);
+  await page.getByLabel('text-field-description').fill('A large room');
+  await page.waitForTimeout(500);
+  await page.getByRole('button', { name: 'Submit' }).click();
+
+  // Edit second item
+  await page.getByLabel('row-action-menu-1').click();
+  await page.getByRole('menuitem', { name: 'Edit' }).click();
+  await expect(page.getByLabel('text-field-name')).toHaveValue('Box (Large)');
+  await expect(page.getByLabel('text-field-description')).toHaveValue(
+    'Large cardboard box'
+  );
+  await page.getByRole('button', { name: 'Cancel' }).click();
+
+  // Edit first item again (revert values)
+  await page.getByLabel('row-action-menu-0').click();
+  await page.getByRole('menuitem', { name: 'Edit' }).click();
+  await expect(page.getByLabel('text-field-name')).toHaveValue('Large Room');
+  await expect(page.getByLabel('text-field-description')).toHaveValue(
+    'A large room'
+  );
+  await page.getByLabel('text-field-name').fill('Room');
+  await page.waitForTimeout(500);
+  await page.getByLabel('text-field-description').fill('A room');
+  await page.waitForTimeout(500);
+  await page.getByRole('button', { name: 'Submit' }).click();
 });
 
 test('PUI - Admin - Unauthorized', async ({ page }) => {
diff --git a/src/frontend/tests/pui_tables.spec.ts b/src/frontend/tests/pui_tables.spec.ts
index 07ac232847..de16429912 100644
--- a/src/frontend/tests/pui_tables.spec.ts
+++ b/src/frontend/tests/pui_tables.spec.ts
@@ -62,6 +62,4 @@ test('PUI - Tables - Columns', async ({ page }) => {
   // De-select some items
   await page.getByRole('menuitem', { name: 'Description' }).click();
   await page.getByRole('menuitem', { name: 'Stocktake' }).click();
-
-  await page.waitForTimeout(2500);
 });
diff --git a/src/frontend/yarn.lock b/src/frontend/yarn.lock
index 886fc793e7..6f1f2ca87c 100644
--- a/src/frontend/yarn.lock
+++ b/src/frontend/yarn.lock
@@ -4356,10 +4356,10 @@ make-dir@^4.0.0:
   dependencies:
     semver "^7.5.3"
 
-mantine-datatable@^7.11.1:
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/mantine-datatable/-/mantine-datatable-7.11.1.tgz#a77ab8fc151569998ae2ef479dc535f48694cb05"
-  integrity sha512-YpTdmk1rRHengIyqjS2QI2GOIVtVUvBRdLClGJPnT1Sallunhx7aCFJWsvm3FQJO6yriz+/DexgQaOt8hZ6GNQ==
+mantine-datatable@^7.11.2:
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/mantine-datatable/-/mantine-datatable-7.11.2.tgz#800cf3b91158089616f905f257461683f018c73d"
+  integrity sha512-4TUBw/LXJF+S5DpES26c+0CDFfVwUsO5or2bChHBZqg04Hpoev87i/JvRpuNgzvqRJaZ/EKqkSCuc1ldOrFgWg==
 
 markdown-table@^3.0.0:
   version "3.0.3"