diff --git a/census/static/scripts/site/table.js b/census/static/scripts/site/table.js
index 2b41fbde..39b7bbfd 100644
--- a/census/static/scripts/site/table.js
+++ b/census/static/scripts/site/table.js
@@ -49,33 +49,27 @@ define(['jquery', 'bootstrap', 'chroma', 'tablesorter', 'stickykit'],
         headers: {
           2: {sorter: false},
           3: {sorter: false},
-          4: {sorter: false},
-          6: {sorter: false}
+          5: {sorter: false}
         }
       },
       tablesorterSliceIndexOptions = {
         sortList: [[0, 0]],
         headers: {
-          2: {sorter: false},
-          3: {sorter: false},
-          4: {sorter: false},
-          6: {sorter: false}
+          2: {sorter: false}
         }
       },
       tablesorterPlaceSliceOptions = {
-        sortList: [[4, 1]],
+        sortList: [[3, 1]],
         headers: {
           1: {sorter: false},
           2: {sorter: false},
-          3: {sorter: false},
-          5: {sorter: false}
+          4: {sorter: false}
         }
       },
       tablesorterPlaceSliceIndexOptions = {
-        sortList: [[3, 1]],
+        sortList: [[2, 1]],
         headers: {
-          1: {sorter: false},
-          2: {sorter: false}
+          1: {sorter: false}
         }
       },
       sortFlag = true;
diff --git a/census/views/includes/dataviews/table_slice_dataset.html b/census/views/includes/dataviews/table_slice_dataset.html
index e9b43653..4ea1c0d6 100644
--- a/census/views/includes/dataviews/table_slice_dataset.html
+++ b/census/views/includes/dataviews/table_slice_dataset.html
@@ -15,7 +15,6 @@
           <col style="width:6%">
           <col style="width:24%">
           <col style="width:23%">
-          <col style="width:5%">
           <col style="width:6%">
         </colgroup>
         {% else %}
@@ -23,7 +22,6 @@
           <col style="width:6%">
           <col style="width:20%">
           <col style="width:23%">
-          <col style="width:5%">
           <col style="width:8%">
           <col style="width:6%">
           <col style="width:4%">
@@ -35,7 +33,6 @@
             <th class="clickable">{{ gettext("Rank") }}</th>
             <th class="clickable">{{ gettext("Place") }}</th>
             <th>{{ gettext("Breakdown") }}</th>
-            <th>{{ gettext("Info") }}</th>
             {% if not is_index %}
             <th>{{ gettext("Year") }}</th>
             {% endif %}
@@ -59,15 +56,10 @@
                       {% set answer = entry.getAnswerValueForQuestion(question) %}
                       {% set pass = 'yes' if question.pass(answer) else 'no' %}
                     {% endif %}
-                    <li class="{{ pass }}" title="{{ question.question }}" data-toggle="popover" data-content="{{ popovers.popover_slice_content(question.description)|escape }}"><i class="fa fa-{{ question.icon }}"></i>&nbsp;</li>
+                    <li class="{{ pass }}" title="{{ question.questionshort }}" data-toggle="tooltip"><i class="fa fa-{{ question.icon }}"></i>&nbsp;</li>
                   {% endfor %}
                 </ul>
               </td>
-              <td class="info-expander" title="Click for full details">
-                <a aria-expanded="false" data-toggle="collapse" data-target="#detail-{{place.id}}" class="collapsed">
-                  <i class="fa fa-info-circle"></i>
-                </a>
-              </td>
               {% if not is_index %}
               <td class="year">
                 {% if entry %}
@@ -88,18 +80,6 @@
                 </td>
               {% endif %}
             </tr>
-            {% if entry.details %}
-            <tr id="detail-{{ place.id }}" class="details collapse">
-              <td>{# hack around tablesorter and our row toggler #}<span style="visibility: hidden">{{ place.rank }}</span></td>
-              <td colspan="6">
-                {# hack around tablesorter and our row toggler #}<span style="visibility: hidden;">{{ place.name }}</span>
-                {% if entry.details %}
-                {{ entry.details|marked }}
-                {% endif %}
-                <br />
-              </td>
-            </tr>
-            {% endif %}
 
             {% if not is_index %}
             {% for submission in submissions %}
@@ -129,11 +109,6 @@ <h6><span class="icon">&#8627;</span> {{ gettext("Awaiting review") }}</h6>
                   {% endfor %}
                 </ul>
               </td>
-              <td class="info-expander" title="Click for full details">
-                  <a data-toggle="collapse" data-target="#detail-submission-{{place.id}}-{{loop.index}}" class="collapsed">
-                    <i class="fa fa-info-circle"></i>
-                  </a>
-              </td>
               {% if not is_index %}
               <td class="year">
                 {% if submission %}
@@ -148,16 +123,6 @@ <h6><span class="icon">&#8627;</span> {{ gettext("Awaiting review") }}</h6>
               </td>
               {% endif %}
             </tr>
-            <tr id="detail-submission-{{place.id}}-{{loop.index}}" class="details collapse">
-              <td>{# hack around tablesorter and our row toggler #}<span style="visibility: hidden">{{ place.rank }}</span></td>
-              <td colspan="6">
-                {# hack around tablesorter and our row toggler #}<span style="visibility: hidden;">{{ place.name }}</span>
-                {% if submission.details %}
-                {{ submission.details|marked }}
-                {% endif %}
-                <br />
-              </td>
-            </tr>
             {% endfor %}
             {% endif %}
 
diff --git a/census/views/includes/dataviews/table_slice_place.html b/census/views/includes/dataviews/table_slice_place.html
index cd582675..7749bd85 100644
--- a/census/views/includes/dataviews/table_slice_place.html
+++ b/census/views/includes/dataviews/table_slice_place.html
@@ -14,14 +14,12 @@
         <colgroup>
           <col style="width:24%">
           <col style="width:23%">
-          <col style="width:5%">
           <col style="width:6%">
         </colgroup>
         {% else %}
         <colgroup>
           <col style="width:20%">
           <col style="width:23%">
-          <col style="width:5%">
           <col style="width:8%">
           <col style="width:6%">
           <col style="width:4%">
@@ -32,7 +30,6 @@
           <tr>
             <th class="clickable">{{ gettext("Dataset") }}</th>
             <th>{{ gettext("Breakdown") }}</th>
-            <th>{{ gettext("Info") }}</th>
             {% if not is_index %}
             <th>{{ gettext("Year") }}</th>
             {% endif %}
@@ -64,15 +61,10 @@
                       {% set answer = entry.getAnswerValueForQuestion(question) %}
                       {% set pass = 'yes' if question.pass(answer) else 'no' %}
                     {% endif %}
-                    <li class="{{ pass }}" title="{{ question.question }}" data-toggle="popover" data-content="{{ popovers.popover_slice_content(question.description)|escape }}"><i class="fa fa-{{ question.icon }}"></i>&nbsp;</li>
+                    <li class="{{ pass }}" title="{{ question.questionshort }}" data-toggle="tooltip"><i class="fa fa-{{ question.icon }}"></i>&nbsp;</li>
                   {% endfor %}
                 </ul>
               </td>
-              <td class="info-expander" title="Click for full details">
-                <a aria-expanded="false" data-toggle="collapse" data-target="#detail-{{ dataset.id }}" class="collapsed">
-                  <i class="fa fa-info-circle"></i>
-                </a>
-              </td>
               {% if not is_index %}
               <td class="year">
                 {% if entry %}
@@ -93,21 +85,6 @@
                 </td>
               {% endif %}
             </tr>
-            {% if entry.details %}
-            <tr id="detail-{{ dataset.id }}" class="details collapse">
-            {% if is_index %}
-            <td colspan="4">
-            {% else %}
-            <td colspan="6">
-            {% endif %}
-                {# hack around tablesorter and our row toggler #}<span style="visibility: hidden;">{{ dataset.name }}</span>
-                {% if entry.details %}
-                {{ entry.details|marked }}
-                {% endif %}
-                <br />
-              </td>
-            </tr>
-            {% endif %}
 
             {% if not is_index %}
             {% for submission in submissions %}
@@ -136,11 +113,6 @@ <h6><span class="icon">&#8627;</span> {{ gettext("Awaiting review") }}</h6>
                   {% endfor %}
                 </ul>
               </td>
-              <td class="info-expander" title="Click for full details">
-                  <a data-toggle="collapse" data-target="#detail-submission-{{dataset.id}}-{{loop.index}}" class="collapsed">
-                    <i class="fa fa-info-circle"></i>
-                  </a>
-              </td>
               {% if not is_index %}
               <td class="year">
                 {% if submission %}
@@ -155,15 +127,6 @@ <h6><span class="icon">&#8627;</span> {{ gettext("Awaiting review") }}</h6>
               </td>
               {% endif %}
             </tr>
-            <tr id="detail-submission-{{dataset.id}}-{{loop.index}}" class="details collapse">
-              <td colspan="6">
-                {# hack around tablesorter and our row toggler #}<span style="visibility: hidden;">{{ dataset.name }}</span>
-                {% if submission.details %}
-                {{ submission.details|marked }}
-                {% endif %}
-                <br />
-              </td>
-            </tr>
             {% endfor %}
             {% endif %}