diff --git a/src/qml/Config.qml b/src/qml/Config.qml
--- a/src/qml/Config.qml
+++ b/src/qml/Config.qml
@@ -1,6 +1,7 @@
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.0
+import QtQuick.Controls 2.3
 import KamosoQtGStreamer 1.0
 import org.kde.kamoso 3.0
 import org.kde.kirigami 2.0 as Kirigami
diff --git a/src/qml/ImagesView.qml b/src/qml/ImagesView.qml
--- a/src/qml/ImagesView.qml
+++ b/src/qml/ImagesView.qml
@@ -269,6 +269,21 @@
                         }
                     }
                 }
+
+                Item {
+                    Kirigami.FormData.isSection: true
+                    Kirigami.FormData.label: i18n("Cameras")
+                }
+
+                ComboBox {
+                    Layout.fillWidth: parent
+                    model: devicesModel
+                    textRole: "display"
+                    enabled: count>1
+                    onAccepted: {
+                        devicesModel.playingDeviceUdi = udi
+                    }
+                }
             }
 
             // Otherwise the back button might not always be right on the bottom
diff --git a/src/qml/Main.qml b/src/qml/Main.qml
--- a/src/qml/Main.qml
+++ b/src/qml/Main.qml
@@ -159,10 +159,10 @@
 
             QQC2.ScrollBar.vertical: QQC2.ScrollBar {}
 
-            header: QQC2.Control {
-                height: effectsGalleryHeading.height + Kirigami.Units.largeSpacing
+            header: ColumnLayout {
+                width: parent.width
                 Kirigami.Heading {
-                    id: effectsGalleryHeading
+                    Layout.fillWidth: parent
                     level: 1
                     color: Kirigami.Theme.textColor
                     elide: Text.ElideRight
@@ -199,24 +199,6 @@
         VideoItem {
             surface: videoSurface1
             anchors.fill: parent
-
-            ColumnLayout {
-                spacing: Kirigami.Units.smallSpacing
-                anchors.margins: Kirigami.Units.smallSpacing
-                anchors.top: parent.top
-                anchors.left: parent.left
-                visible: devicesModel.count>1
-
-                Repeater {
-                    model: devicesModel
-                    delegate: Button {
-                        width: 30
-                        iconName: "camera-web"
-                        tooltip: display
-                        onClicked: devicesModel.playingDeviceUdi = udi
-                    }
-                }
-            }
         }
 
         Text {