diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js
index f1a1f05..43d96b7 100644
--- a/src/components/FiDataGrid.js
+++ b/src/components/FiDataGrid.js
@@ -110,7 +110,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
                             count={_rows.length}
                             page={page}
                             rowsPerPage={pageSize}
-                            rowsPerPageOptions={[5, 10, 25, 50]}
+                            rowsPerPageOptions={[10]}
                             labelDisplayedRows={({ from, to, count }) =>
                                 `${from}-${to} ${intl.formatMessage({ id: "of" })} ${count}`
                             }
diff --git a/src/pages/PublicNotice/ListPanel/BaseGrid.js b/src/pages/PublicNotice/ListPanel/BaseGrid.js
index 7727eee..8b88df2 100644
--- a/src/pages/PublicNotice/ListPanel/BaseGrid.js
+++ b/src/pages/PublicNotice/ListPanel/BaseGrid.js
@@ -118,7 +118,7 @@ export default function BaseGrid({rows}) {
     }
 
     return (
-        <div style={{minHeight: 400, width: '100%', padding: 4}}>
+        <div style={{minHeight: 400, height:"100%", width: '100%', padding: 4}}>
             <FiDataGrid
                 rows={rows}
                 columns={columns}
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js
index 288731a..1703c4a 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js
@@ -35,7 +35,12 @@ const UserSearchPage_Individual = () => {
             url: GET_PUBLIC_NOTICE_LIST,
             params: searchCriteria,
             onSuccess: function(responseData){
-                setRecord(responseData);
+                setRecord(
+                    [
+                        responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],
+                        responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0],responseData[0]
+                    ]
+                );
             }
         });
     }
@@ -45,7 +50,7 @@ const UserSearchPage_Individual = () => {
     }
 
     return (
-        <Grid container>
+        <Grid container sx={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
             {/*row 1*/}
             <Grid item xs={12} md={12} lg={12} sx={{mb:-3}}>
                 <SearchForm 
@@ -58,11 +63,14 @@ const UserSearchPage_Individual = () => {
                 <MainCard elevation={0}
                           border={false}
                           content={false}
-                          sx={{width: "-webkit-fill-available"}}
+                          sx={{width: "-webkit-fill-available",height: "100%", minHeight:'100%'}}
                 >
-                    <EventTable
-                        recordList={record}
-                    />
+                    <div style={{height: '100%', width: '100%' , minHeight:'80vh'}}>
+                        <EventTable
+                            autoHeight
+                            recordList={record}
+                        />
+                    </div>
                 </MainCard>
             </Grid>
 
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
index ce1c222..f29aa12 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
@@ -121,7 +121,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
     }
 
     return (
-        <div style={{ minHeight: 400, width: '100%' }}>
+        <div style={{ minHeight: 400, height: "100%", width: '100%' }}>
             <FiDataGrid
                 rows={rows}
                 columns={columns}
diff --git a/src/pages/PublicNotice/ListPanel/index.js b/src/pages/PublicNotice/ListPanel/index.js
index 72112f0..31d625b 100644
--- a/src/pages/PublicNotice/ListPanel/index.js
+++ b/src/pages/PublicNotice/ListPanel/index.js
@@ -129,9 +129,9 @@ const PublicNotice = () => {
 
                 {
                     JSON.parse(localStorage.getItem('userData')).creditor ? (
-                        <Grid item xs={12} sm={12} md={12} lg={12} sx={{ minHeight: '75vh', maxWidth: '1%',width: "-webkit-fill-available", backgroundColor: "#fff", mt: 3, mr: 3, ml: 3, mb: 3, ..._sx }}>
+                        <Grid item xs={12} sm={12} md={12} lg={12} sx={{ height:'100%', maxWidth: '1%',width: "-webkit-fill-available", backgroundColor: "#fff", mt: 3, mr: 3, ml: 3, mb: 3, ..._sx }}>
                             <TabContext value={selectedTab}>
-                                <Box sx={{ borderBottom: 1, borderColor: 'divider', overflowX: 'auto', }}>
+                                <Box sx={{ borderBottom: 1, borderColor: 'divider', overflowX: 'auto', overflowY:'auto' }}>
                                     <TabList onChange={handleChange} aria-label="lab API tabs example" sx={{ display: 'flex', flexDirection: 'row' }}>
                                         <Tab label={intl.formatMessage({id: 'processing'}) + " (" + submittedList?.length + ")"} value="1" />
                                         <Tab label={intl.formatMessage({id: 'pendingPublish'}) + " (" + pendingPublishList?.length + ")"} value="3" />
@@ -166,7 +166,7 @@ const PublicNotice = () => {
                             </TabContext>
                         </Grid>
                     ) : (
-                        <Grid item xs={12} sx={{ minHeight: '75vh', maxWidth: '95%', width: "-webkit-fill-available", backgroundColor: "#fff", mt: 3, mr: 3, ml: 3, mb: 3, ..._sx }}>
+                        <Grid item xs={12} sx={{ minHeight: '80vh',height:"100%", maxHeight:'300vh', maxWidth: '95%', width: "-webkit-fill-available", backgroundColor: "#fff", mt: 3, mr: 3, ml: 3, mb: 3, ..._sx }}>
                             <TabContext value={selectedTab}>
                                 <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
                                     <TabList onChange={handleChange} aria-label="lab API tabs example">