diff --git a/frontend/src/components/BookPage.js b/frontend/src/components/BookPage.js
index c2fe2713..bdb04319 100644
--- a/frontend/src/components/BookPage.js
+++ b/frontend/src/components/BookPage.js
@@ -112,8 +112,8 @@ export default class BookPage extends Component {
           { field: 'amount', headerName: 'Amount', type: 'number', width: 80 },
           { field: 'currency', headerName: 'Currency', width: 100, 
           renderCell: (params) => {return (
-            <div style={{ cursor: "pointer" }}>{params.row.currency + " " + getFlags(params.row.currency)}</div>
-          )} },
+            <div style={{ cursor: "pointer" }}>{params.row.currency+" "+getFlags(params.row.currency)}</div>)
+          }},
           { field: 'payment_method', headerName: 'Payment Method', width: 180 },
           { field: 'price', headerName: 'Price', type: 'number', width: 140,
           renderCell: (params) => {return (
@@ -173,7 +173,14 @@ export default class BookPage extends Component {
           { field: 'currency', headerName: 'Currency', width: 100, 
           renderCell: (params) => {return (
             <Tooltip placement="left" enterTouchDelay="0" title={params.row.payment_method}>
-            <div style={{ cursor: "pointer" }}>{params.row.currency + " " + getFlags(params.row.currency)}</div>
+                <Grid container xs={12} aling="center">
+                  <Grid item xs={6} aling="center">
+                    <span>{params.row.currency}</span> 
+                  </Grid>
+                  <Grid item xs={6} aling="center">
+                    <Typography>{getFlags(params.row.currency)}</Typography> 
+                  </Grid>
+                </Grid>
             </Tooltip>
           )} },
           { field: 'payment_method', headerName: 'Payment Method', width: 180, hide:'true'},
diff --git a/frontend/src/components/UserGenPage.js b/frontend/src/components/UserGenPage.js
index 463aa633..ed849ec4 100644
--- a/frontend/src/components/UserGenPage.js
+++ b/frontend/src/components/UserGenPage.js
@@ -6,8 +6,6 @@ import InfoDialog from './InfoDialog'
 import SmartToyIcon from '@mui/icons-material/SmartToy';
 import CasinoIcon from '@mui/icons-material/Casino';
 import ContentCopy from "@mui/icons-material/ContentCopy";
-import InfoIcon from '@mui/icons-material/Info';
-import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
 
 function getCookie(name) {
   let cookieValue = null;
@@ -212,11 +210,13 @@ export default class UserGenPage extends Component {
             </Button>
             :
             <Tooltip enterTouchDelay="0" title="You must enter a new token first">
+              <div>
               <Button disabled={true} type="submit" size='small' >
                 <SmartToyIcon sx={{width:18, height:18}} />
                 <span>  Generate Robot</span>
               </Button>
-              </Tooltip>
+              </div>
+            </Tooltip>
             }
           </Grid>
           <Grid item xs={12} align="center">