diff --git a/mixins/templates/mixins/window-content/object.html b/mixins/templates/mixins/window-content/object.html
index c27de2e..06eedc4 100644
--- a/mixins/templates/mixins/window-content/object.html
+++ b/mixins/templates/mixins/window-content/object.html
@@ -1,50 +1,44 @@
-{% load cache %}
+{% include 'mixins/partials/notify.html' %}
+{% if page_title is not None %}
+
{{ page_title }}
+{% endif %}
+{% if page_subtitle is not None %}
+ {{ page_subtitle }}
+{% endif %}
+
-{% endcache %}
\ No newline at end of file
+{% include detail_template %}
diff --git a/mixins/templates/mixins/window-content/objects.html b/mixins/templates/mixins/window-content/objects.html
index 9092db6..5313ec4 100644
--- a/mixins/templates/mixins/window-content/objects.html
+++ b/mixins/templates/mixins/window-content/objects.html
@@ -1,49 +1,44 @@
-{% load cache %}
+{% include 'mixins/partials/notify.html' %}
+{% if page_title is not None %}
+ {{ page_title }}
+{% endif %}
+{% if page_subtitle is not None %}
+ {{ page_subtitle }}
+{% endif %}
+
-{% endcache %}
\ No newline at end of file
+{% include list_template %}