diff --git a/app/controllers/currency.js b/app/controllers/currency.js
index 9642e970..244ef327 100644
--- a/app/controllers/currency.js
+++ b/app/controllers/currency.js
@@ -48,19 +48,13 @@ exports.index = function(req, res) {
 
       res.jsonp({
         status: 200,
-        data: {
-          bitstamp: bitstampRate,
-          delay: delay
-        }
+        data: { bitstamp: bitstampRate }
       });
     });
   } else {
     res.jsonp({
       status: 200,
-      data: {
-        bitstamp: bitstampRate,
-        delay: delay
-      }
+      data: { bitstamp: bitstampRate }
     });
   }
 };
diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade
index 4e9a987c..23b6ce8b 100755
--- a/app/views/includes/foot.jade
+++ b/app/views/includes/foot.jade
@@ -35,11 +35,12 @@ script(type='text/javascript', src='/js/services/currency.js')
 //Application Controllers
 script(type='text/javascript', src='/js/controllers/index.js')
 script(type='text/javascript', src='/js/controllers/header.js')
+script(type='text/javascript', src='/js/controllers/search.js')
 script(type='text/javascript', src='/js/controllers/blocks.js')
 script(type='text/javascript', src='/js/controllers/transactions.js')
 script(type='text/javascript', src='/js/controllers/address.js')
-script(type='text/javascript', src='/js/controllers/search.js')
 script(type='text/javascript', src='/js/controllers/status.js')
 script(type='text/javascript', src='/js/controllers/footer.js')
 script(type='text/javascript', src='/js/controllers/connection.js')
+script(type='text/javascript', src='/js/controllers/currency.js')
 script(type='text/javascript', src='/js/init.js')
diff --git a/public/js/controllers/currency.js b/public/js/controllers/currency.js
new file mode 100644
index 00000000..e5c7c62c
--- /dev/null
+++ b/public/js/controllers/currency.js
@@ -0,0 +1,56 @@
+'use strict';
+
+angular.module('insight.currency').controller('CurrencyController',
+  function($scope, $rootScope, Currency) {
+
+    $rootScope.currency = {
+      factor: 1,
+      bitstamp: 0,
+      symbol: 'BTC',
+      getConvertion: function(value) {
+        if (typeof value !== 'undefined' && value !== null) {
+          var response;
+
+          if (this.symbol === 'USD') {
+            response = _roundFloat((value * this.factor), 2);
+          } else if (this.symbol === 'mBTC') {
+            this.factor = 1000;
+            response = _roundFloat((value * this.factor), 5);
+          } else {
+            this.factor = 1;
+            response = value;
+          }
+
+          return response + ' ' + this.symbol;
+        }
+
+        return 'value error';
+      }
+    };
+
+    var _roundFloat = function(x, n) {
+      if(!parseInt(n, 10) || !parseFloat(x)) n = 0;
+
+      return Math.round(x * Math.pow(10, n)) / Math.pow(10, n);
+    };
+
+    $scope.setCurrency = function(currency) {
+      $rootScope.currency.symbol = currency;
+
+      if (currency === 'USD') {
+        Currency.get({}, function(res) {
+          $rootScope.currency.factor = $rootScope.currency.bitstamp = res.data.bitstamp;
+        });
+      } else if (currency === 'mBTC') {
+        $rootScope.currency.factor = 1000;
+      } else {
+        $rootScope.currency.factor = 1;
+      }
+    };
+
+    // Get initial value
+    Currency.get({}, function(res) {
+      $rootScope.currency.bitstamp = res.data.bitstamp;
+    });
+
+  });
diff --git a/public/js/controllers/footer.js b/public/js/controllers/footer.js
index 28744bc3..047ba1e9 100644
--- a/public/js/controllers/footer.js
+++ b/public/js/controllers/footer.js
@@ -1,52 +1,7 @@
 'use strict';
 
 angular.module('insight.system').controller('FooterController',
-  function($rootScope, $scope, Version, Currency) {
-
-    var _roundFloat = function(x, n) {
-      if(!parseInt(n, 10) || !parseFloat(x)) n = 0;
-
-      return Math.round(x * Math.pow(10, n)) / Math.pow(10, n);
-    };
-
-    $rootScope.currency = {
-      factor: 1,
-      symbol: 'BTC',
-      bitstamp: 0,
-      getConversion: function(value) {
-        if (value !== 'undefined' && value !== null) {
-          var response;
-
-          if (this.symbol === 'USD') {
-            response = _roundFloat((value * this.factor), 2);
-          } else if (this.symbol === 'mBTC') {
-            this.factor = 1000;
-            response = _roundFloat((value * this.factor), 5);
-          } else {
-            this.factor = 1;
-            response = value;
-          }
-
-          return response + ' ' + this.symbol;
-        }
-
-        return null;
-      }
-    };
-
-    $scope.setCurrency = function(currency) {
-      if (currency === 'USD') {
-        Currency.get({}, function(res) {
-          $rootScope.currency.factor = $rootScope.currency.bitstamp = res.data.bitstamp;
-        });
-      } else if (currency === 'mBTC') {
-        $rootScope.currency.factor = 1000;
-      } else {
-        $rootScope.currency.factor = 1;
-      }
-
-      $rootScope.currency.symbol = currency;
-    };
+  function($scope, Version) {
 
     var _getVersion = function() {
       Version.get({},
diff --git a/public/js/controllers/header.js b/public/js/controllers/header.js
index cf63deb6..e5fa3acd 100755
--- a/public/js/controllers/header.js
+++ b/public/js/controllers/header.js
@@ -1,13 +1,9 @@
 'use strict';
 
 angular.module('insight.system').controller('HeaderController',
-  function($scope, $rootScope, getSocket, Global, Block, Currency) {
+  function($scope, $rootScope, getSocket, Global, Block) {
   $scope.global = Global;
 
-  Currency.get({}, function(res) {
-    $rootScope.currency.bitstamp = res.data.bitstamp;
-  });
-
   $scope.menu = [
     {
       'title': 'Blocks',
diff --git a/public/views/address.html b/public/views/address.html
index c6c82695..4c5e9df6 100644
--- a/public/views/address.html
+++ b/public/views/address.html
@@ -16,15 +16,15 @@
           <tbody>
           <tr>
             <td class="small">Total Received</td>
-            <td class="address ellipsis text-right">{{$root.currency.getConversion(address.totalReceived)}}</td>
+            <td class="address ellipsis text-right">{{$root.currency.getConvertion(address.totalReceived)}}</td>
           </tr>
           <tr>
             <td class="small">Total Sent</td>
-            <td class="address ellipsis text-right">{{$root.currency.getConversion(address.totalSent)}}</td>
+            <td class="address ellipsis text-right">{{$root.currency.getConvertion(address.totalSent)}}</td>
           </tr>
           <tr>
             <td class="small">Final Balance</td>
-            <td class="address ellipsis text-right">{{$root.currency.getConversion(address.balance)}}</td>
+            <td class="address ellipsis text-right">{{$root.currency.getConvertion(address.balance)}}</td>
           </tr>
           <tr>
             <td class="small">No. Transactions</td>
diff --git a/public/views/includes/currency.html b/public/views/includes/currency.html
index 3dc3ef22..c9acb46c 100644
--- a/public/views/includes/currency.html
+++ b/public/views/includes/currency.html
@@ -1,8 +1,8 @@
-<div class="currency text-center m10t" data-ng-controller="FooterController">
+<div class="currency text-center m10t" data-ng-controller="CurrencyController">
   <small>
     Currency:
-    <a href="#" data-ng-click="setCurrency('USD')" data-ng-class="{active: $root.currency.symbol == 'USD'}" tooltip="Change to USD: Bitstamp ${{$root.currency.bitstamp}}">USD</a> ·
-    <a href="#" data-ng-click="setCurrency('BTC')" data-ng-class="{active: $root.currency.symbol == 'BTC'}" tooltip="Change to BTC">BTC</a> ·
-    <a href="#" data-ng-click="setCurrency('mBTC')" data-ng-class="{active: $root.currency.symbol == 'mBTC'}" tooltip="Change to mBTC">mBTC</a>
+    <a href="#" data-ng-click="setCurrency('USD')" data-ng-class="{active: currency.symbol == 'USD'}" tooltip="Change to USD: Bitstamp ${{currency.bitstamp}}">USD</a> ·
+    <a href="#" data-ng-click="setCurrency('BTC')" data-ng-class="{active: currency.symbol == 'BTC'}" tooltip="Change to BTC">BTC</a> ·
+    <a href="#" data-ng-click="setCurrency('mBTC')" data-ng-class="{active: currency.symbol == 'mBTC'}" tooltip="Change to mBTC">mBTC</a>
   </small>
 </div>
diff --git a/public/views/transaction.html b/public/views/transaction.html
index 78735363..bcf0074d 100644
--- a/public/views/transaction.html
+++ b/public/views/transaction.html
@@ -27,36 +27,32 @@
     </table>
     <div data-ng-include src="'/views/includes/currency.html'"></div>
   </div>
-
   <div class="col-xs-12 col-md-9 col-md-offset-3">
     <h2>
-      Details 
+      Details
       <small>View information about a bitcoin transaction</small>
     </h2>
-
     <div class="block-tx">
       <div data-ng-include src="'/views/transaction/tx.html'"></div>
     </div>
-
     <div data-ng-show="!tx.isCoinBase">
       <h2>Inputs and Outputs</h2>
         <table class="table">
           <tbody>
           <tr>
             <td><strong>Total Input</strong></td>
-            <td class="text-muted text-right">{{$root.currency.getConversion(tx.valueIn)}}</td>
+            <td class="text-muted text-right">{{$root.currency.getConvertion(tx.valueIn)}}</td>
           </tr>
           <tr>
             <td><strong>Total Output</strong></td>
-            <td class="text-muted text-right">{{$root.currency.getConversion(tx.valueOut)}}</td>
+            <td class="text-muted text-right">{{$root.currency.getConvertion(tx.valueOut)}}</td>
           </tr>
           <tr>
             <td><strong>Fees</strong></td>
-            <td class="text-muted text-right">{{$root.currency.getConversion(tx.fees)}}</td>
+            <td class="text-muted text-right">{{$root.currency.getConvertion(tx.fees)}}</td>
           </tr>
           </tbody>
         </table>
     </div>
   </div>
 </section>
-
diff --git a/public/views/transaction/tx.html b/public/views/transaction/tx.html
index 154dca21..2d6cce8f 100644
--- a/public/views/transaction/tx.html
+++ b/public/views/transaction/tx.html
@@ -11,109 +11,109 @@
   </div>
 </div>
 <div class="row line-mid">
-    <div class="col-md-5">
-      <div class="row" data-ng-show="tx.isCoinBase">
-        <div class="col-md-12 transaction-vin-vout" data-ng-repeat="vin in tx.vin">
-          <div class="text-muted pull-right btc-value"><small>{{$root.currency.getConversion(vin.reward)}}</small></div>
+  <div class="col-md-5">
+    <div class="row" data-ng-show="tx.isCoinBase">
+      <div class="col-md-12 transaction-vin-vout" data-ng-repeat="vin in tx.vin">
+        <div class="text-muted pull-right btc-value"><small>{{$root.currency.getConvertion(vin.reward)}}</small></div>
+        <div class="ellipsis">
+          <span>No Inputs (Newly Generated Coins)</span>
+        </div>
+      </div>
+    </div>
+    <div class="row" data-ng-show="!tx.isCoinBase">
+      <div data-ng-repeat="vin in tx.vinSimple" data-ng-show="!itemsExpanded">
+        <div class="col-md-12 transaction-vin-vout">
+          <div class="text-muted pull-right btc-value" data-ng-class="{'text-danger': $root.currentAddr == vin.addr}"><small>{{$root.currency.getConvertion(vin.value)}}</small></div>
           <div class="ellipsis">
-            <span>No Inputs (Newly Generated Coins)</span>
+            <span data-ng-show="vin.notAddr">{{vin.addr}}</span>
+            <span class="text-muted" title="Current Bitcoin Address" data-ng-show="vin.addr == $root.currentAddr">{{vin.addr}}</span>
+            <a href="/address/{{vin.addr}}" data-ng-show="!vin.notAddr && vin.addr != $root.currentAddr">{{vin.addr}}</a>
           </div>
         </div>
       </div>
-      <div class="row" data-ng-show="!tx.isCoinBase">
-        <div data-ng-repeat="vin in tx.vinSimple" data-ng-show="!itemsExpanded">
-          <div class="col-md-12 transaction-vin-vout">
-            <div class="text-muted pull-right btc-value" data-ng-class="{'text-danger': $root.currentAddr == vin.addr}"><small>{{$root.currency.getConversion(vin.value)}}</small></div>
-            <div class="ellipsis">
-              <span data-ng-show="vin.notAddr">{{vin.addr}}</span>
-              <span class="text-muted" title="Current Bitcoin Address" data-ng-show="vin.addr == $root.currentAddr">{{vin.addr}}</span>
-              <a href="/address/{{vin.addr}}" data-ng-show="!vin.notAddr && vin.addr != $root.currentAddr">{{vin.addr}}</a>
-            </div>
+      <div data-ng-repeat="vin in tx.vin" data-ng-show="itemsExpanded">
+        <div class="col-md-12 transaction-vin-vout">
+          <div class="text-muted pull-right btc-value"><small>{{$root.currency.getConvertion(vin.value)}}</small></div>
+          <div class="ellipsis">
+            <a class="glyphicon glyphicon-chevron-right" href="/#!/tx/{{vin.txid}}" title="Outpoint: {{vin.txid}},{{vin.vout}}"></a>&nbsp;&nbsp;
+            <span data-ng-show="vin.notAddr">{{vin.addr}}</span>
+            <a href="/address/{{vin.addr}}" data-ng-show="!vin.notAddr">{{vin.addr}}</a>
           </div>
         </div>
-        <div data-ng-repeat="vin in tx.vin" data-ng-show="itemsExpanded">
-          <div class="col-md-12 transaction-vin-vout">
-            <div class="text-muted pull-right btc-value"><small>{{$root.currency.getConversion(vin.value)}}</small></div>
-            <div class="ellipsis">
-              <a class="glyphicon glyphicon-chevron-right" href="/#!/tx/{{vin.txid}}" title="Outpoint: {{vin.txid}},{{vin.vout}}"></a>&nbsp;&nbsp;
-              <span data-ng-show="vin.notAddr">{{vin.addr}}</span>
-              <a href="/address/{{vin.addr}}" data-ng-show="!vin.notAddr">{{vin.addr}}</a>
-            </div>
-          </div>
-          <div class="col-md-12">
-            <div class="panel panel-default">
-              <div class="panel-body" style="word-wrap:break-word">
-                <small>
-                  <strong>scriptSig</strong>
-                  {{vin.scriptSig.asm}}
-                </small>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="col-md-1 text-center hidden-xs hidden-sm">
-      <span class="glyphicon glyphicon-chevron-right text-primary"></span>
-    </div>
-    <div class="col-xs-12 text-center hidden-md hidden-lg">
-      <span class="glyphicon glyphicon-chevron-down text-primary"></span>
-    </div>
-    <div class="col-md-6">
-      <div class="row">
-        <div data-ng-repeat="vout in tx.voutSimple" data-ng-show="!itemsExpanded">
-          <div class="col-md-12 transaction-vin-vout">
-            <div class="text-muted pull-right btc-value" data-ng-class="{'text-success': $root.currentAddr == vout.addr}"><small>{{$root.currency.getConversion(vout.value)}}</small></div>
-            <div class="ellipsis">
-              <span data-ng-show="vout.notAddr">{{vout.addr}}</span>
-              <span class="text-muted" title="Current Bitcoin Address" data-ng-show="address == $root.currentAddr" data-ng-repeat="address in vout.addr.split(',')">{{vout.addr}}</span>
-              <a href="/address/{{address}}"  data-ng-show="!vout.notAddr && address != $root.currentAddr" data-ng-repeat="address in vout.addr.split(',')">{{address}}</a>
-            </div>
-          </div>
-        </div>
-        <div data-ng-repeat="vout in tx.vout" data-ng-show="itemsExpanded">
-          <div class="col-md-12 transaction-vin-vout">
-            <div class="text-muted pull-right btc-value"><small>{{$root.currency.getConversion(vout.value)}}</small></div>
-            <div class="ellipsis">
-              <a href="/address/{{address}}" data-ng-repeat="address in vout.scriptPubKey.addresses">{{address}}</a>
-            </div>
-          </div>
-          <div class="col-md-12">
-            <div class="panel panel-default">
-              <div class="panel-body" style="word-wrap:break-word">
-                <small>
-                  <p>
-                    <strong>Type</strong>
-                    {{vout.scriptPubKey.type}}
-                  </p>
-                  <p>
-                    <strong>scriptPubKey</strong>
-                    {{vout.scriptPubKey.asm}}
-                  </p>
-                </small>
-              </div>
+        <div class="col-md-12">
+          <div class="panel panel-default">
+            <div class="panel-body" style="word-wrap:break-word">
+              <small>
+                <strong>scriptSig</strong>
+                {{vin.scriptSig.asm}}
+              </small>
             </div>
           </div>
         </div>
       </div>
     </div>
   </div>
-  <div class="panel panel-default" data-ng-show="itemsExpanded">
-    <div class="panel-body" style="word-wrap:break-word">
-      <small>
-        <strong>BlockHash</strong> 
-        <a href="/block/{{tx.blockhash}}">{{tx.blockhash}}</a>
-        <button class="btn-copy" clip-copy="tx.blockhash"></button>
-      </small>
+  <div class="col-md-1 text-center hidden-xs hidden-sm">
+    <span class="glyphicon glyphicon-chevron-right text-primary"></span>
+  </div>
+  <div class="col-xs-12 text-center hidden-md hidden-lg">
+    <span class="glyphicon glyphicon-chevron-down text-primary"></span>
+  </div>
+  <div class="col-md-6">
+    <div class="row">
+      <div data-ng-repeat="vout in tx.voutSimple" data-ng-show="!itemsExpanded">
+        <div class="col-md-12 transaction-vin-vout">
+          <div class="text-muted pull-right btc-value" data-ng-class="{'text-success': $root.currentAddr == vout.addr}"><small>{{$root.currency.getConvertion(vout.value)}}</small></div>
+          <div class="ellipsis">
+            <span data-ng-show="vout.notAddr">{{vout.addr}}</span>
+            <span class="text-muted" title="Current Bitcoin Address" data-ng-show="address == $root.currentAddr" data-ng-repeat="address in vout.addr.split(',')">{{vout.addr}}</span>
+            <a href="/address/{{address}}"  data-ng-show="!vout.notAddr && address != $root.currentAddr" data-ng-repeat="address in vout.addr.split(',')">{{address}}</a>
+          </div>
+        </div>
+      </div>
+      <div data-ng-repeat="vout in tx.vout" data-ng-show="itemsExpanded">
+        <div class="col-md-12 transaction-vin-vout">
+          <div class="text-muted pull-right btc-value"><small>{{$root.currency.getConvertion(vout.value)}}</small></div>
+          <div class="ellipsis">
+            <a href="/address/{{address}}" data-ng-repeat="address in vout.scriptPubKey.addresses">{{address}}</a>
+          </div>
+        </div>
+        <div class="col-md-12">
+          <div class="panel panel-default">
+            <div class="panel-body" style="word-wrap:break-word">
+              <small>
+                <p>
+                  <strong>Type</strong>
+                  {{vout.scriptPubKey.type}}
+                </p>
+                <p>
+                  <strong>scriptPubKey</strong>
+                  {{vout.scriptPubKey.asm}}
+                </p>
+              </small>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
-  <div class="line-top row">
-    <div class="col-xs-4 col-md-6">
-      <button data-ng-show="!tx.isCoinBase" class="btn btn-default">Fees: {{$root.currency.getConversion(tx.fees)}}</button>
-    </div>
-    <div class="col-xs-8 col-md-6 text-right">
-      <button data-ng-show="tx.confirmations" class="btn btn-success">{{tx.confirmations}} Confirmations</button>
-      <button data-ng-show="!tx.confirmations" class="btn btn-danger">Unconfirmed Transaction!</button>
-      <button class="btn btn-primary">{{$root.currency.getConversion(tx.valueOut)}}</button>
-    </div>
+</div>
+<div class="panel panel-default" data-ng-show="itemsExpanded">
+  <div class="panel-body" style="word-wrap:break-word">
+    <small>
+      <strong>BlockHash</strong>
+      <a href="/block/{{tx.blockhash}}">{{tx.blockhash}}</a>
+      <button class="btn-copy" clip-copy="tx.blockhash"></button>
+    </small>
   </div>
+</div>
+<div class="line-top row">
+  <div class="col-xs-4 col-md-6">
+    <button data-ng-show="!tx.isCoinBase" class="btn btn-default">Fees: {{$root.currency.getConvertion(tx.fees)}}</button>
+  </div>
+  <div class="col-xs-8 col-md-6 text-right">
+    <button data-ng-show="tx.confirmations" class="btn btn-success">{{tx.confirmations}} Confirmations</button>
+    <button data-ng-show="!tx.confirmations" class="btn btn-danger">Unconfirmed Transaction!</button>
+    <button class="btn btn-primary">{{$root.currency.getConvertion(tx.valueOut)}}</button>
+  </div>
+</div>