1 files changed, 37 insertions, 48 deletions
diff --git a/qt-mobile/qml/main.qml b/qt-mobile/qml/main.qml
index ac2e3eefd..53d872743 100644
--- a/qt-mobile/qml/main.qml
+++ b/qt-mobile/qml/main.qml
@@ -202,57 +202,46 @@ MobileComponents.ApplicationWindow {
 		}
 	}
 
-	ColumnLayout {
-		anchors.fill: parent
+	toolBar: TopBar {
+		width: parent.width
+		height: Layout.minimumHeight
+	}
 
-		TopBar {
+	property Item stackView: pageStack
+	initialPage: Item {
+		width: parent.width
+		height: parent.height
+
+		ColumnLayout {
+			id: awLayout
+			anchors.fill: parent
+			spacing: MobileComponents.Units.gridUnit / 2
+
+			Rectangle {
+				id: detailsPage
+				Layout.fillHeight: true
+				Layout.fillWidth: true
+
+				DiveList {
+					anchors.fill: detailsPage
+					id: diveDetails
+					color: MobileComponents.Theme.backgroundColor
+				}
+			}
 
-		}
 
-		StackView {
-			id: stackView
-			Layout.preferredWidth: parent.width
-			Layout.fillHeight: true
-			focus: true
-			Keys.onReleased: if (event.key == Qt.Key_Back && stackView.depth > 1) {
-						stackView.pop()
-						event.accepted = true;
-					}
-			initialItem: Item {
-				width: parent.width
-				height: parent.height
-
-				ColumnLayout {
-					id: awLayout
-					anchors.fill: parent
-					spacing: MobileComponents.Units.gridUnit / 2
-
-					Rectangle {
-						id: detailsPage
-						Layout.fillHeight: true
-						Layout.fillWidth: true
-
-						DiveList {
-							anchors.fill: detailsPage
-							id: diveDetails
-							color: MobileComponents.Theme.backgroundColor
-						}
-					}
-
-					Rectangle {
-						id: messageArea
-						height: childrenRect.height
-						Layout.fillWidth: true
-						color: MobileComponents.Theme.backgroundColor
-
-						Text {
-							id: message
-							color: MobileComponents.Theme.textColor
-							wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
-							styleColor: MobileComponents.Theme.textColor
-							font.pointSize: subsurfaceTheme.smallPointSize
-						}
-					}
+			Rectangle {
+				id: messageArea
+				height: childrenRect.height
+				Layout.fillWidth: true
+				color: MobileComponents.Theme.backgroundColor
+
+				Text {
+					id: message
+					color: MobileComponents.Theme.textColor
+					wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
+					styleColor: MobileComponents.Theme.textColor
+					font.pointSize: MobileComponents.Units.smallPointSize
 				}
 			}
 		}