Merging changes, modifying close button

interface/resources/qml/LoginDialog/LinkAccountBody.qml

@@ -86,6 +86,23 @@ Item {
         height: 48
     }
 
+    ShortcutText {
+        id: flavorText
+        anchors {
+            top: parent.top
+            left: parent.left
+            margins: 0
+            topMargin: hifi.dimensions.contentSpacing.y
+        }
+
+        text: qsTr("Sign in to High Fidelity to make friends, get HFC, and buy interesting things on the Marketplace!")
+        width: parent.width
+        wrapMode: Text.WordWrap
+        lineHeight: 1
+        lineHeightMode: Text.ProportionalHeight
+        horizontalAlignment: Text.AlignHCenter
+    }
+
     ShortcutText {
         id: mainTextContainer
         anchors {
@@ -128,7 +145,8 @@ Item {
                 y: usernameField.height
                 anchors {
                     right: usernameField.right
-                    topMargin: -19
+                    top: usernameField.bottom
+                    topMargin: 4
                 }
 
                 text: "<a href='https://highfidelity.com/users/password/new'>Forgot Username?</a>"
@@ -159,6 +177,8 @@ Item {
                 z: 10
                 anchors {
                     right: passwordField.right
+                    top: passwordField.bottom
+                    topMargin: 4
                 }
 
                 text: "<a href='https://highfidelity.com/users/password/new'>Forgot Password?</a>"
@@ -247,6 +267,9 @@ Item {
                         Settings.setValue("wallet/savedUsername", Account.username);
                     }
                 }
+                Component.onDestruction: {
+                    Settings.setValue("wallet/autoLogout", !checked);
+                }
             }
 
             Button {

interface/resources/qml/windows/ModalFrame.qml

@@ -108,6 +108,7 @@ Frame {
                 rightMargin: 10
             }
             glyph: hifi.glyphs.close
+            size: 23
             onClicked: {
                 window.destroy();
             }