diff --git a/umap/templates/base.html b/umap/templates/base.html
index 94146f1a..91528aa4 100644
--- a/umap/templates/base.html
+++ b/umap/templates/base.html
@@ -1,4 +1,4 @@
-{% load compress %}
+{% load compress umap_tags %}
 <!DOCTYPE html>
 <html>
 <head>
@@ -24,11 +24,15 @@
     <![endif]-->
     {% block extra_head %}
     {% endblock extra_head %}
+    <script src="{{ STATIC_URL }}storage/contrib/js/storage.ui.default.js"></script>
     <script src="{{ STATIC_URL }}storage/src/locale/fr.js"></script>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 </head>
 <body class="{% block body_class %}{% endblock %}">
+    <div id="storage-ui-container"></div>
+    <div id="storage-alert-container"></div>
+    <div id="storage-tooltip-container"></div>
 
     {% block header %}
     {% endblock %}
@@ -37,7 +41,6 @@
     {% endblock %}
 
     {% block bottom_js %}
-        <script src="{{ STATIC_URL }}storage/contrib/js/storage.ui.default.js"></script>
         <script type="text/javascript">
             L.Storage.on('ui:ready', function () {
                 function fn (e) {
@@ -62,8 +65,5 @@
             D.Event.on('.more_button', 'click', getMore);
         </script>
     {% endblock %}
-    <div id="storage-ui-container"></div>
-    <div id="storage-alert-container"></div>
-    <div id="storage-tooltip-container"></div>
 </body>
 </html>
diff --git a/umap/templates/leaflet_storage/map_detail.html b/umap/templates/leaflet_storage/map_detail.html
index c2be96e3..604a582c 100644
--- a/umap/templates/leaflet_storage/map_detail.html
+++ b/umap/templates/leaflet_storage/map_detail.html
@@ -16,4 +16,5 @@
     {% block map_init %}
         {% include "leaflet_storage/map_init.html" %}
     {% endblock %}
+    {% include "leaflet_storage/map_messages.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/umap/templatetags/umap_tags.py b/umap/templatetags/umap_tags.py
index 40403bdb..fa836940 100644
--- a/umap/templatetags/umap_tags.py
+++ b/umap/templatetags/umap_tags.py
@@ -17,3 +17,10 @@ def paginate_querystring(context, page):
     qs = copy(context["request"].GET)
     qs["p"] = page
     return qs.urlencode()
+
+
+@register.filter
+def ipdb(what):
+    import ipdb
+    ipdb.set_trace()
+    return ''
