diff --git a/.tx/config b/.tx/config
new file mode 100644
index 00000000..eeb009d1
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+
+[umap.project]
+file_filter = umap/locale/<lang>/LC_MESSAGES/django.po
+source_file = umap/locale/en/LC_MESSAGES/django.po
+source_lang = en
+type = PO
+
+
diff --git a/fabfile.py b/fabfile.py
index f976b085..3824dc9e 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -172,6 +172,7 @@ def collectstatic():
     """
     collect_remote_statics()
     dj('collectstatic --link --noinput')
+    dj('storagei18n')
     dj('compress')
 
 
@@ -250,6 +251,7 @@ def collect_remote_statics():
         'loading': 'git://github.com/ebrelsford/Leaflet.loading.git@master',
         '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',
     }
     with cd(remote_static_dir):
         for subdir, path in remote_repositories.iteritems():
diff --git a/umap/locale/en/LC_MESSAGES/django.po b/umap/locale/en/LC_MESSAGES/django.po
new file mode 100644
index 00000000..ff67baf8
--- /dev/null
+++ b/umap/locale/en/LC_MESSAGES/django.po
@@ -0,0 +1,165 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-22 15:14+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/auth/user_detail.html:7
+#, python-format
+msgid "Browse %(current_user)s's maps"
+msgstr ""
+
+#: templates/leaflet_storage/map_list.html:6
+msgid "Cooked up by"
+msgstr ""
+
+#: templates/leaflet_storage/map_list.html:6
+msgid "See this map!"
+msgstr ""
+
+#: templates/leaflet_storage/map_list.html:10
+msgid "More"
+msgstr ""
+
+#: templates/leaflet_storage/map_update_settings.html:2
+msgid "Map settings"
+msgstr ""
+
+#: templates/registration/login.html:3
+msgid "Please choose a provider"
+msgstr ""
+
+#: templates/umap/about_summary.html:4
+msgid "What is uMap"
+msgstr ""
+
+#: templates/umap/about_summary.html:5
+#, python-format
+msgid ""
+"uMap let you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
+"layers in a minute and embed them in your site."
+msgstr ""
+
+#: templates/umap/about_summary.html:8
+#, python-format
+msgid ""
+"This is a demo instance, used for tests and pre-rolling releases. If you "
+"need a stable instance, please use <a href=\"%(stable_url)s\">"
+"%(stable_url)s</a>. You can also host your own instance, it's <a href="
+"\"%(repo_url)s\">open source</a>!"
+msgstr ""
+
+#: templates/umap/about_summary.html:10
+#, python-format
+msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
+msgstr ""
+
+#: templates/umap/about_summary.html:15
+msgid "What can you do?"
+msgstr ""
+
+#: templates/umap/about_summary.html:17
+msgid "Choose the layers of your map"
+msgstr ""
+
+#: templates/umap/about_summary.html:18
+msgid "Add POIs: markers, lines, polygons..."
+msgstr ""
+
+#: templates/umap/about_summary.html:19
+msgid "Manage POIs colours and icons"
+msgstr ""
+
+#: templates/umap/about_summary.html:20
+msgid "Manage map options: display a minimap, locate user on load…"
+msgstr ""
+
+#: templates/umap/about_summary.html:21
+msgid "Batch import geostructured data (GEOJson...)"
+msgstr ""
+
+#: templates/umap/about_summary.html:22
+msgid "Choose the license for your data"
+msgstr ""
+
+#: templates/umap/about_summary.html:23
+msgid "Embed and share your map"
+msgstr ""
+
+#: templates/umap/about_summary.html:29
+msgid "Play with the demo"
+msgstr ""
+
+#: templates/umap/content.html:26 templates/umap/search_bar.html:6
+msgid "Search maps"
+msgstr ""
+
+#: templates/umap/content.html:35
+msgid "Last maps"
+msgstr ""
+
+#: templates/umap/home.html:12
+msgid "Get inspired, browse maps"
+msgstr ""
+
+#: templates/umap/navigation.html:12
+msgid "My maps"
+msgstr ""
+
+#: templates/umap/navigation.html:14
+msgid "Log in"
+msgstr ""
+
+#: templates/umap/navigation.html:14
+msgid "Sign in"
+msgstr ""
+
+#: templates/umap/navigation.html:16
+msgid "About"
+msgstr ""
+
+#: templates/umap/navigation.html:17
+msgid "Feedback"
+msgstr ""
+
+#: templates/umap/navigation.html:19
+msgid "Log out"
+msgstr ""
+
+#: templates/umap/navigation.html:28
+msgid "Create a map"
+msgstr ""
+
+#: templates/umap/search.html:9
+#, python-format
+msgid "Search for maps containing «%(q)s» "
+msgstr ""
+
+#: templates/umap/search.html:17
+msgid "Not map found."
+msgstr ""
+
+#: templates/umap/search_bar.html:9
+msgid "Search"
+msgstr ""
+
+#: templates/umap/styles_fieldset.html:3
+msgid "Styles options"
+msgstr ""
+
+#: templates/umap/styles_fieldset.html:11
+msgid "Change marker shape and symbol."
+msgstr ""
diff --git a/umap/locale/es/LC_MESSAGES/django.po b/umap/locale/es/LC_MESSAGES/django.po
index 4054505c..5bb8a3f7 100644
--- a/umap/locale/es/LC_MESSAGES/django.po
+++ b/umap/locale/es/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-16 17:32+0200\n"
+"POT-Creation-Date: 2013-11-22 15:13+0100\n"
 "PO-Revision-Date: 2013-06-23 22:17-0500\n"
 "Last-Translator: Igor Támara <igor@tamarapatino.org>\n"
 "Language-Team: Traducción de umap al español\n"
@@ -22,29 +22,6 @@ msgstr ""
 msgid "Browse %(current_user)s's maps"
 msgstr "Mapas de %(current_user)s"
 
-#: templates/leaflet_storage/datalayer_form.html:18
-#: templates/leaflet_storage/feature_form.html:12
-#: templates/leaflet_storage/map_form.html:20
-msgid "Delete"
-msgstr "Borrar"
-
-#: templates/leaflet_storage/map_form.html:3
-msgid "Create your map now!"
-msgstr "!Crea tu propio mapa!"
-
-#: templates/leaflet_storage/map_form.html:17
-msgid ""
-"You are creating a map without being authenticated. A cookie will be set on "
-"this browser to make possible for you to edit the map in the future. If you "
-"want to edit the map from another computer, use the \"edit url\" displayed "
-"in the \"permissions\" window. If you log in and load the map, it will be "
-"attached to your account."
-msgstr ""
-"Estás creando un mapa sin estar autenticado. Establecemos una cookie en tu "
-"navegador para que puedas editarlo en el futuro. Si quieres editar el mapa "
-"desde otro computador, usa la opción \"url de edición\" que está en la ventana "
-"de \"permisos\". Si ingresas y cargas el mapa, se adjuntará a tu cuenta."
-
 #: templates/leaflet_storage/map_list.html:6
 msgid "Cooked up by"
 msgstr "Iniciado por"
@@ -61,51 +38,6 @@ msgstr "Más"
 msgid "Map settings"
 msgstr "Opciones de mapa"
 
-#: templates/leaflet_storage/upload_form.html:2
-msgid "Upload features"
-msgstr "Subir características"
-
-#: templates/leaflet_storage/upload_form.html:14
-msgid "Details on formats"
-msgstr "Detalles de formatos"
-
-#: templates/leaflet_storage/upload_form.html:16
-msgid "GeoJSON"
-msgstr "GeoJSON"
-
-#: templates/leaflet_storage/upload_form.html:18
-#: templates/leaflet_storage/upload_form.html:25
-#: templates/leaflet_storage/upload_form.html:32
-msgid "Properties used"
-msgstr "Propiedades usadas"
-
-#: templates/leaflet_storage/upload_form.html:23
-msgid "KML"
-msgstr "KML"
-
-#: templates/leaflet_storage/upload_form.html:30
-msgid "GPX"
-msgstr "GPX"
-
-#: templates/leaflet_storage/upload_form.html:37
-msgid "CSV"
-msgstr "CSV"
-
-#: templates/leaflet_storage/upload_form.html:39
-msgid ""
-"Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point "
-"geometries are imported. The import will look at the column headers for any "
-"mention of «lat», «latitude», «lng», «lon», «longitude» (at the end or the "
-"begining of the header, case insensitive). Also, column «title» or «name», "
-"«description» and «color» will be taken into account."
-msgstr ""
-"valores separados por coma, tabuladores o punto y coma. Se asume SRS WGS84. "
-"Solamente se importan geometrías de puntos. El importador buscará los "
-"encabezados buscando menciones de «lat», «latitude», «lng», «lon», "
-"«longitude» (al final o al principio del encabezado sin distinguir "
-"capitalización). También se tendrá en cuenta ls columnas «title» o «name», "
-"«description» y «color»."
-
 #: templates/registration/login.html:3
 msgid "Please choose a provider"
 msgstr "Por favor elija un proveedor"
@@ -120,58 +52,58 @@ msgid ""
 "uMap let you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
 "layers in a minute and embed them in your site."
 msgstr ""
-"uMap te permite crear mapas con capas de <a href=\"%(osm_url)s\" "
-"/>OpenStreetMap</a> en un minuto y embeberlas en tu sitio."
+"uMap te permite crear mapas con capas de <a href=\"%(osm_url)s\" /"
+">OpenStreetMap</a> en un minuto y embeberlas en tu sitio."
 
-#: templates/umap/about_summary.html:7
+#: templates/umap/about_summary.html:8
 #, python-format
 msgid ""
-"This is a demo instance, you can host your own, it's <a href=\"%(repo_url)s"
-"\">open source</a>!"
+"This is a demo instance, used for tests and pre-rolling releases. If you "
+"need a stable instance, please use <a href=\"%(stable_url)s\">"
+"%(stable_url)s</a>. You can also host your own instance, it's <a href="
+"\"%(repo_url)s\">open source</a>!"
 msgstr ""
-"Esta es una instancia de demostración, puedes alojar la tuya, !es de <a "
-"href=\"%(repo_url)s\">fuentes abiertas</a>!"
 
-#: templates/umap/about_summary.html:9
+#: templates/umap/about_summary.html:10
 #, python-format
 msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
 msgstr "Y es de !<a href=\"%(repo_url)s\">fuentes abiertas</a>!"
 
-#: templates/umap/about_summary.html:14
+#: templates/umap/about_summary.html:15
 msgid "What can you do?"
 msgstr "¿Qué puedes hacer?"
 
-#: templates/umap/about_summary.html:16
+#: templates/umap/about_summary.html:17
 msgid "Choose the layers of your map"
 msgstr "Elige las capas de tu mapa"
 
-#: templates/umap/about_summary.html:17
+#: templates/umap/about_summary.html:18
 msgid "Add POIs: markers, lines, polygons..."
 msgstr "Añade PDIs: Marcadores, líneas, polígonos..."
 
-#: templates/umap/about_summary.html:18
+#: templates/umap/about_summary.html:19
 msgid "Manage POIs colours and icons"
 msgstr "Elige los colores y los íconos de tus PDIs"
 
-#: templates/umap/about_summary.html:19
+#: templates/umap/about_summary.html:20
 msgid "Manage map options: display a minimap, locate user on load…"
 msgstr ""
 "Administra las opciones de tu mapa: muestra un minimapa, localiza al usuario "
 "al cargar..."
 
-#: templates/umap/about_summary.html:20
+#: templates/umap/about_summary.html:21
 msgid "Batch import geostructured data (GEOJson...)"
 msgstr "Importa en lotes datos geoestructurados (GEOJson...)"
 
-#: templates/umap/about_summary.html:21
+#: templates/umap/about_summary.html:22
 msgid "Choose the license for your data"
 msgstr "Elige la licencia de tus datos"
 
-#: templates/umap/about_summary.html:22
+#: templates/umap/about_summary.html:23
 msgid "Embed and share your map"
 msgstr "Incrusta y comparte tu mapa"
 
-#: templates/umap/about_summary.html:28
+#: templates/umap/about_summary.html:29
 msgid "Play with the demo"
 msgstr "Juega con el demo"
 
@@ -235,3 +167,64 @@ msgstr "Opciones de estilo"
 #: templates/umap/styles_fieldset.html:11
 msgid "Change marker shape and symbol."
 msgstr "Cambiar forma y símbolo del marcador."
+
+#~ msgid "Delete"
+#~ msgstr "Borrar"
+
+#~ msgid "Create your map now!"
+#~ msgstr "!Crea tu propio mapa!"
+
+#~ msgid ""
+#~ "You are creating a map without being authenticated. A cookie will be set "
+#~ "on this browser to make possible for you to edit the map in the future. "
+#~ "If you want to edit the map from another computer, use the \"edit url\" "
+#~ "displayed in the \"permissions\" window. If you log in and load the map, "
+#~ "it will be attached to your account."
+#~ msgstr ""
+#~ "Estás creando un mapa sin estar autenticado. Establecemos una cookie en "
+#~ "tu navegador para que puedas editarlo en el futuro. Si quieres editar el "
+#~ "mapa desde otro computador, usa la opción \"url de edición\" que está en "
+#~ "la ventana de \"permisos\". Si ingresas y cargas el mapa, se adjuntará a "
+#~ "tu cuenta."
+
+#~ msgid "Upload features"
+#~ msgstr "Subir características"
+
+#~ msgid "Details on formats"
+#~ msgstr "Detalles de formatos"
+
+#~ msgid "GeoJSON"
+#~ msgstr "GeoJSON"
+
+#~ msgid "Properties used"
+#~ msgstr "Propiedades usadas"
+
+#~ msgid "KML"
+#~ msgstr "KML"
+
+#~ msgid "GPX"
+#~ msgstr "GPX"
+
+#~ msgid "CSV"
+#~ msgstr "CSV"
+
+#~ msgid ""
+#~ "Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only "
+#~ "Point geometries are imported. The import will look at the column headers "
+#~ "for any mention of «lat», «latitude», «lng», «lon», «longitude» (at the "
+#~ "end or the begining of the header, case insensitive). Also, column "
+#~ "«title» or «name», «description» and «color» will be taken into account."
+#~ msgstr ""
+#~ "valores separados por coma, tabuladores o punto y coma. Se asume SRS "
+#~ "WGS84. Solamente se importan geometrías de puntos. El importador buscará "
+#~ "los encabezados buscando menciones de «lat», «latitude», «lng», «lon», "
+#~ "«longitude» (al final o al principio del encabezado sin distinguir "
+#~ "capitalización). También se tendrá en cuenta ls columnas «title» o "
+#~ "«name», «description» y «color»."
+
+#~ msgid ""
+#~ "This is a demo instance, you can host your own, it's <a href=\"%(repo_url)"
+#~ "s\">open source</a>!"
+#~ msgstr ""
+#~ "Esta es una instancia de demostración, puedes alojar la tuya, !es de <a "
+#~ "href=\"%(repo_url)s\">fuentes abiertas</a>!"
diff --git a/umap/locale/fi/LC_MESSAGES/django.po b/umap/locale/fi/LC_MESSAGES/django.po
index e744c897..63fb9e5b 100644
--- a/umap/locale/fi/LC_MESSAGES/django.po
+++ b/umap/locale/fi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-16 17:32+0200\n"
+"POT-Creation-Date: 2013-11-22 15:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,25 +23,6 @@ msgstr ""
 msgid "Browse %(current_user)s's maps"
 msgstr ""
 
-#: templates/leaflet_storage/datalayer_form.html:18
-#: templates/leaflet_storage/feature_form.html:12
-#: templates/leaflet_storage/map_form.html:20
-msgid "Delete"
-msgstr ""
-
-#: templates/leaflet_storage/map_form.html:3
-msgid "Create your map now!"
-msgstr ""
-
-#: templates/leaflet_storage/map_form.html:17
-msgid ""
-"You are creating a map without being authenticated. A cookie will be set on "
-"this browser to make possible for you to edit the map in the future. If you "
-"want to edit the map from another computer, use the \"edit url\" displayed "
-"in the \"permissions\" window. If you log in and load the map, it will be "
-"attached to your account."
-msgstr ""
-
 #: templates/leaflet_storage/map_list.html:6
 msgid "Cooked up by"
 msgstr ""
@@ -58,45 +39,6 @@ msgstr ""
 msgid "Map settings"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:2
-msgid "Upload features"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:14
-msgid "Details on formats"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:16
-msgid "GeoJSON"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:18
-#: templates/leaflet_storage/upload_form.html:25
-#: templates/leaflet_storage/upload_form.html:32
-msgid "Properties used"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:23
-msgid "KML"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:30
-msgid "GPX"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:37
-msgid "CSV"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:39
-msgid ""
-"Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point "
-"geometries are imported. The import will look at the column headers for any "
-"mention of «lat», «latitude», «lng», «lon», «longitude» (at the end or the "
-"begining of the header, case insensitive). Also, column «title» or «name», "
-"«description» and «color» will be taken into account."
-msgstr ""
-
 #: templates/registration/login.html:3
 msgid "Please choose a provider"
 msgstr ""
@@ -112,51 +54,53 @@ msgid ""
 "layers in a minute and embed them in your site."
 msgstr ""
 
-#: templates/umap/about_summary.html:7
+#: templates/umap/about_summary.html:8
 #, python-format
 msgid ""
-"This is a demo instance, you can host your own, it's <a href=\"%(repo_url)s"
-"\">open source</a>!"
+"This is a demo instance, used for tests and pre-rolling releases. If you "
+"need a stable instance, please use <a href=\"%(stable_url)s\">"
+"%(stable_url)s</a>. You can also host your own instance, it's <a href="
+"\"%(repo_url)s\">open source</a>!"
 msgstr ""
 
-#: templates/umap/about_summary.html:9
+#: templates/umap/about_summary.html:10
 #, python-format
 msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
 msgstr ""
 
-#: templates/umap/about_summary.html:14
+#: templates/umap/about_summary.html:15
 msgid "What can you do?"
 msgstr ""
 
-#: templates/umap/about_summary.html:16
+#: templates/umap/about_summary.html:17
 msgid "Choose the layers of your map"
 msgstr ""
 
-#: templates/umap/about_summary.html:17
+#: templates/umap/about_summary.html:18
 msgid "Add POIs: markers, lines, polygons..."
 msgstr ""
 
-#: templates/umap/about_summary.html:18
+#: templates/umap/about_summary.html:19
 msgid "Manage POIs colours and icons"
 msgstr ""
 
-#: templates/umap/about_summary.html:19
+#: templates/umap/about_summary.html:20
 msgid "Manage map options: display a minimap, locate user on load…"
 msgstr ""
 
-#: templates/umap/about_summary.html:20
+#: templates/umap/about_summary.html:21
 msgid "Batch import geostructured data (GEOJson...)"
 msgstr ""
 
-#: templates/umap/about_summary.html:21
+#: templates/umap/about_summary.html:22
 msgid "Choose the license for your data"
 msgstr ""
 
-#: templates/umap/about_summary.html:22
+#: templates/umap/about_summary.html:23
 msgid "Embed and share your map"
 msgstr ""
 
-#: templates/umap/about_summary.html:28
+#: templates/umap/about_summary.html:29
 msgid "Play with the demo"
 msgstr ""
 
diff --git a/umap/locale/fr/LC_MESSAGES/django.po b/umap/locale/fr/LC_MESSAGES/django.po
index 364e9f80..1959a9ca 100644
--- a/umap/locale/fr/LC_MESSAGES/django.po
+++ b/umap/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-16 17:32+0200\n"
+"POT-Creation-Date: 2013-11-22 15:13+0100\n"
 "PO-Revision-Date: 2012-12-27 11:09+0100\n"
 "Last-Translator: YOHAN BONIFACE <yb@enix.org>\n"
 "Language-Team: FR <LL@li.org>\n"
@@ -23,30 +23,6 @@ msgstr ""
 msgid "Browse %(current_user)s's maps"
 msgstr "Consulter les cartes de %(current_user)s"
 
-#: templates/leaflet_storage/datalayer_form.html:18
-#: templates/leaflet_storage/feature_form.html:12
-#: templates/leaflet_storage/map_form.html:20
-msgid "Delete"
-msgstr "Supprimer"
-
-#: templates/leaflet_storage/map_form.html:3
-msgid "Create your map now!"
-msgstr "Créer une carte"
-
-#: templates/leaflet_storage/map_form.html:17
-msgid ""
-"You are creating a map without being authenticated. A cookie will be set on "
-"this browser to make possible for you to edit the map in the future. If you "
-"want to edit the map from another computer, use the \"edit url\" displayed "
-"in the \"permissions\" window. If you log in and load the map, it will be "
-"attached to your account."
-msgstr ""
-"Vous créez une carte sans être authentifié. Un cookie sera enregistré sur ce "
-"navigateur, vous permettant d'éditer la map plus tard. Si vous voulez éditer "
-"la carte depuis un autre ordinateur, utilisez l'url d'édition, visible dans "
-"la fenêtre de gestion des permissions. Si vous vous identifiez par la suite "
-"et chargez la carte, celle-ci sera automatiquement associée à votre compte."
-
 #: templates/leaflet_storage/map_list.html:6
 msgid "Cooked up by"
 msgstr "Maintenu par"
@@ -63,51 +39,6 @@ msgstr "Plus"
 msgid "Map settings"
 msgstr "Paramètres"
 
-#: templates/leaflet_storage/upload_form.html:2
-msgid "Upload features"
-msgstr "Importer des données"
-
-#: templates/leaflet_storage/upload_form.html:14
-msgid "Details on formats"
-msgstr "Détails sur les formats"
-
-#: templates/leaflet_storage/upload_form.html:16
-msgid "GeoJSON"
-msgstr "GeoJSON"
-
-#: templates/leaflet_storage/upload_form.html:18
-#: templates/leaflet_storage/upload_form.html:25
-#: templates/leaflet_storage/upload_form.html:32
-msgid "Properties used"
-msgstr "Propriétés prises en compte"
-
-#: templates/leaflet_storage/upload_form.html:23
-msgid "KML"
-msgstr "KML"
-
-#: templates/leaflet_storage/upload_form.html:30
-msgid "GPX"
-msgstr "GPX"
-
-#: templates/leaflet_storage/upload_form.html:37
-msgid "CSV"
-msgstr "CSV"
-
-#: templates/leaflet_storage/upload_form.html:39
-msgid ""
-"Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point "
-"geometries are imported. The import will look at the column headers for any "
-"mention of «lat», «latitude», «lng», «lon», «longitude» (at the end or the "
-"begining of the header, case insensitive). Also, column «title» or «name», "
-"«description» and «color» will be taken into account."
-msgstr ""
-"CSV (séparateur: virgule, point-virgule ou tabulation). Seule la projection WGS84 "
-"est supportée. Seuls les géométries de type Point sont pris en compte. Les chaînes "
-"suivantes sont recherchées, en début ou fin de titre de colonne, insensible à la "
-"casse pour déterminer les coordonnées géométriques: «lat», «latitude», «lng», «lon», " 
-"«longitude». Les colonnes «title» ou «name», «description» ou «text» et «color» "
-"seront aussi utilisées, si présentes."
-
 #: templates/registration/login.html:3
 msgid "Please choose a provider"
 msgstr "Merci de choisir un fournisseur"
@@ -126,55 +57,55 @@ msgstr ""
 "\"%(osm_url)s\" />OpenStreetMap</a> en un instant et les afficher dans votre "
 "site."
 
-#: templates/umap/about_summary.html:7
+#: templates/umap/about_summary.html:8
 #, python-format
 msgid ""
-"This is a demo instance, you can host your own, it's <a href=\"%(repo_url)s"
-"\">open source</a>!"
+"This is a demo instance, used for tests and pre-rolling releases. If you "
+"need a stable instance, please use <a href=\"%(stable_url)s\">"
+"%(stable_url)s</a>. You can also host your own instance, it's <a href="
+"\"%(repo_url)s\">open source</a>!"
 msgstr ""
-"Ceci est une instance de démonstration, vous pouvez héberger la vôtre, c'est "
-"<a href=\"%(repo_url)s\">open source</a>"
 
-#: templates/umap/about_summary.html:9
+#: templates/umap/about_summary.html:10
 #, python-format
 msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
 msgstr "Et c'est <a href=\"%(repo_url)s\">open source</a>!"
 
-#: templates/umap/about_summary.html:14
+#: templates/umap/about_summary.html:15
 msgid "What can you do?"
 msgstr "Que pouvez-vous faire?"
 
-#: templates/umap/about_summary.html:16
+#: templates/umap/about_summary.html:17
 msgid "Choose the layers of your map"
 msgstr "Choisir les fonds de carte"
 
-#: templates/umap/about_summary.html:17
+#: templates/umap/about_summary.html:18
 msgid "Add POIs: markers, lines, polygons..."
 msgstr "Ajouter des POI: marqueurs, lignes, polygones..."
 
-#: templates/umap/about_summary.html:18
+#: templates/umap/about_summary.html:19
 msgid "Manage POIs colours and icons"
 msgstr "Choisir la couleur et les icônes"
 
-#: templates/umap/about_summary.html:19
+#: templates/umap/about_summary.html:20
 msgid "Manage map options: display a minimap, locate user on load…"
 msgstr ""
 "Gérer les options de la carte: afficher une minicarte, géolocaliser "
 "l'utilisateur..."
 
-#: templates/umap/about_summary.html:20
+#: templates/umap/about_summary.html:21
 msgid "Batch import geostructured data (GEOJson...)"
 msgstr "Import des données géographiques en masse (GeoJSON...)"
 
-#: templates/umap/about_summary.html:21
+#: templates/umap/about_summary.html:22
 msgid "Choose the license for your data"
 msgstr "Choisir la licence de vos données"
 
-#: templates/umap/about_summary.html:22
+#: templates/umap/about_summary.html:23
 msgid "Embed and share your map"
 msgstr "Exporter et partager votre carte"
 
-#: templates/umap/about_summary.html:28
+#: templates/umap/about_summary.html:29
 msgid "Play with the demo"
 msgstr "Tester la démo"
 
diff --git a/umap/locale/it/LC_MESSAGES/django.po b/umap/locale/it/LC_MESSAGES/django.po
index 7990284d..467e82f5 100644
--- a/umap/locale/it/LC_MESSAGES/django.po
+++ b/umap/locale/it/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-16 17:32+0200\n"
+"POT-Creation-Date: 2013-11-22 15:13+0100\n"
 "PO-Revision-Date: 2013-01-04 12:19+0100\n"
 "Last-Translator: Stefano\n"
 "Language-Team: FR <LL@li.org>\n"
@@ -22,25 +22,6 @@ msgstr ""
 msgid "Browse %(current_user)s's maps"
 msgstr ""
 
-#: templates/leaflet_storage/datalayer_form.html:18
-#: templates/leaflet_storage/feature_form.html:12
-#: templates/leaflet_storage/map_form.html:20
-msgid "Delete"
-msgstr "Cancella"
-
-#: templates/leaflet_storage/map_form.html:3
-msgid "Create your map now!"
-msgstr "Crea la tua mappa!"
-
-#: templates/leaflet_storage/map_form.html:17
-msgid ""
-"You are creating a map without being authenticated. A cookie will be set on "
-"this browser to make possible for you to edit the map in the future. If you "
-"want to edit the map from another computer, use the \"edit url\" displayed "
-"in the \"permissions\" window. If you log in and load the map, it will be "
-"attached to your account."
-msgstr ""
-
 #: templates/leaflet_storage/map_list.html:6
 msgid "Cooked up by"
 msgstr "Curato da"
@@ -57,45 +38,6 @@ msgstr ""
 msgid "Map settings"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:2
-msgid "Upload features"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:14
-msgid "Details on formats"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:16
-msgid "GeoJSON"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:18
-#: templates/leaflet_storage/upload_form.html:25
-#: templates/leaflet_storage/upload_form.html:32
-msgid "Properties used"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:23
-msgid "KML"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:30
-msgid "GPX"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:37
-msgid "CSV"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:39
-msgid ""
-"Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point "
-"geometries are imported. The import will look at the column headers for any "
-"mention of «lat», «latitude», «lng», «lon», «longitude» (at the end or the "
-"begining of the header, case insensitive). Also, column «title» or «name», "
-"«description» and «color» will be taken into account."
-msgstr ""
-
 #: templates/registration/login.html:3
 msgid "Please choose a provider"
 msgstr ""
@@ -114,52 +56,54 @@ msgstr ""
 "di integrarle nel tuo sito. <br/> Questa è una istanza di prova, puoi "
 "hostare la tua copia, è <strong>open source</strong>!"
 
-#: templates/umap/about_summary.html:7
+#: templates/umap/about_summary.html:8
 #, python-format
 msgid ""
-"This is a demo instance, you can host your own, it's <a href=\"%(repo_url)s"
-"\">open source</a>!"
+"This is a demo instance, used for tests and pre-rolling releases. If you "
+"need a stable instance, please use <a href=\"%(stable_url)s\">"
+"%(stable_url)s</a>. You can also host your own instance, it's <a href="
+"\"%(repo_url)s\">open source</a>!"
 msgstr ""
 
-#: templates/umap/about_summary.html:9
+#: templates/umap/about_summary.html:10
 #, python-format
 msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
 msgstr ""
 
-#: templates/umap/about_summary.html:14
+#: templates/umap/about_summary.html:15
 #, fuzzy
 msgid "What can you do?"
 msgstr "Cosa puoi fare?"
 
-#: templates/umap/about_summary.html:16
+#: templates/umap/about_summary.html:17
 msgid "Choose the layers of your map"
 msgstr "Scegli i livelli della tua mappa"
 
-#: templates/umap/about_summary.html:17
+#: templates/umap/about_summary.html:18
 msgid "Add POIs: markers, lines, polygons..."
 msgstr "Aggiungi POI: marker, linee, poligoni.."
 
-#: templates/umap/about_summary.html:18
+#: templates/umap/about_summary.html:19
 msgid "Manage POIs colours and icons"
 msgstr "Scegli i colori e le icone dei POI"
 
-#: templates/umap/about_summary.html:19
+#: templates/umap/about_summary.html:20
 msgid "Manage map options: display a minimap, locate user on load…"
 msgstr ""
 
-#: templates/umap/about_summary.html:20
+#: templates/umap/about_summary.html:21
 msgid "Batch import geostructured data (GEOJson...)"
 msgstr "Importa dati geostrutturati (GEOJson...)"
 
-#: templates/umap/about_summary.html:21
+#: templates/umap/about_summary.html:22
 msgid "Choose the license for your data"
 msgstr "Scegli la licenza dei tuoi dati"
 
-#: templates/umap/about_summary.html:22
+#: templates/umap/about_summary.html:23
 msgid "Embed and share your map"
 msgstr "Integra e condividi la tua mappa"
 
-#: templates/umap/about_summary.html:28
+#: templates/umap/about_summary.html:29
 msgid "Play with the demo"
 msgstr ""
 
@@ -225,4 +169,10 @@ msgstr ""
 
 #: templates/umap/styles_fieldset.html:11
 msgid "Change marker shape and symbol."
-msgstr ""
\ No newline at end of file
+msgstr ""
+
+#~ msgid "Delete"
+#~ msgstr "Cancella"
+
+#~ msgid "Create your map now!"
+#~ msgstr "Crea la tua mappa!"
diff --git a/umap/locale/nl/LC_MESSAGES/django.po b/umap/locale/nl/LC_MESSAGES/django.po
new file mode 100644
index 00000000..bceeee4b
--- /dev/null
+++ b/umap/locale/nl/LC_MESSAGES/django.po
@@ -0,0 +1,166 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-22 15:14+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/auth/user_detail.html:7
+#, python-format
+msgid "Browse %(current_user)s's maps"
+msgstr ""
+
+#: templates/leaflet_storage/map_list.html:6
+msgid "Cooked up by"
+msgstr ""
+
+#: templates/leaflet_storage/map_list.html:6
+msgid "See this map!"
+msgstr ""
+
+#: templates/leaflet_storage/map_list.html:10
+msgid "More"
+msgstr ""
+
+#: templates/leaflet_storage/map_update_settings.html:2
+msgid "Map settings"
+msgstr ""
+
+#: templates/registration/login.html:3
+msgid "Please choose a provider"
+msgstr ""
+
+#: templates/umap/about_summary.html:4
+msgid "What is uMap"
+msgstr ""
+
+#: templates/umap/about_summary.html:5
+#, python-format
+msgid ""
+"uMap let you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
+"layers in a minute and embed them in your site."
+msgstr ""
+
+#: templates/umap/about_summary.html:8
+#, python-format
+msgid ""
+"This is a demo instance, used for tests and pre-rolling releases. If you "
+"need a stable instance, please use <a href=\"%(stable_url)s\">"
+"%(stable_url)s</a>. You can also host your own instance, it's <a href="
+"\"%(repo_url)s\">open source</a>!"
+msgstr ""
+
+#: templates/umap/about_summary.html:10
+#, python-format
+msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
+msgstr ""
+
+#: templates/umap/about_summary.html:15
+msgid "What can you do?"
+msgstr ""
+
+#: templates/umap/about_summary.html:17
+msgid "Choose the layers of your map"
+msgstr ""
+
+#: templates/umap/about_summary.html:18
+msgid "Add POIs: markers, lines, polygons..."
+msgstr ""
+
+#: templates/umap/about_summary.html:19
+msgid "Manage POIs colours and icons"
+msgstr ""
+
+#: templates/umap/about_summary.html:20
+msgid "Manage map options: display a minimap, locate user on load…"
+msgstr ""
+
+#: templates/umap/about_summary.html:21
+msgid "Batch import geostructured data (GEOJson...)"
+msgstr ""
+
+#: templates/umap/about_summary.html:22
+msgid "Choose the license for your data"
+msgstr ""
+
+#: templates/umap/about_summary.html:23
+msgid "Embed and share your map"
+msgstr ""
+
+#: templates/umap/about_summary.html:29
+msgid "Play with the demo"
+msgstr ""
+
+#: templates/umap/content.html:26 templates/umap/search_bar.html:6
+msgid "Search maps"
+msgstr ""
+
+#: templates/umap/content.html:35
+msgid "Last maps"
+msgstr ""
+
+#: templates/umap/home.html:12
+msgid "Get inspired, browse maps"
+msgstr ""
+
+#: templates/umap/navigation.html:12
+msgid "My maps"
+msgstr ""
+
+#: templates/umap/navigation.html:14
+msgid "Log in"
+msgstr ""
+
+#: templates/umap/navigation.html:14
+msgid "Sign in"
+msgstr ""
+
+#: templates/umap/navigation.html:16
+msgid "About"
+msgstr ""
+
+#: templates/umap/navigation.html:17
+msgid "Feedback"
+msgstr ""
+
+#: templates/umap/navigation.html:19
+msgid "Log out"
+msgstr ""
+
+#: templates/umap/navigation.html:28
+msgid "Create a map"
+msgstr ""
+
+#: templates/umap/search.html:9
+#, python-format
+msgid "Search for maps containing «%(q)s» "
+msgstr ""
+
+#: templates/umap/search.html:17
+msgid "Not map found."
+msgstr ""
+
+#: templates/umap/search_bar.html:9
+msgid "Search"
+msgstr ""
+
+#: templates/umap/styles_fieldset.html:3
+msgid "Styles options"
+msgstr ""
+
+#: templates/umap/styles_fieldset.html:11
+msgid "Change marker shape and symbol."
+msgstr ""
diff --git a/umap/locale/pt/LC_MESSAGES/django.po b/umap/locale/pt/LC_MESSAGES/django.po
index 7aad9876..5f77aa3b 100644
--- a/umap/locale/pt/LC_MESSAGES/django.po
+++ b/umap/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-16 17:32+0200\n"
+"POT-Creation-Date: 2013-11-22 15:13+0100\n"
 "PO-Revision-Date: 2013-03-10 20:00+0100\n"
 "Last-Translator: Francisco DOS SANTOS <f.dos.santos@free.fr>\n"
 "Language-Team: PT <LL@li.org>\n"
@@ -23,25 +23,6 @@ msgstr ""
 msgid "Browse %(current_user)s's maps"
 msgstr "Consulta os mapas de %(current_user)s"
 
-#: templates/leaflet_storage/datalayer_form.html:18
-#: templates/leaflet_storage/feature_form.html:12
-#: templates/leaflet_storage/map_form.html:20
-msgid "Delete"
-msgstr "Apagar"
-
-#: templates/leaflet_storage/map_form.html:3
-msgid "Create your map now!"
-msgstr "Cria o seu mapa já!"
-
-#: templates/leaflet_storage/map_form.html:17
-msgid ""
-"You are creating a map without being authenticated. A cookie will be set on "
-"this browser to make possible for you to edit the map in the future. If you "
-"want to edit the map from another computer, use the \"edit url\" displayed "
-"in the \"permissions\" window. If you log in and load the map, it will be "
-"attached to your account."
-msgstr ""
-
 #: templates/leaflet_storage/map_list.html:6
 msgid "Cooked up by"
 msgstr "Mantido por"
@@ -58,46 +39,6 @@ msgstr "Mais"
 msgid "Map settings"
 msgstr "Parâmetros"
 
-#: templates/leaflet_storage/upload_form.html:2
-msgid "Upload features"
-msgstr "Carregar objetos"
-
-#: templates/leaflet_storage/upload_form.html:14
-msgid "Details on formats"
-msgstr "Detalhes nos formatos"
-
-#: templates/leaflet_storage/upload_form.html:16
-msgid "GeoJSON"
-msgstr "GeoJSON"
-
-#: templates/leaflet_storage/upload_form.html:18
-#: templates/leaflet_storage/upload_form.html:25
-#: templates/leaflet_storage/upload_form.html:32
-#, fuzzy
-msgid "Properties used"
-msgstr "Uso propriedade: name, desc"
-
-#: templates/leaflet_storage/upload_form.html:23
-msgid "KML"
-msgstr "KML"
-
-#: templates/leaflet_storage/upload_form.html:30
-msgid "GPX"
-msgstr "GPX"
-
-#: templates/leaflet_storage/upload_form.html:37
-msgid "CSV"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:39
-msgid ""
-"Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point "
-"geometries are imported. The import will look at the column headers for any "
-"mention of «lat», «latitude», «lng», «lon», «longitude» (at the end or the "
-"begining of the header, case insensitive). Also, column «title» or «name», "
-"«description» and «color» will be taken into account."
-msgstr ""
-
 #: templates/registration/login.html:3
 msgid "Please choose a provider"
 msgstr "Por favor escolha um provedor"
@@ -117,51 +58,53 @@ msgstr ""
 "uma demonstração, podes instalar este software no teu próprio site, é <a "
 "href=\"%(repo_url)s\">software livre</a>!"
 
-#: templates/umap/about_summary.html:7
+#: templates/umap/about_summary.html:8
 #, python-format
 msgid ""
-"This is a demo instance, you can host your own, it's <a href=\"%(repo_url)s"
-"\">open source</a>!"
+"This is a demo instance, used for tests and pre-rolling releases. If you "
+"need a stable instance, please use <a href=\"%(stable_url)s\">"
+"%(stable_url)s</a>. You can also host your own instance, it's <a href="
+"\"%(repo_url)s\">open source</a>!"
 msgstr ""
 
-#: templates/umap/about_summary.html:9
+#: templates/umap/about_summary.html:10
 #, python-format
 msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
 msgstr ""
 
-#: templates/umap/about_summary.html:14
+#: templates/umap/about_summary.html:15
 msgid "What can you do?"
 msgstr "O que podes fazer"
 
-#: templates/umap/about_summary.html:16
+#: templates/umap/about_summary.html:17
 msgid "Choose the layers of your map"
 msgstr "Escolher o mapa de fundo"
 
-#: templates/umap/about_summary.html:17
+#: templates/umap/about_summary.html:18
 msgid "Add POIs: markers, lines, polygons..."
 msgstr "Adicionar objetos: marcos, linhas, polígonos..."
 
-#: templates/umap/about_summary.html:18
+#: templates/umap/about_summary.html:19
 msgid "Manage POIs colours and icons"
 msgstr "Modificar cor e ícone dos objetos"
 
-#: templates/umap/about_summary.html:19
+#: templates/umap/about_summary.html:20
 msgid "Manage map options: display a minimap, locate user on load…"
 msgstr "Gerir diversas opções: mostrar um minimapa, localizar o usuário..."
 
-#: templates/umap/about_summary.html:20
+#: templates/umap/about_summary.html:21
 msgid "Batch import geostructured data (GEOJson...)"
 msgstr "Carregar ficheiros georeferenciados (GEOJson...)"
 
-#: templates/umap/about_summary.html:21
+#: templates/umap/about_summary.html:22
 msgid "Choose the license for your data"
 msgstr "Escolher uma licença para os seus dados"
 
-#: templates/umap/about_summary.html:22
+#: templates/umap/about_summary.html:23
 msgid "Embed and share your map"
 msgstr "Exportar e partilhar seu mapa"
 
-#: templates/umap/about_summary.html:28
+#: templates/umap/about_summary.html:29
 msgid "Play with the demo"
 msgstr "Testar a demo"
 
@@ -225,3 +168,28 @@ msgstr "Opções de estilo"
 #: templates/umap/styles_fieldset.html:11
 msgid "Change marker shape and symbol."
 msgstr "Mudar forma e pictograma do marco."
+
+#~ msgid "Delete"
+#~ msgstr "Apagar"
+
+#~ msgid "Create your map now!"
+#~ msgstr "Cria o seu mapa já!"
+
+#~ msgid "Upload features"
+#~ msgstr "Carregar objetos"
+
+#~ msgid "Details on formats"
+#~ msgstr "Detalhes nos formatos"
+
+#~ msgid "GeoJSON"
+#~ msgstr "GeoJSON"
+
+#, fuzzy
+#~ msgid "Properties used"
+#~ msgstr "Uso propriedade: name, desc"
+
+#~ msgid "KML"
+#~ msgstr "KML"
+
+#~ msgid "GPX"
+#~ msgstr "GPX"
diff --git a/umap/templates/base.html b/umap/templates/base.html
index 2b697fbb..542aaf98 100644
--- a/umap/templates/base.html
+++ b/umap/templates/base.html
@@ -25,10 +25,6 @@
     <![endif]-->
     {% block extra_head %}
     {% endblock extra_head %}
-    {% compress js %}
-    <script src="{{ STATIC_URL }}storage/contrib/js/storage.ui.default.js"></script>
-    <script src="{{ STATIC_URL }}storage/src/locale/fr.js"></script>
-    {% endcompress js %}
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 </head>
diff --git a/umap/templates/leaflet_storage/datalayer_form.html b/umap/templates/leaflet_storage/datalayer_form.html
deleted file mode 100644
index 5db0c661..00000000
--- a/umap/templates/leaflet_storage/datalayer_form.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% load umap_tags i18n %}
-<form action="{{ action_url }}" method="post" id="datalayer_edit">
-    {% csrf_token %}
-    {% for error in form.errors %}
-        <small class="error">{{ error }}</small>
-    {% endfor %}
-    {% foundation_field form.name %}
-    {% foundation_field form.description %}
-    {% foundation_field form.rank %}
-    <div class="formbox">
-        <span>{{ form.display_on_load.label }}</span>{{ form.display_on_load }}
-    </div>
-    <small class="help-text">{{ form.display_on_load.help_text }}</small>
-    {{ form.map }}
-    {% include "umap/styles_fieldset.html" %}
-    <input type="submit" class="button" />
-    {% if delete_url %}
-        <a href="{{ delete_url }}" id="delete_datalayer_button" >{% trans "Delete" %}</a>
-    {% endif %}
-</form>
\ No newline at end of file
diff --git a/umap/templates/leaflet_storage/feature_detail.html b/umap/templates/leaflet_storage/feature_detail.html
deleted file mode 100644
index 05d450a6..00000000
--- a/umap/templates/leaflet_storage/feature_detail.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% load markup %}
-<h5>{{ feature }}</h5>
-{% if feature.description %}
-    <div>{{ feature.description|urlize|markdown }}</div>
-{% endif %}
\ No newline at end of file
diff --git a/umap/templates/leaflet_storage/feature_form.html b/umap/templates/leaflet_storage/feature_form.html
deleted file mode 100644
index 514b250f..00000000
--- a/umap/templates/leaflet_storage/feature_form.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load umap_tags i18n %}
-<form method="post" action="{{ action }}" id="feature_form" onsubmit="return false;">
-    {% csrf_token %}
-    {{ form.no_field_errors }}
-    {% foundation_field form.name %}
-    {% foundation_field form.description %}
-    {% foundation_field form.datalayer %}
-    {% include "umap/styles_fieldset.html" %}
-    {{ form.latlng }}
-    <input type="submit" class="button" />
-    {% if delete_url %}
-        <a href="{{ delete_url }}" id="delete_feature_button" >{% trans "Delete" %}</a>
-    {% endif %}
-</form>
diff --git a/umap/templates/leaflet_storage/map_detail.html b/umap/templates/leaflet_storage/map_detail.html
index 90540993..57803453 100644
--- a/umap/templates/leaflet_storage/map_detail.html
+++ b/umap/templates/leaflet_storage/map_detail.html
@@ -10,6 +10,9 @@
     {% compress js %}
         {% leaflet_storage_js %}
     {% endcompress %}
+    {% if locale %}
+        <script src="{{ STATIC_URL }}storage/src/locale/{{ locale }}.js"></script>
+    {% endif %}
 {% endblock %}
 
 {% block content %}
diff --git a/umap/templates/leaflet_storage/map_form.html b/umap/templates/leaflet_storage/map_form.html
deleted file mode 100644
index 131a590f..00000000
--- a/umap/templates/leaflet_storage/map_form.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% load umap_tags i18n %}
-{% if not map %}
-    <h3>{% trans "Create your map now!" %}</h3>
-{% endif %}
-<form action="{{ action_url }}" method="post" id="map_edit">
-    {% for error in form.non_field_errors %}
-        <small class="error">{{ error }}</small>
-    {% endfor %}
-    {% csrf_token %}
-    {% foundation_field form.name %}
-    {% foundation_field form.description %}
-    {% foundation_field form.licence %}
-    {{ form.zoom }}
-    {{ form.center }}
-    <input type="submit" class="button" />
-    {% if not map and not user.is_authenticated %}
-    <small class="helptext">{% trans 'You are creating a map without being authenticated. A cookie will be set on this browser to make possible for you to edit the map in the future. If you want to edit the map from another computer, use the "edit url" displayed in the "permissions" window. If you log in and load the map, it will be attached to your account.' %}</small>
-    {% endif %}
-    {% if clone_url and map %}
-        <a href="{{ clone_url }}" id="clone_map_button" >{% trans "Clone this map" %}</a>
-    {% endif %}
-    {% if delete_url and map and user == map.owner %}
-        <a href="{{ delete_url }}" id="delete_map_button" >{% trans "Delete" %}</a>
-    {% endif %}
-</form>
\ No newline at end of file
diff --git a/umap/templates/leaflet_storage/upload_form.html b/umap/templates/leaflet_storage/upload_form.html
deleted file mode 100644
index 97e3b1af..00000000
--- a/umap/templates/leaflet_storage/upload_form.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% load i18n umap_tags %}
-<h3>{% trans "Upload features" %}</h3>
-<form action="{{ action_url }}" method="post" enctype="multipart/form-data" id="upload_data">
-    {% csrf_token %}
-    {% if form.non_field_errors %}
-        <div class="error">{{ form.non_field_errors }}</div>
-    {% endif %}
-    {% for field in form %}
-        {% foundation_field field %}
-    {% endfor %}
-    <input type="submit" class="button" />
-</form>
-<fieldset class="toggle">
-    <legend>{% trans "Details on formats" %}</legend>
-    <div>
-        <h5>{% trans "GeoJSON" %}</h5>
-        <div>
-            {% trans "Properties used" %}: name / title, description, color
-        </div>
-    </div>
-    <hr />
-    <div>
-        <h5>{% trans "KML" %}</h5>
-        <div>
-            {% trans "Properties used" %}: name, description
-        </div>
-    </div>
-    <hr />
-    <div>
-        <h5>{% trans "GPX" %}</h5>
-        <div>
-            {% trans "Properties used" %}: name, desc
-        </div>
-    </div>
-    <hr />
-    <div>
-        <h5>{% trans "CSV" %}</h5>
-        <div>
-            {% trans "Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point geometries are imported. The import will look at the column headers for any mention of «lat», «latitude», «lng», «lon», «longitude» (at the end or the begining of the header, case insensitive). Also, column «title» or «name», «description» and «color» will be taken into account." %}
-        </div>
-    </div>
-</fieldset>