diff --git a/frontend/src/components/BottomBar.js b/frontend/src/components/BottomBar.js
index d36a1b1b..a0800075 100644
--- a/frontend/src/components/BottomBar.js
+++ b/frontend/src/components/BottomBar.js
@@ -13,6 +13,7 @@ import BoltIcon from '@mui/icons-material/Bolt';
 import GitHubIcon from '@mui/icons-material/GitHub';
 import EqualizerIcon from '@mui/icons-material/Equalizer';
 import SendIcon from '@mui/icons-material/Send';
+import PublicIcon from '@mui/icons-material/Public';
 
 export default class BottomBar extends Component {
     constructor(props) {
@@ -66,6 +67,7 @@ export default class BottomBar extends Component {
                     <ListItemIcon><BoltIcon/></ListItemIcon>
                     <ListItemText primary={this.state.lnd_version} secondary="LND version"/>
                 </ListItem>
+
                 <Divider/>
                 <ListItem>
                     <ListItemIcon><GitHubIcon/></ListItemIcon>
@@ -75,12 +77,20 @@ export default class BottomBar extends Component {
                         </a>
                     </ListItemText>
                 </ListItem>
+
                 <Divider/>
                 <ListItem>
                     <ListItemIcon><EqualizerIcon/></ListItemIcon>
                     <ListItemText primary={this.state.today_total_volume+" BTC"} secondary="Today traded volume"/>
                 </ListItem>
+
+                <Divider/>
+                <ListItem>
+                    <ListItemIcon><PublicIcon/></ListItemIcon>
+                    <ListItemText primary="Made with ❤️ and ⚡" secondary="... somewhere on Earth!"/>
+                </ListItem>
             </List>
+
             </DialogContent>
         </Dialog>
     )
@@ -105,10 +115,10 @@ export default class BottomBar extends Component {
             <Typography component="h5" variant="h5">Community</Typography>
             <Typography component="body2" variant="body2">
                 <p> Support is only offered via public channels.
-                    For questions and hanging out with other robots
-                    join the Telegram Groups. If you find a bug
-                    or want to see new features, use the Github
-                    Issues page.
+                    Writte us on our Telegram community if you have
+                    questions or want to hang out with other cool robots.
+                    If you find a bug or want to see new features, use 
+                    the Github Issues page.
                 </p>
             </Typography>
             <List> 
diff --git a/frontend/src/components/InfoDialog.js b/frontend/src/components/InfoDialog.js
index ac867a1a..3815edcf 100644
--- a/frontend/src/components/InfoDialog.js
+++ b/frontend/src/components/InfoDialog.js
@@ -44,9 +44,9 @@ export default class InfoDialog extends Component {
           <Typography component="h5" variant="h5">Are there trade limits?</Typography>
           <Typography component="body2" variant="body2">
             <p>Maximum single trade size is 500,000 Satoshis to minimize lightning
-              routing failures. This limit will be raised as the Lightning Network 
-              matures. There is no limits to the number of trades per day
-              or number of simultaneous Robots you can use. </p>
+              routing. There is no limits to the number of trades per day. A robot
+              can only have one order at a time. However, you can use multiple
+              Robots simultatenously in different browsers (remember to back up the tokens!). </p>
           </Typography>
 
           <Typography component="h5" variant="h5">Is <i>RoboSats</i> private?</Typography>
@@ -99,7 +99,7 @@ export default class InfoDialog extends Component {
             </p>
           </Typography>
 
-          <Typography component="h5" variant="h5">It <i>RoboSats</i> legal in my country?</Typography>
+          <Typography component="h5" variant="h5">Is <i>RoboSats</i> legal in my country?</Typography>
           <Typography component="body2" variant="body2">
             <p> In many countries using <i>RoboSats</i> is no different than using Ebay 
               or Craiglist. Your regulation may vary. It is your responsibility
@@ -112,12 +112,11 @@ export default class InfoDialog extends Component {
             <p> This lightning application is provided as is. It is in active 
               development: trade with the utmost caution. There is no private 
               support. Support is only offered via public channels <a href='https://t.me/robosats'>
-              (Telegram)</a>. <i>RoboSats</i> will never contact you.
-              <i>RoboSats</i> will definitely never ask for your user token.
+              (Telegram)</a>. <i>RoboSats</i> will never contact you. <i>
+              RoboSats</i> will definitely never ask for your robot token.
             </p>
           </Typography>
 
-      
         </DialogContent>
 
       </div>
diff --git a/frontend/src/components/UserGenPage.js b/frontend/src/components/UserGenPage.js
index 5ed55d18..796e756e 100644
--- a/frontend/src/components/UserGenPage.js
+++ b/frontend/src/components/UserGenPage.js
@@ -71,7 +71,8 @@ export default class UserGenPage extends Component {
     this.delGeneratedUser()
     this.setState({
       token: this.genBase62Token(34),
-    })
+    });
+    this.getGeneratedUser(this.state.token);
   }
 
   handleChangeToken=(e)=>{
diff --git a/frontend/templates/frontend/index.html b/frontend/templates/frontend/index.html
index a8fca818..34f11a4a 100644
--- a/frontend/templates/frontend/index.html
+++ b/frontend/templates/frontend/index.html
@@ -1,6 +1,10 @@
 <!DOCTYPE html>
 <html>
   <head>
+
+    {% comment %} TODO Add a proper fav icon {% endcomment %}
+    <link rel="shortcut icon" href="#" /> 
+
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>RoboSats - Simple and Private Bitcoin Exchange</title>