diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 547b903b15..f5a618e2c1 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -80,11 +80,23 @@ span.port {
   display: none;
 }
 
-#setup-sidebar.affix {
-  /* This overrides a case where going to the bottom of the page,
-   * then scrolling up, causes `position: relative` to be added to the style
-   */
-  position: fixed !important;
+@media (min-width: 768px) {
+  #setup-sidebar.affix {
+    /* This overrides a case where going to the bottom of the page,
+     * then scrolling up, causes `position: relative` to be added to the style
+     */
+    position: fixed !important;
+  }
+}
+
+@media (max-width: 767px) {
+  #setup-sidebar.affix {
+    position: static !important;
+  }
+
+  #setup-sidebar {
+    margin-bottom: 20px;
+  }
 }
 
 #setup-sidebar button {
@@ -302,6 +314,7 @@ table .headers + .headers td {
 }
 
 .account-connected-header {
+  vertical-align: middle;
   color: #6FCF97;
   font-size: 30px;
   margin-right: 20px;
diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index 66159209ea..00f699fa4e 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -62,26 +62,25 @@ var Strings = {
   // dialog with new path still set, allowing them to retry immediately, and without
   // having to type the new path in again.
   EDIT_PLACE_TITLE: "Modify Viewpoint or Path",
-  EDIT_PLACE_ERROR: "Failed to update place path. Please try again.",
+  EDIT_PLACE_ERROR: "Failed to update Viewpoint or Path for this Place Name. Please try again.",
   EDIT_PLACE_CONFIRM_BUTTON: "Save",
   EDIT_PLACE_CONFIRM_BUTTON_PENDING: "Saving...",
   EDIT_PLACE_CANCEL_BUTTON: "Cancel",
 
-  REMOVE_PLACE_TITLE: "Are you sure you want to remove <strong>{{place}}</strong>?",
-  REMOVE_PLACE_ERROR: "Failed to remove place. Please try again.",
-  REMOVE_PLACE_DELETE_BUTTON: "Delete",
+  REMOVE_PLACE_TITLE: "Are you sure you want to remove <strong>{{place}}</strong> and its path information?",
+  REMOVE_PLACE_ERROR: "Failed to remove Place Name and its Path information.",
+  REMOVE_PLACE_DELETE_BUTTON: "This action removes your Place Name",
   REMOVE_PLACE_DELETE_BUTTON_PENDING: "Deleting...",
   REMOVE_PLACE_CANCEL_BUTTON: "Cancel",
 
   ADD_PLACE_TITLE: "Choose a place",
-  ADD_PLACE_MESSAGE: "Choose the High Fidelity place to point at this domain server.",
-  ADD_PLACE_CONFIRM_BUTTON: "Choose place",
+  ADD_PLACE_MESSAGE: "Choose a Place Name that you own or register a new Place Name.",
+  ADD_PLACE_CONFIRM_BUTTON: "Save",
   ADD_PLACE_CONFIRM_BUTTON_PENDING: "Saving...",
   ADD_PLACE_CANCEL_BUTTON: "Cancel",
-  ADD_PLACE_UNKNOWN_ERROR: "There was an error adding this place name.",
+  ADD_PLACE_UNKNOWN_ERROR: "There was an error adding this Place Name. Try saving again",
 
-  ADD_PLACE_NO_PLACES_MESSAGE: "<p>You do not have any places in your High Fidelity account."
-      + "<br/><br/>Go to your <a href='https://metaverse.highfidelity.com/user/places/new'>places page</a> to create a new one. Once your place is created re-open this dialog to select it.</p>",
+  ADD_PLACE_NO_PLACES_MESSAGE: "You don't have any Place Names registered. Once you have a Place Name, reopen this window to select it.",
   ADD_PLACE_NO_PLACES_BUTTON: "Create new place",
   ADD_PLACE_UNABLE_TO_LOAD_ERROR: "We were unable to load your place names. Please try again later.",
   ADD_PLACE_LOADING_DIALOG: "Loading your places...",
@@ -236,7 +235,7 @@ function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAd
 
               if (forcePathTo === undefined || forcePathTo === null) {
                 var path = "<div class='form-group'>";
-                path += "<label for='place-path-input' class='control-label'>Path</label>";
+                path += "<label for='place-path-input' class='control-label'>Path or Viewpoint</label>";
                 path += "<input type='text' id='place-path-input' class='form-control' value='/'>";
                 path += "</div>";
                 modal_body.append($(path));
@@ -339,7 +338,6 @@ function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAd
                         $('.add-place-confirm-button').html(Strings.ADD_PLACE_CONFIRM_BUTTON);
                         $('.add-place-cancel-button').removeAttr('disabled');
                         bootbox.alert(Strings.ADD_PLACE_UNKNOWN_ERROR);
-                        bootbox.alert("FAIL");
                       });
                     }
                   }
@@ -363,7 +361,8 @@ function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAd
               title: Strings.ADD_PLACE_TITLE,
               message: modal_body,
               closeButton: false,
-              buttons: modal_buttons
+              buttons: modal_buttons,
+              onEscape: true
             });
           } else {
             bootbox.alert(Strings.ADD_PLACE_UNABLE_TO_LOAD_ERROR);
diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index 5a8184db30..d36330375a 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -36,11 +36,6 @@
     </div>
 
     <div class="col-md-9 col-sm-9 col-xs-12">
-
-      <div id="xs-advanced-container" class="col-xs-12 hidden-sm hidden-md hidden-lg">
-        <button id="advanced-toggle-button-xs" class="btn btn-info advanced-toggle">Show advanced</button>
-      </div>
-
       <div class="col-xs-12">
 
         <div id="cloud-domains-alert" class="alert alert-info alert-dismissible" role="alert" style="display: none;">
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 7f99b367a3..3faeff4482 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -503,7 +503,7 @@ function showDomainCreationAlert(justConnected) {
   swal({
     title: 'Create new domain ID',
     type: 'input',
-    text: 'Enter a short description for this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>',
+    text: 'Enter a label this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>',
     showCancelButton: true,
     confirmButtonText: "Create",
     closeOnConfirm: false,
@@ -527,13 +527,12 @@ function showDomainCreationAlert(justConnected) {
 function createNewDomainID(label, justConnected) {
   // get the JSON object ready that we'll use to create a new domain
   var domainJSON = {
-   "label": label
-    //"access_token": $(Settings.ACCESS_TOKEN_SELECTOR).val()
+    "label": label
   }
 
   $.post("/api/domains", domainJSON, function(data){
     // we successfully created a domain ID, set it on that field
-    var domainID = data.domain_id;
+    var domainID = data.domain.id;
     console.log("Setting domain id to ", data, domainID);
     $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
 
@@ -620,18 +619,14 @@ function parseJSONResponse(xhr) {
 
 function showOrHideLabel() {
   var type = getCurrentDomainIDType();
-  if (!accessTokenIsSet() || (type !== DOMAIN_ID_TYPE_FULL && type !== DOMAIN_ID_TYPE_UNKNOWN)) {
-    $(".panel#label").hide();
-    return false;
-  }
-  $(".panel#label").show();
-  return true;
+  var shouldShow = accessTokenIsSet() && (type === DOMAIN_ID_TYPE_FULL || type === DOMAIN_ID_TYPE_UNKNOWN);
+  $(".panel#label").toggle(shouldShow);
+  $("li a[href='#label']").parent().toggle(shouldShow);
+  return shouldShow;
 }
 
 function setupDomainLabelSetting() {
-  if (!showOrHideLabel()) {
-    return;
-  }
+  showOrHideLabel();
 
   var html = "<div>"
   html += "<label class='control-label'>Specify a label for your domain</label> <a class='domain-loading-hide' href='#'>Edit</a>";
@@ -654,6 +649,7 @@ function setupDomainLabelSetting() {
       title: 'Edit Label',
       message: modal_body,
       closeButton: false,
+      onEscape: true,
       buttons: [
         {
           label: 'Cancel',
@@ -742,7 +738,7 @@ function setupDomainNetworkingSettings() {
   var includeAddress = autoNetworkingSetting === 'disabled';
 
   if (includeAddress) {
-    var label = "Network Address and Port";
+    var label = "Network Address:Port";
   } else {
     var label = "Network Port";
   }
@@ -777,6 +773,7 @@ function setupDomainNetworkingSettings() {
       title: 'Edit Network',
       message: modal_body,
       closeButton: false,
+      onEscape: true,
       buttons: [
         {
           label: 'Cancel',
@@ -924,6 +921,7 @@ function placeTableRow(name, path, isTemporary, placeID) {
     var dialog = bootbox.dialog({
       message: confirmString,
       closeButton: false,
+      onEscape: true,
       buttons: [
         {
           label: Strings.REMOVE_PLACE_CANCEL_BUTTON,
@@ -1025,7 +1023,9 @@ function reloadDomainInfo() {
         }
       }
 
-      appendAddButtonToPlacesTable();
+      if (accessTokenIsSet()) {
+        appendAddButtonToPlacesTable();
+      }
 
     } else {
       $('.domain-loading-error').show();
@@ -1098,6 +1098,7 @@ function editHighFidelityPlace(placeID, name, path) {
   dialog = bootbox.dialog({
     title: Strings.EDIT_PLACE_TITLE,
     closeButton: false,
+    onEscape: true,
     message: modal_body,
     buttons: modal_buttons
   })
@@ -1180,6 +1181,7 @@ function chooseFromHighFidelityDomains(clickedButton) {
 
         bootbox.dialog({
           title: "Choose matching domain",
+          onEscape: true,
           message: modal_body,
           buttons: modal_buttons
         })
diff --git a/libraries/embedded-webserver/src/HTTPConnection.cpp b/libraries/embedded-webserver/src/HTTPConnection.cpp
index 0a8448108e..a61bc95f8b 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.cpp
+++ b/libraries/embedded-webserver/src/HTTPConnection.cpp
@@ -65,7 +65,9 @@ QHash<QString, QString> HTTPConnection::parseUrlEncodedForm() {
     QUrlQuery form { _requestContent };
     QHash<QString, QString> pairs;
     for (auto pair : form.queryItems()) {
-        pairs[QUrl::fromPercentEncoding(pair.first.toLatin1())] = QUrl::fromPercentEncoding(pair.second.toLatin1());
+        auto key = QUrl::fromPercentEncoding(pair.first.toLatin1().replace('+', ' '));
+        auto value = QUrl::fromPercentEncoding(pair.second.toLatin1().replace('+', ' '));
+        pairs[key] = value;
     }
 
     return pairs;