diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/grant.html b/openid-connect-server-webapp/src/main/webapp/resources/template/grant.html
index 4206bfc11..1c1f670ae 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/grant.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/grant.html
@@ -33,7 +33,8 @@
 
 	<div class="tab-pane active" id="grant-approved-tab">
 
-	<h3>Sites you have manually approved</h3>
+	<p>These are sites you have approved manually. If the same site asks for the same access in the future, it will
+		be granted without prompting.</p>
 
 	<div id="grant-table-empty" class="alert alert-info">
 		You have not approved any sites.
@@ -56,8 +57,8 @@
 
 	<div class="tab-pane" id="grant-whitelist-tab">
 	
-	<h3>Sites that have been whitelisted by an administrator</h3>
-	<p class="text-warning"><b>NOTE:</b> If you revoke them here, they will automatically be re-approved on your next visit.</p>
+	<p>These are sites that have been pre-approved by an administrator.</p>
+	<p class="text-warning"><b>NOTE:</b> If you revoke them here, they will automatically be re-approved on your next visit wthout prompting.</p>
 
 	<div id="grant-whitelist-table-empty" class="alert alert-info">
 		You have not accessed any whitelisted sites.
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/token.html b/openid-connect-server-webapp/src/main/webapp/resources/template/token.html
index 31d0e8529..dbdbbc585 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/token.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/token.html
@@ -20,9 +20,19 @@
 		<button class="btn btn-small refresh-table"><i class="icon-refresh"></i> Refresh</button> &nbsp;
     </div>
 
-	<h2>Access Tokens</h2>
+	<div class="tabbable">
 
-	<div><p>Access tokens and ID tokens are usually short-lived and provide clients with access to specific resources.</p></div>
+ 		<ul class="nav nav-tabs">
+			<li class="active"><a data-target="#token-access-tab" data-toggle="tab" href="#">Access Tokens</a></li>
+			<li><a data-target="#token-refresh-tab" data-toggle="tab" href="#">Refresh Tokens</a></li>
+		</ul>
+
+	<div class="tab-content">
+
+	<div class="tab-pane active" id="token-access-tab">
+
+	<div><p>Access tokens are usually short-lived and provide clients with access to specific resources. 
+			ID Tokens are specialized access tokens to facilitate log on using OpenID Connect.</p></div>
 
 	<div id="access-token-table-empty" class="alert alert-info">
 		There are no active access tokens.
@@ -45,7 +55,9 @@
 
 	<div class="pagination paginator-access"></div>
 
-	<h2>Refresh Tokens</h2>
+	</div>
+
+	<div class="tab-pane" id="token-refresh-tab">
 
 	<div><p>Refresh tokens are usually long-lived and provide clients with the ability to get new access tokens without end-user involvement.</p></div>
 
@@ -70,6 +82,9 @@
 
 	<div class="pagination paginator-refresh"></div>
 
+	</div>
+	</div>
+
     <div class="well well-small">
 		<button class="btn btn-small refresh-table"><i class="icon-refresh"></i> Refresh</button> &nbsp; 
     </div>