diff --git a/cookbook/templates/generic/list_template.html b/cookbook/templates/generic/list_template.html
index 92a82d7d..57ac4b08 100644
--- a/cookbook/templates/generic/list_template.html
+++ b/cookbook/templates/generic/list_template.html
@@ -2,31 +2,21 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 {% load django_tables2 %}
-{% load class_tag %}
 
-{% block title %}{% trans 'List' %} - {{ title }}{% endblock %}
+
 
 {% block content %}
 
-    <h3>{{ title }} {% trans 'List' %}
-    {% if table.Meta.model|get_class == 'Category' %}
-        <a href="{% url 'new_category' %}" ><i class="fal fa-plus-circle"></i></a>
-    {% elif table.Meta.model|get_class == 'Keyword' %}
-        <a href="{% url 'new_keyword' %}" ><i class="fal fa-plus-circle"></i></a>
-    {% elif table.Meta.model|get_class == 'Storage' %}
-        <a href="{% url 'new_storage' %}" ><i class="fal fa-plus-circle"></i></a>
-    {% endif %}
-    </h3>
-    <br/>
-
-    {% if table.Meta.model|get_class == 'RecipeImport' %}
-        <a href="{% url 'data_batch_import' %}" class="btn btn-warning">{% trans 'Import all' %}</a>
-        <br/>
-        <br/>
-    {% endif %}
-
-    {% if table %}
+    <div class="table-container">
+        <h3>{{ title }} {% trans 'List' %}
+            {% if create_url %}
+                <a href="{% url create_url %}">
+                    <button class="btn btn-primary float-right">{% trans 'New' %} <i class="fal fa-plus-circle"></i>
+                    </button>
+                </a>
+            {% endif %}
+        </h3>
         {% render_table table %}
-    {% endif %}
+    </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock content %}
\ No newline at end of file
diff --git a/cookbook/templates/generic/table_template.html b/cookbook/templates/generic/table_template.html
index c40a9b96..10bc5dcd 100644
--- a/cookbook/templates/generic/table_template.html
+++ b/cookbook/templates/generic/table_template.html
@@ -1,100 +1,117 @@
-{% load django_tables2 %}
+{% load crispy_forms_tags %}
 {% load i18n %}
-{% block table-wrapper %}
-    <div class="row">
-        <div class="table-responsive">
-            {% block table %}
-                <table  {% if table.attrs %} <!-- style='font-size: 24px' removed because smaller looked better -->
-                    {{ table.attrs.as_html }}{% else %}class="table table-bordered"{% endif %}>
-                    {% block table.thead %}
-                        {% if table.show_header %}
-                            <thead>
-                            <tr>
-                                {% for column in table.columns %}
+{% load django_tables2 %}
+{% block content %}
+
+
+
+    <div class="table-container">
+        {% if create_url %}
+            <a href="{% url create_url %}">
+                <button class="btn btn-primary float-right">{% trans 'New' %} <i class="fal fa-plus-circle"></i>
+                </button>
+            </a>
+        {% endif %}
+        </h3>
+
+        {% block table %}
+            <table {% render_attrs table.attrs class="table" %}>
+                {% block table.thead %}
+                    {% if table.show_header %}
+                        <thead {{ table.attrs.thead.as_html }}>
+                        <tr>
+                            {% for column in table.columns %}
+                                <th {{ column.attrs.th.as_html }}>
                                     {% if column.orderable %}
-                                        <th {{ column.attrs.th.as_html }}><a
-                                                href="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}">{{ column.header }}</a>
-                                        </th>
+                                        <a href="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}">{{ column.header }}</a>
                                     {% else %}
-                                        <th {{ column.attrs.th.as_html }}>{{ column.header }}</th>
+                                        {{ column.header }}
                                     {% endif %}
+                                </th>
+                            {% endfor %}
+                        </tr>
+                        </thead>
+                    {% endif %}
+                {% endblock table.thead %}
+                {% block table.tbody %}
+                    <tbody {{ table.attrs.tbody.as_html }}>
+                    {% for row in table.paginated_rows %}
+                        {% block table.tbody.row %}
+                            <tr {{ row.attrs.as_html }}>
+                                {% for column, cell in row.items %}
+                                    <td {{ column.attrs.td.as_html }}>
+                                        {% if column.localize == None %}{{ cell }}{% else %}{% if column.localize %}
+                                            {{ cell|localize }}{% else %}{{ cell|unlocalize }}
+                                        {% endif %}{% endif %}</td>
                                 {% endfor %}
                             </tr>
-                            </thead>
-                        {% endif %}
-                    {% endblock table.thead %}
-                    {% block table.tbody %}
-                        <tbody>
-                        {% for row in table.page.object_list|default:table.rows %} {# support pagination #}
-                            {% block table.tbody.row %}
-                                <tr {{ row.attrs.as_html }}>
-                                    {% for column, cell in row.items %}
-                                        <td {{ column.attrs.td.as_html }}>
-                                            {% if column.localize == None %}{{ cell }}{% else %}{% if column.localize %}
-                                                {{ cell|localize }}{% else %}{{ cell|unlocalize }}
-                                            {% endif %}{% endif %}</td>
-                                    {% endfor %}
+                        {% endblock table.tbody.row %}
+                    {% empty %}
+                        {% if table.empty_text %}
+                            {% block table.tbody.empty_text %}
+                                <tr>
+                                    <td colspan="{{ table.columns|length }}">{{ table.empty_text }}</td>
                                 </tr>
-                            {% endblock table.tbody.row %}
-                        {% empty %}
-                            {% if table.empty_text %}
-                                {% block table.tbody.empty_text %}
-                                    <tr>
-                                        <td colspan="{{ table.columns|length }}">{{ table.empty_text }}</td>
-                                    </tr>
-                                {% endblock table.tbody.empty_text %}
-                            {% endif %}
-                        {% endfor %}
-                        </tbody>
-                    {% endblock table.tbody %}
-                    {% block table.tfoot %}
-                        {% if table.has_footer %}
-                            <tfoot>
-                            <tr>
-                                {% for column in table.columns %}
-                                    <td {{ column.attrs.tf.as_html }}>{{ column.footer }}</td>
-                                {% endfor %}
-                            </tr>
-                            </tfoot>
+                            {% endblock table.tbody.empty_text %}
                         {% endif %}
-                    {% endblock table.tfoot %}
-                </table>
-            {% endblock table %}
+                    {% endfor %}
+                    </tbody>
+                {% endblock table.tbody %}
+                {% block table.tfoot %}
+                    {% if table.has_footer %}
+                        <tfoot {{ table.attrs.tfoot.as_html }}>
+                        <tr>
+                            {% for column in table.columns %}
+                                <td {{ column.attrs.tf.as_html }}>{{ column.footer }}</td>
+                            {% endfor %}
+                        </tr>
+                        </tfoot>
+                    {% endif %}
+                {% endblock table.tfoot %}
+            </table>
+        {% endblock table %}
 
+        {% block pagination %}
             {% if table.page and table.paginator.num_pages > 1 %}
-                {% with current_page=table.page.number page_count=table.paginator.num_pages rows_per_page=table.page.object_list|length total_rows=table.page.paginator.count %}
-                    {% block pagination %}
-                        <nav>
-                            <ul class="pagination justify-content-center">
-                                {% block pagination.allpages %}
-                                    <li class="page-item">
-
+                <nav aria-label="Table navigation">
+                    <ul class="pagination justify-content-center">
+                        {% if table.page.has_previous %}
+                            {% block pagination.previous %}
+                                <li class="previous page-item">
+                                    <a href="{% querystring table.prefixed_page_field=table.page.previous_page_number %}"
+                                       class="page-link">
+                                        <span aria-hidden="true">&laquo;</span>
+                                        {% trans 'previous' %}
+                                    </a>
+                                </li>
+                            {% endblock pagination.previous %}
+                        {% endif %}
+                        {% if table.page.has_previous or table.page.has_next %}
+                            {% block pagination.range %}
+                                {% for p in table.page|table_page_range:table.paginator %}
+                                    <li class="page-item{% if table.page.number == p %} active{% endif %}">
+                                        <a class="page-link"
+                                           {% if p != '...' %}href="{% querystring table.prefixed_page_field=p %}"{% endif %}>
+                                            {{ p }}
+                                        </a>
                                     </li>
-                                    {% for page in table.paginator.page_range %}
-                                        {% with range_start=current_page|add:"-3" range_end=current_page|add:"3" page_count_minus_5=page_count|add:"-5" page_count_minus_1=page_count|add:"-1" %}
-                                            {% if page == current_page %}
-                                                <li class="page-item active">
-                                                    <a class="page-link" href="#">{{ page }}</a>
-
-                                                </li>
-                                            {% elif page == 1 or page >= range_start and page <= range_end or page == page_count %}
-                                                <li class="page-item">
-                                                    <a class="page-link"
-                                                       href="{% querystring table.prefixed_page_field=page %}">{{ page }}</a>
-                                                </li>
-                                            {% endif %}
-                                            {% if page == 1 and current_page > 5 or pagina == page_count_minus_1 and current_page <= page_count_minus_5 %}
-                                                <li class="page-item"></li>
-                                            {% endif %}
-                                        {% endwith %}
-                                    {% endfor %}
-                                {% endblock pagination.allpages %}
-                            </ul>
-                        </nav>
-                    {% endblock pagination %}
-                {% endwith %}
+                                {% endfor %}
+                            {% endblock pagination.range %}
+                        {% endif %}
+                        {% if table.page.has_next %}
+                            {% block pagination.next %}
+                                <li class="next page-item">
+                                    <a href="{% querystring table.prefixed_page_field=table.page.next_page_number %}"
+                                       class="page-link">
+                                        {% trans 'next' %}
+                                        <span aria-hidden="true">&raquo;</span>
+                                    </a>
+                                </li>
+                            {% endblock pagination.next %}
+                        {% endif %}
+                    </ul>
+                </nav>
             {% endif %}
-
-        </div>
+        {% endblock pagination %}
     </div>
-{% endblock table-wrapper %}
\ No newline at end of file
+{% endblock content %}
\ No newline at end of file
diff --git a/cookbook/templates/index.html b/cookbook/templates/index.html
index 1618d3cb..2323b72a 100644
--- a/cookbook/templates/index.html
+++ b/cookbook/templates/index.html
@@ -34,7 +34,7 @@
 
     <br/>
 
-    {% if recipes %}
+    {% if user.is_authenticated and recipes %}
         {% render_table recipes %}
     {% else %}
         <div class="alert alert-danger" role="alert">
diff --git a/cookbook/views/lists.py b/cookbook/views/lists.py
index b9daa625..9ae0031c 100644
--- a/cookbook/views/lists.py
+++ b/cookbook/views/lists.py
@@ -1,6 +1,7 @@
 from django.contrib.auth.decorators import login_required
 from django.db.models.functions import Lower
 from django.shortcuts import render
+from django.urls import reverse_lazy
 from django_tables2 import RequestConfig
 from django.utils.translation import gettext as _
 
@@ -13,7 +14,7 @@ def keyword(request):
     table = KeywordTable(Keyword.objects.all())
     RequestConfig(request, paginate={'per_page': 25}).configure(table)
 
-    return render(request, 'generic/list_template.html', {'title': _("Keyword"), 'table': table})
+    return render(request, 'generic/list_template.html', {'title': _("Keyword"), 'table': table, 'create_url': 'new_keyword'})
 
 
 @login_required
@@ -27,6 +28,7 @@ def sync_log(request):
 @login_required
 def recipe_import(request):
     table = RecipeImportTable(RecipeImport.objects.all())
+
     RequestConfig(request, paginate={'per_page': 25}).configure(table)
 
     return render(request, 'generic/list_template.html', {'title': _("Import"), 'table': table})
@@ -37,4 +39,4 @@ def storage(request):
     table = StorageTable(Storage.objects.all())
     RequestConfig(request, paginate={'per_page': 25}).configure(table)
 
-    return render(request, 'generic/list_template.html', {'title': _("Storage Backend"), 'table': table})
+    return render(request, 'generic/list_template.html', {'title': _("Storage Backend"), 'table': table, 'create_url': 'new_storage'})
diff --git a/recipes/settings.py b/recipes/settings.py
index 8e87296a..28eb92f2 100644
--- a/recipes/settings.py
+++ b/recipes/settings.py
@@ -27,7 +27,7 @@ LOGIN_REDIRECT_URL = "index"
 LOGOUT_REDIRECT_URL = "index"
 
 CRISPY_TEMPLATE_PACK = 'bootstrap4'
-DJANGO_TABLES2_TEMPLATE = 'django_tables2/bootstrap4.html'
+DJANGO_TABLES2_TEMPLATE = 'cookbook/templates/generic/table_template.html'
 
 MESSAGE_TAGS = {
     messages.ERROR: 'danger'