diff --git a/src/components/PutAwayScan/PutAwayModal.tsx b/src/components/PutAwayScan/PutAwayModal.tsx
index b4b0a5e..4eec24a 100644
--- a/src/components/PutAwayScan/PutAwayModal.tsx
+++ b/src/components/PutAwayScan/PutAwayModal.tsx
@@ -55,7 +55,7 @@ const style = {
   position: "absolute",
   top: "50%",
   left: "50%",
-  transform: "translate(-50%, -50%)",
+  transform: "translate(-50%, -50%) scale(0.85)",
   bgcolor: "background.paper",
   pt: { xs: 0.5, sm: 0.75, md: 1 },
   px: { xs: 1, sm: 1, md: 1.5 },
diff --git a/src/components/StockIn/CalculateExpiryDateModal.tsx b/src/components/StockIn/CalculateExpiryDateModal.tsx
index e14f160..8d3ab5f 100644
--- a/src/components/StockIn/CalculateExpiryDateModal.tsx
+++ b/src/components/StockIn/CalculateExpiryDateModal.tsx
@@ -166,7 +166,7 @@ const CalculateExpiryDateModal: React.FC<Props> = ({
                     position: "fixed",
                     top: "50%",
                     left: "50%",
-                    transform: "translate(-50%, -50%)",
+                    transform: "translate(-50%, -50%) scale(0.8)",
                 }}
             >
                 <Box
@@ -202,7 +202,7 @@ const CalculateExpiryDateModal: React.FC<Props> = ({
                                 alignItems="flex-start"
                                 spacing={2}
                             >
-                                <Grid item xs={2.5}>
+                                <Grid item xs={4}>
                                     <DatePicker
                                         sx={textfieldSx}
                                         label={t("productionDate")}
@@ -229,14 +229,14 @@ const CalculateExpiryDateModal: React.FC<Props> = ({
                                         justifyContent: 'center',
                                         alignItems: 'center',
                                         alignSelf: 'flex-start',
-                                        mt: '8px', // align icon with vertical center of MUI outlined input
+                                        mt: '20px', // align icon with vertical center of 生產日期 input (label ~20px + half input 28px)
                                         height: 56,
                                     }}>
                                     <Add sx={{
                                         fontSize: '1.25rem', color:'secondary.main',
                                     }}/>
                                 </Grid>
-                                <Grid item xs={4}>
+                                <Grid item xs={2.5}>
                                     <ShelfLifeInput
                                         sx={textfieldSx}
                                         value={shelfLife}
@@ -254,7 +254,7 @@ const CalculateExpiryDateModal: React.FC<Props> = ({
                                         justifyContent: 'center',
                                         alignItems: 'center',
                                         alignSelf: 'flex-start',
-                                        mt: '8px',
+                                        mt: '20px', // align with 生產日期 input text box
                                         height: 56,
                                     }}>
                                     <SwapHoriz sx={{fontSize: '1.25rem', color:'secondary.main'}}/>