diff --git a/core/templates/modals/context.html b/core/templates/modals/context.html
index 2b0c7a4..51f99b2 100644
--- a/core/templates/modals/context.html
+++ b/core/templates/modals/context.html
@@ -1,4 +1,4 @@
-{% extends 'wm/modal.html' %}
+{% extends 'mixins/wm/modal.html' %}
 
 {% load index %}
 {% load static %}
diff --git a/core/templates/modals/drilldown.html b/core/templates/modals/drilldown.html
index 4eab9de..86da065 100644
--- a/core/templates/modals/drilldown.html
+++ b/core/templates/modals/drilldown.html
@@ -1,4 +1,4 @@
-{% extends 'wm/modal.html' %}
+{% extends 'mixins/wm/modal.html' %}
 
 {% block modal_content %}
   {% include 'window-content/drilldown.html' %}
diff --git a/core/templates/partials/close-modal.html b/core/templates/partials/close-modal.html
deleted file mode 100644
index 6c0173c..0000000
--- a/core/templates/partials/close-modal.html
+++ /dev/null
@@ -1 +0,0 @@
-<button class="modal-close is-large" aria-label="close"></button>
diff --git a/core/templates/partials/close-widget.html b/core/templates/partials/close-widget.html
deleted file mode 100644
index 0c66e85..0000000
--- a/core/templates/partials/close-widget.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<i
-  class="fa-solid fa-xmark has-text-grey-light float-right"
-  onclick='grid.removeWidget("widget-{{ unique }}");'></i>
\ No newline at end of file
diff --git a/core/templates/partials/close-window.html b/core/templates/partials/close-window.html
deleted file mode 100644
index 894974c..0000000
--- a/core/templates/partials/close-window.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<i
-  class="fa-solid fa-xmark has-text-grey-light float-right"
-  data-script="on click remove the closest <nav/>"></i>
\ No newline at end of file
diff --git a/core/templates/partials/results_load.html b/core/templates/partials/results_load.html
index 8b631ae..13c5f88 100644
--- a/core/templates/partials/results_load.html
+++ b/core/templates/partials/results_load.html
@@ -1,4 +1,4 @@
-{% extends 'wm/widget.html' %}
+{% extends 'mixins/wm/widget.html' %}
 {% load static %}
 
 {% block heading %}
diff --git a/core/templates/partials/results_table.html b/core/templates/partials/results_table.html
index a466c49..1d9ecf3 100644
--- a/core/templates/partials/results_table.html
+++ b/core/templates/partials/results_table.html
@@ -5,529 +5,532 @@
 {% load urlsafe %}
 {% load pretty %}
 {% load splitstr %}
+{% load cache %}
 
-{% block table-wrapper %}
-  <script src="{% static 'js/column-shifter.js' %}"></script>
-  <div id="drilldown-table" class="column-shifter-container" style="position:relative; z-index:1;">
-    {% block table %}
-      <div class="nowrap-parent">
-        <div class="nowrap-child">
-          <div class="dropdown" id="dropdown">
-            <div class="dropdown-trigger">
-              <button id="dropdown-trigger" class="button dropdown-toggle" aria-haspopup="true" aria-controls="dropdown-menu">
-                <span>Show/hide fields</span>
-                <span class="icon is-small">
-                  <i class="fas fa-angle-down" aria-hidden="true"></i>
-                </span>
-              </button>
-            </div>
-            <div class="dropdown-menu" id="dropdown-menu" role="menu">
-              <div class="dropdown-content" style="position:absolute; z-index:2;">
-                {% for column in table.columns %}
-                  {% if column.name in show %}
-                    <a class="btn-shift-column dropdown-item"
-                      data-td-class="{{ column.name }}"
-                      data-state="on"
-                      {% if not forloop.last %} style="border-bottom:1px solid #ccc;" {%endif %}
-                      data-table-class-container="drilldown-table">
-                      <span class="check icon" data-tooltip="Visible" style="display:none;">
-                        <i class="fa-solid fa-check"></i>
-                      </span>
-                      <span class="uncheck icon" data-tooltip="Hidden" style="display:none;">
-                        <i class="fa-solid fa-xmark"></i>
-                      </span>
-                      {{ column.header }}
-                    </a>
-                  {% endif %}
-                {% endfor %}
+{% cache 3600 results_table_full request.user.id table %}
+  {% block table-wrapper %}
+    <script src="{% static 'js/column-shifter.js' %}"></script>
+    <div id="drilldown-table" class="column-shifter-container" style="position:relative; z-index:1;">
+      {% block table %}
+        <div class="nowrap-parent">
+          <div class="nowrap-child">
+            <div class="dropdown" id="dropdown">
+              <div class="dropdown-trigger">
+                <button id="dropdown-trigger" class="button dropdown-toggle" aria-haspopup="true" aria-controls="dropdown-menu">
+                  <span>Show/hide fields</span>
+                  <span class="icon is-small">
+                    <i class="fas fa-angle-down" aria-hidden="true"></i>
+                  </span>
+                </button>
+              </div>
+              <div class="dropdown-menu" id="dropdown-menu" role="menu">
+                <div class="dropdown-content" style="position:absolute; z-index:2;">
+                  {% for column in table.columns %}
+                    {% if column.name in show %}
+                      <a class="btn-shift-column dropdown-item"
+                        data-td-class="{{ column.name }}"
+                        data-state="on"
+                        {% if not forloop.last %} style="border-bottom:1px solid #ccc;" {%endif %}
+                        data-table-class-container="drilldown-table">
+                        <span class="check icon" data-tooltip="Visible" style="display:none;">
+                          <i class="fa-solid fa-check"></i>
+                        </span>
+                        <span class="uncheck icon" data-tooltip="Hidden" style="display:none;">
+                          <i class="fa-solid fa-xmark"></i>
+                        </span>
+                        {{ column.header }}
+                      </a>
+                    {% endif %}
+                  {% endfor %}
+                </div>
               </div>
             </div>
           </div>
+          <div class="nowrap-child">
+            <span id="loader" class="button is-light has-text-link is-loading">Static</span>
+          </div>
         </div>
-        <div class="nowrap-child">
-          <span id="loader" class="button is-light has-text-link is-loading">Static</span>
-        </div>
-      </div>
-      <script>
-        var dropdown_button = document.getElementById("dropdown-trigger");
-        var dropdown = document.getElementById("dropdown");
-        dropdown_button.addEventListener('click', function(e) {
-          // elements[i].preventDefault();
-          dropdown.classList.toggle('is-active');
-        });
+        <script>
+          var dropdown_button = document.getElementById("dropdown-trigger");
+          var dropdown = document.getElementById("dropdown");
+          dropdown_button.addEventListener('click', function(e) {
+            // elements[i].preventDefault();
+            dropdown.classList.toggle('is-active');
+          });
 
-      </script>
-      <div id="table-container" style="display:none;">
-        <table {% render_attrs table.attrs class="table drilldown-results-table is-fullwidth" %}>
-          {% block table.thead %}
-            {% if table.show_header %}
-              <thead {% render_attrs table.attrs.thead class="" %}>
-                {% block table.thead.row %}
-                  <tr>
-                    {% for column in table.columns %}
-                      {% if column.name in show %}
-                        {% block table.thead.th %}
-                          <th class="orderable {{ column.name }}">
-                            <div class="nowrap-parent">
-                              {% if column.orderable %}
-                                <div class="nowrap-child">
-                                  {% if column.is_ordered %}
-                                    {% is_descending column.order_by as descending %}
-                                    {% if descending %}
-                                      <span class="icon" aria-hidden="true">{% block table.desc_icon %}<i class="fa-solid fa-sort-down"></i>{% endblock table.desc_icon %}</span>
+        </script>
+        <div id="table-container" style="display:none;">
+          <table {% render_attrs table.attrs class="table drilldown-results-table is-fullwidth" %}>
+            {% block table.thead %}
+              {% if table.show_header %}
+                <thead {% render_attrs table.attrs.thead class="" %}>
+                  {% block table.thead.row %}
+                    <tr>
+                      {% for column in table.columns %}
+                        {% if column.name in show %}
+                          {% block table.thead.th %}
+                            <th class="orderable {{ column.name }}">
+                              <div class="nowrap-parent">
+                                {% if column.orderable %}
+                                  <div class="nowrap-child">
+                                    {% if column.is_ordered %}
+                                      {% is_descending column.order_by as descending %}
+                                      {% if descending %}
+                                        <span class="icon" aria-hidden="true">{% block table.desc_icon %}<i class="fa-solid fa-sort-down"></i>{% endblock table.desc_icon %}</span>
+                                      {% else %}
+                                        <span class="icon" aria-hidden="true">{% block table.asc_icon %}<i class="fa-solid fa-sort-up"></i>{% endblock table.asc_icon %}</span>
+                                      {% endif %}
                                     {% else %}
-                                      <span class="icon" aria-hidden="true">{% block table.asc_icon %}<i class="fa-solid fa-sort-up"></i>{% endblock table.asc_icon %}</span>
+                                      <span class="icon" aria-hidden="true">{% block table.orderable_icon %}<i class="fa-solid fa-sort"></i>{% endblock table.orderable_icon %}</span>
                                     {% endif %}
-                                  {% else %}
-                                    <span class="icon" aria-hidden="true">{% block table.orderable_icon %}<i class="fa-solid fa-sort"></i>{% endblock table.orderable_icon %}</span>
-                                  {% endif %}
-                                </div>
-                                <div class="nowrap-child">
-                                  <a
-                                    hx-get="search/partial/{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}&{{ uri }}"
-                                    hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                                    hx-trigger="click"
-                                    hx-target="#drilldown-table"
-                                    hx-swap="outerHTML"
-                                    hx-indicator="#spinner"
-                                    style="cursor: pointer;">
+                                  </div>
+                                  <div class="nowrap-child">
+                                    <a
+                                      hx-get="search/partial/{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}&{{ uri }}"
+                                      hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                                      hx-trigger="click"
+                                      hx-target="#drilldown-table"
+                                      hx-swap="outerHTML"
+                                      hx-indicator="#spinner"
+                                      style="cursor: pointer;">
+                                      {{ column.header }}
+                                    </a>
+                                  </div>
+                                {% else %}
+                                  <div class="nowrap-child">
                                     {{ column.header }}
-                                  </a>
-                                </div>
-                              {% else %}
-                                <div class="nowrap-child">
-                                  {{ column.header }}
-                                </div>
-                              {% endif %}
-                            </div>
-                          </th>
-                        {% endblock table.thead.th %}
-                      {% endif %}
-
-                    {% endfor %}
-                  </tr>
-                {% endblock table.thead.row %}
-              </thead>
-            {% endif %}
-          {% endblock table.thead %}
-          {% block table.tbody %}
-            <tbody {{ table.attrs.tbody.as_html }}>
-              {% for row in table.paginated_rows %}
-                {% block table.tbody.row %}
-                  {% if row.cells.type == 'control' %}
-                    <tr>
-                      <td></td>
-                      <td>
-                        <span class="icon has-text-grey" data-tooltip="Hidden">
-                          <i class="fa-solid fa-file-slash"></i>
-                        </span>
-                      </td>
-                      <td>
-                        <p class="has-text-grey">Hidden {{ row.cells.hidden }} similar result{% if row.cells.hidden > 1%}s{% endif %}</p>
-                      </td>
+                                  </div>
+                                {% endif %}
+                              </div>
+                            </th>
+                          {% endblock table.thead.th %}
+                        {% endif %}
 
+                      {% endfor %}
                     </tr>
-                  {% else %}
-                    <tr class="
-                      {% if row.cells.exemption == True %}has-background-grey-lighter
-                      {% elif cell == 'join' %}has-background-success-light
-                      {% elif cell == 'quit' %}has-background-danger-light
-                      {% elif cell == 'kick' %}has-background-danger-light
-                      {% elif cell == 'part' %}has-background-warning-light
-                      {% elif cell == 'mode' %}has-background-info-light
-                      {% endif %}">
-                      {% for column, cell in row.items %}
-                        {% if column.name in show %}
-                          {% block table.tbody.td %}
-                            {% if cell == '—' %}
-                              <td class="{{ column.name }}">
-                                <span class="icon">
-                                  <i class="fa-solid fa-file-slash"></i>
-                                </span>
-                              </td>
-                            {% elif column.name == 'src' %}
-                              <td class="{{ column.name }}">
-                                <a
-                                  class="has-text-grey"
-                                  onclick="populateSearch('src', '{{ cell|escapejs }}')">
-                                  {% if row.cells.src == 'irc' %}
-                                    <span class="icon" data-tooltip="IRC">
-                                      <i class="fa-solid fa-hashtag" aria-hidden="true"></i>
-                                    </span>
-                                  {% elif row.cells.src == 'dis' %}
-                                    <span class="icon" data-tooltip="Discord">
-                                      <i class="fa-brands fa-discord" aria-hidden="true"></i>
-                                    </span>
-                                  {% elif row.cells.src == '4ch' %}
-                                    <span class="icon" data-tooltip="4chan">
-                                      <i class="fa-solid fa-leaf" aria-hidden="true"></i>
-                                    </span>
-                                  {% endif %}
-                                </a>
-                              </td>
-                            {% elif column.name == 'ts' %}
-                              <td class="{{ column.name }}">
-                                <p>{{ row.cells.date }}</p>
-                                <p>{{ row.cells.time }}</p>
-                              </td>
-                            {% elif column.name == 'match_ts' %}
-                              <td class="{{ column.name }}">
-                                {% with match_ts=cell|splitstr:'T' %}
-                                  <p>{{ match_ts.0 }}</p>
-                                  <p>{{ match_ts.1 }}</p>
-                                {% endwith %}
-                              </td>
-                            {% elif column.name == 'type' or column.name == 'mtype' %}
-                              <td class="{{ column.name }}">
-                                <a
-                                  class="has-text-grey"
-                                  onclick="populateSearch('{{ column.name }}', '{{ cell|escapejs }}')">
-                                  {% if cell == 'msg' %}
-                                    <span class="icon" data-tooltip="Message">
-                                      <i class="fa-solid fa-message"></i>
-                                    </span>
-                                  {% elif cell == 'join' %}
-                                    <span class="icon" data-tooltip="Join">
-                                      <i class="fa-solid fa-person-to-portal"></i>
-                                    </span>
-                                  {% elif cell == 'part' %}
-                                    <span class="icon" data-tooltip="Part">
-                                      <i class="fa-solid fa-person-from-portal"></i>
-                                    </span>
-                                  {% elif cell == 'quit' %}
-                                    <span class="icon" data-tooltip="Quit">
-                                      <i class="fa-solid fa-circle-xmark"></i>
-                                    </span>
-                                  {% elif cell == 'kick' %}
-                                    <span class="icon" data-tooltip="Kick">
-                                      <i class="fa-solid fa-user-slash"></i>
-                                    </span>
-                                  {% elif cell == 'nick' %}
-                                    <span class="icon" data-tooltip="Nick">
-                                      <i class="fa-solid fa-signature"></i>
-                                    </span>
-                                  {% elif cell == 'mode' %}
-                                    <span class="icon" data-tooltip="Mode">
-                                      <i class="fa-solid fa-gear"></i>
-                                    </span>
-                                  {% elif cell == 'action' %}
-                                    <span class="icon" data-tooltip="Action">
-                                      <i class="fa-solid fa-exclamation"></i>
-                                    </span>
-                                  {% elif cell == 'notice' %}
-                                    <span class="icon" data-tooltip="Notice">
-                                      <i class="fa-solid fa-message-code"></i>
-                                    </span>
-                                  {% elif cell == 'conn' %}
-                                    <span class="icon" data-tooltip="Connection">
-                                      <i class="fa-solid fa-cloud-exclamation"></i>
-                                    </span>
-                                  {% elif cell == 'znc' %}
-                                    <span class="icon" data-tooltip="ZNC">
-                                      <i class="fa-brands fa-unity"></i>
-                                    </span>
-                                  {% elif cell == 'query' %}
-                                    <span class="icon" data-tooltip="Query">
-                                      <i class="fa-solid fa-message"></i>
-                                    </span>
-                                  {% elif cell == 'highlight' %}
-                                    <span class="icon" data-tooltip="Highlight">
-                                      <i class="fa-solid fa-exclamation"></i>
-                                    </span>
-                                  {% elif cell == 'who' %}
-                                    <span class="icon" data-tooltip="Who">
-                                      <i class="fa-solid fa-passport"></i>
-                                    </span>
-                                  {% elif cell == 'topic' %}
-                                    <span class="icon" data-tooltip="Topic">
-                                      <i class="fa-solid fa-sign"></i>
-                                    </span>
-                                  {% else %}
-                                    {{ cell }}
-                                  {% endif %}
-                                </a>
-                              </td>
-                            {% elif column.name == 'msg' %}
-                              <td class="{{ column.name }} wrap">
-                                <a
-                                  class="has-text-grey is-underlined"
-                                  hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                                  hx-post="{% url 'modal_context' %}"
-                                  hx-vals='{"net": "{{ row.cells.net|escapejs }}",
-                                  "num": "{{ row.cells.num|escapejs }}",
-                                  "source": "{{ row.cells.src|escapejs }}",
-                                  "channel": "{{ row.cells.channel|escapejs }}",
-                                  "time": "{{ row.cells.time|escapejs }}",
-                                  "date": "{{ row.cells.date|escapejs }}",
-                                  "index": "{% if row.cells.index != '—' %}{{row.cells.index}}{% else %}{{ params.index }}{% endif %}",
-                                  "type": "{{ row.cells.type }}",
-                                  "mtype": "{{ row.cells.mtype }}",
-                                  "nick": "{{ row.cells.nick|escapejs }}",
-                                  "dedup": "{{ params.dedup }}"}'
-                                  hx-target="#modals-here"
-                                  hx-trigger="click"
-                                  href="/?modal=context&net={{row.cells.net|escapejs}}&num={{row.cells.num|escapejs}}&source={{row.cells.src|escapejs}}&channel={{row.cells.channel|urlsafe}}&time={{row.cells.time|escapejs}}&date={{row.cells.date|escapejs}}&index={{params.index}}&type={{row.cells.type}}&mtype={{row.cells.mtype}}&nick={{row.cells.mtype|escapejs}}">
-                                  {{ row.cells.msg }}
-                                </a>
-                              </td>
-                            {% elif column.name == 'nick' %}
-                              <td class="{{ column.name }}">
-                                <div class="nowrap-parent">
-                                  <div class="nowrap-child">
-                                    {% if row.cells.online is True %}
-                                      <span class="icon has-text-success has-tooltip-success" data-tooltip="Online">
-                                        <i class="fa-solid fa-circle"></i>
+                  {% endblock table.thead.row %}
+                </thead>
+              {% endif %}
+            {% endblock table.thead %}
+            {% block table.tbody %}
+              <tbody {{ table.attrs.tbody.as_html }}>
+                {% for row in table.paginated_rows %}
+                  {% block table.tbody.row %}
+                    {% if row.cells.type == 'control' %}
+                      <tr>
+                        <td></td>
+                        <td>
+                          <span class="icon has-text-grey" data-tooltip="Hidden">
+                            <i class="fa-solid fa-file-slash"></i>
+                          </span>
+                        </td>
+                        <td>
+                          <p class="has-text-grey">Hidden {{ row.cells.hidden }} similar result{% if row.cells.hidden > 1%}s{% endif %}</p>
+                        </td>
+
+                      </tr>
+                    {% else %}
+                      <tr class="
+                        {% if row.cells.exemption == True %}has-background-grey-lighter
+                        {% elif cell == 'join' %}has-background-success-light
+                        {% elif cell == 'quit' %}has-background-danger-light
+                        {% elif cell == 'kick' %}has-background-danger-light
+                        {% elif cell == 'part' %}has-background-warning-light
+                        {% elif cell == 'mode' %}has-background-info-light
+                        {% endif %}">
+                        {% for column, cell in row.items %}
+                          {% if column.name in show %}
+                            {% block table.tbody.td %}
+                              {% if cell == '—' %}
+                                <td class="{{ column.name }}">
+                                  <span class="icon">
+                                    <i class="fa-solid fa-file-slash"></i>
+                                  </span>
+                                </td>
+                              {% elif column.name == 'src' %}
+                                <td class="{{ column.name }}">
+                                  <a
+                                    class="has-text-grey"
+                                    onclick="populateSearch('src', '{{ cell|escapejs }}')">
+                                    {% if row.cells.src == 'irc' %}
+                                      <span class="icon" data-tooltip="IRC">
+                                        <i class="fa-solid fa-hashtag" aria-hidden="true"></i>
                                       </span>
-                                    {% elif row.cells.online is False %}
-                                      <span class="icon has-text-danger has-tooltip-danger" data-tooltip="Offline">
-                                        <i class="fa-solid fa-circle"></i>
+                                    {% elif row.cells.src == 'dis' %}
+                                      <span class="icon" data-tooltip="Discord">
+                                        <i class="fa-brands fa-discord" aria-hidden="true"></i>
                                       </span>
-                                    {% else %}
-                                      <span class="icon has-text-warning has-tooltip-warning" data-tooltip="Unknown">
-                                        <i class="fa-solid fa-circle"></i>
+                                    {% elif row.cells.src == '4ch' %}
+                                      <span class="icon" data-tooltip="4chan">
+                                        <i class="fa-solid fa-leaf" aria-hidden="true"></i>
                                       </span>
                                     {% endif %}
-                                  </div>
-                                  <a class="nowrap-child has-text-grey" onclick="populateSearch('nick', '{{ cell|escapejs }}')">
-                                    {{ cell }}
                                   </a>
-                                  <div class="nowrap-child">
-                                    {% if row.cells.src == 'irc' %}
-                                      <a
-                                        hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                                        hx-post="{% url 'modal_drilldown' %}"
-                                        hx-vals='{"net": "{{ row.cells.net }}", "nick": "{{ row.cells.nick }}", "channel": "{{ row.cells.channel }}"}'
-                                        hx-target="#modals-here"
-                                        hx-trigger="click"
-                                        class="has-text-black">
-                                        <span class="icon" data-tooltip="Open drilldown modal">
-                                          <i class="fa-solid fa-album"></i>
+                                </td>
+                              {% elif column.name == 'ts' %}
+                                <td class="{{ column.name }}">
+                                  <p>{{ row.cells.date }}</p>
+                                  <p>{{ row.cells.time }}</p>
+                                </td>
+                              {% elif column.name == 'match_ts' %}
+                                <td class="{{ column.name }}">
+                                  {% with match_ts=cell|splitstr:'T' %}
+                                    <p>{{ match_ts.0 }}</p>
+                                    <p>{{ match_ts.1 }}</p>
+                                  {% endwith %}
+                                </td>
+                              {% elif column.name == 'type' or column.name == 'mtype' %}
+                                <td class="{{ column.name }}">
+                                  <a
+                                    class="has-text-grey"
+                                    onclick="populateSearch('{{ column.name }}', '{{ cell|escapejs }}')">
+                                    {% if cell == 'msg' %}
+                                      <span class="icon" data-tooltip="Message">
+                                        <i class="fa-solid fa-message"></i>
+                                      </span>
+                                    {% elif cell == 'join' %}
+                                      <span class="icon" data-tooltip="Join">
+                                        <i class="fa-solid fa-person-to-portal"></i>
+                                      </span>
+                                    {% elif cell == 'part' %}
+                                      <span class="icon" data-tooltip="Part">
+                                        <i class="fa-solid fa-person-from-portal"></i>
+                                      </span>
+                                    {% elif cell == 'quit' %}
+                                      <span class="icon" data-tooltip="Quit">
+                                        <i class="fa-solid fa-circle-xmark"></i>
+                                      </span>
+                                    {% elif cell == 'kick' %}
+                                      <span class="icon" data-tooltip="Kick">
+                                        <i class="fa-solid fa-user-slash"></i>
+                                      </span>
+                                    {% elif cell == 'nick' %}
+                                      <span class="icon" data-tooltip="Nick">
+                                        <i class="fa-solid fa-signature"></i>
+                                      </span>
+                                    {% elif cell == 'mode' %}
+                                      <span class="icon" data-tooltip="Mode">
+                                        <i class="fa-solid fa-gear"></i>
+                                      </span>
+                                    {% elif cell == 'action' %}
+                                      <span class="icon" data-tooltip="Action">
+                                        <i class="fa-solid fa-exclamation"></i>
+                                      </span>
+                                    {% elif cell == 'notice' %}
+                                      <span class="icon" data-tooltip="Notice">
+                                        <i class="fa-solid fa-message-code"></i>
+                                      </span>
+                                    {% elif cell == 'conn' %}
+                                      <span class="icon" data-tooltip="Connection">
+                                        <i class="fa-solid fa-cloud-exclamation"></i>
+                                      </span>
+                                    {% elif cell == 'znc' %}
+                                      <span class="icon" data-tooltip="ZNC">
+                                        <i class="fa-brands fa-unity"></i>
+                                      </span>
+                                    {% elif cell == 'query' %}
+                                      <span class="icon" data-tooltip="Query">
+                                        <i class="fa-solid fa-message"></i>
+                                      </span>
+                                    {% elif cell == 'highlight' %}
+                                      <span class="icon" data-tooltip="Highlight">
+                                        <i class="fa-solid fa-exclamation"></i>
+                                      </span>
+                                    {% elif cell == 'who' %}
+                                      <span class="icon" data-tooltip="Who">
+                                        <i class="fa-solid fa-passport"></i>
+                                      </span>
+                                    {% elif cell == 'topic' %}
+                                      <span class="icon" data-tooltip="Topic">
+                                        <i class="fa-solid fa-sign"></i>
+                                      </span>
+                                    {% else %}
+                                      {{ cell }}
+                                    {% endif %}
+                                  </a>
+                                </td>
+                              {% elif column.name == 'msg' %}
+                                <td class="{{ column.name }} wrap">
+                                  <a
+                                    class="has-text-grey is-underlined"
+                                    hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                                    hx-post="{% url 'modal_context' %}"
+                                    hx-vals='{"net": "{{ row.cells.net|escapejs }}",
+                                    "num": "{{ row.cells.num|escapejs }}",
+                                    "source": "{{ row.cells.src|escapejs }}",
+                                    "channel": "{{ row.cells.channel|escapejs }}",
+                                    "time": "{{ row.cells.time|escapejs }}",
+                                    "date": "{{ row.cells.date|escapejs }}",
+                                    "index": "{% if row.cells.index != '—' %}{{row.cells.index}}{% else %}{{ params.index }}{% endif %}",
+                                    "type": "{{ row.cells.type }}",
+                                    "mtype": "{{ row.cells.mtype }}",
+                                    "nick": "{{ row.cells.nick|escapejs }}",
+                                    "dedup": "{{ params.dedup }}"}'
+                                    hx-target="#modals-here"
+                                    hx-trigger="click"
+                                    href="/?modal=context&net={{row.cells.net|escapejs}}&num={{row.cells.num|escapejs}}&source={{row.cells.src|escapejs}}&channel={{row.cells.channel|urlsafe}}&time={{row.cells.time|escapejs}}&date={{row.cells.date|escapejs}}&index={{params.index}}&type={{row.cells.type}}&mtype={{row.cells.mtype}}&nick={{row.cells.mtype|escapejs}}">
+                                    {{ row.cells.msg }}
+                                  </a>
+                                </td>
+                              {% elif column.name == 'nick' %}
+                                <td class="{{ column.name }}">
+                                  <div class="nowrap-parent">
+                                    <div class="nowrap-child">
+                                      {% if row.cells.online is True %}
+                                        <span class="icon has-text-success has-tooltip-success" data-tooltip="Online">
+                                          <i class="fa-solid fa-circle"></i>
                                         </span>
-                                      </a>
-                                      <a
-                                        hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                                        hx-post="{% url 'modal_drilldown' type='window' %}"
-                                        hx-vals='{"net": "{{ row.cells.net }}", "nick": "{{ row.cells.nick }}", "channel": "{{ row.cells.channel }}"}'
-                                        hx-target="#windows-here"
-                                        hx-swap="afterend"
-                                        hx-trigger="click"
-                                        class="has-text-black">
-                                        <span class="icon" data-tooltip="Open drilldown window">
-                                          <i class="fa-solid fa-album"></i>
+                                      {% elif row.cells.online is False %}
+                                        <span class="icon has-text-danger has-tooltip-danger" data-tooltip="Offline">
+                                          <i class="fa-solid fa-circle"></i>
                                         </span>
-                                      </a>
-                                      <a
-                                        hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                                        hx-post="{% url 'modal_drilldown' type='widget' %}"
-                                        hx-vals='{"net": "{{ row.cells.net }}", "nick": "{{ row.cells.nick }}", "channel": "{{ row.cells.channel }}"}'
-                                        hx-target="#widgets-here"
-                                        hx-trigger="click"
-                                        class="has-text-black">
-                                        <span class="icon" data-tooltip="Open drilldown widget">
-                                          <i class="fa-solid fa-album"></i>
+                                      {% else %}
+                                        <span class="icon has-text-warning has-tooltip-warning" data-tooltip="Unknown">
+                                          <i class="fa-solid fa-circle"></i>
                                         </span>
-                                      </a>
-                                    {% endif %}
-                                  </div>
-                                  {% if row.cells.num_chans != '—' %}
-                                    <div class="nowrap-child">
-                                      <span class="tag">
-                                        {{ row.cells.num_chans }}
-                                      </span>
+                                      {% endif %}
                                     </div>
-                                  {% endif %}
-                                </div>
-                              </td>
-                            {% elif column.name == 'channel' %}
-                              <td class="{{ column.name }}">
-                                {% if cell != '—' %}
-                                  <div class="nowrap-parent">
-                                    <a
-                                      class="nowrap-child has-text-grey"
-                                      onclick="populateSearch('channel', '{{ cell|escapejs }}')">
+                                    <a class="nowrap-child has-text-grey" onclick="populateSearch('nick', '{{ cell|escapejs }}')">
                                       {{ cell }}
                                     </a>
-                                    {% if row.cells.num_users != '—' %}
+                                    <div class="nowrap-child">
+                                      {% if row.cells.src == 'irc' %}
+                                        <a
+                                          hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                                          hx-post="{% url 'modal_drilldown' %}"
+                                          hx-vals='{"net": "{{ row.cells.net }}", "nick": "{{ row.cells.nick }}", "channel": "{{ row.cells.channel }}"}'
+                                          hx-target="#modals-here"
+                                          hx-trigger="click"
+                                          class="has-text-black">
+                                          <span class="icon" data-tooltip="Open drilldown modal">
+                                            <i class="fa-solid fa-album"></i>
+                                          </span>
+                                        </a>
+                                        <a
+                                          hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                                          hx-post="{% url 'modal_drilldown' type='window' %}"
+                                          hx-vals='{"net": "{{ row.cells.net }}", "nick": "{{ row.cells.nick }}", "channel": "{{ row.cells.channel }}"}'
+                                          hx-target="#windows-here"
+                                          hx-swap="afterend"
+                                          hx-trigger="click"
+                                          class="has-text-black">
+                                          <span class="icon" data-tooltip="Open drilldown window">
+                                            <i class="fa-solid fa-album"></i>
+                                          </span>
+                                        </a>
+                                        <a
+                                          hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                                          hx-post="{% url 'modal_drilldown' type='widget' %}"
+                                          hx-vals='{"net": "{{ row.cells.net }}", "nick": "{{ row.cells.nick }}", "channel": "{{ row.cells.channel }}"}'
+                                          hx-target="#widgets-here"
+                                          hx-trigger="click"
+                                          class="has-text-black">
+                                          <span class="icon" data-tooltip="Open drilldown widget">
+                                            <i class="fa-solid fa-album"></i>
+                                          </span>
+                                        </a>
+                                      {% endif %}
+                                    </div>
+                                    {% if row.cells.num_chans != '—' %}
                                       <div class="nowrap-child">
                                         <span class="tag">
-                                          {{ row.cells.num_users }}
+                                          {{ row.cells.num_chans }}
                                         </span>
                                       </div>
                                     {% endif %}
                                   </div>
-                                {% else %}
-                                  {{ cell }}
-                                {% endif %}
-                              </td>
-                            {% elif cell is True or cell is False %}
-                              <td class="{{ column.name }}">
-                                {% if cell is True %}
-                                  <span class="icon has-text-success">
-                                    <i class="fa-solid fa-check"></i>
-                                  </span>
-                                {% else %}
-                                  <span class="icon">
-                                    <i class="fa-solid fa-xmark"></i>
-                                  </span>
-                                {% endif %}
-                              </td>
-                            {% elif column.name == "tokens" %}
-                              <td class="{{ column.name }}">
-                                <div class="tags">
-                                  {% for word in cell %}
-                                    <a
-                                      class="tag"
-                                      onclick="populateSearch('{{ column.name }}', '{{ word }}')">
-                                      {{ word }}
-                                    </a>
-                                  {% endfor %}
-                                </div>
-                              </td>
-                            {% elif column.name == "meta" %}
-                              <td class="{{ column.name }}">
-                                <pre class="small-field" style="cursor: pointer;">{{ cell|pretty }}</pre>
-                              </td>
-                            {% elif 'id' in column.name %}
-                              <td class="{{ column.name }}">
-                                <div class="buttons">
-                                  <div class="nowrap-parent">
-                                    <!-- <input class="input" type="text" value="{{ cell }}" style="width: 50px;" readonly> -->
-                                    <a
-                                      class="has-text-grey button nowrap-child"
-                                      onclick="populateSearch('{{ column.name }}', '{{ cell|escapejs }}')">
-                                      <span class="icon" data-tooltip="Populate {{ cell }}">
-                                        <i class="fa-solid fa-arrow-left-long-to-line" aria-hidden="true"></i>
-                                      </span>
-                                    </a>
-                                    <a
-                                      class="has-text-grey button nowrap-child"
-                                      onclick="window.prompt('Copy to clipboard: Ctrl+C, Enter', '{{ cell|escapejs }}');">
-                                      <span class="icon" data-tooltip="Copy to clipboard">
-                                        <i class="fa-solid fa-copy" aria-hidden="true"></i>
-                                      </span>
-                                    </a>
+                                </td>
+                              {% elif column.name == 'channel' %}
+                                <td class="{{ column.name }}">
+                                  {% if cell != '—' %}
+                                    <div class="nowrap-parent">
+                                      <a
+                                        class="nowrap-child has-text-grey"
+                                        onclick="populateSearch('channel', '{{ cell|escapejs }}')">
+                                        {{ cell }}
+                                      </a>
+                                      {% if row.cells.num_users != '—' %}
+                                        <div class="nowrap-child">
+                                          <span class="tag">
+                                            {{ row.cells.num_users }}
+                                          </span>
+                                        </div>
+                                      {% endif %}
+                                    </div>
+                                  {% else %}
+                                    {{ cell }}
+                                  {% endif %}
+                                </td>
+                              {% elif cell is True or cell is False %}
+                                <td class="{{ column.name }}">
+                                  {% if cell is True %}
+                                    <span class="icon has-text-success">
+                                      <i class="fa-solid fa-check"></i>
+                                    </span>
+                                  {% else %}
+                                    <span class="icon">
+                                      <i class="fa-solid fa-xmark"></i>
+                                    </span>
+                                  {% endif %}
+                                </td>
+                              {% elif column.name == "tokens" %}
+                                <td class="{{ column.name }}">
+                                  <div class="tags">
+                                    {% for word in cell %}
+                                      <a
+                                        class="tag"
+                                        onclick="populateSearch('{{ column.name }}', '{{ word }}')">
+                                        {{ word }}
+                                      </a>
+                                    {% endfor %}
                                   </div>
-                                </div>
-                              </td>
-                            {% else %}
-                              <td class="{{ column.name }}">
-                                <a
-                                  class="has-text-grey"
-                                  onclick="populateSearch('{{ column.name }}', '{{ cell|escapejs }}')">
-                                  {{ cell }}
-                                </a>
-                              </td>
-                            {% endif %}
-                          {% endblock table.tbody.td %}
-                        {% endif %}
+                                </td>
+                              {% elif column.name == "meta" %}
+                                <td class="{{ column.name }}">
+                                  <pre class="small-field" style="cursor: pointer;">{{ cell|pretty }}</pre>
+                                </td>
+                              {% elif 'id' in column.name and column.name != "ident" %}
+                                <td class="{{ column.name }}">
+                                  <div class="buttons">
+                                    <div class="nowrap-parent">
+                                      <!-- <input class="input" type="text" value="{{ cell }}" style="width: 50px;" readonly> -->
+                                      <a
+                                        class="has-text-grey button nowrap-child"
+                                        onclick="populateSearch('{{ column.name }}', '{{ cell|escapejs }}')">
+                                        <span class="icon" data-tooltip="Populate {{ cell }}">
+                                          <i class="fa-solid fa-arrow-left-long-to-line" aria-hidden="true"></i>
+                                        </span>
+                                      </a>
+                                      <a
+                                        class="has-text-grey button nowrap-child"
+                                        onclick="window.prompt('Copy to clipboard: Ctrl+C, Enter', '{{ cell|escapejs }}');">
+                                        <span class="icon" data-tooltip="Copy to clipboard">
+                                          <i class="fa-solid fa-copy" aria-hidden="true"></i>
+                                        </span>
+                                      </a>
+                                    </div>
+                                  </div>
+                                </td>
+                              {% else %}
+                                <td class="{{ column.name }}">
+                                  <a
+                                    class="has-text-grey"
+                                    onclick="populateSearch('{{ column.name }}', '{{ cell|escapejs }}')">
+                                    {{ cell }}
+                                  </a>
+                                </td>
+                              {% endif %}
+                            {% endblock table.tbody.td %}
+                          {% endif %}
+                        {% endfor %}
+                      </tr>
+                    {% endif %}
+                  {% endblock table.tbody.row %}
+                {% empty %}
+                  {% if table.empty_text %}
+                    {% block table.tbody.empty_text %}
+                      <tr><td class="{{ column.name }}" 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 {{ table.attrs.tfoot.as_html }}>
+                  {% block table.tfoot.row %}
+                    <tr>
+                      {% for column in table.columns %}
+                        {% block table.tfoot.td %}
+                          <td class="{{ column.name }}" {{ column.attrs.tf.as_html }}>{{ column.footer }}</td>
+                        {% endblock table.tfoot.td %}
                       {% endfor %}
                     </tr>
-                  {% endif %}
-                {% endblock table.tbody.row %}
-              {% empty %}
-                {% if table.empty_text %}
-                  {% block table.tbody.empty_text %}
-                    <tr><td class="{{ column.name }}" colspan="{{ table.columns|length }}">{{ table.empty_text }}</td></tr>
-                  {% endblock table.tbody.empty_text %}
+                  {% endblock table.tfoot.row %}
+                </tfoot>
+              {% endif %}
+            {% endblock table.tfoot %}
+          </table>
+        </div>
+      {% endblock table %}
+      {% block pagination %}
+        {% if table.page and table.paginator.num_pages > 1 %}
+          <nav class="pagination is-justify-content-flex-end" role="navigation" aria-label="pagination">
+            {% block pagination.previous %}
+              <a
+                class="pagination-previous is-flex-grow-0 {% if not table.page.has_previous %}is-hidden-mobile{% endif %}"
+                {% if table.page.has_previous %}
+                  hx-get="search/partial/{% querystring table.prefixed_page_field=table.page.previous_page_number %}&{{ uri }}"
+                  hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                  hx-trigger="click"
+                  hx-target="#drilldown-table"
+                  hx-swap="outerHTML"
+                  hx-indicator="#spinner"
+                {% else %}
+                  href="#"
+                  disabled
+                {% endif %}
+                style="order:1;">
+                {% block pagination.previous.text %}
+                  <span aria-hidden="true">&laquo;</span>
+                {% endblock pagination.previous.text  %}
+              </a>
+            {% endblock pagination.previous %}
+            {% block pagination.next %}
+              <a
+                class="pagination-next is-flex-grow-0 {% if not table.page.has_next %}is-hidden-mobile{% endif %}"
+                {% if table.page.has_next %}
+                  hx-get="search/partial/{% querystring table.prefixed_page_field=table.page.next_page_number %}&{{ uri }}"
+                  hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                  hx-trigger="click"
+                  hx-target="#drilldown-table"
+                  hx-swap="outerHTML"
+                  hx-indicator="#spinner"
+                {% else %}
+                  href="#"
+                  disabled
                 {% endif %}
-              {% endfor %}
-            </tbody>
-          {% endblock table.tbody %}
-          {% block table.tfoot %}
-            {% if table.has_footer %}
-              <tfoot {{ table.attrs.tfoot.as_html }}>
-                {% block table.tfoot.row %}
-                  <tr>
-                    {% for column in table.columns %}
-                      {% block table.tfoot.td %}
-                        <td class="{{ column.name }}" {{ column.attrs.tf.as_html }}>{{ column.footer }}</td>
-                      {% endblock table.tfoot.td %}
-                    {% endfor %}
-                  </tr>
-                {% endblock table.tfoot.row %}
-              </tfoot>
+                style="order:3;"
+              >
+                {% block pagination.next.text %}
+                  <span aria-hidden="true">&raquo;</span>
+                {% endblock pagination.next.text  %}
+              </a>
+            {% endblock pagination.next %}
+            {% if table.page.has_previous or table.page.has_next %}
+              {% block pagination.range %}
+                <ul class="pagination-list is-flex-grow-0" style="order:2;">
+                  {% for p in table.page|table_page_range:table.paginator %}
+                    <li>
+                      <a
+                        class="pagination-link {% if p == table.page.number %}is-current{% endif %}"
+                        aria-label="Page {{ p }}" block
+                        {% if p == table.page.number %}aria-current="page"{% endif %}
+                        {% if p == table.page.number %}
+                          href="#"
+                        {% else %}
+                          hx-get="search/partial/{% querystring table.prefixed_page_field=p %}&{{ uri }}"
+                          hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                          hx-trigger="click"
+                          hx-target="#drilldown-table"
+                          hx-swap="outerHTML"
+                          hx-indicator="#spinner"
+                        {% endif %}
+                      >
+                        {% if p == '...' %}
+                          <span class="pagination-ellipsis">&hellip;</span>
+                        {% else %}
+                          {{ p }}
+                        {% endif %}
+                      </a>
+                    </li>
+                  {% endfor %}
+                </ul>
+              {% endblock pagination.range %}
             {% endif %}
-          {% endblock table.tfoot %}
-        </table>
-      </div>
-    {% endblock table %}
-    {% block pagination %}
-      {% if table.page and table.paginator.num_pages > 1 %}
-        <nav class="pagination is-justify-content-flex-end" role="navigation" aria-label="pagination">
-          {% block pagination.previous %}
-            <a
-              class="pagination-previous is-flex-grow-0 {% if not table.page.has_previous %}is-hidden-mobile{% endif %}"
-              {% if table.page.has_previous %}
-                hx-get="search/partial/{% querystring table.prefixed_page_field=table.page.previous_page_number %}&{{ uri }}"
-                hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                hx-trigger="click"
-                hx-target="#drilldown-table"
-                hx-swap="outerHTML"
-                hx-indicator="#spinner"
-              {% else %}
-                href="#"
-                disabled
-              {% endif %}
-              style="order:1;">
-              {% block pagination.previous.text %}
-                <span aria-hidden="true">&laquo;</span>
-              {% endblock pagination.previous.text  %}
-            </a>
-          {% endblock pagination.previous %}
-          {% block pagination.next %}
-            <a
-              class="pagination-next is-flex-grow-0 {% if not table.page.has_next %}is-hidden-mobile{% endif %}"
-              {% if table.page.has_next %}
-                hx-get="search/partial/{% querystring table.prefixed_page_field=table.page.next_page_number %}&{{ uri }}"
-                hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                hx-trigger="click"
-                hx-target="#drilldown-table"
-                hx-swap="outerHTML"
-                hx-indicator="#spinner"
-              {% else %}
-                href="#"
-                disabled
-              {% endif %}
-              style="order:3;"
-            >
-              {% block pagination.next.text %}
-                <span aria-hidden="true">&raquo;</span>
-              {% endblock pagination.next.text  %}
-            </a>
-          {% endblock pagination.next %}
-          {% if table.page.has_previous or table.page.has_next %}
-            {% block pagination.range %}
-              <ul class="pagination-list is-flex-grow-0" style="order:2;">
-                {% for p in table.page|table_page_range:table.paginator %}
-                  <li>
-                    <a
-                      class="pagination-link {% if p == table.page.number %}is-current{% endif %}"
-                      aria-label="Page {{ p }}" block
-                      {% if p == table.page.number %}aria-current="page"{% endif %}
-                      {% if p == table.page.number %}
-                        href="#"
-                      {% else %}
-                        hx-get="search/partial/{% querystring table.prefixed_page_field=p %}&{{ uri }}"
-                        hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                        hx-trigger="click"
-                        hx-target="#drilldown-table"
-                        hx-swap="outerHTML"
-                        hx-indicator="#spinner"
-                      {% endif %}
-                    >
-                      {% if p == '...' %}
-                        <span class="pagination-ellipsis">&hellip;</span>
-                      {% else %}
-                        {{ p }}
-                      {% endif %}
-                    </a>
-                  </li>
-                {% endfor %}
-              </ul>
-            {% endblock pagination.range %}
-          {% endif %}
-        </nav>
-      {% endif %}
-    {% endblock pagination %}
-  </div>
-{% endblock table-wrapper %}
\ No newline at end of file
+          </nav>
+        {% endif %}
+      {% endblock pagination %}
+    </div>
+  {% endblock table-wrapper %}
+{% endcache %}
\ No newline at end of file
diff --git a/core/templates/widgets/drilldown.html b/core/templates/widgets/drilldown.html
index 1b460c1..ae37180 100644
--- a/core/templates/widgets/drilldown.html
+++ b/core/templates/widgets/drilldown.html
@@ -1,4 +1,4 @@
-{% extends 'wm/widget.html' %}
+{% extends 'mixins/wm/widget.html' %}
 
 
 {% block widget_options %}
diff --git a/core/templates/window-content/object-form.html b/core/templates/window-content/object-form.html
deleted file mode 100644
index 0cf755e..0000000
--- a/core/templates/window-content/object-form.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% include 'mixins/partials/notify.html' %}
-{% if page_title is not None %}
-  <h1 class="title is-4">{{ page_title }}</h1>
-{% endif %}
-{% if page_subtitle is not None %}
-  <h1 class="subtitle">{{ page_subtitle }}</h1>
-{% endif %}
-{% load crispy_forms_tags %}
-
-{% load crispy_forms_bulma_field %}
-<form
-  hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-  hx-post="{{ submit_url }}"
-  hx-target="#modals-here"
-  hx-swap="innerHTML">
-  {% csrf_token %}
-  {{ form|crispy }}
-  {% if hide_cancel is not True %}
-    <button
-      type="button"
-      class="button is-light modal-close-button">
-      Cancel
-    </button>
-  {% endif %}
-  <button type="submit" class="button modal-close-button">Submit</button>
-</form>
-
-
-
-
-
-
-
-
diff --git a/core/templates/window-content/object.html b/core/templates/window-content/object.html
deleted file mode 100644
index 343ae7c..0000000
--- a/core/templates/window-content/object.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{% include 'mixins/partials/notify.html' %}
-{% if page_title is not None %}
-  <h1 class="title is-4">{{ page_title }}</h1>
-{% endif %}
-{% if page_subtitle is not None %}
-  <h1 class="subtitle">{{ page_subtitle }}</h1>
-{% endif %}
-<div class="buttons">
-
-  {% if submit_url is not None %}
-    <button
-      hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-      hx-get="{{ submit_url }}"
-      hx-trigger="click"
-      hx-target="#modals-here"
-      class="button">
-      <span class="icon-text">
-        <span class="icon">
-          <i class="fa-solid fa-plus"></i>
-        </span>
-        <span>{{ title_singular }}</span>
-      </span>
-    </button>
-  {% endif %}
-  {% if delete_all_url is not None %}
-    <button
-      hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-      hx-delete="{{ delete_all_url }}"
-      hx-trigger="click"
-      hx-target="#modals-here"
-      hx-swap="innerHTML"
-      hx-confirm="Are you sure you wish to delete all {{ context_object_name }}?"
-      class="button">
-      <span class="icon-text">
-        <span class="icon">
-          <i class="fa-solid fa-xmark"></i>
-        </span>
-        <span>Delete all {{ context_object_name }} </span>
-      </span>
-    </button>
-  {% endif %}
-</div>
-
-{% include detail_template %}
-
diff --git a/core/templates/window-content/objects.html b/core/templates/window-content/objects.html
deleted file mode 100644
index 81423ed..0000000
--- a/core/templates/window-content/objects.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{% include 'mixins/partials/notify.html' %}
-{% if page_title is not None %}
-  <h1 class="title is-4">{{ page_title }}</h1>
-{% endif %}
-{% if page_subtitle is not None %}
-  <h1 class="subtitle">{{ page_subtitle }}</h1>
-{% endif %}
-<div class="buttons">
-
-  {% if submit_url is not None %}
-    <button
-      hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-      hx-get="{{ submit_url }}"
-      hx-trigger="click"
-      hx-target="#modals-here"
-      class="button">
-      <span class="icon-text">
-        <span class="icon">
-          <i class="fa-solid fa-plus"></i>
-        </span>
-        <span>{{ title_singular }}</span>
-      </span>
-    </button>
-  {% endif %}
-  {% if delete_all_url is not None %}
-    <button
-      hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-      hx-delete="{{ delete_all_url }}"
-      hx-trigger="click"
-      hx-target="#modals-here"
-      hx-swap="innerHTML"
-      hx-confirm="Are you sure you wish to delete all {{ context_object_name }}?"
-      class="button">
-      <span class="icon-text">
-        <span class="icon">
-          <i class="fa-solid fa-xmark"></i>
-        </span>
-        <span>Delete all {{ context_object_name }} </span>
-      </span>
-    </button>
-  {% endif %}
-</div>
-
-{% include list_template %}
-
diff --git a/core/templates/windows/drilldown.html b/core/templates/windows/drilldown.html
index d070e4c..c7a78df 100644
--- a/core/templates/windows/drilldown.html
+++ b/core/templates/windows/drilldown.html
@@ -1,4 +1,4 @@
-{% extends 'wm/window.html' %}
+{% extends 'mixins/wm/window.html' %}
 
 {% block heading %}
   Drilldown
diff --git a/core/templates/wm/modal.html b/core/templates/wm/modal.html
deleted file mode 100644
index b8e5614..0000000
--- a/core/templates/wm/modal.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% load static %}
-
-<script src="{% static 'modal.js' %}"></script>
-{% block scripts %}
-{% endblock %}
-
-{% block styles %}
-{% endblock %}
-
-<div id="modal" class="modal is-active is-clipped">
-  <div class="modal-background"></div>
-  <div class="modal-content">
-    <div class="box">
-      {% block modal_content %}
-        {% include window_content %}
-      {% endblock %}
-      {% include 'partials/close-modal.html' %}
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/core/templates/wm/page.html b/core/templates/wm/page.html
deleted file mode 100644
index 93ea8c1..0000000
--- a/core/templates/wm/page.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "base.html" %}
-
-
-{% block content %}
-  {% include window_content %}
-{% endblock %}
diff --git a/core/templates/wm/panel.html b/core/templates/wm/panel.html
deleted file mode 100644
index b180b38..0000000
--- a/core/templates/wm/panel.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<nav class="panel">
-  <p class="panel-heading" style="padding: .2em; line-height: .5em;">
-    <i class="fa-solid fa-arrows-up-down-left-right has-text-grey-light"></i>
-    {% block close_button %}
-      {% include 'partials/close-window.html' %}
-    {% endblock %}
-    {% block heading %}
-    {% endblock %}
-  </p>
-  <article class="panel-block is-active">
-    <div class="control">
-      {% block panel_content %}
-      {% endblock %}
-    </div>
-  </article>
-</nav>
diff --git a/core/templates/wm/widget.html b/core/templates/wm/widget.html
deleted file mode 100644
index 9ef8154..0000000
--- a/core/templates/wm/widget.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<div id="widget">
-  <div id="widget-{{ unique }}" class="grid-stack-item" {% block widget_options %}gs-w="10" gs-h="1" gs-y="10" gs-x="1"{% endblock %}>
-    <div class="grid-stack-item-content">
-
-      <nav class="panel">
-        <p class="panel-heading" style="padding: .2em; line-height: .5em;">
-          <i class="fa-solid fa-arrows-up-down-left-right has-text-grey-light"></i>
-          {% block close_button %}
-            {% include 'partials/close-widget.html' %}
-          {% endblock %}
-          <i
-            class="fa-solid fa-arrows-minimize has-text-grey-light float-right"
-            onclick='grid.compact();'></i>
-          {% block heading %}
-            {{ title }}
-          {% endblock %}
-        </p>
-        <article class="panel-block is-active">
-          <div class="control">
-            {% block panel_content %}
-              {% include window_content %}
-            {% endblock %}
-          </div>
-        </article>
-      </nav>
-    </div>
-  </div>
-</div>
-
-<script>
-  {% block custom_script %}
-  {% endblock %}
-  var widget_event = new Event('load-widget');
-  document.dispatchEvent(widget_event);
-</script>
-{% block custom_end %}
-{% endblock %}
\ No newline at end of file
diff --git a/core/templates/wm/window.html b/core/templates/wm/window.html
deleted file mode 100644
index 3a9a776..0000000
--- a/core/templates/wm/window.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<magnet-block attract-distance="10" align-to="outer|center" class="floating-window">
-  {% extends 'wm/panel.html' %}
-  {% block heading %}
-    {{ title }}
-  {% endblock %}
-
-  {% block panel_content %}
-    {% include window_content %}
-  {% endblock %}
-</magnet-block>
\ No newline at end of file
diff --git a/core/views/ui/drilldown.py b/core/views/ui/drilldown.py
index deaef8c..b97b993 100644
--- a/core/views/ui/drilldown.py
+++ b/core/views/ui/drilldown.py
@@ -98,10 +98,11 @@ def make_graph(results):
 
 class DrilldownTableView(SingleTableView):
     table_class = DrilldownTable
-    template_name = "wm/widget.html"
+    template_name = "mixins/wm/widget.html"
     window_content = "window-content/results.html"
     # htmx_partial = "partials/"
     paginate_by = settings.DRILLDOWN_RESULTS_PER_PAGE
+    widget_options = 'gs-w="10" gs-h="1" gs-y="10" gs-x="1"'
 
     def common_request(self, request, **kwargs):
         extra_params = {}
@@ -112,6 +113,7 @@ class DrilldownTableView(SingleTableView):
             sizes = settings.MAIN_SIZES
 
         if request.GET:
+            print("GET")
             self.template_name = "index.html"
             # GET arguments in URL like ?query=xyz
             query_params = request.GET.dict()
@@ -119,6 +121,7 @@ class DrilldownTableView(SingleTableView):
                 if request.resolver_match.url_name == "search_partial":
                     self.template_name = "partials/results_table.html"
         elif request.POST:
+            print("POST")
             query_params = request.POST.dict()
         else:
             self.template_name = "index.html"
@@ -126,10 +129,12 @@ class DrilldownTableView(SingleTableView):
             # Don't try to search, since there's clearly nothing to do
             params_with_defaults = {}
             add_defaults(params_with_defaults)
+            print("GOT TO CONTEXT")
             context = {
                 "sizes": sizes,
                 "params": params_with_defaults,
                 "unique": "results",
+                "widget_options": self.widget_options,
                 "window_content": self.window_content,
                 "title": "Results",
             }
@@ -187,6 +192,7 @@ class DrilldownTableView(SingleTableView):
         # We don't want a random one since we only want one results pane.
         context["unique"] = "results"
         context["window_content"] = self.window_content
+        context["widget_options"] = self.widget_options
         context["title"] = "Results"
 
         # Valid sizes