diff --git a/fabfile.py b/fabfile.py
index 0da710fe..ac773963 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -249,7 +249,7 @@ def collect_remote_statics():
         'csv2geojson': 'git://github.com/mapbox/csv2geojson.git@gh-pages',
         'togeojson': 'git://github.com/mapbox/togeojson.git@gh-pages',
         'osmtogeojson': 'git://github.com/aaronlidman/osm-and-geojson.git@master',
-        'loading': 'git://github.com/ebrelsford/Leaflet.loading.git@master',
+        'loading': 'git://github.com/ebrelsford/Leaflet.loading.git@master#v0.1.6',
         'contextmenu': 'git://github.com/aratcliffe/Leaflet.contextmenu.git@master',
         'markercluster': 'git://github.com/Leaflet/Leaflet.markercluster.git@master',
         'measure': 'git://github.com/makinacorpus/Leaflet.MeasureControl.git@gh-pages',
diff --git a/umap/static/umap/umap.css b/umap/static/umap/umap.css
index 113ed24b..8143235b 100644
--- a/umap/static/umap/umap.css
+++ b/umap/static/umap/umap.css
@@ -483,6 +483,19 @@ h2.section {
 .button-bar .button.half {
     width: calc(50% - 7px);
 }
+.demo-instance-warning {
+    background-color: #c0392b;
+    color: #efefef;
+    margin-top: 0;
+    padding: 14px 0;
+}
+.demo-instance-warning .row {
+    margin-top: 0;
+}
+.demo-instance-warning a {
+    color: #efefef;
+    text-decoration: underline;
+}
 
 
 /* **************************** */
diff --git a/umap/templates/umap/about_summary.html b/umap/templates/umap/about_summary.html
index b3601e8e..ff90dc0f 100644
--- a/umap/templates/umap/about_summary.html
+++ b/umap/templates/umap/about_summary.html
@@ -20,11 +20,7 @@
     <div class="col quarter mwide">
       <img class="colophon" src="{{ STATIC_URL }}umap/img/opensource.svg" />
       <p class="note">
-      {% if DEMO_SITE %}
-        {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" stable_url="http://umap.openstreetmap.fr" %}This is a demo instance, used for tests and pre-rolling releases. If you need a stable instance, please use <a href="{{ stable_url }}">{{ stable_url }}</a>. You can also host your own instance, it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
-      {% else %}
         {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" %}And it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
-      {% endif %}
       </p>
     </div>
   </div>
diff --git a/umap/templates/umap/home.html b/umap/templates/umap/home.html
index 317027f6..28eab43c 100644
--- a/umap/templates/umap/home.html
+++ b/umap/templates/umap/home.html
@@ -4,6 +4,13 @@
 
 {% block content %}
 {% include "umap/search_bar.html" %}
+{% if DEMO_SITE %}
+<div class="wrapper demo-instance-warning">
+  <div class="row">
+    {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" stable_url="http://umap.openstreetmap.fr" %}This is a demo instance, used for tests and pre-rolling releases. If you need a stable instance, please use <a href="{{ stable_url }}">{{ stable_url }}</a>. You can also host your own instance, it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
+  </div>
+</div>
+{% endif %}
 {% include "umap/about_summary.html" %}
 {% if showcase_map %}
   <div class="wrapper showcase-map">