diff --git a/src/pages/pdf/TemplateMaintainPage/UploadTemplateWindow.js b/src/pages/pdf/TemplateMaintainPage/UploadTemplateWindow.js
index d9eedc1..2c8625b 100644
--- a/src/pages/pdf/TemplateMaintainPage/UploadTemplateWindow.js
+++ b/src/pages/pdf/TemplateMaintainPage/UploadTemplateWindow.js
@@ -40,7 +40,7 @@ export function UploadTemplateWindow({ isWindowOpen, onNormalClose, onConfirmClo
     const handleChange = (event) => {
         if(event !== null){
             const newFile = event.target.files[0];
-            setFile(newFile);
+            handleFieldChange(newFile);
         }
         else{
             setFile(null)
@@ -248,9 +248,9 @@ export function UploadTemplateWindow({ isWindowOpen, onNormalClose, onConfirmClo
               </Grid>
 
               <Grid container alignItems={'flex-start'} spacing={2} sx={{ mt: 3 }}>
-                <Grid item sx={{ mr: 3 }}>
+                <Grid item sx={{ mr: -0.5 }}>{/*3 }}>*/}
                   <Typography variant="lionerLabel" component="span">
-                    Remark:
+                    Form Code:
                   </Typography>
                 </Grid>
                 <Grid item xs={9}>
diff --git a/src/pages/pdf/TemplateSearchPage/TemplateSearchForm.js b/src/pages/pdf/TemplateSearchPage/TemplateSearchForm.js
index abbf3d7..0c9f9e6 100644
--- a/src/pages/pdf/TemplateSearchPage/TemplateSearchForm.js
+++ b/src/pages/pdf/TemplateSearchPage/TemplateSearchForm.js
@@ -189,7 +189,7 @@ const TemplateSearchForm = ({applySearch, setExpanded,expanded, clientId}) => {
                     </Grid>
 
                     <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:0.5}}>
-                        <InputLabel htmlFor="remarks">Remarks</InputLabel>
+                        <InputLabel htmlFor="remarks">Form Code</InputLabel>
                         <TextField
                             fullWidth
                             {...register("remarks")}
diff --git a/src/pages/pdf/TemplateSearchPage/TemplateTable.js b/src/pages/pdf/TemplateSearchPage/TemplateTable.js
index f799d79..c8d0544 100644
--- a/src/pages/pdf/TemplateSearchPage/TemplateTable.js
+++ b/src/pages/pdf/TemplateSearchPage/TemplateTable.js
@@ -14,6 +14,7 @@ import AbilityContext from "../../../components/AbilityProvider";
 import {LIONER_BUTTON_THEME} from "../../../themes/colorConst";
 import {ThemeProvider} from "@emotion/react";
 import {UploadTemplateWindow} from "../TemplateMaintainPage/UploadTemplateWindow";
+import { color } from '../../../../node_modules/@mui/system/index';
 
 // ==============================|| Template TABLE ||============================== //
 
@@ -141,10 +142,11 @@ export default function TemplateTable({recordList, applySearch}) {
         {
             id: 'remarks',
             field: 'remarks',
-            headerName: 'Remarks',
+            headerName: 'Form Code',
             flex: 2,
             renderCell: (params) => {
                 return (
+                    // params.value == null? <div style={{"color": "red"}}><b>Missing Form Code!</b></div> :
                     <div style={{display: 'flex', alignItems: 'center', justifyContent: 'center', whiteSpace: 'normal', wordBreak: 'break-word'}}>
                         {params.value}
                     </div>