diff --git a/js/controllers/addresses.js b/js/controllers/addresses.js
index 20f5a92a5..e2a3174cc 100644
--- a/js/controllers/addresses.js
+++ b/js/controllers/addresses.js
@@ -25,7 +25,7 @@ angular.module('copayApp.controllers').controller('AddressesController',
       };
 
       $modal.open({
-        templateUrl: 'addressModal.html',
+        templateUrl: 'views/modals/qr-address.html',
         controller: ModalInstanceCtrl,
         resolve: {
           address: function() { return address; }
diff --git a/js/controllers/send.js b/js/controllers/send.js
index 7b7c87ce9..8c77f960a 100644
--- a/js/controllers/send.js
+++ b/js/controllers/send.js
@@ -206,7 +206,7 @@ angular.module('copayApp.controllers').controller('SendController',
 
     $scope.openAddressBookModal = function() {
       var modalInstance = $modal.open({
-        templateUrl: 'views/modals/addressbook.html',
+        templateUrl: 'views/modals/address-book.html',
         windowClass: 'tiny',
         controller: function($scope, $modalInstance) {
 
diff --git a/js/routes.js b/js/routes.js
index 910fac48d..486aba7c7 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -45,8 +45,8 @@ angular
       .when('/unsupported', {
         templateUrl: 'views/unsupported.html'
       })
-      .when('/uri_payment/:data', {
-        templateUrl: 'views/uri_payment.html'
+      .when('/uri-payment/:data', {
+        templateUrl: 'views/uri-payment.html'
       })
       .otherwise({
         templateUrl: 'views/errors/404.html',
diff --git a/js/services/uriHandler.js b/js/services/uriHandler.js
index 969ff1c0e..59a8304c0 100644
--- a/js/services/uriHandler.js
+++ b/js/services/uriHandler.js
@@ -4,8 +4,8 @@ var UriHandler = function() {};
 
 UriHandler.prototype.register = function() {
   var base = window.location.origin + '/';
-  var url = base + '#/uri_payment/%s';
-  // navigator.registerProtocolHandler('bitcoin', url, 'Copay');
+  var url = base + '#/uri-payment/%s';
+  navigator.registerProtocolHandler('bitcoin', url, 'Copay');
 };
 
 angular.module('copayApp.services').value('uriHandler', new UriHandler());
diff --git a/views/addresses.html b/views/addresses.html
index ffc56db9e..e4cf4d67b 100644
--- a/views/addresses.html
+++ b/views/addresses.html
@@ -5,44 +5,32 @@
       <span class="button small side-bar" ng-click="newAddr()" ng-disabled="loading" loading="Creating"><i class="fi-plus"></i></span>
     </h3> 
     
-      <div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">
-        <div class="large-12 medium-12" ng-init="showAll=0">
-          <ul>
-            <li class="panel radius db" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
+    <div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">
+      <div class="large-12 medium-12" ng-init="showAll=0">
+        <ul>
+          <li class="panel radius db" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
 
-              <span><contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/></span>
-              <small ng-if="addr.isChange">change</small>
-              <a href="#" ng-click="openAddressModal(addr)">Show QR</a>
+            <span><contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/></span>
+            <small ng-if="addr.isChange">change</small>
+            <a href="#" ng-click="openAddressModal(addr)">Show QR</a>
 
-              <span class="right">
-                <span ng-if="$root.updatingBalance">
-                  <i class="fi-bitcoin-circle icon-rotate spinner"></i>
-                </span>
-                <span ng-if="!$root.updatingBalance">
-                  {{addr.balance || 0|noFractionNumber}} {{$root.unitName}}
-                </span>
-              </span>
-            </li>
-          </ul>
-
-          <a class="secondary radius" ng-click="showAll=!showAll" ng-show="(addresses|removeEmpty).length != (addresses|removeEmpty|limitAddress).length">
-            <span ng-if="!showAll">Show all</span>
-            <span ng-if="showAll">Show less</span>
-          </a>
-        </div>
-
-        <script type="text/ng-template" id="addressModal.html">
-          <qrcode size="160" data="{{address.address}}"></qrcode>
-          Address: {{address.address}}<br/>
-          <span ng-if="$root.updatingBalance">
+            <span class="right">
+              <span ng-if="$root.updatingBalance">
                 <i class="fi-bitcoin-circle icon-rotate spinner"></i>
-          </span>
-          <span ng-if="!$root.updatingBalance">
-            Balance: {{address.balance || 0|noFractionNumber}} {{$root.unitName}}
-          </span>
-          <a class="close-reveal-modal" ng-click="cancel()">&#215;</a>
-        </script>
+              </span>
+              <span ng-if="!$root.updatingBalance">
+                {{addr.balance || 0|noFractionNumber}} {{$root.unitName}}
+              </span>
+            </span>
+          </li>
+        </ul>
+
+        <a class="secondary radius" ng-click="showAll=!showAll" ng-show="(addresses|removeEmpty).length != (addresses|removeEmpty|limitAddress).length">
+          <span ng-if="!showAll">Show all</span>
+          <span ng-if="showAll">Show less</span>
+        </a>
       </div>
+    </div>
   </div>
 </div>
 
diff --git a/views/modals/addressbook.html b/views/modals/address-book.html
similarity index 100%
rename from views/modals/addressbook.html
rename to views/modals/address-book.html
diff --git a/views/modals/qr-address.html b/views/modals/qr-address.html
new file mode 100644
index 000000000..972a6e799
--- /dev/null
+++ b/views/modals/qr-address.html
@@ -0,0 +1,9 @@
+<qrcode size="160" data="{{address.address}}"></qrcode>
+Address: {{address.address}}<br/>
+<span ng-if="$root.updatingBalance">
+      <i class="fi-bitcoin-circle icon-rotate spinner"></i>
+</span>
+<span ng-if="!$root.updatingBalance">
+  Balance: {{address.balance || 0|noFractionNumber}} {{$root.unitName}}
+</span>
+<a class="close-reveal-modal" ng-click="cancel()">&#215;</a>
\ No newline at end of file
diff --git a/views/uri_payment.html b/views/uri-payment.html
similarity index 100%
rename from views/uri_payment.html
rename to views/uri-payment.html