diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml
index 502b273e49..320873a4f9 100644
--- a/interface/resources/qml/LoginDialog.qml
+++ b/interface/resources/qml/LoginDialog.qml
@@ -17,16 +17,16 @@ import "windows" as Windows
 
 import "LoginDialog"
 
-Windows.ModalWindow {
+Rectangle {
     id: root
     HifiStylesUit.HifiConstants { id: hifi }
     objectName: "LoginDialog"
-    implicitWidth: 520
-    implicitHeight: 320
-    destroyOnCloseButton: true
-    destroyOnHidden: true
+    // implicitWidth: 520
+    // implicitHeight: 320
+    // destroyOnCloseButton: true
+    // destroyOnHidden: true
     visible: true
-    frame: Item {}
+    // frame: Item {}
 
     anchors.fill: parent
 
diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index d824caa882..14f55271a3 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -21,8 +21,8 @@ import TabletScriptingInterface 1.0
 Item {
     id: linkAccountBody
     clip: true
-    height: root.pane.height
-    width: root.pane.width
+    height: root.height
+    width: root.width
     property bool failAfterSignUp: false
     property string fontFamily: "Cairo"
     property int fontSize: 24
@@ -54,10 +54,10 @@ Item {
 
             var newWidth = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth));
             if (!isNaN(newWidth)) {
-                parent.width = root.pane.width = newWidth;
+                parent.width = root.width = newWidth;
             }
 
-            parent.height = root.pane.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
+            parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
                     + (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : hifi.dimensions.contentSpacing.y);
         }
     }
@@ -76,8 +76,8 @@ Item {
 
     Item {
         id: topContainer
-        width: root.pane.width
-        height: 0.6 * root.pane.height
+        width: root.width
+        height: 0.6 * root.height
         onHeightChanged: d.resize(); onWidthChanged: d.resize();
         anchors {
             top: parent.top
@@ -158,8 +158,8 @@ Item {
     }
     Item {
         id: bottomContainer
-        width: root.pane.width
-        height: 0.4 * root.pane.height
+        width: root.width
+        height: 0.4 * root.height
         onHeightChanged: d.resize(); onWidthChanged: d.resize();
         anchors {
             top: topContainer.bottom
diff --git a/interface/resources/qml/LoginDialog/SignInBody.qml b/interface/resources/qml/LoginDialog/SignInBody.qml
index 0645cc2e73..b93c7c4bfd 100644
--- a/interface/resources/qml/LoginDialog/SignInBody.qml
+++ b/interface/resources/qml/LoginDialog/SignInBody.qml
@@ -370,7 +370,6 @@ Item {
         }
         d.resize();
         init(loginDialog.isLogIn);
-        print(signInBody.errorString);
     }
 
     Keys.onPressed: {
diff --git a/interface/resources/qml/dialogs/TabletLoginDialog.qml b/interface/resources/qml/dialogs/TabletLoginDialog.qml
index 157fc27853..7c8b689841 100644
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@@ -21,7 +21,10 @@ FocusScope {
     id: root
     objectName: "LoginDialog"
     visible: true
+
     anchors.fill: parent
+    width: parent.width
+    height: parent.height
 
     signal sendToScript(var message);
     property bool isHMD: false
@@ -69,8 +72,10 @@ FocusScope {
     LoginDialog {
         id: loginDialog
 
+        anchors.fill: parent
         Loader {
             id: bodyLoader
+            anchors.fill: parent
         }
     }
 
diff --git a/interface/resources/qml/windows/ScrollingWindow.qml b/interface/resources/qml/windows/ScrollingWindow.qml
index c156b80388..3c374ac8cf 100644
--- a/interface/resources/qml/windows/ScrollingWindow.qml
+++ b/interface/resources/qml/windows/ScrollingWindow.qml
@@ -13,7 +13,7 @@ import QtQuick 2.5
 import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
 
-import "."
+import "." as Windows
 import "../styles-uit"
 import "../controls-uit" as HiFiControls
 
@@ -25,7 +25,7 @@ import "../controls-uit" as HiFiControls
 // of the desktop?  How do I ensure when the desktop resizes all the windows
 // are still at least partially visible?
 
-Window {
+Windows.Window {
     id: window
     HifiConstants { id: hifi }
     children: [ swallower, frame, defocuser, pane, activator ]
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f94d21ae9f..4b600ce374 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5196,6 +5196,7 @@ void Application::pauseUntilLoginDetermined() {
     const auto& nodeList = DependencyManager::get<NodeList>();
     // disconnect domain handler.
     nodeList->getDomainHandler().disconnect();
+    Menu::getInstance()->setIsOptionChecked(MenuOption::Stats, false);
     Menu::getInstance()->setVisible(false);
 
     {
diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp
index 084615cae2..ede2a54964 100644
--- a/interface/src/ui/overlays/Web3DOverlay.cpp
+++ b/interface/src/ui/overlays/Web3DOverlay.cpp
@@ -229,6 +229,8 @@ void Web3DOverlay::setupQmlSurface(bool isTablet) {
     _webSurface->getSurfaceContext()->setContextProperty("MyAvatar", DependencyManager::get<AvatarManager>()->getMyAvatar().get());
     _webSurface->getSurfaceContext()->setContextProperty("Entities", DependencyManager::get<EntityScriptingInterface>().data());
     _webSurface->getSurfaceContext()->setContextProperty("Snapshot", DependencyManager::get<Snapshot>().data());
+    //_webSurface->getSurfaceContext()->setContextProperty("Settings", SettingsScriptingInterface::getInstance());
+    //_webSurface->getSurfaceContext()->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data());
 
     if (isTablet) {
         auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();