diff --git a/nymea-app/ui/components/FancyHeader.qml b/nymea-app/ui/components/FancyHeader.qml
index bfe5ac1d..36a49fa3 100644
--- a/nymea-app/ui/components/FancyHeader.qml
+++ b/nymea-app/ui/components/FancyHeader.qml
@@ -61,7 +61,7 @@ ToolBar {
             verticalAlignment: Text.AlignVCenter
             font.pixelSize: app.mediumFont
             elide: Text.ElideRight
-            text: qsTr("menu")
+            text: qsTr("Menu")
             color: app.headerForegroundColor
         }
 
diff --git a/nymea-app/ui/thingconfiguration/SetupWizard.qml b/nymea-app/ui/thingconfiguration/SetupWizard.qml
index 0ec7a0ec..1a27ec11 100644
--- a/nymea-app/ui/thingconfiguration/SetupWizard.qml
+++ b/nymea-app/ui/thingconfiguration/SetupWizard.qml
@@ -175,6 +175,7 @@ Page {
                 ListView {
                     Layout.fillWidth: true
                     Layout.fillHeight: true
+                    clip: true
                     model: DeviceDiscoveryProxy {
                         id: discoveryProxy
                         deviceDiscovery: discovery
@@ -222,7 +223,7 @@ Page {
                     Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
                     text: qsTr("Search again")
                     onClicked: discovery.discoverDevices(root.deviceClass.id, d.discoveryParams)
-                    visible: !discovery.busy && discoveryProxy.count > 0
+                    visible: !discovery.busy
                 }
 
                 Button {
@@ -274,13 +275,6 @@ Page {
                     text: qsTr("Make sure your things are set up and connected, try searching again or go back and pick a different kind of thing.")
                     wrapMode: Text.WordWrap
                 }
-                Button {
-                    text: qsTr("Try again!")
-                    Layout.fillWidth: true
-                    onClicked: {
-                        discovery.discoverDevices(root.deviceClass.id, d.discoveryParams)
-                    }
-                }
             }
         }
     }