diff --git a/public/views/address.html b/public/views/address.html
index bcafe33..539dca1 100644
--- a/public/views/address.html
+++ b/public/views/address.html
@@ -40,26 +40,6 @@
 
   <div data-ng-controller="transactionsController" data-ng-init="byAddress(params.addrStr)"> 
     <h2>Transactions <small>Transactions contained within this block</small></h2>
-    <table class="table table-striped">
-      <thead>
-        <tr>
-          <th>Transaction Hash</th>
-          <th>Datetime</th>
-          <th>Fee</th>
-          <th>Transacted Amount</th>
-        </tr>
-      </thead>
-      <tbody>
-      <tr data-ng-show="!txs.length">
-        <td colspan="4" class="text-center">Loading...</td>
-      </tr>
-      <tr data-ng-repeat="tx in txs">
-        <td><a href="/#!/tx/{{tx.txid}}">{{tx.txid}}</a></td>
-        <td>{{tx.time * 1000 | date:'medium'}}</td>
-        <td>{{tx.feeds}}</td>
-        <td>{{tx.valueOut}}</td>
-      </tr>
-      </tbody>
-    </table>
+    <div data-ng-include src="'/views/transaction/list.html'"></div>
   </div>
 </section>
diff --git a/public/views/block.html b/public/views/block.html
index a81b42d..8d85c85 100644
--- a/public/views/block.html
+++ b/public/views/block.html
@@ -50,18 +50,6 @@
                 <td> <strong> Number Of Transactions </strong> </td>
                 <td class="text-right text-muted">{{block.tx.length}}<td>
               </tr>
-              <tr>
-                <td> <strong> Output Total</strong></td>
-                <td class="text-right text-muted">--</td>
-              </tr>
-              <tr>
-                <td> <strong> Estimated Transaction Volume </strong></td>
-                <td class="text-right text-muted">--</td>
-              </tr>
-              <tr>
-                <td> <strong> Transaction Fees </strong></td>
-                <td class="text-right text-muted">--</td>
-              </tr>
               <tr>
                 <td> <strong> Height </strong></td>
                 <td class="text-right text-muted">{{block.height}}</td>
@@ -76,10 +64,6 @@
         <div class="col-md-6">
           <table class="table">
             <tbody>
-              <tr>
-                <td> <strong> Relayed By </strong></td>
-                <td class="text-right text-muted">--</td>
-              </tr>
               <tr>
                 <td> <strong> Difficulty </strong></td>
                 <td class="text-right text-muted">{{block.difficulty}}</td>
@@ -107,42 +91,7 @@
 
       <div data-ng-controller="transactionsController" data-ng-init="byBlock(params.blockHash)"> 
         <h2>Transactions <small >Transactions contained within this block</small></h2>
-
-        <div class="block-tx" data-ng-repeat="tx in txs">
-          <div class="line-bot">
-              <a href="/#!/tx/{{tx.txid}}">{{tx.txid}}</a>
-              <span class="pull-right">{{tx.time * 1000 | date:'medium'}}</span>
-          </div> 
-
-          <div class="row">
-            <div class="col-md-5">
-              Transmitter
-            </div>
-            <div class="col-md-2">
-              <span class="glyphicon glyphicon-arrow-right lead"></span>
-            </div>
-            <div class="col-md-5">
-              <div class="row">
-                <div class="col-md-6">
-                  <p>Receptor</p>
-                  <p>Receptor</p>
-                </div>
-                <div class="col-md-6 text-right">
-                  <p>Bitcoin of Receptor</p>
-                  <p>Bitcoin of Receptor</p>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <div class="line-top">
-            <small class="text-muted">Feeds: {{tx.feeds}}</small>
-            <div class="btn btn-primary pull-right">
-              {{tx.valueOut}}
-            </div>
-          </div> 
-        </div><!--  END OF BLOCK-TX -->
-
+        <div data-ng-include src="'/views/transaction/list.html'"></div>
       </div>
     </div>
   </div>
diff --git a/public/views/transaction/list.html b/public/views/transaction/list.html
new file mode 100644
index 0000000..ca60761
--- /dev/null
+++ b/public/views/transaction/list.html
@@ -0,0 +1,48 @@
+<div data-ng-show="!txs || txs.lenght">Loading...</div>
+<div class="block-tx" data-ng-repeat="tx in txs">
+  <div class="line-bot">
+    <a href="/#!/tx/{{tx.txid}}">{{tx.txid}}</a>
+    <span class="pull-right">{{tx.time * 1000 | date:'medium'}}</span>
+  </div>
+
+  <div class="row">
+    <div class="col-md-5">
+      <span data-ng-show="tx.isCoinBase">No Inputs (Newly Generated isCoinBasens)</span>
+      <div data-ng-show="!tx.isCoinBase">
+        <div data-ng-repeat="vin in tx.vin">
+          <a href="/#!/address/{{vin.addr}}" class="ellipsis">{{vin.addr}}</a>
+          <span class="badge">{{vin.value}} BTC</span>
+          <p>
+          Outpoint:
+          <a href="/#!/tx/{{vin.txid}}" class="ellipsis">{{vin.txid}}</a>
+          </p>
+        </div>
+      </div>
+    </div>
+    <div class="col-md-2">
+      <span class="glyphicon glyphicon-arrow-right lead"></span>
+    </div>
+    <div class="col-md-5">
+      <div class="row">
+        <div class="col-md-6">
+          <div data-ng-repeat="vout in tx.vout">
+            <span data-ng-repeat="address in vout.scriptPubKey.addresses">{{vout.scriptPubKey.type}}</span>
+          </div>
+        </div>
+        <div class="col-md-6 text-right">
+          <div data-ng-repeat="vout in tx.vout">
+            <a href="/#!/address/{{address}}" data-ng-repeat="address in vout.scriptPubKey.addresses" class="ellipsis">{{address}}</a>
+            <span class="badge">{{vout.value}} BTC</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="line-top">
+    <small data-ng-show="!tx.isCoinBase" class="text-muted">Feeds: {{tx.feeds}}</small>
+    <div class="btn btn-primary pull-right">
+      {{tx.valueOut}}
+    </div>
+  </div>
+</div>