diff --git a/androidservice/java/io/guh/nymeaapp/NymeaAppServiceConnection.java b/androidservice/java/io/guh/nymeaapp/NymeaAppServiceConnection.java
index 95f1b608..ca76c5bb 100644
--- a/androidservice/java/io/guh/nymeaapp/NymeaAppServiceConnection.java
+++ b/androidservice/java/io/guh/nymeaapp/NymeaAppServiceConnection.java
@@ -212,7 +212,7 @@ public class NymeaAppServiceConnection implements ServiceConnection {
             m_service.transact(1, parcel, retParcel, 0);
             thingsList = retParcel.readString();
         } catch (Exception e) {
-            Log.d(TAG, "Error fetching things from NymeaAppService");
+            Log.d(TAG, "Error fetching things from NymeaAppService: " + e.toString());
             onError();
             return;
         }
diff --git a/androidservice/nymeaappservice/nymeaappservice.cpp b/androidservice/nymeaappservice/nymeaappservice.cpp
index 59713651..2ff110e5 100644
--- a/androidservice/nymeaappservice/nymeaappservice.cpp
+++ b/androidservice/nymeaappservice/nymeaappservice.cpp
@@ -23,10 +23,11 @@ NymeaAppService::NymeaAppService(int argc, char **argv):
     AWSClient::instance()->setConfig(settings.value("cloudEnvironment").toString());
     discovery->setAwsClient(AWSClient::instance());
 
-
-    for (int i = 0; i < 5; i++) {
-        settings.beginGroup(QString("tabSettings%1").arg(i));
-        QUuid lastConnected = settings.value("lastConnectedHost").toUuid();
+    settings.beginGroup("ConfiguredHosts");
+    foreach (const QString &childGroup, settings.childGroups()) {
+        settings.beginGroup(childGroup);
+        QUuid lastConnected = settings.value("uuid").toUuid();
+        QString cachedName = settings.value("cachedName").toString();
         settings.endGroup();
 
         if (lastConnected.isNull()) {
@@ -60,6 +61,7 @@ NymeaAppService::NymeaAppService(int argc, char **argv):
             sendNotification("ReadyStateChanged", params);
         });
     }
+    settings.endGroup();
 
     qDebug() << "NymeaAppService started.";
 
diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml
index 14425051..58386678 100644
--- a/nymea-app/ui/Nymea.qml
+++ b/nymea-app/ui/Nymea.qml
@@ -570,6 +570,6 @@ ApplicationWindow {
         antialiasing: true
         smooth: true
         sourceSize.width: Math.max(width, height)
-        sourceSize.height: sourceSize.width
+        sourceSize.height: Math.max(width, height)
     }
 }
diff --git a/nymea-app/ui/connection/ConnectingPage.qml b/nymea-app/ui/connection/ConnectingPage.qml
index a664adb1..0af4aa53 100644
--- a/nymea-app/ui/connection/ConnectingPage.qml
+++ b/nymea-app/ui/connection/ConnectingPage.qml
@@ -41,18 +41,18 @@ Page {
 
     signal cancel()
 
-    ColorIcon {
-        anchors { top: parent.top; right: parent.right; margins: app.margins }
-        height: Style.iconSize
-        width: height
-        name: "../images/logs.svg"
+    ProgressButton {
+        anchors { top: parent.top; left: parent.left; margins: Style.margins }
+        imageSource: "/ui/images/navigation-menu.svg"
+        longpressEnabled: false
+        onClicked: mainMenu.open()
+    }
+
+    ProgressButton {
+        anchors { top: parent.top; right: parent.right; margins: Style.margins }
+        imageSource: "/ui/images/logs.svg"
         visible: settings.showHiddenOptions && AppLogController.enabled
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                onClicked: pageStack.push(Qt.resolvedUrl("../appsettings/AppLogPage.qml"))
-            }
-        }
+        onClicked: pageStack.push(Qt.resolvedUrl("../appsettings/AppLogPage.qml"))
     }
 
     ColumnLayout {
@@ -125,10 +125,10 @@ Page {
         }
     }
 
-    Button {
-        text: qsTr("Cancel")
-        anchors { left: parent.left; bottom: parent.bottom; right: parent.right }
-        anchors.margins: app.margins
-        onClicked: root.cancel()
-    }
+//    Button {
+//        text: qsTr("Cancel")
+//        anchors { left: parent.left; bottom: parent.bottom; right: parent.right }
+//        anchors.margins: app.margins
+//        onClicked: root.cancel()
+//    }
 }