diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml
index dc0ca3d5..64877cac 100644
--- a/nymea-app/ui/Nymea.qml
+++ b/nymea-app/ui/Nymea.qml
@@ -40,7 +40,7 @@ ApplicationWindow {
         property int currentMainViewIndex: 0
         property bool showHiddenOptions: false
         property int cloudEnvironment: 0
-        property bool showConnectionTabs: app.hasOwnProperty("industrialSetup") && app.industrialSetup
+        property bool showConnectionTabs: false
         property int tabCount: 1
     }
 
@@ -236,9 +236,9 @@ ApplicationWindow {
             page = "GarageGateDevicePage.qml";
         } else if (interfaceList.indexOf("light") >= 0) {
             page = "LightDevicePage.qml";
-        } else if (interfaceList.indexOf("extendedshutter") >= 0 ) {
+        } else if (interfaceList.indexOf("shutter") >= 0  || interfaceList.indexOf("blind") >= 0) {
             page = "ShutterDevicePage.qml";
-        } else if (interfaceList.indexOf("extendedawning") >= 0) {
+        } else if (interfaceList.indexOf("awning") >= 0) {
             page = "AwningDevicePage.qml";
         } else if (interfaceList.indexOf("notifications") >= 0) {
             page = "NotificationsDevicePage.qml";
diff --git a/nymea-app/ui/RootItem.qml b/nymea-app/ui/RootItem.qml
index 1bdfef45..ba10a727 100644
--- a/nymea-app/ui/RootItem.qml
+++ b/nymea-app/ui/RootItem.qml
@@ -15,6 +15,10 @@ Item {
         color: Material.background
     }
 
+    function handleCloseEvent(close) {
+        swipeView.currentItem.handleCloseEvent(close)
+    }
+
     ListModel {
         id: tabModel