diff --git a/packages/client/hmi-client/src/components/workflow/tera-workflow.vue b/packages/client/hmi-client/src/components/workflow/tera-workflow.vue
index 57b6b857c0..007242a126 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-workflow.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-workflow.vue
@@ -471,46 +471,37 @@ function onMenuSelection(operatorType: string, menuNode: WorkflowNode<any>) {
 // Menu categories and list items are in order of appearance for separators to work
 const contextMenuItems: MenuItem[] = [
 	{
-		label: 'Add resource',
+		label: 'Modeling',
 		items: [
-			{
-				label: ModelOp.operation.displayName,
-				command: addOperatorToWorkflow(ModelOp)
-			},
 			{
 				label: ModelFromDocumentOp.operation.displayName,
 				command: addOperatorToWorkflow(ModelFromDocumentOp)
 			},
-			{ separator: true },
-			{ label: DatasetOp.operation.displayName, command: addOperatorToWorkflow(DatasetOp) },
-			{ separator: true },
-			{ label: DocumentOp.operation.displayName, command: addOperatorToWorkflow(DocumentOp) },
-			{ separator: true },
 			{
-				label: CodeAssetOp.operation.displayName,
-				command: addOperatorToWorkflow(CodeAssetOp)
+				label: ModelEditOp.operation.displayName,
+				command: addOperatorToWorkflow(ModelEditOp)
+			},
+			{
+				label: StratifyMiraOp.operation.displayName,
+				command: addOperatorToWorkflow(StratifyMiraOp)
+			},
+			{
+				label: ModelComparisonOp.operation.displayName,
+				command: addOperatorToWorkflow(ModelComparisonOp)
 			}
 		]
 	},
 	{
-		label: 'Work with model',
+		label: 'Config & Intervention',
 		items: [
 			{
 				label: ModelConfigOp.operation.displayName,
 				command: addOperatorToWorkflow(ModelConfigOp)
 			},
-			{
-				label: ModelEditOp.operation.displayName,
-				command: addOperatorToWorkflow(ModelEditOp)
-			},
 			{
 				label: FunmanOp.operation.displayName,
 				command: addOperatorToWorkflow(FunmanOp)
 			},
-			{
-				label: StratifyMiraOp.operation.displayName,
-				command: addOperatorToWorkflow(StratifyMiraOp)
-			},
 			{
 				label: InterventionPolicyOp.operation.displayName,
 				command: addOperatorToWorkflow(InterventionPolicyOp)
@@ -518,13 +509,20 @@ const contextMenuItems: MenuItem[] = [
 		]
 	},
 	{
-		label: 'Work with multiple models',
+		label: 'Simulation',
 		items: [
 			{
-				label: ModelComparisonOp.operation.displayName,
-				command: addOperatorToWorkflow(ModelComparisonOp)
+				label: SimulateCiemssOp.operation.displayName,
+				command: addOperatorToWorkflow(SimulateCiemssOp)
+			},
+			{
+				label: CalibrateCiemssOp.operation.displayName,
+				command: addOperatorToWorkflow(CalibrateCiemssOp)
+			},
+			{
+				label: OptimizeCiemssOp.operation.displayName,
+				command: addOperatorToWorkflow(OptimizeCiemssOp)
 			},
-			{ separator: true },
 			{
 				label: SimulateEnsembleCiemssOp.operation.displayName,
 				command: addOperatorToWorkflow(SimulateEnsembleCiemssOp)
@@ -536,7 +534,7 @@ const contextMenuItems: MenuItem[] = [
 		]
 	},
 	{
-		label: 'Work with dataset',
+		label: 'Data',
 		items: [
 			{
 				label: DatasetTransformerOp.operation.displayName,
@@ -551,23 +549,6 @@ const contextMenuItems: MenuItem[] = [
 				command: addOperatorToWorkflow(RegriddingOp)
 			}
 		]
-	},
-	{
-		label: 'Run model',
-		items: [
-			{
-				label: SimulateCiemssOp.operation.displayName,
-				command: addOperatorToWorkflow(SimulateCiemssOp)
-			},
-			{
-				label: CalibrateCiemssOp.operation.displayName,
-				command: addOperatorToWorkflow(CalibrateCiemssOp)
-			},
-			{
-				label: OptimizeCiemssOp.operation.displayName,
-				command: addOperatorToWorkflow(OptimizeCiemssOp)
-			}
-		]
 	}
 ];
 const addComponentMenu = ref();