diff --git a/geonode/client/templates/leaflet/layers/layer_leaflet_map.html b/geonode/client/templates/leaflet/layers/layer_leaflet_map.html
new file mode 100644
index 00000000000..ce9fa957403
--- /dev/null
+++ b/geonode/client/templates/leaflet/layers/layer_leaflet_map.html
@@ -0,0 +1,242 @@
+{% load static from staticfiles %}
+{% load leaflet_tags %}
+{% load i18n %}
+
+{% leaflet_js %}
+{% leaflet_css %}
+
+<style>
+    .leaflet-container { /* all maps */
+        height: 400px;
+    }
+
+    .leaflet-control-zoom, .leaflet-control-zoomslider {  /* all controls */
+        position: relative;
+        left: 0px !important;
+    }
+</style>
+<script type="text/javascript">
+    document.addEventListener("DOMContentLoaded", function (event) {
+      L.TileLayer.BetterWMS = L.TileLayer.WMS.extend({
+
+        onAdd: function (map) {
+          // Triggered when the layer is added to a map.
+          // Register a click listener, then do all the upstream WMS things
+          L.TileLayer.WMS.prototype.onAdd.call(this, map);
+          map.on('click', this.getFeatureInfo, this);
+        },
+
+        onRemove: function (map) {
+          // Triggered when the layer is removed from a map.
+          // Unregister a click listener, then do all the upstream WMS things
+          L.TileLayer.WMS.prototype.onRemove.call(this, map);
+          map.off('click', this.getFeatureInfo, this);
+        },
+
+        getFeatureInfo: function (evt) {
+          // Make an AJAX request to the server and hope for the best
+          var url = this.getFeatureInfoUrl(evt.containerPoint),
+              showResults = L.Util.bind(this.showGetFeatureInfo, this);
+          // console.log(url);
+          $.ajax({
+            url: url,
+            success: function (data, status, xhr) {
+              var err = typeof data === 'string' ? null : data;
+              showResults(err, evt.latlng, data);
+            },
+            error: function (xhr, status, error) {
+              showResults(error);
+            }
+          });
+        },
+
+        getFeatureInfoUrl: function (layerPoint) {
+          // Construct a GetFeatureInfo request URL given a point
+          if (!map) {
+              map = this._map;
+          }
+          // Compute WMS options
+          var bounds = map.getBounds();
+          var size = map.getSize();
+          var wmsVersion = parseFloat(this.wmsParams.version);
+          var crs = this.options.crs || map.options.crs;
+          var projectionKey = wmsVersion >= 1.3 ? 'crs' : 'srs';
+          var nw = crs.project(bounds.getNorthWest());
+          var se = crs.project(bounds.getSouthEast());
+
+          // Assemble WMS parameter string
+
+          var size = this._map.getSize(),
+              params = {
+                request: 'GetFeatureInfo',
+                service: 'WMS',
+                srs: 'EPSG:4326',
+                styles: this.wmsParams.styles,
+                transparent: this.wmsParams.transparent,
+                version: this.wmsParams.version,
+                format: this.wmsParams.format,
+                // bbox: this._map.getBounds().toBBoxString(),
+                height: size.y,
+                width: size.x,
+                layers: this.wmsParams.layers,
+                query_layers: this.wmsParams.layers,
+                info_format: 'text/html'
+              };
+          params[projectionKey] = crs.code;
+          params.bbox = (
+              wmsVersion >= 1.3 && crs === L.CRS.EPSG4326 ?
+              [se.y, nw.x, nw.y, se.x] :
+              [nw.x, se.y, se.x, nw.y]
+          ).join(',');
+
+          params[params.version === '1.3.0' ? 'i' : 'x'] = Math.floor(layerPoint.x);
+          params[params.version === '1.3.0' ? 'j' : 'y'] = Math.floor(layerPoint.y);
+
+          return this._url + L.Util.getParamString(params, this._url, true);
+        },
+
+        showGetFeatureInfo: function (err, latlng, content) {
+          if (err) { console.log(err); return; } // do nothing if there's an error
+
+          // Otherwise show the content in a popup, or something.
+          L.popup({ maxWidth: 900, maxHeight: 200})
+            .setLatLng(latlng)
+            .setContent(content)
+            .openOn(this._map);
+        }
+      });
+
+        L.tileLayer.betterWms = function (url, options) {
+          return new L.TileLayer.BetterWMS(url, options);
+        };
+        var osm = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+            attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+        });
+
+        var unesco = L.tileLayer(
+            'http://en.unesco.org/tiles/{z}/{x}/{y}.png', {
+            attribution: '&copy; unesco'
+        });
+
+        var unesco_geodata = L.tileLayer(
+            'http://en.unesco.org/tiles/geodata/{z}/{x}/{y}.png', {
+            attribution: '&copy; unesco'
+        });
+
+        var OpenMapSurfer_Roads = L.tileLayer('http://korona.geog.uni-heidelberg.de/tiles/roads/x={x}&y={y}&z={z}', {
+            maxZoom: 20,
+            attribution: 'Imagery from <a href="http://giscience.uni-hd.de/">GIScience Research Group @ University of Heidelberg</a> &mdash; Map data &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+        });
+
+        // not yet available
+        // var unesco_white = L.tileLayer(
+        //     'http://en.unesco.org/tiles/white/{z}/{x}/{y}.png', {
+        //     attribution: '&copy; unesco'
+        // });
+
+        var base_maps = {
+            "OpenMapSurfer_Roads": OpenMapSurfer_Roads,
+            'OpenStreetMap': osm
+        };
+
+        var overlay_layer = {};
+
+        var map = L.map('preview_map',{measureControl: true});
+
+      	//add elements to maps page
+        var scale_bar = L.control.scale().addTo(map);
+       	//var attribution = L.control.attribution({prefix: 'UNESCO-IHP-Wins'}).addTo(map);
+      	//on surcharge attribution
+      	map.attributionControl.addAttribution('<a href="http://en.unesco.org/themes/water-security/hydrology", class="your_class">UNESCO-IHP-Wins</a>');
+
+        L.Control.Watermark = L.Control.extend({
+          onAdd: function(map) {
+          var img = L.DomUtil.create('img');
+
+          // Default to Geonode logo
+          img.src = "{% static "geonode/img/logo.png" %}";
+          img.style.width = '120px';
+
+          return img;
+          },
+
+          onRemove: function(map) {
+          // Nothing to do here
+          }
+        });
+
+        L.control.watermark = function(opts) {
+          return new L.Control.Watermark(opts);
+        };
+
+        L.control.watermark({ position: 'bottomright' }).addTo(map);
+
+        // L.control.measureControl.addTo(map);
+        map.addLayer(OpenMapSurfer_Roads);
+
+        {% if layer_bbox %}
+            zoom_to_box(map, [{{ layer_bbox }}]);
+        {% endif %}
+
+        var tile_layer;
+        {% if resource.get_tiles_url %}
+            tile_layer = L.tileLayer("{{ resource.get_tiles_url|safe }}",
+                    {
+                        'opacity': 0.8
+                    });
+        {%  elif resource.ptype == "gxp_wmscsource"  %}
+            tile_layer = L.tileLayer.betterWms('{{ resource.ows_url|safe }}', {
+                layers: '{{ resource.alternate }}',
+                format: 'image/png',
+                transparent: true,
+                'opacity': 0.8
+            });
+        {%  elif resource.ptype == "gxp_arcrestsource" %}
+            tile_layer = L.esri.dynamicMapLayer('{{ resource.ows_url|safe }}', {
+                layers: '{{ resource.alternate }}',
+                format: 'png',
+                transparent: true,
+                'opacity': 0.8
+            });
+        {% elif resource.ows_url %}
+            tile_layer = L.tileLayer.betterWms('{{ resource.ows_url|safe }}', {
+              layers: '{{ resource.alternate }}',
+              transparent: true,
+              format: 'image/png'
+            });
+        {% endif %}
+
+        if (tile_layer != null) {
+            overlay_layer["{{ resource.title }}"] = tile_layer;
+            map.addLayer(tile_layer);
+        }
+        var layerControl = L.control.layers(
+                base_maps, overlay_layer
+        ).addTo(map);
+
+        if (L.control.hasOwnProperty('fullscreen')) {
+            L.control.fullscreen().addTo(map);
+        }
+
+        if(L.Control.hasOwnProperty('opacitySlider')) {
+            //adjust opacity
+            var opacitySlider = new L.Control.opacitySlider();
+            map.addControl(opacitySlider);
+
+            opacitySlider.setOpacityLayer(tile_layer);
+        }
+
+        if(L.control.hasOwnProperty('navbar')){
+            //adjust info
+            L.control.navbar().addTo(map);
+        }
+  });
+
+  function zoom_to_box(map, bbox) {
+          var bounds = [
+              [bbox[1], bbox[0]],
+              [bbox[3], bbox[2]]
+          ];
+          map.fitBounds(bounds);
+      }
+</script>
diff --git a/geonode/layers/templates/layers/layer_detail.html b/geonode/layers/templates/layers/layer_detail.html
index cf6714dece1..ee15c48a46a 100644
--- a/geonode/layers/templates/layers/layer_detail.html
+++ b/geonode/layers/templates/layers/layer_detail.html
@@ -482,7 +482,11 @@ <h4>{% trans "Metadata" %}</h4>
                     <div class="col-sm-3">
                       <i class="fa fa-tint fa-3x"></i>
                       <h4>{% trans "Styles" %}</h4>
-                      <a class="btn btn-default btn-block btn-xs style-edit" href="{% url "layer_sld_edit" resource.service_typename %}">{% trans "Edit" %}</a>
+                      {% if preview == 'react' or preview == 'leaflet' %}
+                        <a class="btn btn-default btn-block btn-xs style-edit" data-dismiss="modal" href="#">{% trans "Edit" %}</a>
+                      {% else %}
+                        <a class="btn btn-default btn-block btn-xs style-edit" href="{% url "layer_sld_edit" resource.service_typename %}">{% trans "Edit" %}</a>
+                      {% endif %}
                       <a class="btn btn-default btn-block btn-xs" href="{% url "layer_sld_upload" resource.service_typename %}">{% trans "Upload" %}</a>
                       <a class="btn btn-default btn-block btn-xs" href="{% url "layer_style_manage" resource.service_typename %}">{% trans "Manage" %}</a>
                     </div>
@@ -548,8 +552,8 @@ <h5 class="modal-title" id="myModalLabel">
                 {% trans "Full metadata" %}
                 </h5>
                 <ul>
-                    <li><a target="_blank" href="../catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title | slugify }}.txt"> {% trans "Text format" %} </a></li>
-                    <li><a target="_blank" href="../catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title | slugify }}.html"> {% trans "HTML format" %} </a></li>
+                    <li><a target="_blank" href="../catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.txt"> {% trans "Text format" %} </a></li>
+                    <li><a target="_blank" href="../catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.html"> {% trans "HTML format" %} </a></li>
                 </ul>
             </div>
             <div style="margin-bottom:20px">
@@ -795,10 +799,17 @@ <h1>{% trans "Processing..." %}</h1>
 
     {% block thumbnail_script %}
       <script type="text/javascript">
-        $('#set_thumbnail').click(function(){
-          createMapThumbnail();
-          $('#edit-layer').modal('toggle');
-        });
+            {% if preview == 'react' %}
+            $('#set_thumbnail').click(function(){
+              window.setThumbnail({{resource.id}})
+              $('#edit-layer').modal('toggle');
+            });
+            {% else %}
+            $('#set_thumbnail').click(function(){
+              createMapThumbnail();
+              $('#edit-layer').modal('toggle');
+            });
+            {% endif %}
       </script>
     {% endblock thumbnail_script %}
 
diff --git a/geonode/maps/urls.py b/geonode/maps/urls.py
index 92987cc31f6..c0624fc4680 100644
--- a/geonode/maps/urls.py
+++ b/geonode/maps/urls.py
@@ -20,6 +20,9 @@
 
 from django.conf.urls import url, include
 from django.views.generic import TemplateView
+
+from geonode import geoserver
+from geonode.utils import check_ogc_backend
 from geonode.monitoring import register_url_event
 
 from . import views
@@ -30,10 +33,15 @@
 
 new_map_view = views.new_map
 existing_map_view = views.map_view
-map_embed = views.map_embed
-map_edit = views.map_edit
-map_json = views.map_json
-map_thumbnail = views.map_thumbnail
+
+if check_ogc_backend(geoserver.BACKEND_PACKAGE):
+    new_map_view = views.new_map
+    existing_map_view = views.map_view
+    map_embed = views.map_embed
+    map_edit = views.map_edit
+    map_json = views.map_json
+    map_thumbnail = views.map_thumbnail
+
 maps_list = register_url_event()(TemplateView.as_view(template_name='maps/map_list.html'))
 
 urlpatterns = [
diff --git a/pavement.py b/pavement.py
index d246be4e368..193b221ad89 100644
--- a/pavement.py
+++ b/pavement.py
@@ -27,10 +27,7 @@
 import signal
 import sys
 import time
-import pytz
 import logging
-import datetime
-from dateutil.parser import parse as parsedate
 
 from urllib.parse import urlparse
 from urllib.request import urlopen, Request
@@ -105,23 +102,9 @@ def grab(src, dest, name):
         logger.info("Downloading {}".format(name))
     elif not zipfile.is_zipfile(dest):
         logger.info("Downloading {} (corrupt file)".format(name))
-    elif not src.startswith("file://"):
-        r = requests.head(src)
-        file_time = datetime.datetime.fromtimestamp(os.path.getmtime(dest))
-        url_time = file_time
-        for _k in ['last-modified', 'Date']:
-            if _k in r.headers:
-                url_time = r.headers[_k]
-        url_date = parsedate(url_time)
-        utc = pytz.utc
-        url_date = url_date.replace(tzinfo=utc)
-        file_time = file_time.replace(tzinfo=utc)
-        if url_date < file_time :
-            # Do not download if older than the local one
-            return
-        logger.info("Downloading updated {}".format(name))
+    else:
+        return
 
-    # Local file does not exist or remote one is newer
     if src.startswith("file://"):
         src2 = src.replace("file://", '')
         if not os.path.exists(src2):
@@ -182,8 +165,6 @@ def setup_geoserver(options):
             os.path.basename(urlparse(dev_config['GEOSERVER_URL']).path)
         jetty_runner = download_dir / \
             os.path.basename(urlparse(dev_config['JETTY_RUNNER_URL']).path)
-        geoserver_data = download_dir / \
-                       os.path.basename(urlparse(dev_config['DATA_DIR_URL']).path)
         grab(
             options.get(
                 'geoserver',
@@ -196,13 +177,6 @@ def setup_geoserver(options):
                 dev_config['JETTY_RUNNER_URL']),
             jetty_runner,
             "jetty runner")
-        grab(
-            options.get(
-                'geoserver data',
-                dev_config['DATA_DIR_URL']),
-            geoserver_data,
-            "geoserver data-dir")
-
         if not geoserver_dir.exists():
             geoserver_dir.makedirs()
 
@@ -213,12 +187,7 @@ def setup_geoserver(options):
             logger.info("extracting geoserver")
             z = zipfile.ZipFile(geoserver_bin, "r")
             z.extractall(webapp_dir)
-
-            logger.info("extracting geoserver data dir")
-            z = zipfile.ZipFile(geoserver_data, "r")
-            z.extractall(geoserver_dir)
-
-        _configure_data_dir()
+        _install_data_dir()
 
 
 def _robust_rmtree(path, logger=None, max_retries=5):
@@ -242,7 +211,17 @@ def _robust_rmtree(path, logger=None, max_retries=5):
     shutil.rmtree(path)
 
 
-def _configure_data_dir():
+def _install_data_dir():
+    target_data_dir = path('geoserver/data')
+    if target_data_dir.exists():
+        try:
+            target_data_dir.rmtree()
+        except OSError:
+            _robust_rmtree(target_data_dir, logger=True)
+
+    original_data_dir = path('geoserver/geoserver/data')
+    justcopy(original_data_dir, target_data_dir)
+
     try:
         config = path(
             'geoserver/data/global.xml')
@@ -412,7 +391,6 @@ def sync(options):
     if 'django_celery_beat' in INSTALLED_APPS:
         sh("%s python -W ignore manage.py loaddata geonode/base/fixtures/django_celery_beat.json" % settings)
     sh("%s python -W ignore manage.py set_all_layers_alternate" % settings)
-    sh("%s python -W ignore manage.py collectstatic --noinput" % settings)
 
 
 @task
@@ -929,7 +907,7 @@ def _reset():
     )
     sh("rm -rf geonode/development.db")
     sh("rm -rf geonode/uploaded/*")
-    _configure_data_dir()
+    _install_data_dir()
 
 
 @needs(['reset'])