diff --git a/mayan/apps/appearance/templates/appearance/base_plain.html b/mayan/apps/appearance/templates/appearance/base_plain.html
index 639a8f6ccb..b797b15a4e 100644
--- a/mayan/apps/appearance/templates/appearance/base_plain.html
+++ b/mayan/apps/appearance/templates/appearance/base_plain.html
@@ -23,20 +23,30 @@
 
         {% compress css %}
             <link href="{% static 'appearance/vendors/fontawesome-free-5.0.8/svg-with-js/css/fa-svg-with-js.css' %}" media="screen" rel="stylesheet" type="text/css" />
-            <link href="{% static 'appearance/packages/bootswatch.com/flatly/bootstrap.css' %}" media="screen" rel="stylesheet" type="text/css" />
+            <link href="{% static 'appearance/node_modules/bootswatch/flatly/bootstrap.min.css' %}" media="screen" rel="stylesheet" type="text/css" />
             <link href="{% static 'appearance/css/base.css' %}" media="screen" rel="stylesheet" type="text/css" />
             {% block stylesheets %}{% endblock %}
         {% endcompress %}
         <script>
-            function waitForJQuery(func) {
-                if (window.jQuery) {
-                    func();
-                } else {
-                    setTimeout(function() {
-                        waitForJQuery(func)
-                    }, 50);
+            {% compress js %}
+                // Detect if we are inside of an AJAX content container
+                // and break free as this is supposed to be a top level
+                // template.
+                var currentHash = window.location.hash;
+                if (currentHash.length) {
+                    window.location = currentHash.substring(1);
                 }
-            }
+
+                function waitForJQuery(func) {
+                    if (window.jQuery) {
+                        func();
+                    } else {
+                        setTimeout(function() {
+                            waitForJQuery(func)
+                        }, 50);
+                    }
+                }
+            {% endcompress %}
         </script>
     </head>
     <body>
@@ -49,9 +59,9 @@
         <![endif]-->
 
         {% compress js %}
-        <script src="{% static 'appearance/packages/jquery-2.1.4.min.js' %}" type="text/javascript"></script>
-        <script src="{% static 'appearance/packages/bootstrap-3.3.4-dist/js/bootstrap.min.js' %}" type="text/javascript"></script>
-        <script src="{% static 'appearance/vendors/fontawesome-free-5.0.8/svg-with-js/js/fontawesome-all.min.js' %}" type="text/javascript"></script>
+            <script src="{% static 'appearance/node_modules/jquery/dist/jquery.min.js' %}" type="text/javascript"></script>
+            <script src="{% static 'appearance/node_modules/bootstrap/dist/js/bootstrap.min.js' %}" type="text/javascript"></script>
+            <script src="{% static 'appearance/vendors/fontawesome-free-5.0.8/svg-with-js/js/fontawesome-all.min.js' %}" type="text/javascript"></script>
         {% endcompress %}
     </body>
 </html>
