Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -rca3449dbec4170e0321aa3f0612a26419e70d6ec -rbdfdac3498b97ecf6bf04d53c581f557e7e87795
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision ca3449dbec4170e0321aa3f0612a26419e70d6ec)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision bdfdac3498b97ecf6bf04d53c581f557e7e87795)
@@ -459,19 +459,17 @@
                    .AddSeparator()
                    .AddClearAllCalculationOutputInGroupItem(group);
 
-            if (!isNestedGroup)
+            if (isNestedGroup)
             {
-                builder.AddRemoveAllChildrenItem();
-                builder.AddSeparator();
+                builder.AddDeleteItem();
             }
-
-            if (isNestedGroup)
+            else
             {
-                builder.AddDeleteItem()
-                       .AddSeparator();
+                builder.AddRemoveAllChildrenItem();
             }
 
-            return builder.AddCollapseAllItem()
+            return builder.AddSeparator()
+                          .AddCollapseAllItem()
                           .AddExpandAllItem()
                           .AddSeparator()
                           .AddPropertiesItem()
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -rce9e1d476f00cfb42ce2a8ab6c762baf5abfd97b -rbdfdac3498b97ecf6bf04d53c581f557e7e87795
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision ce9e1d476f00cfb42ce2a8ab6c762baf5abfd97b)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision bdfdac3498b97ecf6bf04d53c581f557e7e87795)
@@ -492,26 +492,24 @@
             }
 
             builder.AddValidateAllCalculationsInGroupItem(
-                       context,
-                       ValidateAll,
-                       ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup)
+                context,
+                ValidateAll,
+                ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup)
                    .AddPerformAllCalculationsInGroupItem(group, context, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup)
                    .AddSeparator()
                    .AddClearAllCalculationOutputInGroupItem(group);
 
-            if (!isNestedGroup)
+            if (isNestedGroup)
             {
-                builder.AddRemoveAllChildrenItem()
-                       .AddSeparator();
+                builder.AddDeleteItem();
             }
-
-            if (isNestedGroup)
+            else
             {
-                builder.AddDeleteItem()
-                       .AddSeparator();
+                builder.AddRemoveAllChildrenItem();
             }
 
-            return builder.AddCollapseAllItem()
+            return builder.AddSeparator()
+                          .AddCollapseAllItem()
                           .AddExpandAllItem()
                           .AddSeparator()
                           .AddPropertiesItem()
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -rc48f16746209f799f93c6fc79a5202a9e3fd419f -rbdfdac3498b97ecf6bf04d53c581f557e7e87795
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision c48f16746209f799f93c6fc79a5202a9e3fd419f)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision bdfdac3498b97ecf6bf04d53c581f557e7e87795)
@@ -72,8 +72,8 @@
             yield return new PropertyInfo<GrassCoverErosionOutwardsFailureMechanismContext, GrassCoverErosionOutwardsFailureMechanismProperties>
             {
                 CreateInstance = context => new GrassCoverErosionOutwardsFailureMechanismProperties(
-                    context.WrappedData, 
-                    new GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler())
+                                                context.WrappedData,
+                                                new GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler())
             };
             yield return new PropertyInfo<GrassCoverErosionOutwardsDesignWaterLevelLocationsContext, GrassCoverErosionOutwardsDesignWaterLevelLocationsContextProperties>
             {
@@ -661,19 +661,17 @@
                    .AddSeparator()
                    .AddClearAllCalculationOutputInGroupItem(group);
 
-            if (!isNestedGroup)
+            if (isNestedGroup)
             {
-                builder.AddRemoveAllChildrenItem()
-                       .AddSeparator();
+                builder.AddDeleteItem();
             }
-
-            if (isNestedGroup)
+            else
             {
-                builder.AddDeleteItem()
-                       .AddSeparator();
+                builder.AddRemoveAllChildrenItem();
             }
 
-            return builder.AddCollapseAllItem()
+            return builder.AddSeparator()
+                          .AddCollapseAllItem()
                           .AddExpandAllItem()
                           .AddSeparator()
                           .AddPropertiesItem()
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -rca3449dbec4170e0321aa3f0612a26419e70d6ec -rbdfdac3498b97ecf6bf04d53c581f557e7e87795
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision ca3449dbec4170e0321aa3f0612a26419e70d6ec)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision bdfdac3498b97ecf6bf04d53c581f557e7e87795)
@@ -483,19 +483,17 @@
                    .AddSeparator()
                    .AddClearAllCalculationOutputInGroupItem(group);
 
-            if (!isNestedGroup)
+            if (isNestedGroup)
             {
-                builder.AddRemoveAllChildrenItem()
-                       .AddSeparator();
+                builder.AddDeleteItem();
             }
-
-            if (isNestedGroup)
+            else
             {
-                builder.AddDeleteItem()
-                       .AddSeparator();
+                builder.AddRemoveAllChildrenItem();
             }
 
-            return builder.AddCollapseAllItem()
+            return builder.AddSeparator()
+                          .AddCollapseAllItem()
                           .AddExpandAllItem()
                           .AddSeparator()
                           .AddPropertiesItem()
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -rce9e1d476f00cfb42ce2a8ab6c762baf5abfd97b -rbdfdac3498b97ecf6bf04d53c581f557e7e87795
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision ce9e1d476f00cfb42ce2a8ab6c762baf5abfd97b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision bdfdac3498b97ecf6bf04d53c581f557e7e87795)
@@ -763,19 +763,17 @@
                    .AddSeparator()
                    .AddClearAllCalculationOutputInGroupItem(group);
 
-            if (!isNestedGroup)
+            if (isNestedGroup)
             {
-                builder.AddRemoveAllChildrenItem()
-                       .AddSeparator();
+                builder.AddDeleteItem();
             }
-
-            if (isNestedGroup)
+            else
             {
-                builder.AddDeleteItem()
-                       .AddSeparator();
+                builder.AddRemoveAllChildrenItem();
             }
 
-            return builder.AddCollapseAllItem()
+            return builder.AddSeparator()
+                          .AddCollapseAllItem()
                           .AddExpandAllItem()
                           .AddSeparator()
                           .AddPropertiesItem()
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -rca3449dbec4170e0321aa3f0612a26419e70d6ec -rbdfdac3498b97ecf6bf04d53c581f557e7e87795
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision ca3449dbec4170e0321aa3f0612a26419e70d6ec)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision bdfdac3498b97ecf6bf04d53c581f557e7e87795)
@@ -490,19 +490,17 @@
                    .AddSeparator()
                    .AddClearAllCalculationOutputInGroupItem(group);
 
-            if (!isNestedGroup)
+            if (isNestedGroup)
             {
-                builder.AddRemoveAllChildrenItem()
-                       .AddSeparator();
+                builder.AddDeleteItem();
             }
-
-            if (isNestedGroup)
+            else
             {
-                builder.AddDeleteItem()
-                       .AddSeparator();
+                builder.AddRemoveAllChildrenItem();
             }
-
-            return builder.AddCollapseAllItem()
+            
+            return builder.AddSeparator()
+                          .AddCollapseAllItem()
                           .AddExpandAllItem()
                           .AddSeparator()
                           .AddPropertiesItem()
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -rc48f16746209f799f93c6fc79a5202a9e3fd419f -rbdfdac3498b97ecf6bf04d53c581f557e7e87795
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision c48f16746209f799f93c6fc79a5202a9e3fd419f)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision bdfdac3498b97ecf6bf04d53c581f557e7e87795)
@@ -334,7 +334,7 @@
             var isNestedGroup = parentData is StabilityStoneCoverWaveConditionsCalculationGroupContext;
 
             builder.AddExportItem()
-             .AddSeparator();
+                   .AddSeparator();
 
             if (!isNestedGroup)
             {
@@ -353,19 +353,18 @@
                    .AddSeparator()
                    .AddClearAllCalculationOutputInGroupItem(group);
 
-            if (!isNestedGroup)
-            {
-                builder.AddRemoveAllChildrenItem()
-                       .AddSeparator();
-            }
 
             if (isNestedGroup)
             {
-                builder.AddDeleteItem()
-                       .AddSeparator();
+                builder.AddDeleteItem();
             }
+            else
+            {
+                builder.AddRemoveAllChildrenItem();
+            }
 
-            return builder.AddCollapseAllItem()
+            return builder.AddSeparator()
+                          .AddCollapseAllItem()
                           .AddExpandAllItem()
                           .AddSeparator()
                           .AddPropertiesItem()
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -rc48f16746209f799f93c6fc79a5202a9e3fd419f -rbdfdac3498b97ecf6bf04d53c581f557e7e87795
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision c48f16746209f799f93c6fc79a5202a9e3fd419f)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision bdfdac3498b97ecf6bf04d53c581f557e7e87795)
@@ -341,7 +341,7 @@
             StrictContextMenuItem generateCalculationsItem = CreateGenerateWaveConditionsCalculationsItem(nodeData);
 
             builder.AddExportItem()
-             .AddSeparator();
+                   .AddSeparator();
 
             if (!isNestedGroup)
             {
@@ -360,19 +360,17 @@
                    .AddSeparator()
                    .AddClearAllCalculationOutputInGroupItem(group);
 
-            if (!isNestedGroup)
+            if (isNestedGroup)
             {
-                builder.AddRemoveAllChildrenItem()
-                       .AddSeparator();
+                builder.AddDeleteItem();
             }
-
-            if (isNestedGroup)
+            else
             {
-                builder.AddDeleteItem()
-                       .AddSeparator();
+                builder.AddRemoveAllChildrenItem();
             }
 
-            return builder.AddCollapseAllItem()
+            return builder.AddSeparator()
+                          .AddCollapseAllItem()
                           .AddExpandAllItem()
                           .AddSeparator()
                           .AddPropertiesItem()