diff --git a/public/index.html b/public/index.html
index 7c910daa..ce9f781e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <meta name="theme-color" content="#4696e5">
     <!--
       manifest.json provides metadata used when your web app is added to the
diff --git a/src/common/MainHeader.js b/src/common/MainHeader.js
index 8b511ac7..18be02fc 100644
--- a/src/common/MainHeader.js
+++ b/src/common/MainHeader.js
@@ -8,19 +8,12 @@ import './MainHeader.scss';
 import shlinkLogo from './shlink-logo-white.png';
 
 export default class MainHeader extends React.Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      isOpen: false,
-    };
-  }
-
-  toggle() {
+  state = { isOpen: false };
+  toggle = () => {
     this.setState({
-      isOpen: ! this.state.isOpen
+      isOpen: !this.state.isOpen
     });
-  }
+  };
 
   render() {
     return (
@@ -28,7 +21,7 @@ export default class MainHeader extends React.Component {
         <NavbarBrand tag={Link} to="/">
           <img src={shlinkLogo} alt="Shlink" className="main-header__brand-logo"/> Shlink
         </NavbarBrand>
-        <NavbarToggler onClick={() => this.toggle()}/>
+        <NavbarToggler onClick={this.toggle}/>
         <Collapse navbar isOpen={this.state.isOpen}>
           <Nav navbar className="ml-auto">
             <NavItem>
diff --git a/src/short-urls/helpers/ShortUrlsRow.js b/src/short-urls/helpers/ShortUrlsRow.js
index f7953f56..c127bc6d 100644
--- a/src/short-urls/helpers/ShortUrlsRow.js
+++ b/src/short-urls/helpers/ShortUrlsRow.js
@@ -35,7 +35,7 @@ export class ShortUrlsRow extends React.Component {
         <td className="short-urls-row__cell">
           <a href={completeShortUrl} target="_blank">{completeShortUrl}</a>
         </td>
-        <td className="short-urls-row__cell">
+        <td className="short-urls-row__cell short-urls-row__cell--break">
           <a href={shortUrl.originalUrl} target="_blank">{shortUrl.originalUrl}</a>
         </td>
         <td className="short-urls-row__cell">{this.renderTags(shortUrl.tags)}</td>
diff --git a/src/short-urls/helpers/ShortUrlsRow.scss b/src/short-urls/helpers/ShortUrlsRow.scss
index 3e7e4a0d..285492dd 100644
--- a/src/short-urls/helpers/ShortUrlsRow.scss
+++ b/src/short-urls/helpers/ShortUrlsRow.scss
@@ -3,6 +3,9 @@
 .short-urls-row__cell {
   vertical-align: middle !important;
 }
+.short-urls-row__cell--break {
+  word-break: break-all;
+}
 
 .short-urls-row__cell--relative {
   position: relative;
