Index: pages/forge/+Page.tsx
===================================================================
--- pages/forge/+Page.tsx	(revision 3a9c59cba2839f8be6bd0a5327349ee3883c2ee4)
+++ pages/forge/+Page.tsx	(revision 4f2900a42af738556efd5fd79be1f104639d6108)
@@ -491,65 +491,67 @@
 
                                 <TableCell align="right" width="15%" sx={{verticalAlign: 'top', pt: 2}}>
-                                    {slot.component && (
-                                        <Box sx={{
-                                            display: 'flex',
-                                            gap: 1,
-                                            justifyContent: 'flex-end',
-                                            alignItems: 'center'
-                                        }}>
-                                            {(slot.type === 'memory' || slot.type === 'storage') && (
-                                                <>
-                                                    <IconButton
-                                                        size="small"
-                                                        color="primary"
-                                                        onClick={() => handleDecrementComponent(slot.id)}
-                                                        disabled={(slot.component.quantity || 1) <= 1}
-                                                        sx={{
-                                                            bgcolor: 'action.hover',
-                                                            '&:disabled': {bgcolor: 'action.disabledBackground'}
-                                                        }}
-                                                    >
-                                                        <RemoveIcon/>
-                                                    </IconButton>
-
-                                                    <Typography
-                                                        variant="body2"
-                                                        sx={{
-                                                            minWidth: '20px',
-                                                            textAlign: 'center',
-                                                            fontWeight: 'bold'
-                                                        }}
-                                                    >
-                                                        {slot.component.quantity || 1}
-                                                    </Typography>
-
-                                                    <IconButton
-                                                        size="small"
-                                                        color="primary"
-                                                        onClick={() => handleIncrementComponent(slot.id)}
-                                                        sx={{bgcolor: 'action.hover'}}
-                                                    >
-                                                        <AddIcon/>
-                                                    </IconButton>
-                                                </>
-                                            )}
-
+                                    <Box sx={{
+                                        display: 'flex',
+                                        gap: 1,
+                                        justifyContent: 'flex-end',
+                                        alignItems: 'center'
+                                    }}>
+                                        {slot.component && (
+                                            <>
+                                                {(slot.type === 'memory' || slot.type === 'storage') && (
+                                                    <>
+                                                        <IconButton
+                                                            size="small"
+                                                            color="primary"
+                                                            onClick={() => handleDecrementComponent(slot.id)}
+                                                            disabled={(slot.component.quantity || 1) <= 1}
+                                                            sx={{
+                                                                bgcolor: 'action.hover',
+                                                                '&:disabled': {bgcolor: 'action.disabledBackground'}
+                                                            }}
+                                                        >
+                                                            <RemoveIcon/>
+                                                        </IconButton>
+
+                                                        <Typography
+                                                            variant="body2"
+                                                            sx={{
+                                                                minWidth: '20px',
+                                                                textAlign: 'center',
+                                                                fontWeight: 'bold'
+                                                            }}
+                                                        >
+                                                            {slot.component.quantity || 1}
+                                                        </Typography>
+
+                                                        <IconButton
+                                                            size="small"
+                                                            color="primary"
+                                                            onClick={() => handleIncrementComponent(slot.id)}
+                                                            sx={{bgcolor: 'action.hover'}}
+                                                        >
+                                                            <AddIcon/>
+                                                        </IconButton>
+                                                    </>
+                                                )}
+
+                                                <IconButton
+                                                    color="error"
+                                                    onClick={() => handleRemovePart(slot.id)}
+                                                >
+                                                    <DeleteIcon/>
+                                                </IconButton>
+                                            </>
+                                        )}
+
+                                        {!slot.required && (
                                             <IconButton
-                                                color="error"
-                                                onClick={() => handleRemovePart(slot.id)}
+                                                color="warning"
+                                                onClick={() => handleDeleteSlot(slot.id)}
                                             >
-                                                <DeleteIcon/>
+                                                <CloseIcon/>
                                             </IconButton>
-
-                                            {!slot.required && (
-                                                <IconButton
-                                                    color="warning"
-                                                    onClick={() => handleDeleteSlot(slot.id)}
-                                                >
-                                                    <CloseIcon/>
-                                                </IconButton>
-                                            )}
-                                        </Box>
-                                    )}
+                                        )}
+                                    </Box>
                                 </TableCell>
                             </TableRow>
@@ -631,5 +633,5 @@
                     disabled={isSubmitting}
                 >
-                    {isSubmitting ? <CircularProgress size={24}/> : 'Submit Build For Review'}
+                    {isSubmitting ? <CircularProgress size={24}/> : 'Save Build'}
                 </Button>
             </Box>