diff --git a/tests/tfa_basic.test b/tests/tfa_basic.test
index 82cc56d..09ce9a7 100644
--- a/tests/tfa_basic.test
+++ b/tests/tfa_basic.test
@@ -286,7 +286,7 @@ class TfaBasicTestCase extends DrupalWebTestCase {
       case 'tfa-status-enabled':
         return 'TFA enabled';
       case 'tfa-disable':
-        return 'Disable TFA';
+        return 'Disable';
       case 'tfa-disable-confirm':
         return 'Are you sure you want to disable TFA on account';
       case 'tfa-disabled':
diff --git a/tfa_basic.pages.inc b/tfa_basic.pages.inc
index 96605ca..474c94c 100644
--- a/tfa_basic.pages.inc
+++ b/tfa_basic.pages.inc
@@ -14,16 +14,30 @@ function tfa_basic_overview($form, &$form_state, $account) {
   $enabled = isset($user_tfa['status']) && $user_tfa['status'] ? TRUE : FALSE;
 
   if (!empty($user_tfa)) {
-    if ($enabled) {
-      $status_text = t('Status: <strong>TFA enabled</strong>, set !time. <a href="!url">Disable TFA</a>', array('!time' => format_date($user_tfa['saved']), '!url' => url('user/' . $account->uid . '/security/tfa/disable')));
-    }
-    else {
-      $status_text = t('Status: <strong>TFA disabled</strong>, set !time.', array('!time' => format_date($user_tfa['saved'])));
-    }
     $output['status'] = array(
-      '#type' => 'markup',
-      '#markup' => '<p>' . $status_text . '</p>',
+      'heading' => array(
+        '#theme' => 'html_tag',
+        '#tag' => 'h3',
+        '#value' => $enabled ? t('Enabled') : t('Disabled'),
+      ),
+      'description' => array(
+        '#theme' => 'html_tag',
+        '#tag' => 'p',
+        '#value' => t('Settings last changed !time.', array('!time' => format_date($user_tfa['saved']))),
+      ),
     );
+    if ($enabled) {
+      $output['status']['link'] = array(
+        'link' => array(
+          '#prefix' => '<p>',
+          '#theme' => 'link',
+          '#path' => 'user/' . $account->uid . '/security/tfa/disable',
+          '#text' => t('Disable'),
+          '#options' => array('attributes' => array(), 'html' => FALSE),
+          '#suffix' => '</p>',
+        ),
+      );
+    }
   }
 
   // Start with validate plugin setup.