Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -r54fd939cf2a3d8f718dad28faa24373334d4cc2e -r2b558b587da934f1088d35ec696ac5ab3bcedb81
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 54fd939cf2a3d8f718dad28faa24373334d4cc2e)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 2b558b587da934f1088d35ec696ac5ab3bcedb81)
@@ -46,7 +46,6 @@
 using GrassCoverErosionInwardsPluginResources = Ringtoets.GrassCoverErosionInwards.Plugin.Properties.Resources;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Plugin
 {
@@ -382,10 +381,11 @@
                     grassCoverErosionInwardsFailureMechanismContext,
                     CalculateAll,
                     ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism)
+                .AddSeparator()
                 .AddClearAllCalculationOutputInFailureMechanismItem(grassCoverErosionInwardsFailureMechanismContext.WrappedData)
                 .AddSeparator()
-                .AddExpandAllItem()
                 .AddCollapseAllItem()
+                .AddExpandAllItem()
                 .AddSeparator()
                 .AddPropertiesItem()
                 .Build();
@@ -405,8 +405,8 @@
             return builder.AddToggleRelevancyOfFailureMechanismItem(grassCoverErosionInwardsFailureMechanismContext,
                                                                     RemoveAllViewsForItem)
                           .AddSeparator()
-                          .AddExpandAllItem()
                           .AddCollapseAllItem()
+                          .AddExpandAllItem()
                           .Build();
         }
 
@@ -474,32 +474,36 @@
             }
 
             builder.AddCreateCalculationGroupItem(group)
-                   .AddCreateCalculationItem(context, AddCalculation);
+                   .AddCreateCalculationItem(context, AddCalculation)
+                   .AddSeparator();
 
-            if (!isNestedGroup)
+            if (isNestedGroup)
             {
-                builder.AddSeparator()
-                       .AddRemoveAllChildrenItem();
+                builder.AddRenameItem();
             }
 
-            builder.AddSeparator()
-                   .AddValidateAllCalculationsInGroupItem(
+            builder.AddValidateAllCalculationsInGroupItem(
                        context,
                        ValidateAll,
                        ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup)
                    .AddPerformAllCalculationsInGroupItem(group, context, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup)
-                   .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();
@@ -623,18 +627,18 @@
 
             GrassCoverErosionInwardsCalculation calculation = context.WrappedData;
 
-            return builder.AddValidateCalculationItem(
-                context,
-                Validate,
-                ValidateAllDataAvailableAndGetErrorMessageForCalculation)
+            return builder.AddRenameItem()
+                          .AddValidateCalculationItem(
+                              context,
+                              Validate,
+                              ValidateAllDataAvailableAndGetErrorMessageForCalculation)
                           .AddPerformCalculationItem(calculation, context, Calculate, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
-                          .AddClearCalculationOutputItem(calculation)
                           .AddSeparator()
-                          .AddRenameItem()
+                          .AddClearCalculationOutputItem(calculation)
                           .AddDeleteItem()
                           .AddSeparator()
-                          .AddExpandAllItem()
                           .AddCollapseAllItem()
+                          .AddExpandAllItem()
                           .AddSeparator()
                           .AddPropertiesItem()
                           .Build();