diff --git a/brutaldon/static/js/brutaldon-enhancements.js b/brutaldon/static/js/brutaldon-enhancements.js
index 299ac15..154ae41 100644
--- a/brutaldon/static/js/brutaldon-enhancements.js
+++ b/brutaldon/static/js/brutaldon-enhancements.js
@@ -3,20 +3,6 @@ String.prototype.trunc =
         return this.substr(0,n-1)+(this.length>n?'&hellip;':'');
     };
 
-function setTitle(user, page)
-{
-    document.title = `Brutaldon (${user}) – ${page}`;
-}
-
-function afterPage(user, page)
-{
-    setTitle(user,page);
-    var menu = document.querySelector('#navMenu');
-    menu.classList.remove('is-active');
-    var burger = document.querySelector('.navbar-burger');
-    burger.classList.remove('is-active');
-    $('#page-load-indicator').hide();
-}
 
 function menuPrepare() {
     // Remove is-active from navbar menu
diff --git a/brutaldon/templates/base.html b/brutaldon/templates/base.html
index e0a7d28..638f5b8 100644
--- a/brutaldon/templates/base.html
+++ b/brutaldon/templates/base.html
@@ -71,7 +71,9 @@
 
 
     </head>
-    <body ic-global-include='{"csrfmiddlewaretoken": "{{ csrf_token }}"}'>
+    <body ic-enhance="true" ic-target="body"
+          ic-global-indicator="#page-load-indicator"
+          ic-global-include='{"csrfmiddlewaretoken": "{{ csrf_token }}"}'>
         <div id="page-load-indicator"></div>
         <div id="new-toot-modal" class="modal"></div>
         {% block navbar %}
@@ -165,8 +167,7 @@
             </nav>
         {% endblock %}
 
-            <main id="main" class="section" ic-enhance="true"
-                  ic-global-indicator="#page-load-indicator">
+        <main id="main" class="section">
             <div class="container">
                 {% block content %}
                     <h1 class="title">
@@ -212,7 +213,8 @@
 
              {% if preferences.lightbox %}
              Intercooler.ready(function ()
-                 {
+             {
+                 document.title = $("title").html();
                      $('.attachments').each(function() {
                          $(this).magnificPopup({
                              delegate: 'figure.attachment-image a',
