diff --git a/app/src/pages/address/address.html b/app/src/pages/address/address.html
index df423be..8c62993 100644
--- a/app/src/pages/address/address.html
+++ b/app/src/pages/address/address.html
@@ -3,40 +3,43 @@
 </ion-header>
 
 <ion-content padding>
-  <ion-grid>
-    <ion-row>
-      <ion-col col-12>
-        <h1>Address</h1>
-        <p>{{ address.addrStr }}</p>
-        <p>{{ address.balance }} BTC</p>
-      </ion-col>
-    </ion-row>
-    <ion-row>
-      <ion-col col-12><h2>Summary</h2></ion-col>
-    </ion-row>
-    <ion-row>
-      <ion-col col-6>Total Received:</ion-col>
-      <ion-col col-6 text-right>{{ address.totalReceived }} BTC</ion-col>
-    </ion-row>
-    <ion-row>
-      <ion-col col-6>Total Sent:</ion-col>
-      <ion-col col-6 text-right>{{ address.totalSent }} BTC</ion-col>
-    </ion-row>
-    <ion-row>
-      <ion-col col-6>Final Balance:</ion-col>
-      <ion-col col-6 text-right>{{ address.balance }} BTC</ion-col>
-    </ion-row>
-    <ion-row>
-      <ion-col col-6>No. Transactions:</ion-col>
-      <ion-col col-6 text-right>{{ address.txApperances }}</ion-col>
-    </ion-row>
-    <ion-row>
-      <ion-col col-12 text-center>QR CODE</ion-col>
-    </ion-row>
-    <ion-row>
-      <ion-col col-12><h2>Transactions</h2></ion-col>
-    </ion-row>
-  </ion-grid>
+  <h1>Address</h1>
+  <p>{{ address.addrStr }}</p>
+  <p>{{ address.balance }} BTC</p>
+
+  <h2>Summary</h2>
+
+  <ion-list>
+    <ion-item>
+      Total Received
+      <span item-end>
+        {{ address.totalReceived }} BTC
+      </span>
+    </ion-item>
+    <ion-item>
+      Total Sent
+      <span item-end>
+        {{ address.totalSent }} BTC
+      </span>
+    </ion-item>
+    <ion-item>
+      Final Balance
+      <span item-end>
+        {{ address.balance }} BTC
+      </span>
+    </ion-item>
+    <ion-item>
+      No. Transactions
+      <span item-end>
+        {{ address.txApperances }}
+      </span>
+    </ion-item>
+  </ion-list>
+
+  <p text-center>QR CODE<p>
+
+  <h2>Transactions</h2>
 
   <transaction-list [queryType]="'address'" [queryValue]="addrStr"></transaction-list>
+
 </ion-content>
diff --git a/app/src/pages/block-detail/block-detail.html b/app/src/pages/block-detail/block-detail.html
index e099f0b..02e00b2 100644
--- a/app/src/pages/block-detail/block-detail.html
+++ b/app/src/pages/block-detail/block-detail.html
@@ -90,10 +90,9 @@
   </ion-list>
 
   <div *ngIf="!loading">
-    <h3>Transactions</h3>
+    <h2>Transactions</h2>
+
     <transaction-list [queryType]="'block'" [queryValue]="block.hash"></transaction-list>
   </div>
-  <div *ngIf="loading">
-    <p>Loading...</p>
-  </div>
+
 </ion-content>
diff --git a/app/src/pages/transaction/transaction.html b/app/src/pages/transaction/transaction.html
index 9bfe587..715ab9f 100644
--- a/app/src/pages/transaction/transaction.html
+++ b/app/src/pages/transaction/transaction.html
@@ -3,36 +3,40 @@
 </ion-header>
 
 <ion-content padding>
-  <ion-grid>
-    <ion-row>
-      <ion-col col-12>
-        <h1>Transaction</h1>
-        <p>{{ tx.txid }}</p>
-      </ion-col>
-    </ion-row>
-    <ion-row>
-      <ion-col col-12><h2>Summary</h2></ion-col>
-    </ion-row>
-    <ion-row>
-      <ion-col col-6>Size</ion-col>
-      <ion-col col-6 text-right>{{ tx.size }} (bytes)</ion-col>
-    </ion-row>
-    <ion-row>
-      <ion-col col-6>Received Time</ion-col>
-      <ion-col col-6 text-right>{{ tx.time * 1000 | date:'medium' }}</ion-col>
-    </ion-row>
-    <ion-row>
-      <ion-col col-6>Mined Time</ion-col>
-      <ion-col col-6 text-right>{{ tx.blocktime * 1000 | date:'medium' }}</ion-col>
-    </ion-row>
-    <ion-row>
-      <ion-col col-6>Included in Block</ion-col>
-      <ion-col col-6 text-right>{{ tx.blockhash }}</ion-col>
-    </ion-row>
-    <ion-row>
-      <ion-col col-12><h2>Details</h2></ion-col>
-    </ion-row>
-  </ion-grid>
+  <h1>Transaction</h1>
+  <p>{{ tx.txid }}</p>
+
+  <h2>Summary</h2>
+
+  <ion-list>
+    <ion-item>
+      Size
+      <span item-end>
+        {{ tx.size }} (bytes)
+      </span>
+    </ion-item>
+    <ion-item>
+      Received Time
+      <span item-end>
+        {{ tx.time * 1000 | date:'medium' }}
+      </span>
+    </ion-item>
+    <ion-item>
+      Mined Time
+      <span item-end>
+        {{ tx.blocktime * 1000 | date:'medium' }}
+      </span>
+    </ion-item>
+    <ion-item>
+      Included in Block
+      <span item-end>
+        <a (click)="goToBlock(tx.blockhash)">{{ tx.blockhash }}</a>
+      </span>
+    </ion-item>
+  </ion-list>
+
+  <h2>Details</h2>
+
+  <transaction [tx]="tx"></transaction>
 
-    <transaction [tx]="tx"></transaction>
 </ion-content>
diff --git a/app/src/pages/transaction/transaction.ts b/app/src/pages/transaction/transaction.ts
index 8e817ea..50f2d4b 100644
--- a/app/src/pages/transaction/transaction.ts
+++ b/app/src/pages/transaction/transaction.ts
@@ -40,4 +40,10 @@ export class TransactionPage {
       }
     );
   }
+
+  public goToBlock(blockHash: string): void {
+    this.navCtrl.push('block-detail', {
+      'blockHash': blockHash
+    });
+  }
 }