diff --git a/u2f-gae-demo/src/soy/card.soy b/u2f-gae-demo/src/soy/card.soy
index f9fa969..892d6f1 100644
--- a/u2f-gae-demo/src/soy/card.soy
+++ b/u2f-gae-demo/src/soy/card.soy
@@ -23,7 +23,7 @@
        <div class="transports">Supported transports:&nbsp;
          <span class="transportsValue">None specified</span>
        </div>
-       <div class="androidAttestationLabel">Android Attestation<br/></div>
+       <div class="androidAttestationLabel">Android Attestation <button class="toggleAttestationButton">show</button><br/></div>
        <div class="androidAttestation">
          <ul>
            <li><span class="label">Keymaster Version: </span><span class="keymasterVersion"></span><br/>
diff --git a/u2f-gae-demo/war/js/u2fdemo.js b/u2f-gae-demo/war/js/u2fdemo.js
index 124f5ea..cb44bfd 100644
--- a/u2f-gae-demo/war/js/u2fdemo.js
+++ b/u2f-gae-demo/war/js/u2fdemo.js
@@ -28,7 +28,6 @@ function tokenToDom(token) {
   }
   if (token.android_attestation) {
     card.querySelector('.androidAttestationLabel').style.display = "inline";
-    card.querySelector('.androidAttestation').style.display = "inline";
     card.querySelector('.keymasterVersion').textContent
         = token.android_attestation.keymaster_version;
     card.querySelector('.challenge').textContent
@@ -53,6 +52,17 @@ function tokenToDom(token) {
       sendRemoveTokenRequest(token.public_key);
      });
 
+  $(card.querySelector('.toggleAttestationButton'))
+    .click(function() {
+      var currentText = $("#" + token.public_key + " .toggleAttestationButton").html();
+      if (currentText == 'show') {
+        $("#" + token.public_key + " .toggleAttestationButton").html('hide')
+      } else {
+        $("#" + token.public_key + " .toggleAttestationButton").html('show')
+      }
+      $("#" + token.public_key + " .androidAttestation").slideToggle(800);
+    });
+
   return card;
 }