diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml
index 6b04cfc1bd..9d11167d9e 100644
--- a/mobile-widgets/qml/DownloadFromDiveComputer.qml
+++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml
@@ -59,6 +59,11 @@ Kirigami.Page {
 		width: parent.width
 		Layout.fillWidth: true
 		GridLayout {
+			id: buttonGrid
+			anchors {
+				top: parent.top
+				topMargin: Kirigami.Units.smallSpacing * 4
+			}
 			columns: 2
 			Controls.Label { text: qsTr(" Vendor name: ") }
 			property var vendoridx: downloadThread.data().getDetectedVendorIndex()
@@ -163,6 +168,10 @@ Kirigami.Page {
 		}
 
 		Controls.ProgressBar {
+			anchors {
+				top: buttonGrid.bottom
+				topMargin: Kirigami.Units.smallSpacing * 4
+			}
 			id: progressBar
 			Layout.fillWidth: true
 			indeterminate: true
@@ -170,9 +179,13 @@ Kirigami.Page {
 		}
 
 		RowLayout {
-			anchors.left: parent.left
-			anchors.right: parent.right
-			anchors.margins: Kirigami.Units.smallSpacing
+			id: buttonBar
+			anchors {
+				left: parent.left
+				right: parent.right
+				top: progressBar.bottom
+				topMargin: Kirigami.Units.smallSpacing * 2
+			}
 			spacing: Kirigami.Units.smallSpacing
 			SsrfButton {
 				id: download
@@ -206,6 +219,11 @@ Kirigami.Page {
 		}
 
 		ListView {
+			id: dlList
+			anchors {
+				top: buttonBar.bottom
+				topMargin: Kirigami.Units.smallSpacing * 4
+			}
 			Layout.fillWidth: true
 			Layout.fillHeight: true
 
diff --git a/mobile-widgets/qml/DownloadedDiveDelegate.qml b/mobile-widgets/qml/DownloadedDiveDelegate.qml
index be9e2aaf50..b88561b179 100644
--- a/mobile-widgets/qml/DownloadedDiveDelegate.qml
+++ b/mobile-widgets/qml/DownloadedDiveDelegate.qml
@@ -48,12 +48,14 @@ Kirigami.AbstractListItem {
 		Controls.Label {
 			id: dateLabel
 			text: innerListItem.datetime
+			anchors.verticalCenter: parent.verticalCenter
 			width: Math.round(parent.width * 0.35)
 			font.pointSize: subsurfaceTheme.smallPointSize
 			color: textColor
 		}
 		Controls.Label {
 			text: innerListItem.depth + ' / ' + innerListItem.duration
+			anchors.verticalCenter: parent.verticalCenter
 			width: Math.round(parent.width * 0.35)
 			font.pointSize: subsurfaceTheme.smallPointSize
 			color: textColor