diff --git a/qt-mobile/qml/DiveDetails.qml b/qt-mobile/qml/DiveDetails.qml
index 452b29974..dc2087a34 100644
--- a/qt-mobile/qml/DiveDetails.qml
+++ b/qt-mobile/qml/DiveDetails.qml
@@ -44,15 +44,6 @@ MobileComponents.Page {
 	]
 
 	contextualActions: [
-		Action {
-			text: "Save"
-			enabled: diveDetailsWindow.state == "edit"
-			iconName: "document-save"
-			onTriggered: {
-				manager.saveChanges();
-				contextDrawer.close();
-			}
-		},
 		Action {
 			text: checked ? "View" : "Edit"
 			checkable: true
diff --git a/qt-mobile/qml/main.qml b/qt-mobile/qml/main.qml
index 5f516a350..cd1e2501a 100644
--- a/qt-mobile/qml/main.qml
+++ b/qt-mobile/qml/main.qml
@@ -25,6 +25,12 @@ MobileComponents.ApplicationWindow {
 
 		bannerImageSource: "dive.jpg"
 		actions: [
+			Action {
+				text: "Cloud credentials"
+				onTriggered: {
+					stackView.push(cloudCredWindow)
+				}
+			},
 			Action {
 				text: "Preferences"
 				onTriggered: {
@@ -32,80 +38,76 @@ MobileComponents.ApplicationWindow {
 				}
 			},
 
-			Action {
-				text: "Cloud login credentials"
-				onTriggered: {
-					stackView.push(cloudCredWindow)
+			MobileComponents.ActionGroup {
+				text: "Manage dives"
+				Action {
+					text: "Download from computer"
+					onTriggered: {
+						stackView.push(downloadDivesWindow)
+					}
 				}
-			},
-
-			Action {
-				text: "Load Dives"
-				onTriggered: {
-					manager.loadDives();
+				Action {
+					text: "Add dive manually"
+					onTriggered: {
+						manager.addDive();
+						stackView.push(detailsWindow)
+					}
 				}
-			},
-
-			Action {
-				text: "Download Dives"
-				onTriggered: {
-					stackView.push(downloadDivesWindow)
+				Action {
+					text: "Refresh"
+					onTriggered: {
+						manager.loadDives();
+					}
 				}
-			},
-
-			Action {
-				text: "Add Dive"
-				onTriggered: {
-					manager.addDive();
-					stackView.push(detailsWindow)
+				Action {
+					text: "Upload to cloud"
+					onTriggered: {
+						manager.saveChanges();
+					}
 				}
 			},
 
 			MobileComponents.ActionGroup {
 				text: "GPS"
 				Action {
-					text: "Run location service"
-					checkable: true
-					checked: manager.locationServiceEnabled
-					onToggled: {
-						manager.locationServiceEnabled = checked;
-					}
-				}
-				Action {
-					text: "Apply GPS data to dives"
+					text: "GPS-tag dives"
 					onTriggered: {
-							manager.applyGpsData();
+						manager.applyGpsData();
 					}
 				}
 
 				Action {
-					text: "Send GPS data to server"
+					text: "Upload GPS data"
 					onTriggered: {
-							manager.sendGpsData();
+						manager.sendGpsData();
 					}
 				}
 
 				Action {
-					text: "Clear stored GPS data"
+					text: "Clear GPS cache"
 					onTriggered: {
-							manager.clearGpsData();
+						manager.clearGpsData();
 					}
 				}
 			},
 
-			Action {
-				text: "View Log"
-				onTriggered: {
-					stackView.push(logWindow)
+			MobileComponents.ActionGroup {
+				text: "Developer"
+				Action {
+					text: "App log"
+					onTriggered: {
+						stackView.push(logWindow)
+					}
 				}
-			},
 
-			Action {
-				text: "Theme Information"
-				onTriggered: {
-					stackView.push(themetest)
+				Action {
+					text: "Theme information"
+					onTriggered: {
+						stackView.push(themetest)
+					}
 				}
 			}
+
 		] // end actions
 
 		MouseArea {