diff --git a/src/components/clusters/index.tsx b/src/components/clusters/index.tsx
index fabf62dc..fea0cd9d 100644
--- a/src/components/clusters/index.tsx
+++ b/src/components/clusters/index.tsx
@@ -26,7 +26,7 @@ import { createTheme, ThemeProvider } from '@mui/material/styles';
 import MoreTimeIcon from '@mui/icons-material/MoreTime';
 import ArrowCircleRightIcon from '@mui/icons-material/ArrowCircleRight';
 import { useNavigate } from 'react-router-dom';
-import { DEFAULT_PAGE_SIZE ,MAX_PAGE_SIZE} from '../../lib/constants';
+import { DEFAULT_PAGE_SIZE, MAX_PAGE_SIZE } from '../../lib/constants';
 
 const theme = createTheme({
   breakpoints: {
@@ -409,17 +409,21 @@ export default function Clusters() {
               </Box>
             ))}
         </Grid>
-        <Box display="flex" justifyContent="flex-end" sx={{ marginTop: theme.spacing(2) }}>
-          <Pagination
-            count={totalPages}
-            page={page}
-            onChange={(_event: any, newPage: number) => {
-              setPage(newPage);
-            }}
-            color="primary"
-            size="small"
-          />
-        </Box>
+        {totalPages > 1 ? (
+          <Box display="flex" justifyContent="flex-end" sx={{ marginTop: theme.spacing(2) }}>
+            <Pagination
+              count={totalPages}
+              page={page}
+              onChange={(_event: any, newPage: number) => {
+                setPage(newPage);
+              }}
+              color="primary"
+              size="small"
+            />
+          </Box>
+        ) : (
+          <></>
+        )}
       </ThemeProvider>
     </Box>
   );
diff --git a/src/components/clusters/show.tsx b/src/components/clusters/show.tsx
index 0914aecf..af4ad366 100644
--- a/src/components/clusters/show.tsx
+++ b/src/components/clusters/show.tsx
@@ -864,17 +864,21 @@ export default function ShowCluster() {
           </LoadingButton>
         </DialogActions>
       </Dialog>
-      <Box display="flex" justifyContent="flex-end" sx={{ marginTop: theme.spacing(2) }}>
-        <Pagination
-          count={schedulerTotalPages}
-          page={schedulerPage}
-          onChange={(_event: any, newPage: number) => {
-            setSchedulerPage(newPage);
-          }}
-          color="primary"
-          size="small"
-        />
-      </Box>
+      {schedulerTotalPages > 1 ? (
+        <Box display="flex" justifyContent="flex-end" sx={{ marginTop: theme.spacing(2) }}>
+          <Pagination
+            count={schedulerTotalPages}
+            page={schedulerPage}
+            onChange={(_event: any, newPage: number) => {
+              setSchedulerPage(newPage);
+            }}
+            color="primary"
+            size="small"
+          />
+        </Box>
+      ) : (
+        <></>
+      )}
       <Typography variant="subtitle1" gutterBottom fontFamily="mabry-bold" mt="2rem" mb="1rem">
         Seed Peer Cluster
       </Typography>
@@ -1138,17 +1142,21 @@ export default function ShowCluster() {
           </LoadingButton>
         </DialogActions>
       </Dialog>
-      <Box display="flex" justifyContent="flex-end" sx={{ marginTop: theme.spacing(2) }}>
-        <Pagination
-          count={seedPeerTotalPages}
-          page={seedPeerPage}
-          onChange={(_event: any, newPage: number) => {
-            setSeedPeerPage(newPage);
-          }}
-          color="primary"
-          size="small"
-        />
-      </Box>
+      {seedPeerTotalPages > 1 ? (
+        <Box display="flex" justifyContent="flex-end" sx={{ marginTop: theme.spacing(2) }}>
+          <Pagination
+            count={seedPeerTotalPages}
+            page={seedPeerPage}
+            onChange={(_event: any, newPage: number) => {
+              setSeedPeerPage(newPage);
+            }}
+            color="primary"
+            size="small"
+          />
+        </Box>
+      ) : (
+        <></>
+      )}
       <Grid sx={{ height: 2 }}> </Grid>
     </ThemeProvider>
   );
diff --git a/src/components/developer/tokens/index.tsx b/src/components/developer/tokens/index.tsx
index 899aae17..934a608d 100644
--- a/src/components/developer/tokens/index.tsx
+++ b/src/components/developer/tokens/index.tsx
@@ -199,125 +199,207 @@ export default function PersonalAccessTokens() {
       <Typography variant="subtitle2" mb="1rem" mt="1rem">
         Tokens you have generated that can be used to access the Dragonfly API.
       </Typography>
-      <Paper variant="outlined" sx={{ width: '100%' }}>
-        {showCopyColumn ? (
-          <>
-            <Box sx={{ display: 'flex', p: '0.8rem', alignItems: 'center', backgroundColor: 'rgba(108,198,68,.1)' }}>
-              <Typography variant="body2" mr="0.2rem">
-                {newToken}
-              </Typography>
-              <IconButton
-                aria-label="delete"
-                sx={{
-                  p: '0',
-                  width: '1.6rem',
-                  height: '1.6rem',
+      {showCopyColumn ? (
+        <Box
+          sx={{
+            display: 'flex',
+            p: '0.8rem',
+            alignItems: 'center',
+            backgroundColor: 'rgba(108,198,68,.1)',
+            mb: '1rem',
+          }}
+        >
+          <Typography variant="body2" mr="0.2rem">
+            {newToken}
+          </Typography>
+          <IconButton
+            aria-label="delete"
+            sx={{
+              p: '0',
+              width: '1.6rem',
+              height: '1.6rem',
+            }}
+            onClick={copyToken}
+          >
+            {showCopyIcon ? (
+              <Tooltip
+                placement="top"
+                PopperProps={{
+                  disablePortal: true,
+                }}
+                onClose={() => {
+                  setShowCopyIcon(false);
                 }}
-                onClick={copyToken}
+                open={showCopyIcon}
+                disableFocusListener
+                disableHoverListener
+                disableTouchListener
+                title="copied!"
               >
-                {showCopyIcon ? (
-                  <Tooltip
-                    placement="top"
-                    PopperProps={{
-                      disablePortal: true,
-                    }}
-                    onClose={() => {
-                      setShowCopyIcon(false);
-                    }}
-                    open={showCopyIcon}
-                    disableFocusListener
-                    disableHoverListener
-                    disableTouchListener
-                    title="copied!"
-                  >
-                    <Box component="img" sx={{ width: '1.2rem', height: '1.2rem' }} src="/icons/tokens/done.svg" />
-                  </Tooltip>
-                ) : (
-                  <Box component="img" sx={{ width: '1.2rem', height: '1.2rem' }} src="/icons/tokens/copy.svg" />
-                )}
-              </IconButton>
-            </Box>
-            <Divider />
-          </>
-        ) : (
-          <></>
-        )}
-        {Array.isArray(tokens) &&
-          tokens.map((item) => {
-            return (
-              <Box key={item.id}>
-                <Box sx={{ display: 'flex', p: '0.8rem', justifyContent: 'space-between', alignItems: 'center' }}>
-                  <Box>
-                    <Box sx={{ display: 'flex', alignItems: 'center', mb: '0.4rem' }}>
-                      {isLoading ? (
-                        <Skeleton sx={{ width: '2rem' }} />
-                      ) : (
-                        <RouterLink
-                          component={Link}
-                          to={`/developer/personal-access-tokens/${item?.id}`}
-                          underline="hover"
-                          sx={{ color: 'var(--description-color)' }}
+                <Box component="img" sx={{ width: '1.2rem', height: '1.2rem' }} src="/icons/tokens/done.svg" />
+              </Tooltip>
+            ) : (
+              <Box component="img" sx={{ width: '1.2rem', height: '1.2rem' }} src="/icons/tokens/copy.svg" />
+            )}
+          </IconButton>
+        </Box>
+      ) : (
+        <></>
+      )}
+
+      {tokens.length === 0 ? (
+        <Paper
+          variant="outlined"
+          sx={{ height: '4rem', display: 'flex', alignItems: 'center', justifyContent: 'center' }}
+        >
+          You don't have any tokens.
+        </Paper>
+      ) : (
+        <>
+          <Paper variant="outlined">
+            {Array.isArray(tokens) &&
+              tokens.map((item, index) => {
+                return index !== tokens.length - 1 ? (
+                  <Box key={item.id}>
+                    <Box sx={{ display: 'flex', p: '0.8rem', justifyContent: 'space-between', alignItems: 'center' }}>
+                      <Box>
+                        <Box sx={{ display: 'flex', alignItems: 'center', mb: '0.4rem' }}>
+                          {isLoading ? (
+                            <Skeleton sx={{ width: '2rem' }} />
+                          ) : (
+                            <RouterLink
+                              component={Link}
+                              to={`/developer/personal-access-tokens/${item?.id}`}
+                              underline="hover"
+                              sx={{ color: 'var(--description-color)' }}
+                            >
+                              {item.name}
+                            </RouterLink>
+                          )}
+                          {isLoading ? (
+                            <>
+                              &nbsp;—&nbsp;
+                              <Skeleton sx={{ width: '1rem' }} />
+                            </>
+                          ) : (
+                            <Typography variant="body2">&nbsp;—&nbsp;{item?.user?.name}</Typography>
+                          )}
+                        </Box>
+                        {isLoading ? (
+                          <Skeleton />
+                        ) : (
+                          <>
+                            <Typography variant="body2" component="span" fontFamily="mabry-bold">
+                              Expires on&nbsp;
+                            </Typography>
+                            <Typography variant="body2" component="span">
+                              {formatDate(item?.expired_at) || ''}.
+                            </Typography>
+                          </>
+                        )}
+                      </Box>
+                      <Box>
+                        <Button
+                          size="small"
+                          sx={{
+                            '&.MuiButton-root': {
+                              backgroundColor: 'var(--button-color)',
+                              borderRadius: 0,
+                              color: '#fff',
+                            },
+                          }}
+                          variant="contained"
+                          onClick={() => {
+                            handleDeleteClose(item);
+                          }}
                         >
-                          {item.name}
-                        </RouterLink>
-                      )}
-                      {isLoading ? (
-                        <>
-                          &nbsp;—&nbsp;
-                          <Skeleton sx={{ width: '1rem' }} />
-                        </>
-                      ) : (
-                        <Typography variant="body2">&nbsp;—&nbsp;{item?.user?.name}</Typography>
-                      )}
+                          Delete
+                        </Button>
+                      </Box>
                     </Box>
-                    {isLoading ? (
-                      <Skeleton />
-                    ) : (
-                      <>
-                        <Typography variant="body2" component="span" fontFamily="mabry-bold">
-                          Expires on&nbsp;
-                        </Typography>
-                        <Typography variant="body2" component="span">
-                          {formatDate(item?.expired_at) || ''}.
-                        </Typography>
-                      </>
-                    )}
+                    <Divider />
                   </Box>
-                  <Box>
-                    <Button
-                      size="small"
-                      sx={{
-                        '&.MuiButton-root': {
-                          backgroundColor: 'var(--button-color)',
-                          borderRadius: 0,
-                          color: '#fff',
-                        },
-                      }}
-                      variant="contained"
-                      onClick={() => {
-                        handleDeleteClose(item);
-                      }}
-                    >
-                      Delete
-                    </Button>
+                ) : (
+                  <Box key={item.id}>
+                    <Box sx={{ display: 'flex', p: '0.8rem', justifyContent: 'space-between', alignItems: 'center' }}>
+                      <Box>
+                        <Box sx={{ display: 'flex', alignItems: 'center', mb: '0.4rem' }}>
+                          {isLoading ? (
+                            <Skeleton sx={{ width: '2rem' }} />
+                          ) : (
+                            <RouterLink
+                              component={Link}
+                              to={`/developer/personal-access-tokens/${item?.id}`}
+                              underline="hover"
+                              sx={{ color: 'var(--description-color)' }}
+                            >
+                              {item.name}
+                            </RouterLink>
+                          )}
+                          {isLoading ? (
+                            <>
+                              &nbsp;—&nbsp;
+                              <Skeleton sx={{ width: '1rem' }} />
+                            </>
+                          ) : (
+                            <Typography variant="body2">&nbsp;—&nbsp;{item?.user?.name}</Typography>
+                          )}
+                        </Box>
+                        {isLoading ? (
+                          <Skeleton />
+                        ) : (
+                          <>
+                            <Typography variant="body2" component="span" fontFamily="mabry-bold">
+                              Expires on&nbsp;
+                            </Typography>
+                            <Typography variant="body2" component="span">
+                              {formatDate(item?.expired_at) || ''}.
+                            </Typography>
+                          </>
+                        )}
+                      </Box>
+                      <Box>
+                        <Button
+                          size="small"
+                          sx={{
+                            '&.MuiButton-root': {
+                              backgroundColor: 'var(--button-color)',
+                              borderRadius: 0,
+                              color: '#fff',
+                            },
+                          }}
+                          variant="contained"
+                          onClick={() => {
+                            handleDeleteClose(item);
+                          }}
+                        >
+                          Delete
+                        </Button>
+                      </Box>
+                    </Box>
                   </Box>
-                </Box>
-                <Divider />
-              </Box>
-            );
-          })}
-      </Paper>
-      <Box display="flex" justifyContent="flex-end" sx={{ marginTop: theme.spacing(2) }}>
-        <Pagination
-          count={tokensTotalPages}
-          page={tokensPage}
-          onChange={(_event: any, newPage: number) => {
-            setTokensPage(newPage);
-          }}
-          color="primary"
-          size="small"
-        />
-      </Box>
+                );
+              })}
+          </Paper>
+        </>
+      )}
+
+      {tokensTotalPages > 1 ? (
+        <Box display="flex" justifyContent="flex-end" sx={{ marginTop: theme.spacing(2) }}>
+          <Pagination
+            count={tokensTotalPages}
+            page={tokensPage}
+            onChange={(_event: any, newPage: number) => {
+              setTokensPage(newPage);
+            }}
+            color="primary"
+            size="small"
+          />
+        </Box>
+      ) : (
+        <></>
+      )}
+
       <Dialog
         open={openDeletToken}
         onClose={() => {
diff --git a/src/components/users/index.tsx b/src/components/users/index.tsx
index 2213558e..0879acd9 100644
--- a/src/components/users/index.tsx
+++ b/src/components/users/index.tsx
@@ -401,17 +401,21 @@ export default function Users() {
           </TableBody>
         </Table>
       </Paper>
-      <Box display="flex" justifyContent="flex-end" sx={{ marginTop: theme.spacing(2) }}>
-        <Pagination
-          count={userTotalPages}
-          page={userPage}
-          onChange={(_event: any, newPage: number) => {
-            setUserPage(newPage);
-          }}
-          color="primary"
-          size="small"
-        />
-      </Box>
+      {userTotalPages > 1 ? (
+        <Box display="flex" justifyContent="flex-end" sx={{ marginTop: theme.spacing(2) }}>
+          <Pagination
+            count={userTotalPages}
+            page={userPage}
+            onChange={(_event: any, newPage: number) => {
+              setUserPage(newPage);
+            }}
+            color="primary"
+            size="small"
+          />
+        </Box>
+      ) : (
+        <></>
+      )}
       <Dialog
         open={switchUser}
         onClose={closeAllPopups}