diff --git a/index.html b/index.html
index ebaddade6..bf40be301 100644
--- a/index.html
+++ b/index.html
@@ -141,15 +141,13 @@
 
         <div class="row">
           <div class="large-6 columns">
-            <a class="panel db"> Adress1 <span class="right"> &gt; </span> </a>
-            <a class="panel db"> Adress2 <span class="right"> &gt; </span> </a>
-            <a class="panel db"> Adress3 <span class="right"> &gt; </span> </a>
-            <a class="panel db"> Adress4 <span class="right"> &gt; </span> </a>
+            <a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr.addrStr)">{{addr.addrStr}} <span class="right"> &gt;</span></a>
           </div>
           <div class="large-6 columns">
-            <qrcode size="160" data="n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb"></qrcode>
+            <qrcode size="160" data="{{selectedAddr}}"></qrcode>
             <p> 2.5432 BTC </p>
           </div>
+          <button class="secondary round large-4 columns" ng-click="newAddr()"> New address</button>
         </div> 
       </div>
     </script>
diff --git a/js/controllers/home.js b/js/controllers/home.js
index f75a35af8..2524ddd1a 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -10,8 +10,15 @@ angular.module('copay.home').controller('HomeController',
       $location.path('signin');
     }
 
-    $scope.addrs = [
-    { addrStr: 'n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb'},
-    { addrStr: 'my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J'}
-    ];
+    $scope.addrs = $rootScope.publicKeyRing.getAddresses();
+    $scope.selectedAddr = $scope.addrs[0];
+
+    $scope.newAddr = function() {
+      var a = $rootScope.publicKeyRing.generateAddress();
+      $scope.addrs.push({ addrStr: a.toString('hex') });
+    };
+
+    $scope.selectAddr = function(addr) {
+      $scope.selectedAddr = addr;
+    };
   });