diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 34026398f8..3c6ca76573 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -1210,13 +1210,17 @@ void Menu::displayNameLocationResponse(const QString& errorString) {
 
 void Menu::toggleLocationList() {
     if (!_userLocationsDialog) {
-        _userLocationsDialog = new UserLocationsDialog(Application::getInstance()->getWindow());
+        _userLocationsDialog = DataWebDialog::dialogForPath("/locations");
     }
-    if (_userLocationsDialog->isVisible()) {
-        _userLocationsDialog->hide();
-    } else {
+    
+    if (!_userLocationsDialog->isVisible()) {
         _userLocationsDialog->show();
     }
+    
+    _userLocationsDialog->raise();
+    _userLocationsDialog->activateWindow();
+    _userLocationsDialog->showNormal();
+    
 }
 
 void Menu::nameLocation() {
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index f2df7a2885..6077788bd4 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -28,12 +28,12 @@
 #endif
 
 #include "location/LocationManager.h"
-#include "ui/PreferencesDialog.h"
 #include "ui/ChatWindow.h"
+#include "ui/DataWebDialog.h"
 #include "ui/JSConsole.h"
 #include "ui/LoginDialog.h"
+#include "ui/PreferencesDialog.h"
 #include "ui/ScriptEditorWindow.h"
-#include "ui/UserLocationsDialog.h"
 
 const float ADJUST_LOD_DOWN_FPS = 40.0;
 const float ADJUST_LOD_UP_FPS = 55.0;
@@ -273,7 +273,7 @@ private:
     QDialog* _jsConsole;
     OctreeStatsDialog* _octreeStatsDialog;
     LodToolsDialog* _lodToolsDialog;
-    UserLocationsDialog* _userLocationsDialog;
+    QPointer<DataWebDialog> _userLocationsDialog;
 #ifdef Q_OS_MAC
     SpeechRecognizer _speechRecognizer;
 #endif
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index bfdfc28d5e..d42cab6210 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -33,7 +33,7 @@ const char SOLO_NODE_TYPES[2] = {
     NodeType::AudioMixer
 };
 
-const QUrl DEFAULT_NODE_AUTH_URL = QUrl("http://localhost:3000");
+const QUrl DEFAULT_NODE_AUTH_URL = QUrl("https://data.highfidelity.io");
 
 LimitedNodeList* LimitedNodeList::_sharedInstance = NULL;