diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js
index 0c8cc67..c39cc66 100644
--- a/src/components/FiDataGrid.js
+++ b/src/components/FiDataGrid.js
@@ -10,7 +10,7 @@ import {TablePagination, Typography} from '@mui/material';
 
 export function FiDataGrid({ rows, columns, sx, autoHeight,
                                hideFooterSelectedRowCount, rowModesModel, editMode,
-                               pageSizeOptions, filterItems, ...props }) {
+                               pageSizeOptions, filterItems, customPageSize, ...props }) {
     const intl = useIntl();
     const [_rows, set_rows] = React.useState([]);
     const [_columns, set_columns] = React.useState([]);
@@ -64,7 +64,11 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
         if(filterItems){
             set_filterItems(filterItems);
         }
-    }, [sx, hideFooterSelectedRowCount, rowModesModel, rows, columns, pageSizeOptions, autoHeight, editMode, filterItems]);
+
+        if(customPageSize){
+            setPageSize(customPageSize);
+        }
+    }, [sx, hideFooterSelectedRowCount, rowModesModel, rows, columns, pageSizeOptions, autoHeight, editMode, filterItems, customPageSize]);
 
     const handleChangePage = (event, newPage) => {
         setPage(newPage);
@@ -109,7 +113,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
                         count={_rows.length}
                         page={page}
                         rowsPerPage={pageSize}
-                        rowsPerPageOptions={[5,10,15]}
+                        rowsPerPageOptions={[5,10,15,20,100]}
                         labelDisplayedRows={({ from, to, count }) =>
                             `${from}-${to} ${intl.formatMessage({ id: "of" })} ${count}`
                         }
diff --git a/src/pages/DemandNote/Create/DataGrid.js b/src/pages/DemandNote/Create/DataGrid.js
index 4b3cc74..9c71016 100644
--- a/src/pages/DemandNote/Create/DataGrid.js
+++ b/src/pages/DemandNote/Create/DataGrid.js
@@ -110,11 +110,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
                 rowHeight={80}
                 rows={rows}
                 columns={columns}
-                initialState={{
-                    pagination: {
-                        paginationModel: { page: 0, pageSize: 5 },
-                    },
-                }}
+                customPageSize={5}
                 onRowDoubleClick={handleEditClick}
             />
         </div>
diff --git a/src/pages/DemandNote/Search/DataGrid.js b/src/pages/DemandNote/Search/DataGrid.js
index 4267afd..dc17f6f 100644
--- a/src/pages/DemandNote/Search/DataGrid.js
+++ b/src/pages/DemandNote/Search/DataGrid.js
@@ -347,11 +347,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
                     }}
                     rows={rows}
                     columns={columns}
-                    initialState={{
-                        pagination: {
-                            paginationModel: { page: 0, pageSize: 100 },
-                        },
-                    }}
+                    customPageSize={100}
                     getRowHeight={() => 'auto'}
                     onRowDoubleClick={handleRowDoubleClick}
                 />
diff --git a/src/pages/DemandNote/Search_Public/DataGrid.js b/src/pages/DemandNote/Search_Public/DataGrid.js
index 2028d5d..fe1c2a3 100644
--- a/src/pages/DemandNote/Search_Public/DataGrid.js
+++ b/src/pages/DemandNote/Search_Public/DataGrid.js
@@ -80,11 +80,7 @@ export default function SearchDemandNote({ recordList }) {
                 <FiDataGrid
                     rows={rows}
                     columns={columns}
-                    initialState={{
-                        pagination: {
-                            paginationModel: { page: 0, pageSize: 100 },
-                        },
-                    }}
+                    customPageSize={100}
                     getRowHeight={() => 'auto'}
                 />
             </Box>
diff --git a/src/pages/GFMIS/DataGrid.js b/src/pages/GFMIS/DataGrid.js
index ca515d4..88108e9 100644
--- a/src/pages/GFMIS/DataGrid.js
+++ b/src/pages/GFMIS/DataGrid.js
@@ -76,11 +76,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
                 rowHeight={80}
                 rows={rows}
                 columns={columns}
-                initialState={{
-                    pagination: {
-                        paginationModel: { page: 0, pageSize: 10 },
-                    },
-                }}
+                customPageSize={10}
                 onRowDoubleClick={handleEditClick}
             />
         </div>
diff --git a/src/pages/Payment/Search_GLD/DataGrid.js b/src/pages/Payment/Search_GLD/DataGrid.js
index bad1ba3..f8e4e46 100644
--- a/src/pages/Payment/Search_GLD/DataGrid.js
+++ b/src/pages/Payment/Search_GLD/DataGrid.js
@@ -93,11 +93,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
                 rowHeight={80}
                 rows={rows}
                 columns={columns}
-                initialState={{
-                    pagination: {
-                        paginationModel: { page: 0, pageSize: 5 },
-                    },
-                }}
+                customPageSize={5}
                 onRowDoubleClick={handleEditClick}
             />
         </div>
diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js
index 7c6c05a..f227e5d 100644
--- a/src/pages/Proof/Reply_Public/ProofForm.js
+++ b/src/pages/Proof/Reply_Public/ProofForm.js
@@ -251,6 +251,7 @@ const FormPanel = ({ formData }) => {
                                                             color="save"
                                                             component="span"
                                                             variant="contained"
+                                                            aria-label={intl.formatMessage({id: 'upload'})}
                                                             disabled={attachments.length >= (formik.values.groupType === "Private Bill" ? 2 : 1)}
                                                         >
                                                             <FormattedMessage id="upload" />
@@ -303,6 +304,7 @@ const FormPanel = ({ formData }) => {
                                             variant="contained"
                                             color="success"
                                             type="submit"
+                                            aria-label={intl.formatMessage({id: 'submitReply'})}
                                         >
                                             <FormattedMessage id="submitReply" />
                                         </Button>
@@ -328,7 +330,12 @@ const FormPanel = ({ formData }) => {
                         <Typography variant="h3" style={{ padding: '16px' }}>{warningText}</Typography>
                     </DialogContent>
                     <DialogActions>
-                        <Button onClick={() => setIsWarningPopUp(false)}>OK</Button>
+                        <Button
+                            aria-label={intl.formatMessage({id: 'ok'})}
+                            onClick={() => setIsWarningPopUp(false)}
+                        >
+                            OK
+                        </Button>
                     </DialogActions>
                 </Dialog>
             </div>
diff --git a/src/pages/Proof/Reply_Public/index.js b/src/pages/Proof/Reply_Public/index.js
index 642ea76..80cc52c 100644
--- a/src/pages/Proof/Reply_Public/index.js
+++ b/src/pages/Proof/Reply_Public/index.js
@@ -95,7 +95,11 @@ const Index = () => {
                         </div>
                     </Grid>
                     <Grid item xs={12} width="100%">
-                        <Button title={intl.formatMessage({id: 'back'})} sx={{ mt: 2.5, ml: 3 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/proof/search") }}>
+                        <Button
+                            aria-label={intl.formatMessage({id: 'back'})}
+                            title={intl.formatMessage({id: 'back'})}
+                            sx={{ mt: 2.5, ml: 3 }} style={{ border: '2px solid' }}
+                            variant="outlined" onClick={() => { navigate("/proof/search") }}>
                             <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
                         </Button>
                     </Grid>
diff --git a/src/pages/Proof/Search_GLD/DataGrid.js b/src/pages/Proof/Search_GLD/DataGrid.js
index ceb1691..1d95455 100644
--- a/src/pages/Proof/Search_GLD/DataGrid.js
+++ b/src/pages/Proof/Search_GLD/DataGrid.js
@@ -133,12 +133,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             <FiDataGrid
                 rows={rows}
                 columns={columns}
-                pageSizeOptions={[5]}
-                initialState={{
-                    pagination: {
-                        paginationModel: { page: 0, pageSize: 10 },
-                    },
-                }}
+                customPageSize={10}
                 onRowDoubleClick={handleRowDoubleClick}
                 getRowHeight={() => 'auto'}
             />
diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js
index b4b69a9..ced7420 100644
--- a/src/pages/Proof/Search_Public/SearchForm.js
+++ b/src/pages/Proof/Search_Public/SearchForm.js
@@ -277,6 +277,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
                         <Button
                             variant="contained"
                             onClick={resetForm}
+                            aria-label={intl.formatMessage({id: 'reset'})}
                         >
                             <FormattedMessage id="reset"/>
                         </Button>
@@ -286,6 +287,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
                         <Button
                             variant="contained"
                             type="submit"
+                            aria-label={intl.formatMessage({id: 'submit'})}
                         >
                             <FormattedMessage id="submit"/>
                         </Button>
diff --git a/src/pages/PublicNotice/Details_GLD/tabTableDetail/PaymentTab.js b/src/pages/PublicNotice/Details_GLD/tabTableDetail/PaymentTab.js
index f9aba55..e9ecf64 100644
--- a/src/pages/PublicNotice/Details_GLD/tabTableDetail/PaymentTab.js
+++ b/src/pages/PublicNotice/Details_GLD/tabTableDetail/PaymentTab.js
@@ -70,11 +70,7 @@ export default function SubmittedTab({ rows }) {
                 <FiDataGrid
                     rows={rows}
                     columns={columns}
-                    initialState={{
-                        pagination: {
-                            paginationModel: { page: 0, pageSize: 5 },
-                        },
-                    }}
+                    customPageSize={5}
                 />
             </div>
         </>
diff --git a/src/pages/PublicNotice/Details_Public/tabTableDetail/PaymentTab.js b/src/pages/PublicNotice/Details_Public/tabTableDetail/PaymentTab.js
index f30e650..6a78c58 100644
--- a/src/pages/PublicNotice/Details_Public/tabTableDetail/PaymentTab.js
+++ b/src/pages/PublicNotice/Details_Public/tabTableDetail/PaymentTab.js
@@ -72,11 +72,7 @@ export default function SubmittedTab({ rows }) {
                 <FiDataGrid
                     rows={rows}
                     columns={columns}
-                    initialState={{
-                        pagination: {
-                            paginationModel: { page: 0, pageSize: 5 },
-                        },
-                    }}
+                    customPageSize={5}
                 />
             </div>
         </>
diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
index 76d26f2..46c9d4d 100644
--- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
+++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
@@ -307,11 +307,7 @@ export default function SubmittedTab({ rows }) {
                     disableRowSelectionOnClick
                     rows={rowList}
                     columns={columns}
-                    initialState={{
-                        pagination: {
-                            paginationModel: { page: 0, pageSize: 20 },
-                        },
-                    }}
+                    customPageSize={20}
                     onRowSelectionModelChange={(newSelection) => {
                         setSelectedRowItems(newSelection);
                     }}
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js
index 5cbb653..de3eb5e 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js
@@ -60,7 +60,7 @@ const UserSearchPage_Individual = () => {
                           content={false}
                           sx={{width: "-webkit-fill-available",height: "100%", minHeight:'100%'}}
                 >
-                    <div style={{height: '100%', width: '100%' , minHeight:'80vh'}}>
+                    <div style={{height: '100%', width: '100%' }}>
                         <EventTable
                             autoHeight
                             recordList={record}
diff --git a/src/pages/PublicNotice/Search_GLD/DataGrid.js b/src/pages/PublicNotice/Search_GLD/DataGrid.js
index 9902706..3f3237a 100644
--- a/src/pages/PublicNotice/Search_GLD/DataGrid.js
+++ b/src/pages/PublicNotice/Search_GLD/DataGrid.js
@@ -114,11 +114,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             <FiDataGrid
                 rows={rows}
                 columns={columns}
-                initialState={{
-                    pagination: {
-                        paginationModel: { page: 0, pageSize: 10 },
-                    },
-                }}
+                customPageSize={10}
                 getRowHeight={() => 'auto'}
                 onRowDoubleClick={handleRowDoubleClick}
             />
diff --git a/src/pages/User/ManagePage_OrgPublic/index.js b/src/pages/User/ManagePage_OrgPublic/index.js
index 02325e5..0d71064 100644
--- a/src/pages/User/ManagePage_OrgPublic/index.js
+++ b/src/pages/User/ManagePage_OrgPublic/index.js
@@ -234,11 +234,7 @@ const ManageOrgUserPage = () => {
                     sx={_sx}
                     rows={rows}
                     columns={columns}
-                    initialState={{
-                        pagination: {
-                            paginationModel: { page: 0, pageSize: 10 },
-                        },
-                    }}
+                    customPageSize={10}
                 />
             </Grid>
             <div>