diff --git a/lib/PushTask.php b/lib/PushTask.php
index 74afa31..7c6a921 100644
--- a/lib/PushTask.php
+++ b/lib/PushTask.php
@@ -47,6 +47,7 @@ class PushTask {
           echo "Subscriber verified the request and is now subscribed\n";
         } else {
           $subscription->date_unsubscribed = db\now();
+          $subscription->date_expires = null;
           $subscription->active = 0;
           echo "Subscriber verified the request and is now unsubscribed\n";
         }
diff --git a/public/css/style.css b/public/css/style.css
index 24f8e4f..28260ca 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -64,6 +64,13 @@ body.logged-out {
   font-size: 18px;
 }
 
+.subscription-status {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  border: 1px #ccc solid;
+}
+
 
 /**
  * Bootstrap callouts
diff --git a/views/subscription-status.php b/views/subscription-status.php
index e5d2def..8589129 100644
--- a/views/subscription-status.php
+++ b/views/subscription-status.php
@@ -1,4 +1,4 @@
-<div class="narrow">
+<div class="narrow subscription-status">
 
 <? if($this->subscription->active): ?>
   <div class="bs bs-callout bs-callout-success">This subscription is active!</div>
@@ -22,18 +22,25 @@
     <td><?= $this->subscription->date_requested ? friendly_date($this->subscription->date_requested, $tz) : '' ?></td>
   </tr>
   <tr>
-    <td>Subscription Verification Response (from your server)</td>
+    <td>Subscription Verification Response<br>(from your server)</td>
     <td><pre><?= htmlspecialchars($this->subscription->challenge_response) ?></pre></td>
   </tr>
   <tr>
     <td>Date Subscription was Confirmed</td>
     <td><?= $this->subscription->date_confirmed ? friendly_date($this->subscription->date_confirmed, $tz) : '' ?></td>
   </tr>
-  <tr>
-    <td>Subscription Expiration</td>
-    <td><?= $this->subscription->date_expires ? friendly_date($this->subscription->date_expires, $tz) : '' ?></td>
-  </tr>
-
+  <? if($this->subscription->date_unsubscribed): ?>
+    <tr>
+      <td>Date Unsubscribed</td>
+      <td><?= friendly_date($this->subscription->date_unsubscribed, $tz) ?></td>
+    </tr>
+  <? endif; ?>
+  <? if($this->subscription->date_expires): ?>
+    <tr>
+      <td>Subscription Expiration</td>
+      <td><?= friendly_date($this->subscription->date_expires, $tz) ?></td>
+    </tr>
+  <? endif; ?>
 
 </table>