diff --git a/public/js/config.js b/public/js/config.js
index 2d074393..65028fd9 100755
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -26,7 +26,7 @@ angular.module('insight').config(['$routeProvider',
       templateUrl: 'views/status.html'
     }).
     otherwise({
-      redirectTo: '/'
+      templateUrl: 'views/404.html'
     });
   }
 ]);
diff --git a/public/views/404.html b/public/views/404.html
new file mode 100644
index 00000000..f056178e
--- /dev/null
+++ b/public/views/404.html
@@ -0,0 +1,5 @@
+<div class="jumbotron">
+  <h1>Ooops!</h1>
+  <h2 class="text-muted">Page not found :(</h2>
+  <p><a href="/" class="pull-right">Go to home</a></p>
+</div>
diff --git a/public/views/address.html b/public/views/address.html
index 539dca16..1e21aec7 100644
--- a/public/views/address.html
+++ b/public/views/address.html
@@ -15,15 +15,15 @@
         </tr>
         <tr>
           <td>Total Received</td>
-          <td>{{address.totalReceivedSat / 100000000}} BTC</td>
+          <td>{{address.totalReceived}} BTC</td>
         </tr>
         <tr>
           <td>Total Sent</td>
-          <td>{{address.totalSentSat / 100000000}} BTC</td>
+          <td>{{address.totalSent}} BTC</td>
         </tr>
         <tr>
           <td>Final Balance</td>
-          <td>{{address.balanceSat / 100000000}} BTC</td>
+          <td>{{address.balance}} BTC</td>
         </tr>
         <tr>
           <td>No. Transactions</td>
@@ -38,7 +38,7 @@
     </div>
   </div>
 
-  <div data-ng-controller="transactionsController" data-ng-init="byAddress(params.addrStr)"> 
+  <div data-ng-controller="transactionsController" data-ng-init="byAddress(params.addrStr)">
     <h2>Transactions <small>Transactions contained within this block</small></h2>
     <div data-ng-include src="'/views/transaction/list.html'"></div>
   </div>