diff --git a/src/components/Dashboard/Management/ProductSkus/ProductSkuInfo.jsx b/src/components/Dashboard/Management/ProductSkus/ProductSkuInfo.jsx
index 448df47..28cc4cc 100644
--- a/src/components/Dashboard/Management/ProductSkus/ProductSkuInfo.jsx
+++ b/src/components/Dashboard/Management/ProductSkus/ProductSkuInfo.jsx
@@ -131,24 +131,26 @@ const ProductSkuInfo = () => {
               loading={objectFormState.loading}
               ref={actionHandlerRef}
             >
-              <InfoCollapse
-                title='Product SKU Information'
-                icon={<InfoCircleIcon />}
-                active={collapseState.info}
-                onToggle={(expanded) => updateCollapseState('info', expanded)}
-                collapseKey='info'
+              <ObjectForm
+                id={productSkuId}
+                type='productSku'
+                style={{ height: '100%' }}
+                ref={objectFormRef}
+                onStateChange={(state) => {
+                  setEditFormState((prev) => ({ ...prev, ...state }))
+                }}
               >
-                <ObjectForm
-                  id={productSkuId}
-                  type='productSku'
-                  style={{ height: '100%' }}
-                  ref={objectFormRef}
-                  onStateChange={(state) => {
-                    setEditFormState((prev) => ({ ...prev, ...state }))
-                  }}
-                >
-                  {({ loading, isEditing, objectData }) => (
-                    <>
+                {({ loading, isEditing, objectData }) => (
+                  <Flex vertical gap={'large'}>
+                    <InfoCollapse
+                      title='Product SKU Information'
+                      icon={<InfoCircleIcon />}
+                      active={collapseState.info}
+                      onToggle={(expanded) =>
+                        updateCollapseState('info', expanded)
+                      }
+                      collapseKey='info'
+                    >
                       <ObjectInfo
                         loading={loading}
                         isEditing={isEditing}
@@ -158,56 +160,60 @@ const ProductSkuInfo = () => {
                           parts: false
                         }}
                       />
-                    </>
-                  )}
-                </ObjectForm>
-              </InfoCollapse>
+                    </InfoCollapse>
+                    <InfoCollapse
+                      title='SKU Parts'
+                      icon={<PartIcon />}
+                      active={collapseState.parts}
+                      onToggle={(expanded) =>
+                        updateCollapseState('parts', expanded)
+                      }
+                      collapseKey='parts'
+                    >
+                      <ObjectProperty
+                        {...getModelProperty('productSku', 'parts')}
+                        isEditing={isEditing}
+                        objectData={objectData}
+                        loading={loading}
+                        size='medium'
+                      />
+                    </InfoCollapse>
+                  </Flex>
+                )}
+              </ObjectForm>
             </ActionHandler>
-            <InfoCollapse
-              title='SKU Parts'
-              icon={<PartIcon />}
-              active={collapseState.parts}
-              onToggle={(expanded) => updateCollapseState('parts', expanded)}
-              collapseKey='parts'
-            >
-              <ObjectProperty
-                {...getModelProperty('productSku', 'parts')}
-                isEditing={objectFormState.isEditing}
-                objectData={objectFormState.objectData}
-                loading={objectFormState.loading}
-                size='medium'
-              />
-            </InfoCollapse>
-            <InfoCollapse
-              title='Notes'
-              icon={<NoteIcon />}
-              active={collapseState.notes}
-              onToggle={(expanded) => updateCollapseState('notes', expanded)}
-              collapseKey='notes'
-            >
-              <Card>
-                <NotesPanel _id={productSkuId} type='productSku' />
-              </Card>
-            </InfoCollapse>
-            <InfoCollapse
-              title='Audit Logs'
-              icon={<AuditLogIcon />}
-              active={collapseState.auditLogs}
-              onToggle={(expanded) =>
-                updateCollapseState('auditLogs', expanded)
-              }
-              collapseKey='auditLogs'
-            >
-              {objectFormState.loading ? (
-                <InfoCollapsePlaceholder />
-              ) : (
-                <ObjectTable
-                  type='auditLog'
-                  masterFilter={{ 'parent._id': productSkuId }}
-                  visibleColumns={{ _id: false, 'parent._id': false }}
-                />
-              )}
-            </InfoCollapse>
+            <Flex vertical gap={'large'}>
+              <InfoCollapse
+                title='Notes'
+                icon={<NoteIcon />}
+                active={collapseState.notes}
+                onToggle={(expanded) => updateCollapseState('notes', expanded)}
+                collapseKey='notes'
+              >
+                <Card>
+                  <NotesPanel _id={productSkuId} type='productSku' />
+                </Card>
+              </InfoCollapse>
+              <InfoCollapse
+                title='Audit Logs'
+                icon={<AuditLogIcon />}
+                active={collapseState.auditLogs}
+                onToggle={(expanded) =>
+                  updateCollapseState('auditLogs', expanded)
+                }
+                collapseKey='auditLogs'
+              >
+                {objectFormState.loading ? (
+                  <InfoCollapsePlaceholder />
+                ) : (
+                  <ObjectTable
+                    type='auditLog'
+                    masterFilter={{ 'parent._id': productSkuId }}
+                    visibleColumns={{ _id: false, 'parent._id': false }}
+                  />
+                )}
+              </InfoCollapse>
+            </Flex>
           </Flex>
         </ScrollBox>
       </Flex>
diff --git a/src/components/Dashboard/common/ObjectChildTable.jsx b/src/components/Dashboard/common/ObjectChildTable.jsx
index 96c0d10..6b80f1a 100644
--- a/src/components/Dashboard/common/ObjectChildTable.jsx
+++ b/src/components/Dashboard/common/ObjectChildTable.jsx
@@ -259,6 +259,7 @@ const ObjectChildTable = ({
     const currentItems = Array.isArray(itemsSource) ? itemsSource : []
     const newItems = [...currentItems, newItem]
 
+    console.log('newItems', newItems)
     if (typeof onChange === 'function') {
       onChange(newItems)
     }
diff --git a/src/database/models/ProductSku.js b/src/database/models/ProductSku.js
index 366b1d7..2f27c44 100644
--- a/src/database/models/ProductSku.js
+++ b/src/database/models/ProductSku.js
@@ -332,15 +332,28 @@ export const ProductSku = {
       name: 'parts',
       label: 'Parts',
       type: 'objectChildren',
-      objectType: 'partSku',
+      size: 'medium',
       properties: [
+        {
+          name: 'part',
+          label: 'Part',
+          type: 'object',
+          objectType: 'part',
+          required: true,
+          showHyperlink: true
+        },
         {
           name: 'partSku',
           label: 'Part SKU',
           type: 'object',
           objectType: 'partSku',
           required: true,
-          showHyperlink: true
+          showHyperlink: true,
+          masterFilter: (objectData) => {
+            const partId = objectData?.part?._id
+            if (partId == null) return {}
+            return { part: partId }
+          }
         },
         {
           name: 'quantity',