diff --git a/src/frontend/src/components/nav/PartCategoryTree.tsx b/src/frontend/src/components/nav/PartCategoryTree.tsx
index f1ef938517..de1c496782 100644
--- a/src/frontend/src/components/nav/PartCategoryTree.tsx
+++ b/src/frontend/src/components/nav/PartCategoryTree.tsx
@@ -157,7 +157,7 @@ export function PartCategoryTree({
           RenderIcon={renderIcon}
           defaultSelectedNodes={selectedCategory ? [selectedCategory] : []}
           showEmptyItems={false}
-          theme={theme.colorScheme}
+          theme={prefferedColorScheme}
           themes={themes}
         />
       </Stack>
diff --git a/src/frontend/src/main.css.ts b/src/frontend/src/main.css.ts
index c0f2e165b7..b07cbd7f17 100644
--- a/src/frontend/src/main.css.ts
+++ b/src/frontend/src/main.css.ts
@@ -130,14 +130,7 @@ export const tabs = style({
 });
 
 export const tabsList = style({
-  borderBottom: '0 !important',
-  '& > button:first-of-type': {
-    paddingLeft: '0 !important'
-  },
-
-  '& > button:last-of-type': {
-    paddingRight: '0 !important'
-  }
+  borderBottom: '0 !important'
 });
 
 export const tab = style({
diff --git a/src/frontend/src/pages/Index/Scan.tsx b/src/frontend/src/pages/Index/Scan.tsx
index 8784084e3d..9a20100bf7 100644
--- a/src/frontend/src/pages/Index/Scan.tsx
+++ b/src/frontend/src/pages/Index/Scan.tsx
@@ -3,7 +3,6 @@ import {
   ActionIcon,
   Button,
   Checkbox,
-  Col,
   Grid,
   Group,
   ScrollArea,
@@ -285,7 +284,7 @@ export default function Scan() {
       </Group>
       <Space h={'md'} />
       <Grid maw={'100%'}>
-        <Col span={4}>
+        <Grid.Col span={4}>
           <Stack>
             <Stack gap="xs">
               <Group justify="apart">
@@ -353,8 +352,8 @@ export default function Scan() {
               )}
             </Stack>
           </Stack>
-        </Col>
-        <Col span={8}>
+        </Grid.Col>
+        <Grid.Col span={8}>
           <Group justify="apart">
             <TitleWithDoc
               order={3}
@@ -372,7 +371,7 @@ export default function Scan() {
             selection={selection}
             setSelection={setSelection}
           />
-        </Col>
+        </Grid.Col>
       </Grid>
     </>
   );
diff --git a/src/frontend/src/tables/InvenTreeTable.tsx b/src/frontend/src/tables/InvenTreeTable.tsx
index 977824b043..8939ccec4c 100644
--- a/src/frontend/src/tables/InvenTreeTable.tsx
+++ b/src/frontend/src/tables/InvenTreeTable.tsx
@@ -512,7 +512,7 @@ export function InvenTreeTable<T = any>({
 
   // Callback when a row is clicked
   const handleRowClick = useCallback(
-    (record: any, index: number, event: any) => {
+    ({ event, record, index }: { event: any; record: any; index: number }) => {
       if (props.onRowClick) {
         // If a custom row click handler is provided, use that
         props.onRowClick(record, index, event);