diff --git a/app/assets/stylesheets/location.css b/app/assets/stylesheets/location.css
index 024442402f..b5f1ee32ba 100644
--- a/app/assets/stylesheets/location.css
+++ b/app/assets/stylesheets/location.css
@@ -10,6 +10,98 @@
 #map_content .form-group .btn {
   margin-top: .4rem;
 }
+#map_content .form-group.recent-locations {
+  /* margin-bottom: 1.2rem; */
+}
+#map_content .recent-locations label {
+  margin-bottom: 0;
+}
+#map_content .slide-container label {
+  margin: 0;
+}
+
+#blurred-location-modal .small-description {
+  font-size: 0.9rem;
+  color: #808080;
+}
+
+#blurred-location-modal .modal-header {
+  border-bottom: 0;
+  padding-bottom: 0;
+}
+#blurred-location-modal .modal-header .close {
+  padding-bottom: 0.5rem;
+}
+
+#blurred-location-modal .modal-content .badge-group {
+  margin-left: -6px;
+}
+
+#blurred-location-modal .modal-content .badge.badge-info {
+  background-color: #337ab7;
+  margin-left: 7px;
+  margin-bottom: 2px;
+  padding: 3px;
+}
+#blurred-location-modal .modal-content .badge {
+  background-color: white;
+  color: #337ab7;
+  margin: 0;
+}
+#blurred-location-modal .modal-footer {
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+#blurred-location-modal #place_name {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+#blurred-location-modal .modal-footer .location-box {
+  flex: 0 1 100%;
+}
+#blurred-location-modal #placenameDisplay {
+  flex: 0 1 100%;
+}
+#blurred-location-modal .modal-footer label {
+  flex: 0 1 100%;
+  margin: 0;
+}
+#blurred-location-modal .modal-footer .button-box {
+  flex: 0 1 100%;
+  display: flex;
+  justify-content: center;
+  margin: 0.5rem 0 0 0;
+}
+
+@media (min-width: 576px) {
+  #blurred-location-modal .modal-footer {
+    justify-content: space-between;
+    flex-wrap: nowrap;
+  }
+  #blurred-location-modal .modal-footer .button-box {
+    flex: 0 0 10%;
+    display: inline;
+    margin: 0 0 0 3rem;
+  }
+}
+
+@media (min-width: 992px) {
+  #blurred-location-modal #place_name {
+    flex-wrap: nowrap;
+  }
+  #blurred-location-modal .modal-footer .location-box {
+    flex: 1 1 50%;
+  }
+  #blurred-location-modal #placenameDisplay {
+    flex: 1 1 60%;
+  }
+  #blurred-location-modal .modal-footer label {
+    flex: 1 1 40%;
+    margin: 0;
+    padding-left: 0.5rem;
+  }
+}
 
 a:not([href]):not([tabindex]).btn-location,
 .btn-location {
@@ -25,4 +117,8 @@ a:not([href]):not([tabindex]).btn-outline-secondary.btn-location:hover i,
 .btn-outline-secondary.btn-location:hover,
 .btn-outline-secondary.btn-location:hover i {
   color: white;
-}
\ No newline at end of file
+}
+
+#coord_button {
+  text-decoration: underline;
+}
diff --git a/app/views/editor/rich.html.erb b/app/views/editor/rich.html.erb
index 13a7874586..ccd57a5532 100644
--- a/app/views/editor/rich.html.erb
+++ b/app/views/editor/rich.html.erb
@@ -34,10 +34,6 @@
     margin: 0 auto;
   }
 
-  #coord_button {
-    text-decoration: underline;
-  }
-
   button i.fa-map-marker {
     color: #c40;
   }
diff --git a/app/views/locations/_form.html.erb b/app/views/locations/_form.html.erb
index 67b5da172a..5226035ac2 100644
--- a/app/views/locations/_form.html.erb
+++ b/app/views/locations/_form.html.erb
@@ -2,70 +2,100 @@
 <%= javascript_include_tag('/lib/leaflet-spin/example/spin/dist/spin.min.js') %>
 <%= javascript_include_tag('/lib/leaflet-spin/example/leaflet.spin.min.js') %>
 
-<div class="container blurred-location">
-  <div class="form-group">
-    <label for="placenameInput"><b>Search by place name</b></label>
-    <input id="placenameInput" type="text" class="form-control" />
-  </div>
+<div id="map_content" class="modal-body text-left">
+  <div class="row">
 
-  <!-- Not part of LBL library -->
-  <% if current_user %>
-    <% latest_locations = current_user.recent_locations %>
-    <% if latest_locations.count > 0 %>
-      <p><b>Your recently used locations:</b></p>
-      <div class="row">
-        <% latest_locations.each_with_index do |location, index| %>
-          <a href="#" onclick="blurredLocation.goTo(<%= location.lat %>, <%= location.lon %>, 6);"> 
-            <span class="badge badge-info" style="background-color: #337ab7 ; margin-left: 7px ;margin-top: 2px; ">
-              <% if location.place %>
-                <%= location.place %>
-              <% end %>
-              <span class="badge" style="background-color: white; color: #337ab7;"><%= location.lat %></span>
-              <span class="badge" style="background-color: white; color: #337ab7;"><%= location.lon %></span>
-            </span>
-          </a>
-        <% end %>
+    <div class="col-lg-7">
+
+      <div id="map" class="leaflet-map" style="width: 100%; height: 300px; margin-bottom:10px;"></div>
+      <div class="slide-container">
+        <label>Scale</label>
+        <input id="ex1" data-slider-id='ex1Slider' type="text" data-slider-min="1" data-slider-max="18" data-slider-step="1" data-slider-value="6" style="width: 100%"/>
+        <p class="small-description d-inline">World</p>
+        <p class="small-description d-inline" style="float: right">Building</p>
       </div>
-    <% end %>
-  <% end %>
-
-  <br>
-  <p><b>By dragging the map</b></p>
-  <div id="map" class="leaflet-map" style="width: 100%; height: 300px; margin-bottom:10px;"></div>
-  <p>
-    <h3><strong>Scale</strong></h3>
-    <div class="slidecontainer" style="border-bottom: 2px solid #ccc;">
-      <b><p style="display: inline">Country</p></b>
-      <b><p style="display: inline; float: right">Building</p></b>
-      <input id="ex1" data-slider-id='ex1Slider' type="text" data-slider-min="5" data-slider-max="18" data-slider-step="1" data-slider-value="6" style="width: 100%"/>
+
     </div>
-  </p>
 
-  <br>
 
-  <p>   
-    <b>Or by co-ordinates</b>
-    <div class="row">
-      <div class="col-lg-6 form-group">
-          <input id="lat" type="text" class="form-control" value="<%= latitude ||= 40 %>">
+    <div class="col-lg-5">
+
+      <div class="form-group">
+        <label for="placenameInput">Search by place name</label>
+        <input id="placenameInput" type="text" class="form-control" />
+      </div>
+
+      <div class="form-group">
+        Or <a href="#" id="coord_button">by entering coordinates</a>
+
+        <div id="coord_input" class="row">
+          <div class="col-sm-6">
+            <label class="small-description">Latitude</label>
+            <input id="lat" type="text" class="form-control" placeholder="Latitude" />
+          </div>
+
+          <div class="col-sm-6">
+            <label class="small-description">Longitude</label>
+            <input id="lng" type="text" class="form-control" placeholder="Longitude" />
+          </div>
+        </div>
       </div>
-      <div class="col-lg-6 form-group">
-        <input id="lng" type="text" class="form-control" value="<%= longitude ||= -90 %>">
+
+      <!-- Not part of LBL library -->
+      <% if current_user %>
+        <div class="form-group recent-locations">
+          <% latest_locations = current_user.recent_locations %>
+          <% if latest_locations.count > 0 %>
+            <label>Your recently used locations:</label>
+            <select id="recent_locations" name="recent_locations" class="custom-select custom-select-sm">
+              <% latest_locations.reverse.each_with_index do |location, index| %>
+                <option value='{ "lat": <%= location.lat %>, "lon": <%= location.lon %> }' >
+                    <% if location.place %>
+                      <%= location.place %>:
+                    <% end %>
+                    (<%= location.lat %>, <%= location.lon %>)
+                </option>
+              <% end %>
+            </select>
+          <% end %>
+        </div>
+      <% end %>
+
+      <div class="form-group">
+        <button class="btn btn-lg btn-outline-secondary" onclick="blurredLocation.geocodeWithBrowser(true);">
+          <div id="ldi-geocode-button">
+            <i class="fa fa-compass"></i>
+            Use current location
+          </div>
+        </button>
+      </div>
+
+      <div class="form-check">
+        <label class="form-check-label">
+          <input id="obscureLocation" type="checkbox" checked class="form-check-input" onchange='blurredLocation.setBlurred(document.getElementById("obscureLocation").checked);' />
+          Blur my location
+        </label>
+        <span class="small-description"><a href="https://publiclab.org/location-privacy" target="_blank">Learn more »</a></span>
       </div>
-    </div>
 
-    <div class="form-group">
-        <label for="placenameDisplay"> <b>Place name as it will be saved:</b></label>
-        <input editable="false" id="placenameDisplay" type="text" class="form-control" />
     </div>
 
-      <button data-dismiss="modal" class="btn btn-lg btn-primary" onclick="saveLocation()">Save</button>
+  </div>
+</div>
+
+<div class="modal-footer bg-light">
 
-  <button id="ldi-geocode-button" class="btn btn-outline-secondary btn-lg" onclick='blurredLocation.geocodeWithBrowser(true);'>Auto-locate me</button>
-  &nbsp; <label>
-    <input id="obscureLocation" type="checkbox" checked onchange='blurredLocation.setBlurred(document.getElementById("obscureLocation").checked);'>
-    Blur my location
-  </label>
+  <div class="location-box text-left">
+    <div id="place_name">
+      <input id="placenameDisplay" type="text" class="form-control" data-preventOverwrite="false" />
+      <label for="placenameDisplay" class="small-description">How this location will be saved</label>
+    </div>
+  </div>
+
+  <div class="button-box">
+    <!-- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> -->
+    <button data-dismiss="modal" class="btn btn-lg btn-primary" onclick="saveLocation()">Save</button>
+  </div>
 
 </div>
 
@@ -79,13 +109,14 @@
   var options = {
     InterfaceOptions: {
       latId: 'lat',
-      lngId: 'lng'
+      lngId: 'lng',
+      placenameDisplayOnError: ''
     },
     location: {
-      lat: 23 ,
+      lat: 23,
       lon: 77 
     }
-  } ;
+  };
 
   var blurredLocation;
 
@@ -120,13 +151,38 @@
       let zoom = blurredLocation.map.getZoom();
       $('#ex1').slider('setValue', zoom);
     })
+    
+    $('#coord_button').click((event) => {
+      event.preventDefault();
+      $('#coord_input').toggle();
+    });
+    $("#coord_input").hide();
+
+    $('#recent_locations').change((event) => {
+      let location = JSON.parse($('#recent_locations').val());
+      blurredLocation.map.setView([location.lat, location.lon], blurredLocation.getZoomFromCoordinates(location.lat, location.lon));
+    });
+
+    var initialPlacename = '';
+    $('#placenameDisplay').on('focusin', function() {
+      initialPlacename = $('#placenameDisplay').val();
+    });
+    $('#placenameDisplay').on('focusout', function() {
+      if($('#placenameDisplay').val() === '') {
+        $('#placenameDisplay').attr('data-preventOverwrite', 'false');
+      } else if ($('#placenameDisplay').val() !== initialPlacename) {
+        $('#placenameDisplay').attr('data-preventOverwrite', 'true');
+      }
+    });
 
   })();
-    
+  
   function saveLocation() {
     var tags = 'lat:' + blurredLocation.getLat() + ',lon:' + blurredLocation.getLon() + ',zoom:' + blurredLocation.getZoom();
     if (blurredLocation.isBlurred()) tags = tags + ',' + 'location:blurred'
-    if ($('#placenameDisplay').val() != 'Location unavailable') tags = tags + ',' + 'place:' + parameterize($('#placenameDisplay').val());
+    if ($('#placenameDisplay').val() !== ('Location unavailable' || '')) {
+      tags = tags + ',' + 'place:' + parameterize($('#placenameDisplay').val());
+    }
     <% if params[:url] %>
       addTag(tags, '<%= params[:url] %>');
     <% else %>
@@ -141,13 +197,3 @@
   }
   
 </script>
-
-<style>
-  .modal-body {
-    background: #f8f8f8;
-  }
-  .blurred-location { 
-    background: #f8f8f8;
-    width: 100%;
-  }
-</style>
diff --git a/app/views/locations/_modal.html.erb b/app/views/locations/_modal.html.erb
index 3830ee8ed4..103ed41c17 100644
--- a/app/views/locations/_modal.html.erb
+++ b/app/views/locations/_modal.html.erb
@@ -5,15 +5,9 @@
         <h4 class="modal-title">Enter a location</h4>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
       </div>
-      <div class="modal-body">
-        <%= render partial: 'locations/form' %>
-      </div>
-      <!--
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-primary">Save changes</button>
-      </div>
-      -->
+
+      <%= render partial: 'locations/form' %>
+
     </div>
   </div>
 </div>
diff --git a/yarn.lock b/yarn.lock
index cf3efad1e1..b1c081b44b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,16 +3,16 @@
 
 
 "@babel/code-frame@^7.0.0":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
-  integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
+  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
   dependencies:
-    "@babel/highlight" "^7.0.0"
+    "@babel/highlight" "^7.8.3"
 
-"@babel/highlight@^7.0.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540"
-  integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==
+"@babel/highlight@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
+  integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
@@ -352,9 +352,9 @@ aws-sign@~0.3.0:
   integrity sha1-PYHKabR0seFlGHKLUcJP8Lvtxuk=
 
 aws4@^1.8.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c"
-  integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
+  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
 
 backbone@~1.3.3:
   version "1.3.3"
@@ -1207,9 +1207,9 @@ cssstyle@^2.0.0:
     cssom "~0.3.6"
 
 csv-parse@^4.6.5:
-  version "4.8.3"
-  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-4.8.3.tgz#9f9b66c3e7e30409dba3d08ecd89eaa04b320659"
-  integrity sha512-0GPxubzYzSn08lhNTWDCkcDKn8krmw0WuscqB2RrW6sugGGskbwaaEz7PCFFwbQ0phNGTTieiyfzzu3S/jZZ7Q==
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-4.8.5.tgz#32e92a0e0acedab141bd5c5a3ad6fc3316f2c72d"
+  integrity sha512-rpsLmlLWJZifmLzZEVGbZ9phWnJyi+cCbCGYr4vX2NaHFtgbmQPFk+WmMkmMkQXgsIUn6CgnK9cTuUAfFjoXbA==
 
 ctype@0.5.3:
   version "0.5.3"
@@ -1520,9 +1520,9 @@ entities@~1.1.1:
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
 es-abstract@^1.17.0-next.1:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0.tgz#f42a517d0036a5591dbb2c463591dc8bb50309b1"
-  integrity sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==
+  version "1.17.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.2.tgz#965b10af56597b631da15872c17a405e86c1fd46"
+  integrity sha512-YoKuru3Lyoy7yVTBSH2j7UxTqe/je3dWAruC0sHvZX1GNd5zX8SSLvQqEgO9b3Ex8IW+goFI9arEEsFIbulhOw==
   dependencies:
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
@@ -2464,9 +2464,9 @@ gpu-mock.js@^1.1.1:
   integrity sha512-BmoRk9nbMaxkrwzTJp4M0iuwIbzNEXt6tlBZ5+ZYzaGH9VWu5Nhn1Q1CBusCam3d8u3FfVEFf3Ueo8DocUCbUw==
 
 gpu.js@^2.0.0-rc.12:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/gpu.js/-/gpu.js-2.4.8.tgz#59e980edfdb622b8e5f85ace012214b7d0525911"
-  integrity sha512-V4CAZIR+kV6enLVPGoeZdb4lK4FGGuolDDYNBMAlNzrfDN7OJjl2V9we6bKDTKhV/gwsYmivs0x22qo/Q0zHzA==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/gpu.js/-/gpu.js-2.5.0.tgz#313998145feb8b3535c435bbbc58d3f770b7c21e"
+  integrity sha512-suq+6lqxfpQqc16VdhN5Ve8hYL9lwGRmDRY/ov4b2JUCESW7q320VO+qcadhVM/V9TDiLZVwbI9+3T5bdUUiXg==
   dependencies:
     acorn "^7.1.0"
     gl "^4.4.0"
@@ -2629,9 +2629,9 @@ gtoken@^2.3.2:
     pify "^4.0.0"
 
 handlebars@^4.0.1:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.6.0.tgz#33af6c3eda930d7a924f5d8f1c6d8edc3180512e"
-  integrity sha512-i1ZUP7Qp2JdkMaFon2a+b0m5geE8Z4ZTLaGkgrObkEd+OkUKyRbRWw4KxuFCoHfdETSY1yf9/574eVoNSiK7pw==
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.2.tgz#01127b3840156a0927058779482031afe0e730d7"
+  integrity sha512-4PwqDL2laXtTWZghzzCtunQUTLbo31pcCJrd/B/9JP8XbhVzpS5ZXuKqlOzsd1rtcaLo4KqAn8nl8mkknS4MHw==
   dependencies:
     neo-async "^2.6.0"
     optimist "^0.6.1"
@@ -3523,8 +3523,8 @@ leaflet-blurred-location@^1.5.1, leaflet-blurred-location@^1.6.0:
     leaflet "^1.3.3"
 
 "leaflet-blurred-location@git://github.com/publiclab/leaflet-blurred-location#main":
-  version "1.5.1"
-  resolved "git://github.com/publiclab/leaflet-blurred-location#550b8ac78144b32e0e01a0dba242a09009f155c8"
+  version "1.6.0"
+  resolved "git://github.com/publiclab/leaflet-blurred-location#ef66dcb768094680e92d4f972b68f18cd4db6ccc"
   dependencies:
     haversine-distance "^1.1.4"
     jquery "^3.2.1"
@@ -5847,9 +5847,9 @@ uc.micro@~0.1.0:
   integrity sha1-7aESHR/blhVO1v3oJHu724MzCMo=
 
 uglify-js@^3.1.4:
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.4.tgz#e6d83a1aa32ff448bd1679359ab13d8db0fe0743"
-  integrity sha512-tinYWE8X1QfCHxS1lBS8yiDekyhSXOO6R66yNOCdUJeojxxw+PX2BHAz/BWyW7PQ7pkiWVxJfIEbiDxyLWvUGg==
+  version "3.7.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.5.tgz#278c7c24927ac5a32d3336fc68fd4ae1177a486a"
+  integrity sha512-GFZ3EXRptKGvb/C1Sq6nO1iI7AGcjyqmIyOw0DrD0675e+NNbGO72xmMM2iEBdFbxaTLo70NbjM/Wy54uZIlsg==
   dependencies:
     commander "~2.20.3"
     source-map "~0.6.1"