diff --git a/app/views/public_pages/plan_index.html.erb b/app/views/public_pages/plan_index.html.erb
index 3ea9622..f8fb614 100644
--- a/app/views/public_pages/plan_index.html.erb
+++ b/app/views/public_pages/plan_index.html.erb
@@ -3,11 +3,6 @@
 <div class="row">
   <div class="col-md-12">
     <h1><%= raw _('Public DMPs') %></h1>
-  </div>
-</div>
-
-<div class="row">
-  <div class="col-md-12">
     <!-- if the user has projects -->
     <% if @plans.count > 0 %>
       <p class="left-indent">
@@ -18,25 +13,29 @@
         <%= _("There are currently no public DMPs.")%>
       </p>
     <% end %>
+  </div>
+</div>
 
+<div class="row">
+  <div class="col-md-12">
     <% if @plans.count > 0 %>
-      <div class="content">
-        <table id="dmp_table" class="dmp_table tablesorter">
+      <div class="table-responsive">
+        <table class="table table-hover tablesorter">
           <thead>
             <% if @plans.count > TABLE_FILTER_MIN_ROWS %>
               <tr>
-                <td colspan="5" class="td-as-th">
+                <th colspan="5" class="sorter-false">
                   <%= render(partial: "shared/table_filter",
                              locals: {path: public_plans_path, placeholder: _('Filter plans')}) %>
-                </td>
+                </th>
               </tr>
             <% end %>
             <tr>
-              <th class="col-large"><%= _('Project Title') %></th>
-              <th class="col-large"><%= _('Template') %></th>
-              <th class="col-medium"><%= _('Institution') %></th>
-              <th class="col-medium"><%= _('Owner') %></th>
-              <th class="col-small sorter-false centered"><%= _('Download') %></th>
+              <th><%= _('Project Title') %></th>
+              <th><%= _('Template') %></th>
+              <th><%= _('Institution') %></th>
+              <th><%= _('Owner') %></th>
+              <th class="sorter-false text-center"><%= _('Download') %></th>
             </tr>
           </thead>
           <tbody>
@@ -46,10 +45,8 @@
                 <td><%= plan.template.title %></td>
                 <td><%= (plan.owner.nil? || plan.owner.org.nil? ? _('Not Applicable') : plan.owner.org.name) %></td>
                 <td><%= (plan.owner.nil? ? _('Unknown') : plan.owner.name(false)) %></td>
-                <td class="dmp_td_medium centered">
-                  <%= link_to _('PDF'),
-                              plan_export_path(plan, format: :pdf), 
-                              class: "dmp_table_link" %>
+                <td class="text-center">
+                  <%= link_to _('PDF'), plan_export_path(plan, format: :pdf), class: "dmp_table_link" %>
                 </td>
               </tr>
             <% end %>
diff --git a/app/views/public_pages/template_index.html.erb b/app/views/public_pages/template_index.html.erb
index e49f7a1..b081e20 100644
--- a/app/views/public_pages/template_index.html.erb
+++ b/app/views/public_pages/template_index.html.erb
@@ -1,41 +1,41 @@
 <div class="row">
   <div class="col-md-12">
     <h1><%= raw _('DMP Templates') %></h1>
+
+    <% if @templates.count > 0 %>
+      <p class="left-indent"><%= _('Templates are provided by a funder, an institution, or a trusted party.') %></p>
+    <% else %>
+      <p class="left-indent"><%= _('There are currently no public Templates.')%></p>
+    <% end %>
   </div>
 </div>
 
 <div class="row">
   <div class="col-md-12">
     <% if @templates.count > 0 %>
-      <p class="left-indent"><%= _('Templates are provided by a funder, an institution, or a trusted party.') %></p>
-    <% else %>
-      <p class="left-indent"><%= _('There are currently no public Templates.')%></p>
-    <% end %>
-
-    <% if @templates.count > 0 %>
-      <div class="content">
-      <table id="dmp_table" class="dmp_table tablesorter">
+      <div class="table-responsive">
+      <table class="table table-hover tablesorter">
         <thead>
           <% if @templates.count > TABLE_FILTER_MIN_ROWS %>
             <tr>
-              <td colspan="5" class="td-as-th">
+              <th colspan="3" class="sorter-false">
                 <%= render(partial: "shared/table_filter",
-                          locals: {path: public_templates_path, placeholder: _('Filter templates')}) %>
-              </td>
+                           locals: {path: public_templates_path, placeholder: _('Filter templates')}) %>
+              </th>
             </tr>
           <% end %>
           <tr>
-            <th class="col-large"><%= _('Template Name') %></th>
-            <th class="col-large"><%= _('Organisation Name') %></th>
-            <th class="col-small sorter-false centered"><%= _('Download') %></th>
+            <th><%= _('Template Name') %></th>
+            <th><%= _('Organisation Name') %></th>
+            <th class="sorter-false text-center"><%= _('Download') %></th>
           </tr>
         </thead>
         <tbody>
           <% @templates.each do |template| %>
-            <tr class="table-data">
+            <tr>
               <td><%= template.title %></td>
               <td><%= template.org.name %></td>
-              <td class="dmp_td_small centered">
+              <td class="text-center">
                 <%= link_to _('DOCX'), template_export_path(template.dmptemplate_id, format: :docx) %>
                 <%= link_to _('PDF'), template_export_path(template.dmptemplate_id, format: :pdf) %>
               </td>