diff --git a/ckanext/spatial/public/css/spatial_query.css b/ckanext/spatial/public/css/spatial_query.css
index bd3d0c84..2893fbe5 100644
--- a/ckanext/spatial/public/css/spatial_query.css
+++ b/ckanext/spatial/public/css/spatial_query.css
@@ -34,10 +34,21 @@
 #dataset-map-edit {
   margin: 5px 8px;
 }
-#dataset-map-edit-buttons {
+.module-narrow #dataset-map-container{
+  position: relative;
+}
+.extended-map-form,
+.module-narrow #dataset-map-attribution,
+.module-narrow #dataset-map-clear,
+#dataset-map-edit-buttons,
+#extended-map-panel{
   display: none;
 }
-.leaflet-draw-toolbar a.leaflet-draw-draw-rectangle {
+.extended-map-show-form{
+  text-align: center;
+  padding-bottom: 10px;
+}
+.leaflet-control-draw-rectangle {
   background-image: url("../img/pencil.png");
   background-repeat: no-repeat;
   background-position: 50% 50%;
@@ -47,12 +58,15 @@
 .leaflet-draw-actions li {
   display: none;
 }
+div[style*="crosshair"] .leaflet-clickable{
+  cursor: crosshair;
+}
 .dataset-map-expanded #dataset-map {
   position: absolute;
-  width: 940px;
-  height: 384px;
+  width: 100%;
+  height: 410px;
   top: -384px;
-  left: -1px;
+  left: 0;
   background-color: white;
   border: 1px solid #CCC;
   margin: 0;
@@ -76,10 +90,42 @@
   float: left;
   margin-right: 10px;
 }
+.dataset-map-layer-drawn #dataset-map-container,
+.dataset-map-expanded #dataset-map-container{
+  position: relative;
+}
+.dataset-map-expanded #dataset-map-container{
+  display: inline-block;
+  width: 67%;
+}
+.dataset-map-expanded #extended-map-panel{
+  display: inline-block;
+  width: 33%;
+  float: right;
+  box-sizing: border-box;
+  padding: 15px;
+  padding-right: 22px;
+  padding-bottom: 0;
+}
+.dataset-map-expanded .dataset-map{
+ height: 300px;
+}
+.extended-map-help li{
+  margin-left: 15px;
+}
+#dataset-map .module-footer{
+  border-top: none;
+}
+.dataset-map-expanded #dataset-map,
+.dataset-map-expanded #dataset-map-clear,
+.dataset-map-layer-drawn #dataset-map #dataset-map-attribution,
+.dataset-map-expanded #dataset-map #dataset-map-attribution,
 .dataset-map-expanded #dataset-map #dataset-map-edit-buttons {
   display: block;
+}
+.dataset-map-expanded #dataset-map #dataset-map-edit-buttons {
   float: right;
-  padding: 10px;
+  padding: 15px;
 }
 .dataset-map-expanded #dataset-map #dataset-map-edit {
   display: none;
@@ -90,3 +136,143 @@
 .dataset-map-expanded .wrapper {
   margin-top: 383px;
 }
+.extended-map-help ul{
+  margin: 10px 0;
+}
+/* .dataset-map-layer-drawn .extended-map-help, */
+.active ~ .extended-map-help{
+  display: none;
+}
+.dataset-map-layer-drawn .extended-map-form,
+.active ~ .extended-map-form{
+  display: block;
+}
+.dataset-map-layer-drawn .extended-map-control{
+  display: none;
+}
+.dataset-map-layer-drawn .extended-map-form input{
+  display: none;
+}
+.active ~ .extended-map-form input{
+  display: inline;
+}
+.active ~ .extended-map-form .span-input{
+  display: none;
+}
+.active ~ .extended-map-form .extended-map-control{
+  display: block;
+}
+.extended-map-form .coord-field{
+  display: inline-block;
+  width: 47.5%;
+}
+.coord-field .span-input{
+  margin-left: 0;
+}
+.coord-field .span-input:after{
+  content: "\00b0";
+}
+.extended-map-form .coord-field input{
+  max-width: 100%;
+  box-sizing: border-box;
+  height: 2em;
+  padding-right: 0;
+}
+.active .show-map-link i{
+  display: inline-block;
+}
+.show-map-link i{
+  position: absolute;
+  right: 2px;
+  padding-top: 3px;
+  font-size: 16px;
+  display: none;
+}
+.nav-facet .nav-item.active .show-map-link:after{
+  display: none;
+}
+
+.extended-map-control .btn{
+  margin-top: 15px;
+  width: 100%;
+  box-sizing: border-box;
+}
+.leaflet-control {
+  display: none;
+}
+.dataset-map-expanded .leaflet-control {
+    display: block;
+}
+.leaflet-control-arrow{
+  border: none;
+  box-shadow: none;
+  padding: 3px;
+}
+.leaflet-control-arrow-left,
+.leaflet-control-arrow-right,
+.leaflet-control-arrow-up,
+.leaflet-control-arrow-down{
+  width: 22px;
+  height: 22px;
+  border-radius: 4px;
+  display: block;
+  border: 1px solid #aaa;
+  font-size: 15px;
+  text-align: center;
+  position: relative;
+}
+.leaflet-control-arrow-left{
+  left: -12px;
+  float: left;
+}
+.leaflet-control-arrow-right{
+  right: 12px;
+  float: right;
+}
+.leaflet-control-arrow-down{
+  clear: both;
+}
+.leaflet-control-arrow-left:before,
+.leaflet-control-arrow-right:before,
+.leaflet-control-arrow-up:before,
+.leaflet-control-arrow-down:before{
+  color: #000;
+  font-family: "FontAwesome";
+}
+.leaflet-control-arrow-left:hover:before,
+.leaflet-control-arrow-right:hover:before,
+.leaflet-control-arrow-up:hover:before,
+.leaflet-control-arrow-down:hover:before{
+  color: #777;
+}
+.leaflet-control-arrow-left:hover,
+.leaflet-control-arrow-right:hover,
+.leaflet-control-arrow-up:hover,
+.leaflet-control-arrow-down:hover,
+.leaflet-control-arrow-left:focus,
+.leaflet-control-arrow-right:focus,
+.leaflet-control-arrow-up:focus,
+.leaflet-control-arrow-down:focus{
+  background: #fff;
+  text-decoration: none;
+}
+.leaflet-control-arrow-left:before{
+  content: "\f060";
+}
+.leaflet-control-arrow-right:before{
+  content: "\f061";
+}
+.leaflet-control-arrow-up:before{
+  content: "\f062";
+}
+.leaflet-control-arrow-down:before{
+  content: "\f063";
+}
+@media (max-width: 768px){
+  .dataset-map-expanded #dataset-map-container{
+    width: 100%;
+  }
+  .dataset-map-expanded #extended-map-panel{
+    display: none;
+  }
+}
diff --git a/ckanext/spatial/public/js/spatial_query.js b/ckanext/spatial/public/js/spatial_query.js
index 78fe286f..7ab63aa3 100644
--- a/ckanext/spatial/public/js/spatial_query.js
+++ b/ckanext/spatial/public/js/spatial_query.js
@@ -2,6 +2,96 @@
  */
 this.ckan.module('spatial-query', function ($, _) {
 
+  L.Control.Arrow = L.Control.extend({
+    options: {
+      position: 'topleft'
+    },
+
+    onAdd: function (map) {
+      var arrowName = 'leaflet-control-arrow',
+          barName = 'leaflet-bar',
+          partName = barName + '-part',
+          container = L.DomUtil.create('div', arrowName + ' ' + barName);
+
+      this._map = map;
+
+      this._moveUpButton = this._createButton('', 'Move up',
+              arrowName + '-up ' +
+              partName + ' ' +
+              partName + '-up',
+              container, this._move('up'), this);
+
+      this._moveLeftButton = this._createButton('', 'Move left',
+              arrowName + '-left ' +
+              partName + ' ' +
+              partName + '-left',
+              container, this._move('left'),  this);
+
+      this._moveRightButton = this._createButton('', 'Move right',
+              arrowName + '-right ' +
+              partName + ' ' +
+              partName + '-right',
+              container, this._move('right'), this);
+
+      this._moveDownButton = this._createButton('', 'Move down',
+              arrowName + '-down ' +
+              partName + ' ' +
+              partName + '-down',
+              container, this._move('down'), this);
+
+
+      return container;
+    },
+
+    onRemove: function () {
+
+    },
+
+    _move: function (direction) {
+      var d = [0, 0];
+      var self = this;
+
+      switch (direction){
+        case 'up':
+          d[1] = -10;
+          break;
+        case 'down':
+          d[1] = 10;
+          break;
+        case 'left':
+          d[0] = -10;
+          break;
+        case 'right':
+          d[0] = 10;
+          break;
+      }
+      return function(){
+        self._map.panBy(d);
+      };
+    },
+
+    _createButton: function (html, title, className, container, fn, context) {
+      var link = L.DomUtil.create('a', className, container);
+      link.innerHTML = html;
+      link.href = '#';
+      link.title = title;
+
+      var stop = L.DomEvent.stopPropagation;
+
+      L.DomEvent
+          .on(link, 'click', stop)
+          .on(link, 'mousedown', stop)
+          .on(link, 'dblclick', stop)
+          .on(link, 'click', L.DomEvent.preventDefault)
+          .on(link, 'click', fn, context);
+
+      return link;
+    }
+  });
+
+
+
+
   return {
     options: {
       i18n: {
@@ -14,7 +104,8 @@ this.ckan.module('spatial-query', function ($, _) {
         fillOpacity: 0.1,
         clickable: false
       },
-      default_extent: [[90, 180], [-90, -180]]
+      default_extent: [[90, 180], [-90, -180]],
+      draw_default: false
     },
     template: {
       buttons: [
@@ -26,7 +117,6 @@ this.ckan.module('spatial-query', function ($, _) {
     },
 
     initialize: function () {
-      var module = this;
       $.proxyAll(this, /_on/);
 
       var user_default_extent = this.el.data('default_extent');
@@ -67,18 +157,34 @@ this.ckan.module('spatial-query', function ($, _) {
       var module = this;
       var map;
       var extentLayer;
-      var previous_box;
       var previous_extent;
       var is_exanded = false;
       var should_zoom = true;
+      var default_drawn = false;
       var form = $("#dataset-search");
+      var map_attribution = $('#dataset-map-attribution');
+      var map_nav = $('#dataset-map-nav');
+      var show_map_link = $('.show-map-link', map_nav);
       // CKAN 2.1
       if (!form.length) {
           form = $(".search-form");
       }
+      var aFields = ['west-lng', 'south-lat', 'east-lng', 'north-lat'];
+      var aForm = [];
+      for (var f in aFields){
+        aForm.push($('#' + aFields[f]));
+      }
 
       var buttons;
 
+      var jqaForm = $();  // empty jQuery object
+      $.each(aForm, function(i, o) {
+        jqaForm = jqaForm.add(o);
+      });
+      jqaForm.on('change', function(e){
+        $(e.target).next().text(parseFloat(e.target.value, 5).toFixed(1));
+      });
+
       // Add necessary fields to the search form if not already created
       $(['ext_bbox', 'ext_prev_extent']).each(function(index, item){
         if ($("#" + item).length === 0) {
@@ -107,36 +213,64 @@ this.ckan.module('spatial-query', function ($, _) {
           rectangle: {shapeOptions: module.options.style}
         }
       }));
+      map.addControl(new L.Control.Arrow());
+
+      $('#dataset-map-clear').on('click', clearMap)
 
       // OK add the expander
-      $('a.leaflet-draw-draw-rectangle', module.el).on('click', function(e) {
-        if (!is_exanded) {
-          $('body').addClass('dataset-map-expanded');
-          if (should_zoom && !extentLayer) {
-            map.zoomIn();
+      $('.leaflet-control-draw a', module.el)
+        .add($('.show-map-link', map_nav))
+        .on('click', function() {
+          if (!is_exanded) {
+            map_nav.hide();
+            $('body').addClass('dataset-map-expanded');
+
+            if (!extentLayer) {
+              if (should_zoom){
+                map.zoomIn();
+              }
+            } else if (extentLayer){
+              map.fitBounds(extentLayer.getBounds());
+            }
+            resetMap();
+            is_exanded = true;
           }
-          resetMap();
-          is_exanded = true;
-        }
       });
+      $('.show-map-link i', map_nav).on('click', function(e){
+        window.location.href = $('#dataset-map-clear').attr('href');
+        e.stopPropagation();
+      });
+
+      $('.extended-map-show-form a', module.el).on('click', toggleCoordinateForm);
 
       // Setup the expanded buttons
-      buttons = $(module.template.buttons).insertBefore('#dataset-map-attribution');
+      buttons = $(module.template.buttons).insertBefore(map_attribution);
 
       // Handle the cancel expanded action
       $('.cancel', buttons).on('click', function() {
-        $('body').removeClass('dataset-map-expanded');
+
+        map_nav.show();
+        $('body').removeClass('dataset-map-expanded  dataset-map-layer-drawn');
+        show_map_link.parent().removeClass('active');
+
+        var show_form = $('.extended-map-show-form a');
+        if (show_form.hasClass('active')) {
+          show_form.trigger('click');
+        }
+
         if (extentLayer) {
           map.removeLayer(extentLayer);
+          extentLayer = null;
         }
-        setPreviousExtent();
         setPreviousBBBox();
+        setPreviousExtent();
         resetMap();
         is_exanded = false;
       });
 
       // Handle the apply expanded action
-      $('.apply', buttons).on('click', function() {
+      $('.apply', buttons).on('click', function(event) {
+        if ($(event.target).hasClass('disabled')) return;
         if (extentLayer) {
           $('body').removeClass('dataset-map-expanded');
           is_exanded = false;
@@ -149,50 +283,118 @@ this.ckan.module('spatial-query', function ($, _) {
         }
       });
 
+      $('#extended-map-reset').on('click', resetBBoxToCurrentView);
+      $('#extended-map-update').on('click', function(){
+        var c = [];
+        for (var i in aForm){
+          c.push(aForm[i].val());
+        }
+        if (c.every(function(e){
+          return e.length;
+        })){
+          var rect = getRectFromCoordinates([
+            [c[3], c[0]],
+            [c[1], c[2]]
+          ]);
+
+          drawRect(rect);
+          default_drawn = false;
+        }
+      });
+
       // When user finishes drawing the box, record it and add it to the map
       map.on('draw:created', function (e) {
-        if (extentLayer) {
-          map.removeLayer(extentLayer);
+        bbox_preparations();
+
+        drawRect(e.layer);
+
+        var drawSelectedBtn = $('.extended-map-show-form a');
+        if (drawSelectedBtn.hasClass('active')){
+          drawSelectedBtn.trigger('click');
         }
-        extentLayer = e.layer;
-        $('#ext_bbox').val(extentLayer.getBounds().toBBoxString());
-        map.addLayer(extentLayer);
-        $('.apply', buttons).removeClass('disabled').addClass('btn-primary');
       });
 
       // Record the current map view so we can replicate it after submitting
-      map.on('moveend', function(e) {
+      map.on('moveend', function() {
         $('#ext_prev_extent').val(map.getBounds().toBBoxString());
       });
 
       // Ok setup the default state for the map
       var previous_bbox;
+
       setPreviousBBBox();
       setPreviousExtent();
+      if(!$('body').is('.dataset-map-layer-drawn')){
+        setTimeout(function() {
+          $('#dataset-map-container').css('position', 'absolute');
+        }, 0);
+      }
 
       // OK, when we expand we shouldn't zoom then
-      map.on('zoomstart', function(e) {
+      map.on('zoomstart', function() {
         should_zoom = false;
       });
 
+      function getRectFromCoordinates(c){
+
+        return new L.Rectangle(
+            new L.LatLngBounds(L.latLng(c[0]), L.latLng(c[1])),
+            module.options.style
+          );
+      }
+
+      function resetBBoxToCurrentView() {
+        if (extentLayer) {
+          map.removeLayer(extentLayer);
+        }
+        drawBBox(map.getBounds().toBBoxString());
+        $('body').addClass('dataset-map-layer-drawn');
+      }
+
+      function drawRect(rect) {
+        if (extentLayer) {
+          map.removeLayer(extentLayer);
+        }
+        extentLayer = rect;
+        var bbox_string = extentLayer.getBounds().toBBoxString();
+        $('#ext_bbox').val(bbox_string);
+        fillForm(bbox_string);
+        map.addLayer(extentLayer);
+        map.fitBounds(extentLayer.getBounds());
+        apply_switch(true);
+      }
 
       // Is there an existing box from a previous search?
       function setPreviousBBBox() {
         previous_bbox = module._getParameterByName('ext_bbox');
         if (previous_bbox) {
-          $('#ext_bbox').val(previous_bbox);
-          extentLayer = module._drawExtentFromCoords(previous_bbox.split(','))
-          map.addLayer(extentLayer);
-          map.fitBounds(extentLayer.getBounds());
+          bbox_preparations();
+          drawBBox(previous_bbox);
+        } else {
+          fillForm(null);
         }
       }
 
+      function drawBBox(bbox, is_default) {
+        default_drawn = is_default;
+        $('#ext_bbox').val(bbox);
+        extentLayer = module._drawExtentFromCoords(bbox.split(','));
+        fillForm(bbox);
+        map.addLayer(extentLayer);
+        apply_switch(true);
+      }
+
       // Is there an existing extent from a previous search?
       function setPreviousExtent() {
-        previous_extent = module._getParameterByName('ext_prev_extent');
+        previous_extent = module._getParameterByName('ext_bbox') ||
+        module._getParameterByName('ext_prev_extent');
         if (previous_extent) {
-          coords = previous_extent.split(',');
-          map.fitBounds([[coords[1], coords[0]], [coords[3], coords[2]]]);
+          var coords = previous_extent.split(',');
+          var prev_bounds = module._drawExtentFromCoords(coords).getBounds();
+          setTimeout(function() {
+            map.fitBounds(prev_bounds);
+          }, 0);
+
         } else {
           if (!previous_bbox){
               map.fitBounds(module.options.default_extent);
@@ -211,6 +413,63 @@ this.ckan.module('spatial-query', function ($, _) {
           form.submit();
         }, 800);
       }
+
+      function bbox_preparations() {
+        $('body').addClass('dataset-map-layer-drawn');
+        show_map_link.parent().addClass('active');
+      }
+
+      function toggleCoordinateForm(event) {
+        $(event.target).toggleClass('active').parent().toggleClass('active');
+
+        if (module.options.draw_default && module.options.default_extent) {
+          if (!default_drawn && !extentLayer) {
+            fallback_default = getRectFromCoordinates(
+              module.options.default_extent)
+              .getBounds();
+
+            drawBBox(fallback_default.toBBoxString(), true);
+          }
+        }
+      }
+
+      function clearMap(event) {
+        event && event.preventDefault();
+        $('body').removeClass('dataset-map-layer-drawn');
+        if (extentLayer) {
+          map.removeLayer(extentLayer);
+        }
+        var ext_bb = $('#ext_bbox');
+        $('#ext_prev_extent').val(ext_bb.val());
+        ext_bb.val('');
+        fillForm(null);
+      }
+
+      function fillForm(bounds){
+        if (bounds === null) {
+          $('.extended-map-form input').val('');
+          $('#ext_bbox').val('');
+          return;
+        }
+        var b = $.map(bounds.split(','), function(e){
+          return parseFloat(e).toFixed(1);
+        });
+
+        for (var i in b){
+          aForm[i].val(b[i]).trigger('change');
+        }
+
+      }
+
+      function apply_switch(state) {
+        var ab = $('.apply', buttons);
+        if (state){
+          ab.removeClass('disabled').addClass('btn-primary');
+        } else {
+          ab.removeClass('btn-primary').addClass('disabled');
+        }
+      }
+
     }
-  }
+  };
 });
diff --git a/ckanext/spatial/templates/spatial/snippets/accessibility_panel.html b/ckanext/spatial/templates/spatial/snippets/accessibility_panel.html
new file mode 100644
index 00000000..1ec29543
--- /dev/null
+++ b/ckanext/spatial/templates/spatial/snippets/accessibility_panel.html
@@ -0,0 +1,50 @@
+<div id="extended-map-panel">
+
+  <div class="extended-map-show-form">
+    {% block extended_map_form_switcher %}
+      <a href="javascript:;" class="btn btn-primary">{{ _('Enter coordinates') }}</a>
+    {% endblock %}
+  </div>
+  {% block extended_map_form %}
+    <div class="extended-map-form">
+      <div class="coord-field">
+        <label for="north-lat">{{ _('North latitude') }}</label>
+        <input type="number" step="0.1" id="north-lat">
+        <span class="span-input"></span>
+      </div>
+
+      <div class="coord-field pull-right">
+        <label for="south-lat">{{ _('South latitude') }}</label>
+        <input type="number" step="0.1" id="south-lat">
+        <span class="span-input"></span>
+      </div>
+
+      <div class="coord-field">
+        <label for="west-lat">{{ _('West longitude') }}</label>
+        <input type="number" step="0.1" id="west-lng">
+        <span class="span-input"></span>
+      </div>
+
+      <div class="coord-field pull-right">
+        <label for="east-lat">{{ _('East longitude') }}</label>
+        <input type="number" step="0.1" id="east-lng">
+        <span class="span-input"></span>
+      </div>
+      <div class="extended-map-control">
+        <a href="javascript:;" id="extended-map-update" class="btn btn-primary">{{ _('Update coordinates') }}</a>
+        <a href="javascript:;" id="extended-map-reset" class="btn">{{ _('Reset coordinates to current map view') }}</a>
+      </div>
+    </div>
+  {% endblock %}
+  {% block extended_map_help %}
+    <div class="extended-map-help">
+      {% trans %}
+        <ul>
+          Select a location extent by:
+          <li>Drawing an extent box, or</li>
+          <li>Enter the latitude and longitude coordinates.</li>
+        </ul>
+      {% endtrans %}
+    </div>
+  {% endblock %}
+</div>
diff --git a/ckanext/spatial/templates/spatial/snippets/spatial_facet.html b/ckanext/spatial/templates/spatial/snippets/spatial_facet.html
new file mode 100644
index 00000000..d72a87e0
--- /dev/null
+++ b/ckanext/spatial/templates/spatial/snippets/spatial_facet.html
@@ -0,0 +1,32 @@
+{#
+Displays a map widget to define a spatial filter on the dataset search page sidebar
+
+default_extent
+  Initial map extent (Optional, defaults to the whole world). It can be defined
+  either as a pair of coordinates or as a GeoJSON bounding box.
+
+e.g.
+  {% snippet "spatial/snippets/spatial_query.html", default_extent=[[15.62, -139.21], [64.92, -61.87]] %}
+
+  {% snippet "spatial/snippets/spatial_query.html", default_extent="{ \"type\": \"Polygon\", \"coordinates\": [[[74.89, 29.39],[74.89, 38.45], [60.50, 38.45], [60.50, 29.39], [74.89, 29.39]]]}" %}
+
+#}
+{% with bbox = request.GET.ext_bbox %}
+    {% if bbox %}
+      <p class="filter-list">
+          <span class="facet">{{ _('Location extent') }}:</span>
+            <span class="filtered pill">
+              {% for coord in bbox.split(',') %}
+                {{ loop.cycle(
+                  _('West longitude'),
+                  _('South latitude'),
+                  _('East longitude'),
+                  _('North latitude'))
+                }}
+                {{ coord|float|round(5) }}&deg;{% if not loop.last %},{% endif %}
+              {% endfor %}
+              <a href="{{ h.remove_url_param(['ext_bbox','ext_prev_extent', 'ext_location']) }}" class="remove" title="{{ _('Remove') }}"><i class="icon-remove"></i></a>
+            </span>
+      </p>
+    {% endif %}
+{% endwith %}
diff --git a/ckanext/spatial/templates/spatial/snippets/spatial_query.html b/ckanext/spatial/templates/spatial/snippets/spatial_query.html
index f847f06d..df064c3f 100644
--- a/ckanext/spatial/templates/spatial/snippets/spatial_query.html
+++ b/ckanext/spatial/templates/spatial/snippets/spatial_query.html
@@ -14,16 +14,26 @@
 <section id="dataset-map" class="module module-narrow module-shallow">
   <h2 class="module-heading">
     <i class="icon-medium icon-globe"></i>
-    {{ _('Filter by location') }}
-    <a href="{{ h.remove_url_param(['ext_bbox','ext_prev_extent', 'ext_location']) }}" class="action">{{ _('Clear') }}</a>
+    {{ _('Location') }}
+    <a id="dataset-map-clear" href="{{ h.remove_url_param(['ext_bbox','ext_prev_extent', 'ext_location']) }}" class="action">{{ _('Clear map') }}</a>
   </h2>
+  <ul class="unstyled nav nav-simple nav-facet nav-dataset-map" id="dataset-map-nav">
+    <li class="nav-item">
+        <a href="#" class="show-map-link">{{ _('Select location extent') }}
+          <i class="icon-remove-sign"></i>
+        </a>
+    </li>
+  </ul>
   {% set map_config = h.get_common_map_config() %}
-  <div class="dataset-map" data-module="spatial-query" data-default_extent="{{ default_extent }}" data-module-map_config="{{ h.dump_json(map_config) }}">
-    <div id="dataset-map-container"></div>
+  <div class="dataset-map" data-module="spatial-query" data-default_extent="{{ default_extent }}" data-module-map_config="{{ h.dump_json(map_config) }}" {% if draw_default %}data-module-draw_default{%endif%}>
+    <div id="dataset-map-container">
+    </div>
+    {% snippet "spatial/snippets/accessibility_panel.html" %}
   </div>
   <div id="dataset-map-attribution">
     {% snippet "spatial/snippets/map_attribution.html", map_config=map_config %}
   </div>
+  <div class="module-footer"></div>
 </section>
 
 {% resource 'ckanext-spatial/spatial_query' %}