diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index ea8a8b87fe..8b004687b9 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -28,14 +28,14 @@ body {
 .table .value-row td,
 .table .value-category td,
 .table .inputs td {
-    vertical-align: middle;
+  vertical-align: middle;
 }
 
 .table .table-checkbox {
-    /* Fix IE sizing checkboxes to fill table cell */
-    width: auto;
-    margin-left: auto;
-    margin-right: auto;
+  /* Fix IE sizing checkboxes to fill table cell */
+  width: auto;
+  margin-left: auto;
+  margin-right: auto;
 }
 
 .value-category:not(.inputs) {
@@ -82,7 +82,7 @@ span.port {
 
 #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 
+   * then scrolling up, causes `position: relative` to be added to the style
    */
   position: fixed !important;
 }
@@ -148,55 +148,55 @@ table {
 }
 
 caption {
-    color: #333;
-    font-weight: 700;
-    padding-top: 0;
+  color: #333;
+  font-weight: 700;
+  padding-top: 0;
 }
 
 table > tbody > .headers > td {
-    vertical-align: middle;
+  vertical-align: middle;
 }
 
 table .headers + .headers td {
-    font-size: 13px;
-    color: #222;
+  font-size: 13px;
+  color: #222;
 }
 
 #security table .headers td + td {
-    text-align: center;
+  text-align: center;
 }
 
 .tooltip.top .tooltip-arrow {
-    border-top-color: #fff;
-    border-width: 10px 10px 0;
-    margin-bottom: -5px;
+  border-top-color: #fff;
+  border-width: 10px 10px 0;
+  margin-bottom: -5px;
 }
 
 .tooltip-inner {
-    padding: 20px 20px 10px 20px;
-    font-size: 14px;
-    text-align: left;
-    color: #333;
-    background-color: #fff;
-    box-shadow: 0 3px 8px 8px #e8e8e8;
+  padding: 20px 20px 10px 20px;
+  font-size: 14px;
+  text-align: left;
+  color: #333;
+  background-color: #fff;
+  box-shadow: 0 3px 8px 8px #e8e8e8;
 }
 
 .tooltip.in {
-    opacity: 1;
+  opacity: 1;
 }
 
 .tooltip-inner ul {
-    padding-left: 0;
-    margin-bottom: 15px;
+  padding-left: 0;
+  margin-bottom: 15px;
 }
 
 .tooltip-inner li {
-    list-style-type: none;
-    margin-bottom: 5px;
+  list-style-type: none;
+  margin-bottom: 5px;
 }
 
 #security .tooltip-inner {
-    max-width: 520px;
+  max-width: 520px;
 }
 
 #xs-advanced-container {
@@ -245,8 +245,8 @@ table .headers + .headers td {
 }
 
 .col-centered {
-    float: none;
-    margin: 0 auto;
+  float: none;
+  margin: 0 auto;
 }
 
 .centered-hack-parent {
@@ -275,20 +275,20 @@ table .headers + .headers td {
 
 /* From https://gist.github.com/alexandrevicenzi/680147013e902a4eaa5d */
 .glyphicon-refresh-animate {
-    -animation: spin .7s infinite linear;
-    -ms-animation: spin .7s infinite linear;
-    -webkit-animation: spinw .7s infinite linear;
-    -moz-animation: spinm .7s infinite linear;
+  -animation: spin .7s infinite linear;
+  -ms-animation: spin .7s infinite linear;
+  -webkit-animation: spinw .7s infinite linear;
+  -moz-animation: spinm .7s infinite linear;
 }
 
 @keyframes spin {
-    from { transform: scale(1) rotate(0deg); }
-    to { transform: scale(1) rotate(360deg); }
+  from { transform: scale(1) rotate(0deg); }
+  to { transform: scale(1) rotate(360deg); }
 }
 
 @-webkit-keyframes spinw {
-    from { -webkit-transform: rotate(0deg); }
-    to { -webkit-transform: rotate(360deg); }
+  from { -webkit-transform: rotate(0deg); }
+  to { -webkit-transform: rotate(360deg); }
 }
 
 @-moz-keyframes spinm {
@@ -315,17 +315,6 @@ table .headers + .headers td {
   color: #2F80ED;
 }
 
-#cloud-domains-alert {
-  position:fixed; top: 55px; width: 100%; z-index: 99;
-}
-
-#cloud-domains-alert .glyphicon {
-  font-size: 11px;
-  color: #000000;
-  mix-blend-mode: normal;
-  opacity: 0.2;
-}
-
 #manage-cloud-domains-link {
   text-align: center;
   margin-top: 20px;
diff --git a/domain-server/resources/web/header.html b/domain-server/resources/web/header.html
index c29a3d3cbc..7b07458784 100644
--- a/domain-server/resources/web/header.html
+++ b/domain-server/resources/web/header.html
@@ -45,10 +45,6 @@
         </div>
       </div><!-- /.container-fluid -->
     </nav>
-    <div id="cloud-domains-alert" class="alert alert-info" role="alert" style="display: none;">
-      <span class="alert-link"><a href="https://highfidelity.com/user/cloud_domains" target="_blank" class="blue-link">Visit Cloud Hosted Domains</a> to manage all your cloud domains</span>
-      <a href="javascript:void(0);" class="glyphicon glyphicon-remove pull-right"></a>
-    </div>
 
     <div class="modal fade" id="restart-modal">
       <div class="modal-dialog">
diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index 0aa39dd5d3..8554e13b47 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -288,7 +288,6 @@ function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAd
                   });
                 }
 
-
                 return false;
               }
             }
diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index 3633d3a632..5a8184db30 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -12,13 +12,15 @@
       <div id="setup-sidebar" data-clampedwidth="#setup-sidebar-col">
         <script id="list-group-template" type="text/template">
           <% _.each(descriptions, function(group){ %>
-            <% panelID = group.name ? group.name : group.html_id %>
-            <li>
-              <a href="#<%- panelID %>" class="list-group-item">
-                <span class="badge"></span>
-                <%- group.label %>
-              </a>
-            </li>
+            <% if (!group.hidden) { %>
+              <% panelID = group.name ? group.name : group.html_id %>
+              <li>
+                <a href="#<%- panelID %>" class="list-group-item">
+                  <span class="badge"></span>
+                  <%- group.label %>
+                </a>
+              </li>
+            <% } %>
           <% }); %>
         </script>
 
@@ -34,49 +36,55 @@
     </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;">
+          <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+          <span class="alert-link">
+            <a href="https://highfidelity.com/user/cloud_domains" target="_blank" class="blue-link">Visit Cloud Hosted Domains</a> to manage all your cloud domains
+          </span>
+        </div>
+
         <form id="settings-form" role="form">
 
         <script id="panels-template" type="text/template">
           <% _.each(descriptions, function(group){ %>
-            <% if (group.hidden) { %>
-              <% $("a[href=#" + group.name + "]").remove() %>
-              <% return %>
-            <% } %>
-            <% var settings = _.partition(group.settings, function(value, index) { return !value.deprecated })[0] %>
-            <% split_settings = _.partition(settings, function(value, index) { return !value.advanced }) %>
-            <% isAdvanced = _.isEmpty(split_settings[0]) && !_.isEmpty(split_settings[1]) %>
-            <% if (isAdvanced) { %>
-              <% $("a[href=#" + group.name + "]").addClass('advanced-setting').hide() %>
-            <% } %>
+            <% if (!group.hidden) { %>
+              <% var settings = _.partition(group.settings, function(value, index) { return !value.deprecated })[0] %>
+              <% split_settings = _.partition(settings, function(value, index) { return !value.advanced }) %>
+              <% isAdvanced = _.isEmpty(split_settings[0]) && !_.isEmpty(split_settings[1]) %>
+              <% if (isAdvanced) { %>
+                <% $("a[href=#" + group.name + "]").addClass('advanced-setting').hide() %>
+              <% } %>
 
-            <% isGrouped = !!group.name %>
-            <% panelID = isGrouped ? group.name : group.html_id %>
+              <% isGrouped = !!group.name %>
+              <% panelID = isGrouped ? group.name : group.html_id %>
 
-            <div class="panel panel-default<%- (isAdvanced) ? ' advanced-setting' : '' %><%- (isGrouped) ? ' grouped' : '' %>"
-                 id="<%- panelID %>">
-              <div class="panel-heading">
-                <h3 class="panel-title"><%- group.label %></h3>
-              </div>
-              <div class="panel-body">
-                <% _.each(split_settings[0], function(setting) { %>
-                  <% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
-                  <%= getFormGroup(keypath, setting, values, false) %>
-                <% }); %>
-                <% if (!_.isEmpty(split_settings[1])) { %>
-                  <% $("#advanced-toggle-button").show() %>
-                  <% _.each(split_settings[1], function(setting) { %>
+              <div class="panel panel-default<%- (isAdvanced) ? ' advanced-setting' : '' %><%- (isGrouped) ? ' grouped' : '' %>"
+                   id="<%- panelID %>">
+                <div class="panel-heading">
+                  <h3 class="panel-title"><%- group.label %></h3>
+                </div>
+                <div class="panel-body">
+                  <% _.each(split_settings[0], function(setting) { %>
                     <% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
-                    <%= getFormGroup(keypath, setting, values, true) %>
+                    <%= getFormGroup(keypath, setting, values, false) %>
                   <% }); %>
-                <% }%>
+                  <% if (!_.isEmpty(split_settings[1])) { %>
+                    <% $("#advanced-toggle-button").show() %>
+                    <% _.each(split_settings[1], function(setting) { %>
+                      <% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
+                      <%= getFormGroup(keypath, setting, values, true) %>
+                    <% }); %>
+                  <% }%>
+                </div>
               </div>
-            </div>
+            <% } %>
           <% }); %>
         </script>
         <div id="panels"></div>
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 9c52f9764c..08b8eba10c 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -679,7 +679,7 @@ function setupDomainLabelSetting() {
                 dialog.modal('hide');
                 reloadDomainInfo();
               },
-              error:function(xhr) {
+              error: function(xhr) {
                 var data = parseJSONResponse(xhr);
                 console.log(data, data.status, data.data);
                 if (data.status === "fail") {
@@ -1281,9 +1281,6 @@ function reloadSettings(callback) {
       var cloudWizardExit = qs["cloud-wizard-exit"];
       if (cloudWizardExit != undefined) {
         $('#cloud-domains-alert').show();
-        $('#cloud-domains-alert .glyphicon').on('click', function() {
-          $('#cloud-domains-alert').remove();
-        });
       }
     }
 
diff --git a/domain-server/resources/web/wizard/header.html b/domain-server/resources/web/wizard/header.html
index 2b829f9837..e9149fa7e1 100644
--- a/domain-server/resources/web/wizard/header.html
+++ b/domain-server/resources/web/wizard/header.html
@@ -5,7 +5,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
-    <link href="/stats/css/json.human.css" rel="stylesheet" media="screen">
     <link href="/css/style.css" rel="stylesheet" media="screen">
     <link href="/wizard/css/style.css" rel="stylesheet" media="screen">
     <link href="/css/sweetalert.css" rel="stylesheet" media="screen">
diff --git a/domain-server/resources/web/wizard/index.shtml b/domain-server/resources/web/wizard/index.shtml
index 7205e3fea2..fedf7a0599 100644
--- a/domain-server/resources/web/wizard/index.shtml
+++ b/domain-server/resources/web/wizard/index.shtml
@@ -3,12 +3,12 @@
   <h4 class="step-title"></h4>
   <dl class="row">
     <dd class="col-md-12">
-      <span class='step-description'>By connecting you High Fidelity Account you will be granting access to your account information.</span>
+      <span class='step-description'>By connecting your High Fidelity Account you will be granting access to your account information.</span>
     </dd>
   </dl>
   <dl class="row">
     <dd class="col-md-12">
-      <a id="connect-account-btn" role="button" class="btn btn-primary btn-md btn-block" href="https://staging.highfidelity.com/user/tokens/new?for_domain_server=true" target="_blank">Connect your High Fidelity account</a>
+      <a id="connect-account-btn" role="button" class="btn btn-primary btn-md btn-block" target="_blank">Connect your High Fidelity account</a>
     </dd>
   </dl>
 
@@ -37,7 +37,7 @@
         <p id="place-name-link"></p>
           <div id="place-name-edit">
             <span class='glyphicon glyphicon-pencil'></span>
-            <a href="javascript:void(0);" id="change-place-name">Choose a custom Place Name instead</a>
+            <a href="#" id="change-place-name">Choose a custom Place Name instead</a>
           </div>
       </div>
     </div>
diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js
index c14f0cddb2..a9e1329f45 100644
--- a/domain-server/resources/web/wizard/js/wizard.js
+++ b/domain-server/resources/web/wizard/js/wizard.js
@@ -4,7 +4,9 @@ var Metaverse = {
 
 $(document).ready(function(){
   Strings.ADD_PLACE_NOT_CONNECTED_MESSAGE = "You must have an access token to query your High Fidelity places.<br><br>" +
-                                            "Please go back and connect your account.";
+    "Please go back and connect your account.";
+
+  $('#connect-account-btn').attr('href', URLs.METAVERSE_URL + "/user/tokens/new?for_domain_server=true");
 
   $('[data-toggle="tooltip"]').tooltip();
 
@@ -51,7 +53,6 @@ $(document).ready(function(){
   });
 
   $('body').on('click', '#explore-settings', function() {
-    console.log('explore-settings')
     exploreSettings();
   });