From 09f1e6430fb800fe1006d6619c98bc3f4c65f6c1 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Mon, 11 Mar 2024 17:27:40 +0800
Subject: [PATCH] GLD user UI update

---
 src/pages/Announcement/Search/DataGrid.js     |  4 +--
 src/pages/Announcement/Search/SearchForm.js   | 14 +++-----
 src/pages/DemandNote/Search/DataGrid.js       |  4 +--
 src/pages/DemandNote/Search/SearchForm.js     | 33 ++++++++-----------
 .../EmailTemplate/Search_GLD/DataGrid.js      |  8 ++---
 src/pages/GFMIS/DataGrid.js                   |  2 +-
 src/pages/GFMIS/SearchForm.js                 |  5 ++-
 src/pages/GFMIS/index.js                      |  4 ++-
 src/pages/Payment/Details_GLD/DataGrid.js     |  2 +-
 .../Payment/Details_GLD/PaymentDetails.js     | 10 +++---
 src/pages/Payment/Search_GLD/DataGrid.js      | 22 ++++++-------
 src/pages/Payment/Search_GLD/SearchForm.js    | 17 ++++------
 src/pages/Payment/Search_GLD/index.js         |  2 +-
 src/pages/Proof/Search_GLD/DataGrid.js        |  4 +--
 src/pages/Proof/Search_GLD/SearchForm.js      | 20 +++++------
 src/pages/PublicNotice/Search_GLD/DataGrid.js |  6 ++--
 .../PublicNotice/Search_GLD/SearchForm.js     | 24 ++++++--------
 src/pages/User/SearchPage/UserTable.js        |  2 +-
 .../UserSearchForm_Organization.js            |  4 +--
 .../UserTable_Organization.js                 |  8 ++---
 20 files changed, 90 insertions(+), 105 deletions(-)

diff --git a/src/pages/Announcement/Search/DataGrid.js b/src/pages/Announcement/Search/DataGrid.js
index bcbeab0..fe63c55 100644
--- a/src/pages/Announcement/Search/DataGrid.js
+++ b/src/pages/Announcement/Search/DataGrid.js
@@ -25,7 +25,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
     const columns = [
         {
             field: 'announceDate',
-            headerName: 'Announce Date',
+            headerName: 'Announcement Date',
             width: 250,
             cellClassName: 'announceDate',
             renderCell: (params) => {
@@ -35,7 +35,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
         {
             id: 'subjec',
             field: 'subjec',
-            headerName: 'Subjec',
+            headerName: 'Subject',
             minWidth: 400,
             renderCell: (params) => {
                 return <>
diff --git a/src/pages/Announcement/Search/SearchForm.js b/src/pages/Announcement/Search/SearchForm.js
index 500385c..7fd9691 100644
--- a/src/pages/Announcement/Search/SearchForm.js
+++ b/src/pages/Announcement/Search/SearchForm.js
@@ -68,14 +68,14 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
                         </Grid>
 
                         <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:marginBottom}}>
-                            <Grid container>
-                                <Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
+                            <Grid container spacing={1}>
+                                <Grid item xs={6}>
                                     <TextField
                                         fullWidth
                                         {...register("dateFrom")}
                                         id="dateFrom"
                                         type="date"
-                                        label={"Submit Date(From)"}
+                                        label={"Submit Date (From)"}
                                         defaultValue={searchCriteria.dateFrom}
                                         InputProps={{ inputProps: { max: maxDate } }}
                                         onChange={(newValue) => {
@@ -87,11 +87,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
                                     />
                                 </Grid>
 
-                                <Grid item xs={1.5} s={1.5} md={1.5} lg={1} sx={{mt:0.8, display: 'flex', justifyContent:"center", alignItems: 'flex-start'}}>
-                                    To
-                                </Grid>
-
-                                <Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
+                                <Grid item xs={6}>
                                     <TextField
                                         fullWidth
                                         InputLabelProps={{
@@ -104,7 +100,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
                                         }}
                                         id="dateTo"
                                         type="date"
-                                        //label={"Submit Date(To)"}
+                                        label={"Submit Date (To)"}
                                         defaultValue={searchCriteria.dateTo}
                                     />
                                 </Grid>
diff --git a/src/pages/DemandNote/Search/DataGrid.js b/src/pages/DemandNote/Search/DataGrid.js
index 4b42eff..fdad4ab 100644
--- a/src/pages/DemandNote/Search/DataGrid.js
+++ b/src/pages/DemandNote/Search/DataGrid.js
@@ -164,7 +164,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
     const columns = [
         {
             field: 'appNo',
-            headerName: 'App No.',
+            headerName: 'Application No.',
             width: 150,
         },
         {
@@ -211,7 +211,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
         },
         {
             field: 'amount',
-            headerName: 'Amount($)',
+            headerName: 'Amount ($)',
             width: 120,
             align: 'right',
             valueGetter: (params) => {
diff --git a/src/pages/DemandNote/Search/SearchForm.js b/src/pages/DemandNote/Search/SearchForm.js
index 319875e..8a93408 100644
--- a/src/pages/DemandNote/Search/SearchForm.js
+++ b/src/pages/DemandNote/Search/SearchForm.js
@@ -142,7 +142,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                 }}
                                 renderInput={(params) => (
                                     <TextField {...params}
-                                        label="Gazette Issue"
+                                        label="Gazette Issue No."
                                         InputLabelProps={{
                                             shrink: true
                                         }}
@@ -156,7 +156,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                 fullWidth
                                 {...register("appNo")}
                                 id='appNo'
-                                label={"App No."}
+                                label={"Application No."}
                                 defaultValue={searchCriteria.appNo}
                                 InputLabelProps={{
                                     shrink: true
@@ -182,7 +182,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                         }}
                                         renderInput={(params) => (
                                             <TextField {...params}
-                                                label="BR No./Organisation"
+                                                label="BR No./ Organisation"
                                                 InputLabelProps={{
                                                     shrink: true
                                                 }}
@@ -208,8 +208,8 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                         </Grid>
 
                         <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>
-                            <Grid container>
-                                <Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
+                            <Grid container spacing={1}>
+                                <Grid item xs={6}>
                                     <TextField
                                         fullWidth
                                         {...register("dateFrom")}
@@ -227,11 +227,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                     />
                                 </Grid>
 
-                                <Grid item xs={1.5} s={1.5} md={1.5} lg={1} sx={{mt:0.8, display: 'flex', justifyContent:"center", alignItems: 'flex-start'}}>
-                                    To
-                                </Grid>
-
-                                <Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
+                                <Grid item xs={6}>
                                     <TextField
                                         fullWidth
                                         InputLabelProps={{
@@ -244,7 +240,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                         }}
                                         id="dateTo"
                                         type="date"
-                                        //label={"Submit Date(To)"}
+                                        label={"Issue Date (To)"}
                                         defaultValue={searchCriteria.dateTo}
                                     />
                                 </Grid>
@@ -252,14 +248,14 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                         </Grid>
 
                         <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>
-                            <Grid container>
-                                <Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
+                            <Grid container spacing={1}>
+                                <Grid item xs={6}>
                                     <TextField
                                         fullWidth
                                         {...register("dueDateFrom")}
                                         id="dueDateFrom"
                                         type="date"
-                                        label={"Due Date(From)"}
+                                        label={"Due Date (From)"}
                                         defaultValue={searchCriteria.dueDateFrom}
                                         InputProps={{ inputProps: { max: maxDueDate } }}
                                         onChange={(newValue) => {
@@ -271,11 +267,8 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                     />
                                 </Grid>
 
-                                <Grid item xs={1.5} s={1.5} md={1.5} lg={1} sx={{mt:0.8, display: 'flex', justifyContent:"center", alignItems: 'flex-start'}}>
-                                    To
-                                </Grid>
-
-                                <Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
+                              
+                                <Grid item xs={6}>
                                     <TextField
                                         fullWidth
                                         InputLabelProps={{
@@ -288,7 +281,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                         }}
                                         id="dueDateTo"
                                         type="date"
-                                        //label={"Submit Date(To)"}
+                                        label={"Due Date (To)"}
                                         defaultValue={searchCriteria.dueDateTo}
                                     />
                                 </Grid>
diff --git a/src/pages/EmailTemplate/Search_GLD/DataGrid.js b/src/pages/EmailTemplate/Search_GLD/DataGrid.js
index 9d05202..5129889 100644
--- a/src/pages/EmailTemplate/Search_GLD/DataGrid.js
+++ b/src/pages/EmailTemplate/Search_GLD/DataGrid.js
@@ -55,25 +55,25 @@ export default function EmailTemplateTable({ recordList }) {
         {
             id: 'params',
             field: 'params',
-            headerName: 'Params',
+            headerName: 'Parameters',
             flex: 1,
         },
         {
             id: 'subjectCht',
             field: 'subjectCht',
-            headerName: 'SubjectCht',
+            headerName: 'Subject (Cht)',
             flex: 1,
         },
         {
             id: 'subjectChs',
             field: 'subjectChs',
-            headerName: 'SubjectChs',
+            headerName: 'Subject (Chs)',
             flex: 1,
         },
         {
             id: 'subjectEng',
             field: 'subjectEng',
-            headerName: 'SubjectEng',
+            headerName: 'Subject (Eng)',
             flex: 1,
         },
     ];
diff --git a/src/pages/GFMIS/DataGrid.js b/src/pages/GFMIS/DataGrid.js
index 88108e9..3284d94 100644
--- a/src/pages/GFMIS/DataGrid.js
+++ b/src/pages/GFMIS/DataGrid.js
@@ -59,7 +59,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
         {
             id: 'payAmount',
             field: 'payAmount',
-            headerName: 'Payment Amount',
+            headerName: 'Amount ($)',
             flex: 5,            
             valueGetter: (params) => {
                 return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : "";
diff --git a/src/pages/GFMIS/SearchForm.js b/src/pages/GFMIS/SearchForm.js
index d72d037..6f4e4d2 100644
--- a/src/pages/GFMIS/SearchForm.js
+++ b/src/pages/GFMIS/SearchForm.js
@@ -73,7 +73,10 @@ const SearchPublicNoticeForm = ({ applySearch, generateXML, searchCriteria }) =>
                             type="date"
                             label="Credit Date"
                             defaultValue={searchCriteria.dateFrom}
-                            InputProps={{ inputProps: { max: maxDate } }}
+                            InputProps={{ 
+                                inputProps: { 
+                                max: maxDate,
+                             } }}
                             // onChange={(newValue) => {
                             //     setMinDate(DateUtils.dateStr(newValue));
                             // }}
diff --git a/src/pages/GFMIS/index.js b/src/pages/GFMIS/index.js
index 4a96416..9b16ad1 100644
--- a/src/pages/GFMIS/index.js
+++ b/src/pages/GFMIS/index.js
@@ -127,7 +127,9 @@ const Index = () => {
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
-                            <Typography ml={15} color='#FFF' variant="h4">GFMIS</Typography>
+                            <Typography ml={15} color='#FFF' variant="h4">
+                            GFMIS Generate XML
+                            </Typography>
                         </Stack>
                     </div>
                 </Grid>
diff --git a/src/pages/Payment/Details_GLD/DataGrid.js b/src/pages/Payment/Details_GLD/DataGrid.js
index af608b4..207e1ba 100644
--- a/src/pages/Payment/Details_GLD/DataGrid.js
+++ b/src/pages/Payment/Details_GLD/DataGrid.js
@@ -54,7 +54,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
         {
             id: 'fee',
             field: 'fee',
-            headerName: 'Amount (HK$)',
+            headerName: 'Amount ($)',
             width: 150,
             valueGetter: (params) => {
                 return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : "";
diff --git a/src/pages/Payment/Details_GLD/PaymentDetails.js b/src/pages/Payment/Details_GLD/PaymentDetails.js
index de9e10a..9efe315 100644
--- a/src/pages/Payment/Details_GLD/PaymentDetails.js
+++ b/src/pages/Payment/Details_GLD/PaymentDetails.js
@@ -70,7 +70,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
                             <Grid container >
                                 <Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}>
                                     <FormLabel sx={{ color: "#000000" }}>
-                                        Trans No.:
+                                    Transaction No.:
                                     </FormLabel>
                                 </Grid>
                                 <Grid item xs={6} md={5} sx={{ml:5, textAlign: "left" }}>
@@ -84,7 +84,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
                             <Grid container >
                                 <Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}>
                                     <FormLabel sx={{ color: "#000000" }}>
-                                        Trans Date:
+                                    Transaction Date:
                                     </FormLabel>
                                 </Grid>
                                 <Grid item xs={6} md={5} sx={{ml:5, textAlign: "left" }}>
@@ -98,7 +98,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
                             <Grid container >
                                 <Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}>
                                     <FormLabel sx={{ color: "#000000" }}>
-                                        Trans Time:
+                                    Transaction Time:
                                     </FormLabel>
                                 </Grid>
                                 <Grid item xs={6} md={5} sx={{ml:5, textAlign: "left" }}>
@@ -112,7 +112,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
                             <Grid container >
                                 <Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}>
                                     <FormLabel sx={{ color: "#000000" }}>
-                                        EGIS Ref No.:
+                                        EGIS Reference No.:
                                     </FormLabel>
                                 </Grid>
                                 <Grid item xs={6} md={5} sx={{ml:5, textAlign: "left" }}>
@@ -153,7 +153,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
                         <Grid item xs={12} md={12}>
                             <Grid container alignItems="center">
                                 <Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}>
-                                    <FormLabel sx={{ fontSize: "16px", color: "#000000" }}>
+                                    <FormLabel sx={{ color: "#000000" }}>
                                         Payment Receipt:
                                     </FormLabel>
                                 </Grid>
diff --git a/src/pages/Payment/Search_GLD/DataGrid.js b/src/pages/Payment/Search_GLD/DataGrid.js
index 6051a59..87ac47a 100644
--- a/src/pages/Payment/Search_GLD/DataGrid.js
+++ b/src/pages/Payment/Search_GLD/DataGrid.js
@@ -40,28 +40,28 @@ export default function SearchPublicNoticeTable({ recordList }) {
 
     const columns = [
         {
-            field: 'actions',
-            headerName: 'Trans. No.',
+            id: 'appNos',
+            field: 'appNos',
+            headerName: 'Application No.',
             flex: 1,
-            cellClassName: 'actions',
             renderCell: (params) => {
-                return <Button onClick={handleEditClick(params)}><u>{params.row.transNo}</u></Button>;
+                let appNo = params.row.appNos;
+                return <div style={{ margin: 4 }}>{appNo}</div>
             },
         },
         {
-            id: 'appNos',
-            field: 'appNos',
-            headerName: 'App No.',
+            field: 'actions',
+            headerName: 'Transaction No.',
             flex: 1,
+            cellClassName: 'actions',
             renderCell: (params) => {
-                let appNo = params.row.appNos;
-                return <div style={{ margin: 4 }}>{appNo}</div>
+                return <Button onClick={handleEditClick(params)}><u>{params.row.transNo}</u></Button>;
             },
         },
         {
             id: 'transDateTime',
             field: 'transDateTime',
-            headerName: 'Trans. Date',
+            headerName: 'Transaction Date',
             flex: 1,
             valueGetter: (params) => {
                 return DateUtils.dateStr(params?.value);
@@ -78,7 +78,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
         {
             id: 'payAmount',
             field: 'payAmount',
-            headerName: 'Amount',
+            headerName: 'Amount ($)',
             width: 150,
             valueGetter: (params) => {
                 return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : "";
diff --git a/src/pages/Payment/Search_GLD/SearchForm.js b/src/pages/Payment/Search_GLD/SearchForm.js
index 07ecc2d..8d048c7 100644
--- a/src/pages/Payment/Search_GLD/SearchForm.js
+++ b/src/pages/Payment/Search_GLD/SearchForm.js
@@ -62,7 +62,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                 fullWidth
                                 {...register("code")}
                                 id='code'
-                                label="App No.:"
+                                label="Application No."
                                 defaultValue={searchCriteria.code}
                                 InputLabelProps={{
                                     shrink: true
@@ -71,14 +71,14 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                         </Grid>
 
                         <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:marginBottom}}>
-                            <Grid container>
-                                <Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
+                            <Grid container spacing={1}>
+                                <Grid item xs={6}>
                                     <TextField
                                         fullWidth
                                         {...register("dateFrom")}
                                         id="dateFrom"
                                         type="date"
-                                        label="Trans. Date From"
+                                        label="Transaction Date (From)"
                                         defaultValue={searchCriteria.dateFrom}
                                         InputProps={{ inputProps: { max: maxDate } }}
                                         onChange={(newValue) => {
@@ -89,10 +89,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                         }}
                                     />
                                 </Grid>
-                                <Grid item xs={1.5} s={1.5} md={1.5} lg={1} sx={{mt:0.8, display: 'flex', justifyContent:"center", alignItems: 'flex-start'}}>
-                                    To
-                                </Grid>
-                                <Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
+                                <Grid item xs={6}>
                                     <TextField
                                         fullWidth
                                         InputLabelProps={{
@@ -105,7 +102,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                         }}
                                         id="dateTo"
                                         type="date"
-                                        label="Trans. Date To"
+                                        label="Transaction Date (To)"
                                         defaultValue={searchCriteria.dateTo}
                                     />
                                 </Grid>
@@ -117,7 +114,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                 fullWidth
                                 {...register("transNo")}
                                 id='transNo'
-                                label="Trans. No.:"
+                                label="Transaction No."
                                 defaultValue={searchCriteria.transNo}
                                 InputLabelProps={{
                                     shrink: true
diff --git a/src/pages/Payment/Search_GLD/index.js b/src/pages/Payment/Search_GLD/index.js
index 64860d0..bed4346 100644
--- a/src/pages/Payment/Search_GLD/index.js
+++ b/src/pages/Payment/Search_GLD/index.js
@@ -69,7 +69,7 @@ const Index = () => {
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
                             <Typography ml={15} color='#FFF' variant="h4">
-                                Payment Record
+                                Online Payment Record
                             </Typography>
                         </Stack>
                     </div>
diff --git a/src/pages/Proof/Search_GLD/DataGrid.js b/src/pages/Proof/Search_GLD/DataGrid.js
index 56e1e2d..da76f23 100644
--- a/src/pages/Proof/Search_GLD/DataGrid.js
+++ b/src/pages/Proof/Search_GLD/DataGrid.js
@@ -68,7 +68,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
         {
             id: 'replyDate',
             field: 'replyDate',
-            headerName: 'Confirmed/Return Date',
+            headerName: 'Confirmed/ Return Date',
             flex: 1,
             valueGetter: (params) => {
                 return params?.value ? DateUtils.datetimeStr(params?.value) : "";
@@ -116,7 +116,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
         {
             id: 'fee',
             field: 'fee',
-            headerName: 'Fee',
+            headerName: 'Amount ($)',
             flex: 1,
             valueGetter: (params) => {
                 return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : "";
diff --git a/src/pages/Proof/Search_GLD/SearchForm.js b/src/pages/Proof/Search_GLD/SearchForm.js
index f537cbd..da1dd99 100644
--- a/src/pages/Proof/Search_GLD/SearchForm.js
+++ b/src/pages/Proof/Search_GLD/SearchForm.js
@@ -142,7 +142,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                 fullWidth
                                 {...register("code")}
                                 id='code'
-                                label="Application / Gazette Code"
+                                label="Application No. / Gazette Code"
                                 defaultValue={searchCriteria.code}
                                 InputLabelProps={{
                                     shrink: true
@@ -165,7 +165,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                 }}
                                 renderInput={(params) => (
                                     <TextField {...params}
-                                        label="Gazette Issue"
+                                        label="Gazette Issue No."
                                         InputLabelProps={{
                                             shrink: true
                                         }}
@@ -199,8 +199,8 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                         </Grid>
 
                         <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:marginBottom}}>
-                            <Grid container>
-                                <Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
+                            <Grid container spacing={1}>
+                                <Grid item xs={6}>
                                     <TextField
                                         fullWidth
                                         {...register("dateFrom")}
@@ -217,10 +217,8 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         }}
                                     />
                                 </Grid>
-                                <Grid item xs={1.5} s={1.5} md={1.5} lg={1} sx={{mt:0.8, display: 'flex', justifyContent:"center", alignItems: 'flex-start'}}>
-                                    To
-                                </Grid>
-                                <Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
+                               
+                                <Grid item xs={6}>
                                     <TextField
                                         fullWidth
                                         InputLabelProps={{
@@ -233,7 +231,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         }}
                                         id="dateTo"
                                         type="date"
-                                        label="Proof Issue Date(To)"
+                                        label="Proof Issue Date (To)"
                                         defaultValue={searchCriteria.dateTo}
                                     />    
                                 </Grid>
@@ -257,7 +255,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                         <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
                             <Autocomplete
                                 {...register("status")}
-                                disablePortal
+                                disablePortal={false}
                                 id="status"
                                 size="small"
                                 filterOptions={(options) => options}
@@ -296,7 +294,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         }}
                                         renderInput={(params) => (
                                             <TextField {...params}
-                                                label="Organisation"
+                                                label="BR No./ Organisation"
                                                 InputLabelProps={{
                                                     shrink: true
                                                 }}
diff --git a/src/pages/PublicNotice/Search_GLD/DataGrid.js b/src/pages/PublicNotice/Search_GLD/DataGrid.js
index 0a5f982..e868062 100644
--- a/src/pages/PublicNotice/Search_GLD/DataGrid.js
+++ b/src/pages/PublicNotice/Search_GLD/DataGrid.js
@@ -42,7 +42,7 @@ export default function SearchPublicNoticeTable({ recordList, reloadFunction })
     const columns = [
         {
             field: 'actions',
-            headerName: 'App No.',
+            headerName: 'Application No.',
             width: 150,
             cellClassName: 'actions',
             renderCell: (params) => {
@@ -70,7 +70,7 @@ export default function SearchPublicNoticeTable({ recordList, reloadFunction })
         {
             id: 'contactPerson',
             field: 'contactPerson',
-            headerName: 'Contact Person',
+            headerName: 'Client',
             flex: 2,
             renderCell: (params) => {
                 let company = params.row.enCompanyName != null ? params.row.enCompanyName : params.row.chCompanyName;
@@ -109,7 +109,7 @@ export default function SearchPublicNoticeTable({ recordList, reloadFunction })
         {
             id: 'issueId',
             field: 'issueId',
-            headerName: 'Issue No',
+            headerName: 'Gazette Issue No.',
             flex: 1.5,
             valueGetter: (params) => {
                 return params.row.issueYear
diff --git a/src/pages/PublicNotice/Search_GLD/SearchForm.js b/src/pages/PublicNotice/Search_GLD/SearchForm.js
index 499932e..2fea903 100644
--- a/src/pages/PublicNotice/Search_GLD/SearchForm.js
+++ b/src/pages/PublicNotice/Search_GLD/SearchForm.js
@@ -125,7 +125,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                 fullWidth
                                 {...register("appNo")}
                                 id='appNo'
-                                label={"App No."}
+                                label={"Application No."}
                                 defaultValue={searchCriteria.appNo}
                                 InputLabelProps={{
                                     shrink: true
@@ -134,14 +134,14 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                         </Grid>
 
                         <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: marginBottom }}>
-                            <Grid container>
-                                <Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
+                            <Grid container spacing={1}>
+                                <Grid item xs={6}>
                                     <TextField
                                         fullWidth
                                         {...register("dateFrom")}
                                         id="dateFrom"
                                         type="date"
-                                        label={"Submit Date(From)"}
+                                        label={"Submit Date (From)"}
                                         defaultValue={searchCriteria.dateFrom}
                                         InputProps={{ inputProps: { max: maxDate } }}
                                         onChange={(newValue) => {
@@ -152,12 +152,8 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         }}
                                     />
                                 </Grid>
-
-                                <Grid item xs={1.5} s={1.5} md={1.5} lg={1} sx={{ mt: 0.8, display: 'flex', justifyContent: "center", alignItems: 'flex-start' }}>
-                                    To
-                                </Grid>
-
-                                <Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
+                                
+                                <Grid item xs={6}>
                                     <TextField
                                         fullWidth
                                         InputLabelProps={{
@@ -170,7 +166,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         }}
                                         id="dateTo"
                                         type="date"
-                                        //label={"Submit Date(To)"}
+                                        label={"Submit Date (To)"}
                                         defaultValue={searchCriteria.dateTo}
                                     />
                                 </Grid>
@@ -267,7 +263,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                         }}
                                         renderInput={(params) => (
                                             <TextField {...params}
-                                                label="Organisation"
+                                                label="BR No./ Organisation"
                                                 InputLabelProps={{
                                                     shrink: true
                                                 }}
@@ -295,7 +291,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                 }}
                                 renderInput={(params) => (
                                     <TextField {...params}
-                                        label="Gazette Issue"
+                                        label="Gazette Issue No."
                                         InputLabelProps={{
                                             shrink: true
                                         }}
@@ -309,7 +305,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                 fullWidth
                                 {...register("groupNo")}
                                 id='groupNo'
-                                label="Gazette Code."
+                                label="Gazette Code"
                                 defaultValue={searchCriteria.groupNo}
                                 InputLabelProps={{
                                     shrink: true
diff --git a/src/pages/User/SearchPage/UserTable.js b/src/pages/User/SearchPage/UserTable.js
index 919bfb7..dd9054e 100644
--- a/src/pages/User/SearchPage/UserTable.js
+++ b/src/pages/User/SearchPage/UserTable.js
@@ -81,7 +81,7 @@ export default function UserTable({recordList,setChangeLocked}) {
         {
             id: 'username',
             field: 'username',
-            headerName: 'User Name',
+            headerName: 'Username',
             flex: 1,
         },
         {
diff --git a/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js b/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js
index 630091b..52052ad 100644
--- a/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js
+++ b/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js
@@ -69,7 +69,7 @@ const UserSearchForm_Organization = ({applySearch}) => {
                                 fullWidth
                                 {...register("orgName")}
                                 id="orgName"
-                                label="Org Name"
+                                label="Organisation Name"
                                 InputLabelProps={{
                                     shrink: true
                                 }}
@@ -139,7 +139,7 @@ const UserSearchForm_Organization = ({applySearch}) => {
                         <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>
                                      <Autocomplete
                                       {...register("accountFilter")}
-                                        disablePortal
+                                        disablePortal={false}
                                         id="accountFilter"
                                         size="small"
                                         options={["All", "Active","Locked","Not verified"]}
diff --git a/src/pages/User/SearchPage_Organization/UserTable_Organization.js b/src/pages/User/SearchPage_Organization/UserTable_Organization.js
index 7fe38ba..fa711ce 100644
--- a/src/pages/User/SearchPage_Organization/UserTable_Organization.js
+++ b/src/pages/User/SearchPage_Organization/UserTable_Organization.js
@@ -49,7 +49,7 @@ export default function UserTable_Organization({recordList}) {
         {
             id: 'username',
             field: 'username',
-            headerName: 'User Name',
+            headerName: 'Username',
             flex: 1,
         },
         {
@@ -61,19 +61,19 @@ export default function UserTable_Organization({recordList}) {
         {
             id: 'enCompanyName',
             field: 'enCompanyName',
-            headerName: 'Company(Eng)',
+            headerName: 'Company (Eng)',
             flex: 1,
         },
         {
             id: 'chCompanyName',
             field: 'chCompanyName',
-            headerName: 'Company(Ch)',
+            headerName: 'Company (Ch)',
             flex: 1,
         },
         {
             id: 'brNo',
             field: 'brNo',
-            headerName: 'Br No',
+            headerName: 'BR No.',
             flex: 1,
         },
         {