diff --git a/index.html b/index.html
index d10b58a89..7a81329cb 100644
--- a/index.html
+++ b/index.html
@@ -48,7 +48,7 @@
     <div ng-if='$root.flashMessage.message' class="panel callout radius" style="color:red" >
       {{$root.flashMessage.type}}: 
       {{$root.flashMessage.message}}
-      <a href="#" ng-click="clearFlashMessage()" class="button tiny">Dismiss</a>
+      <a ng-click="clearFlashMessage()" class="button tiny">Dismiss</a>
     </div>
 
 
@@ -203,6 +203,7 @@
     <!-- HOME -->
     <script type="text/ng-template" id="home.html">
       <div class="home" data-ng-controller="HomeController">
+        <div ng-show='$root.wallet.publicKeyRing.isComplete()'>
         <h3>Address</h3>
 
         <div class="row">
@@ -219,6 +220,7 @@
             <button class="secondary round expand" ng-click="newAddr()"> Create </button>
           </div>
         </div> 
+        </div> 
       </div>
     </script>
 
@@ -226,8 +228,7 @@
     <!-- TRANSACTIONS -->
     <script type="text/ng-template" id="transactions.html">
       <div class="transactions" data-ng-controller="TransactionsController">
-      
-        <div class="row">
+        <div class="row" ng-show='$root.wallet.publicKeyRing.isComplete()'>
           <div class="large-12 columns">
             <h3>Pending Transactions <small>({{txsoutput.length}})</small></h3>
             <div class="panel pending" ng-repeat="txp in txsoutput">
@@ -290,8 +291,7 @@
    <!-- SEND -->
     <script type="text/ng-template" id="send.html">
       <div class="send" data-ng-controller="SendController">
-      <h3>{{title}}</h3>
-        <div class="row">
+        <div class="row" ng-show='$root.wallet.publicKeyRing.isComplete()'>
           <div class="large-8 columns">
             <form>
               <label for="address">To
diff --git a/js/controllers/home.js b/js/controllers/home.js
index 8519571ea..bd3753aa1 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -31,7 +31,6 @@ angular.module('copay.home').controller('HomeController',
     $scope.newAddr = function() {
       var a = $rootScope.wallet.generateAddress().toString();
       $scope.addrs.push(a);
-
       _getBalance();
       var socket = Socket($scope);
       socket.on('connect', controllerUtils.handleTransactionByAddress($scope));