diff --git a/static/css/main.css b/static/css/main.css
index 49aa654e..a9559a03 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -123,13 +123,13 @@ h3 {
     min-height: 100%;
     height: auto;
     padding: 75px 0;
-    margin: 0 auto -45px;
+    margin: 0 auto -42px;
 }
 
 #footer {
     background-color: #212121;
     color: #fff;
-    height: 45px;
+    height: 42px;
     overflow: hidden;
 }
 
diff --git a/static/templates/address.html b/static/templates/address.html
index 64ea44ce..05207f62 100644
--- a/static/templates/address.html
+++ b/static/templates/address.html
@@ -6,7 +6,7 @@
 </div>
 <h3>Confirmed</h3>
 <div class="data-div row">
-    <div class="col-md-10">
+    <div class="col-lg-10">
         <table class="table data-table">
             <tbody>
                 {{- if eq .ChainType 1 -}}
@@ -71,8 +71,8 @@
             </tbody>
         </table>
     </div>
-    <div class="col-md-2">
-        <div id="qrcode" style="width: 160px; height: 160px;"></div>
+    <div class="col-lg-2">
+        <div id="qrcode" style="width: 160px; height: 160px; float: right; padding-left: 10px;"></div>
         <script type="text/javascript" src="/static/js/qrcode.min.js"></script>
         <script type="text/javascript">
             new QRCode(document.getElementById("qrcode"), { text: "{{$addr.AddrStr}}", width: 160, height: 160 });
diff --git a/static/templates/base.html b/static/templates/base.html
index dd60ab8d..55c2a32f 100644
--- a/static/templates/base.html
+++ b/static/templates/base.html
@@ -14,7 +14,7 @@
 <body>
     <header id="header">
         <div class="container">
-            <nav class="navbar navbar-expand-lg navbar-dark bg-trezor">
+            <nav class="navbar navbar-expand-md navbar-dark bg-trezor">
                 <a class="navbar-brand" href="/" title="Home">
                     <div alt="Trezor Wallet" style="margin-top: 3px;">
                         <svg width="100" version="1.1" id="logotyp" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 163.7 41.9" space="preserve">
@@ -73,22 +73,18 @@
     <footer id="footer" class="footer">
         <div class="container">
             <nav class="navbar navbar-expand-lg navbar-dark bg-trezor">
-                <ul class="navbar-nav flex-row">
-                    <li class="nav-item">
-                        <a class="nav-link" href="http://satoshilabs.com/" target="_blank" rel="noopener noreferrer">© 2020 SatoshiLabs</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{- .TOSLink -}}" target="_blank" rel="noopener noreferrer">Terms</a>
-                    </li>
-                </ul>
-                <span class="d-none ml-md-auto d-md-flex navbar-form navbar-nav">
+                <span class="navbar-nav">
+                    <a class="nav-link" href="https://satoshilabs.com/" target="_blank" rel="noopener noreferrer">© 2020 SatoshiLabs</a>
+                </span>
+                <span class="navbar-nav ml-md-auto">
+                    <a class="nav-link" href="{{- .TOSLink -}}" target="_blank" rel="noopener noreferrer">Terms</a>
+                </span>
+                <span class="navbar-nav ml-md-auto">
                     <a href="/sendtx" class="nav-link">Send Transaction</a>
                 </span>
-                <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
-                    <li class="nav-item active">
-                        <a class="nav-link" rel="noopener noreferrer" href="http://shop.trezor.io">Don't have a Trezor? Get one!</a>
-                    </li>
-                </ul>
+                <span class="navbar-nav ml-md-auto d-md-flex d-none">
+                    <a class="nav-link active" rel="noopener noreferrer" href="http://shop.trezor.io">Don't have a Trezor? Get one!</a>
+                </span>
             </nav>
         </div>
     </footer>
diff --git a/static/templates/xpub.html b/static/templates/xpub.html
index ff8ea585..8e6255a4 100644
--- a/static/templates/xpub.html
+++ b/static/templates/xpub.html
@@ -6,7 +6,7 @@
 </div>
 <h3>Confirmed</h3>
 <div class="data-div row">
-    <div class="col-md-10">
+    <div class="col-lg-10">
         <table class="table data-table">
             <tbody>
                 <tr>
@@ -64,8 +64,8 @@
         </tbody>
         </table>
     </div>
-    <div class="col-md-2">
-        <div id="qrcode" style="width: 160px; height: 160px;"></div>
+    <div class="col-lg-2">
+        <div id="qrcode" style="width: 160px; height: 160px; float: right; padding-left: 10px;"></div>
         <script type="text/javascript" src="/static/js/qrcode.min.js"></script>
         <script type="text/javascript">
             new QRCode(document.getElementById("qrcode"), { text: "{{$addr.AddrStr}}", width: 160, height: 160 });
