Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r2e267a2aa6657733945d8bb638e677c48c247db8 -ra3c988fd496fe9d11e875c483f25dc599a0fe4c0
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 2e267a2aa6657733945d8bb638e677c48c247db8)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision a3c988fd496fe9d11e875c483f25dc599a0fe4c0)
@@ -527,10 +527,11 @@
                               pipingFailureMechanismContext,
                               ValidateAll)
                           .AddPerformAllCalculationsInFailureMechanismItem(pipingFailureMechanismContext, CalculateAll)
+                          .AddSeparator()
                           .AddClearAllCalculationOutputInFailureMechanismItem(pipingFailureMechanismContext.WrappedData)
                           .AddSeparator()
-                          .AddExpandAllItem()
                           .AddCollapseAllItem()
+                          .AddExpandAllItem()
                           .AddSeparator()
                           .AddPropertiesItem()
                           .Build();
@@ -554,8 +555,8 @@
 
             return builder.AddToggleRelevancyOfFailureMechanismItem(pipingFailureMechanismContext, RemoveAllViewsForItem)
                           .AddSeparator()
-                          .AddExpandAllItem()
                           .AddCollapseAllItem()
+                          .AddExpandAllItem()
                           .Build();
         }
 
@@ -615,15 +616,15 @@
 
             PipingCalculation calculation = nodeData.WrappedData;
 
-            return builder.AddValidateCalculationItem(nodeData, Validate)
+            return builder.AddRenameItem()
+                          .AddValidateCalculationItem(nodeData, Validate)
                           .AddPerformCalculationItem(calculation, nodeData, PerformCalculation)
-                          .AddClearCalculationOutputItem(calculation)
                           .AddSeparator()
-                          .AddRenameItem()
+                          .AddClearCalculationOutputItem(calculation)
                           .AddDeleteItem()
                           .AddSeparator()
-                          .AddExpandAllItem()
                           .AddCollapseAllItem()
+                          .AddExpandAllItem()
                           .AddSeparator()
                           .AddPropertiesItem()
                           .Build();
@@ -740,29 +741,33 @@
             }
 
             builder.AddCreateCalculationGroupItem(group)
-                   .AddCreateCalculationItem(nodeData, AddCalculationScenario);
+                   .AddCreateCalculationItem(nodeData, AddCalculationScenario)
+                   .AddSeparator();
 
-            if (!isNestedGroup)
+            if (isNestedGroup)
             {
-                builder.AddSeparator()
-                       .AddRemoveAllChildrenItem();
+                builder.AddRenameItem();
             }
 
-            builder.AddSeparator()
-                   .AddValidateAllCalculationsInGroupItem(nodeData, ValidateAll)
+            builder.AddValidateAllCalculationsInGroupItem(nodeData, ValidateAll)
                    .AddPerformAllCalculationsInGroupItem(group, nodeData, CalculateAll)
-                   .AddClearAllCalculationOutputInGroupItem(group)
-                   .AddSeparator();
+                   .AddSeparator()
+                   .AddClearAllCalculationOutputInGroupItem(group);
 
+            if (!isNestedGroup)
+            {
+                builder.AddRemoveAllChildrenItem()
+                       .AddSeparator();
+            }
+
             if (isNestedGroup)
             {
-                builder.AddRenameItem()
-                       .AddDeleteItem()
+                builder.AddDeleteItem()
                        .AddSeparator();
             }
 
-            return builder.AddExpandAllItem()
-                          .AddCollapseAllItem()
+            return builder.AddCollapseAllItem()
+                          .AddExpandAllItem()
                           .AddSeparator()
                           .AddPropertiesItem()
                           .Build();