diff --git a/netbox_attachments/template_content.py b/netbox_attachments/template_content.py
index 5a596ab..d7679e5 100644
--- a/netbox_attachments/template_content.py
+++ b/netbox_attachments/template_content.py
@@ -73,7 +73,7 @@ def buttons(self):
     return Button
 
 
-def create_tab_view(model, base_template_name="generic/object.html"):
+def create_tab_view(model, base_template_name="generic/object_children.html"):
     """Creates attachment tab. Append it to the passed model
 
     Args:
diff --git a/netbox_attachments/templates/netbox_attachments/generic_tab_list.html b/netbox_attachments/templates/netbox_attachments/generic_tab_list.html
index fb5145f..9b9730b 100644
--- a/netbox_attachments/templates/netbox_attachments/generic_tab_list.html
+++ b/netbox_attachments/templates/netbox_attachments/generic_tab_list.html
@@ -1,13 +1,15 @@
 {% extends base_template_name %}
 {% load render_table from django_tables2 %}
 {% load static %}
+{% load helpers %}
 {% if perms.netbox_attachments.view_netboxattachment %}
     {% block content %}
-        {% load helpers %}
+        {% block table_controls %}
+            {% include "inc/table_controls_htmx.html" with table_modal="NetBoxAttachmentTable_config" %}
+        {% endblock table_controls %}
         <div class="card">
             <div class="card-body" id="object_list">
-                {% include "inc/table_controls_htmx.html" with table_modal="NetBoxAttachmentTable_config" %}
-                {% include "htmx/table.html" %}
+                {% htmx_table 'plugins:netbox_attachments:netboxattachment_list' object_type_id=object|content_type_id object_id=object.pk %}
             </div>
         </div>
         <div class="noprint bulk-buttons">
@@ -15,7 +17,7 @@
             <div class="bulk-button-group">
                 {% if perms.netbox_attachments.add_netboxattachment %}
                     <a href="{% url 'plugins:netbox_attachments:netboxattachment_add' %}?object_type={{ object|content_type_id }}&object_id={{ object.pk }}&return_url={{ request.path }}"
-                       class="btn btn-primary btn-sm">
+                       class="btn btn-primary">
                         <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
                         Add Attachment
                     </a>
@@ -24,7 +26,3 @@
         </div>
     {% endblock content %}
 {% endif %}
-{% block modals %}
-    {{ block.super }}
-    {% table_config_form table %}
-{% endblock modals %}