diff --git a/src/common/MenuLayout.js b/src/common/MenuLayout.js
index 592a6b9c..6b5f5057 100644
--- a/src/common/MenuLayout.js
+++ b/src/common/MenuLayout.js
@@ -79,7 +79,7 @@ const MenuLayout = (TagsList, ShortUrls, AsideMenu, CreateShortUrl, ShortUrlVisi
                   <Route exact path="/server/:serverId/short-code/:shortCode/visits" component={ShortUrlVisits} />
                   <Route exact path="/server/:serverId/manage-tags" component={TagsList} />
                   <Route
-                    render={() => <NotFound to={`/server/${serverId}/list-short-urls/1`} btnText="List short URLs" />}
+                    render={() => <NotFound to={`/server/${serverId}/list-short-urls/1`}>List short URLs</NotFound>}
                   />
                 </Switch>
               </div>
diff --git a/src/common/NotFound.js b/src/common/NotFound.js
index d34e0143..7a2355e9 100644
--- a/src/common/NotFound.js
+++ b/src/common/NotFound.js
@@ -4,17 +4,18 @@ import * as PropTypes from 'prop-types';
 
 const propTypes = {
   to: PropTypes.string,
-  btnText: PropTypes.string,
+  children: PropTypes.node,
 };
 
-const NotFound = ({ to = '/', btnText = 'Home' }) => (
+const NotFound = ({ to = '/', children = 'Home' }) => (
   <div className="home">
     <h2>Oops! We could not find requested route.</h2>
     <p>
-      Use your browser{'\''}s back button to navigate to the page you have previously come from, or just press this button.
+      Use your browser&apos;s back button to navigate to the page you have previously come from, or just press this
+      button.
     </p>
     <br />
-    <Link to={to} className="btn btn-outline-primary btn-lg">{btnText}</Link>
+    <Link to={to} className="btn btn-outline-primary btn-lg">{children}</Link>
   </div>
 );