diff --git a/css/main.css b/css/main.css
index d3e74daed..4dbac797c 100644
--- a/css/main.css
+++ b/css/main.css
@@ -29,6 +29,13 @@ html, body {height: 100%;}
   height: 51px;
 }
 
+@media (max-width: 640px) {
+  .logo {
+    margin: 0 auto;
+    margin-bottom: 10px;
+  }
+}
+
 .top-bar-section li:not(.has-form) a:not(.button) {
   line-height: 60px;
 }
@@ -60,6 +67,7 @@ html, body {height: 100%;}
 .header a.button.small-icon {
   padding: 0.1rem 0.3rem;
   font-size: 0.9rem;
+  margin-left: 5px;
 }
 
 .header h1, h5, p {
@@ -207,6 +215,10 @@ small.has-error {
   }
 }
 
+.new-address {
+  width: 220px;
+}
+
 hr { margin: 2.25rem 0;}
 
 [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
@@ -237,6 +249,7 @@ hr { margin: 2.25rem 0;}
 .m10h {margin:0 10px;}
 .m30a {margin: 30px auto;}
 .br100 {border-radius: 100%;}
+.oh {overflow:hidden;}
 
 .signin input.ng-dirty.ng-invalid { 
   border: 2px red solid;
diff --git a/css/tpl-default.css b/css/tpl-default.css
index f4dddaf31..e18e6fc66 100644
--- a/css/tpl-default.css
+++ b/css/tpl-default.css
@@ -87,6 +87,10 @@ body {
   color: #fff;
 }
 
+.header-content a {
+  color: #fff;
+}
+
 .panel {
   color: #333;
   background: #FFFFFF;
diff --git a/index.html b/index.html
index 1d6a72641..e25c6e2b1 100644
--- a/index.html
+++ b/index.html
@@ -14,19 +14,21 @@
       <div data-ng-init="init()" data-ng-controller="HeaderController">
         <div class="header"> 
           <div class="header-content">
-            <div class="large-2 columns">
+            <div class="large-3 medium-3 columns">
               <span class="logo"></span>
             </div>
-            <div class="text-center large-10 columns p10t" ng-show="$root.wallet">
-              <h6 class="large-5 columns line-dashed-v">
-                <span ng-if="!$root.wallet.name && $root.wallet.id">{{$root.wallet.id}}</span>
-                <span ng-if="$root.wallet.name">Wallet: {{$root.wallet.name}} &lt;{{$root.wallet.id}}&gt;</span> 
-                <a class="button radius small-icon" href="#" ng-click="signout()"><i class="fi-power"></i></a>
-              </h6>
-              <div class="large-3 columns line-dashed-v">
+            <div class="large-9 medium-9 columns text-center p10t" ng-show="$root.wallet">
+              <div class="large-4 medium-4 columns line-dashed-v">
+                <a href="#/peer" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
+                  <span ng-if="!$root.wallet.name && $root.wallet.id">{{$root.wallet.id}}</span>
+                  <span ng-if="$root.wallet.name">{{$root.wallet.name}}</span>
+                </a> 
+                <a class="button radius small-icon" href="#" title="Signout" ng-click="signout()"><i class="fi-power"></i></a>
+              </div>
+              <div class="large-4 medium-4 columns line-dashed-v">
                 Balance: {{totalBalance || 0}} <i class="fi-bitcoin"></i><br>
               </div>
-              <div class="large-4 columns">
+              <div class="large-4 medium-4 columns">
                 Available to Spend: {{availableBalance || 0}} <i class="fi-bitcoin"></i>
               </div>
             </div>
@@ -253,24 +255,24 @@
     <script type="text/ng-template" id="addresses.html">
       <div class="addresses" data-ng-controller="AddressesController">
         <div ng-show='$root.wallet.publicKeyRing.isComplete()'>
-        <h3>Addresses (available to spend)</h3>
-        <div class="row">
-          <div class="large-6 columns">
-            <a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}}
-
- <span ng-if="!isMain[addr]">(change)</span>
- <span class="right">({{balanceByAddr[addr] || 0}} <i class="fi-bitcoin"></i>)</span></a>
-           
-          </div>
-          <div class="large-3 columns line-dashed-v text-center">
-            <qrcode size="160" data="{{selectedAddr}}"></qrcode>
-            <p class="m10t" ng-repeat="addr in addrs" ng-if="selectedAddr==addr"> <strong> {{balanceByAddr[addr]}} <i class="fi-bitcoin"></i> </strong> </p>
-          </div>
-          <div class="large-3 columns text-center">
-            <p> Create a New <strong> Address </strong> </p>
-            <button class="secondary round expand" ng-click="newAddr()" ng-disabled="loading" loading="Creating"> Create </button>
-          </div>
-        </div> 
+          <div class="row">
+            <div class="large-9 columns" ng-if="addrs[0]">
+              <h3>Addresses (available to spend)</h3>
+              <div class="large-8 columns">
+                <a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}}
+                <span ng-if="!isMain[addr]">(change)</span>
+                <span class="right">({{balanceByAddr[addr] || 0}} <i class="fi-bitcoin"></i>)</span></a>
+              </div>
+              <div class="large-4 columns line-dashed-v text-center">
+                <qrcode size="160" data="{{selectedAddr}}"></qrcode>
+                <p class="m10t" ng-repeat="addr in addrs" ng-if="selectedAddr==addr"> <strong> {{balanceByAddr[addr]}} <i class="fi-bitcoin"></i> </strong> </p>
+              </div>
+            </div>
+            <div class="columns text-center" ng-class="{'large-3' : addrs[0]}">
+              <p> Create a New <strong> Address </strong> </p>
+              <button class="secondary round expandi new-address" ng-click="newAddr()" ng-disabled="loading" loading="Creating"> Create </button>
+            </div>
+          </div> 
         </div> 
       </div>
     </script>