diff --git a/passbook/admin/templates/administration/application/list.html b/passbook/admin/templates/administration/application/list.html
index 583654805..533f94e03 100644
--- a/passbook/admin/templates/administration/application/list.html
+++ b/passbook/admin/templates/administration/application/list.html
@@ -21,7 +21,7 @@
             </div>
             {% include 'partials/pagination.html' %}
         </div>
-        <table class="pf-c-table pf-m-grid-xl" role="grid">
+        <table class="pf-c-table pf-m-compact pf-m-grid-xl" role="grid">
             <thead>
                 <tr role="row">
                     <th role="columnheader" scope="col">{% trans 'Name' %}</th>
diff --git a/passbook/admin/templates/administration/audit/list.html b/passbook/admin/templates/administration/audit/list.html
index fe4501e8b..1718aaecd 100644
--- a/passbook/admin/templates/administration/audit/list.html
+++ b/passbook/admin/templates/administration/audit/list.html
@@ -17,7 +17,7 @@
         <div class="pf-c-toolbar" id="page-layout-table-simple-toolbar-top">
             {% include 'partials/pagination.html' %}
         </div>
-        <table class="pf-c-table pf-m-grid-xl" role="grid">
+        <table class="pf-c-table pf-m-compact pf-m-grid-xl" role="grid">
             <thead>
                 <tr role="row">
                     <th role="columnheader" scope="col">{% trans 'Action' %}</th>
diff --git a/passbook/admin/templates/administration/debug/request.html b/passbook/admin/templates/administration/debug/request.html
index a9c3e95f8..f4baeea58 100644
--- a/passbook/admin/templates/administration/debug/request.html
+++ b/passbook/admin/templates/administration/debug/request.html
@@ -14,7 +14,7 @@
 </section>
 <section class="pf-c-page__main-section pf-m-no-padding-mobile">
     <div class="pf-c-card">
-        <table class="pf-c-table pf-m-grid-xl" role="grid">
+        <table class="pf-c-table pf-m-compact pf-m-grid-xl" role="grid">
             <thead>
                 <tr role="row">
                     <th role="columnheader" scope="col" style="min-width: 150px;">{% trans 'Key' %}</th>
diff --git a/passbook/admin/templates/administration/factor/list.html b/passbook/admin/templates/administration/factor/list.html
index aec36c5d4..77468cb3a 100644
--- a/passbook/admin/templates/administration/factor/list.html
+++ b/passbook/admin/templates/administration/factor/list.html
@@ -35,7 +35,7 @@
             </div>
             {% include 'partials/pagination.html' %}
         </div>
-        <table class="pf-c-table pf-m-grid-xl" role="grid">
+        <table class="pf-c-table pf-m-compact pf-m-grid-xl" role="grid">
             <thead>
                 <tr role="row">
                     <th role="columnheader" scope="col">{% trans 'Name' %}</th>
diff --git a/passbook/admin/templates/administration/group/list.html b/passbook/admin/templates/administration/group/list.html
index f256a191a..5695f3b7e 100644
--- a/passbook/admin/templates/administration/group/list.html
+++ b/passbook/admin/templates/administration/group/list.html
@@ -23,7 +23,7 @@
             </div>
             {% include 'partials/pagination.html' %}
         </div>
-        <table class="pf-c-table pf-m-grid-xl" role="grid">
+        <table class="pf-c-table pf-m-compact pf-m-grid-xl" role="grid">
             <thead>
                 <tr role="row">
                     <th role="columnheader" scope="col">{% trans 'Name' %}</th>
diff --git a/passbook/admin/templates/administration/invitation/list.html b/passbook/admin/templates/administration/invitation/list.html
index 9da63a848..944d8a261 100644
--- a/passbook/admin/templates/administration/invitation/list.html
+++ b/passbook/admin/templates/administration/invitation/list.html
@@ -23,7 +23,7 @@
             </div>
             {% include 'partials/pagination.html' %}
         </div>
-        <table class="pf-c-table pf-m-grid-xl" role="grid">
+        <table class="pf-c-table pf-m-compact pf-m-grid-xl" role="grid">
             <thead>
                 <tr role="row">
                     <th role="columnheader" scope="col">{% trans 'Expiry' %}</th>
diff --git a/passbook/admin/templates/administration/policy/list.html b/passbook/admin/templates/administration/policy/list.html
index a577ba48d..ed581246a 100644
--- a/passbook/admin/templates/administration/policy/list.html
+++ b/passbook/admin/templates/administration/policy/list.html
@@ -33,7 +33,7 @@
             </div>
             {% include 'partials/pagination.html' %}
         </div>
-        <table class="pf-c-table pf-m-grid-xl" role="grid">
+        <table class="pf-c-table pf-m-compact pf-m-grid-xl" role="grid">
             <thead>
                 <tr role="row">
                     <th role="columnheader" scope="col">{% trans 'Name' %}</th>
diff --git a/passbook/admin/templates/administration/property_mapping/list.html b/passbook/admin/templates/administration/property_mapping/list.html
index c3ca12eb6..29d9d30ad 100644
--- a/passbook/admin/templates/administration/property_mapping/list.html
+++ b/passbook/admin/templates/administration/property_mapping/list.html
@@ -35,7 +35,7 @@
             </div>
             {% include 'partials/pagination.html' %}
         </div>
-        <table class="pf-c-table pf-m-grid-xl" role="grid">
+        <table class="pf-c-table pf-m-compact pf-m-grid-xl" role="grid">
             <thead>
                 <tr role="row">
                     <th role="columnheader" scope="col">{% trans 'Name' %}</th>
diff --git a/passbook/admin/templates/administration/provider/list.html b/passbook/admin/templates/administration/provider/list.html
index 4d5b3807c..4477078f2 100644
--- a/passbook/admin/templates/administration/provider/list.html
+++ b/passbook/admin/templates/administration/provider/list.html
@@ -35,7 +35,7 @@
             </div>
             {% include 'partials/pagination.html' %}
         </div>
-        <table class="pf-c-table pf-m-grid-xl" role="grid">
+        <table class="pf-c-table pf-m-compact pf-m-grid-xl" role="grid">
             <thead>
                 <tr role="row">
                     <th role="columnheader" scope="col">{% trans 'Name' %}</th>
diff --git a/passbook/admin/templates/administration/source/list.html b/passbook/admin/templates/administration/source/list.html
index 50162d83e..d8b651b86 100644
--- a/passbook/admin/templates/administration/source/list.html
+++ b/passbook/admin/templates/administration/source/list.html
@@ -35,7 +35,7 @@
             </div>
             {% include 'partials/pagination.html' %}
         </div>
-        <table class="pf-c-table pf-m-grid-xl" role="grid">
+        <table class="pf-c-table pf-m-compact pf-m-grid-xl" role="grid">
             <thead>
                 <tr role="row">
                     <th role="columnheader" scope="col">{% trans 'Name' %}</th>
diff --git a/passbook/admin/templates/administration/user/list.html b/passbook/admin/templates/administration/user/list.html
index f4909d464..95a6cd4ce 100644
--- a/passbook/admin/templates/administration/user/list.html
+++ b/passbook/admin/templates/administration/user/list.html
@@ -20,7 +20,7 @@
             </div>
             {% include 'partials/pagination.html' %}
         </div>
-        <table class="pf-c-table pf-m-grid-xl" role="grid">
+        <table class="pf-c-table pf-m-compact pf-m-grid-xl" role="grid">
             <thead>
                 <tr role="row">
                     <th role="columnheader" scope="col">{% trans 'Name' %}</th>
diff --git a/passbook/factors/otp/templates/otp/setup.html b/passbook/factors/otp/templates/otp/setup.html
deleted file mode 100644
index 9282ee12b..000000000
--- a/passbook/factors/otp/templates/otp/setup.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "generic/wizard.html" %}
-
-{% load utils %}
-
-{% block title %}
-{% title "Setup" %}
-{% endblock %}
-
-{% block form %}
-<label for="">Keep these tokens somewhere safe. These are to be used if you loose your primary TOTP device.</label>
-{% for field in wizard.form %}
-  {% if field.field.widget|fieldtype == 'SelectMultiple' %}
-    <ul class="list">
-    {% for token in field.field.choices %}
-      <li>{{ token.0 }}</li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-{% endfor %}
-{% endblock %}