Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs
===================================================================
diff -u -rc85b5e367887a96d602dfb7a0b46073b6eef84da -r10fc7315f4478647b2708f74c3e596cdf0e5a98c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision c85b5e367887a96d602dfb7a0b46073b6eef84da)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision 10fc7315f4478647b2708f74c3e596cdf0e5a98c)
@@ -337,7 +337,12 @@
             {
                 Text = context => RingtoetsCommonFormsResources.CalculationOutput_DisplayName,
                 Image = context => RingtoetsCommonFormsResources.GeneralOutputIcon,
+                ForeColor = context => context.WrappedData.HasOutput
+                                          ? Color.FromKnownColor(KnownColor.ControlText)
+                                          : Color.FromKnownColor(KnownColor.GrayText),
                 ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
+                                                                                 .AddOpenItem()
+                                                                                 .AddSeparator()
                                                                                  .AddPropertiesItem()
                                                                                  .Build()
             };
@@ -350,16 +355,6 @@
                                                                                  .AddOpenItem()
                                                                                  .Build()
             };
-
-            yield return new TreeNodeInfo<EmptyMacroStabilityInwardsOutput>
-            {
-                Text = output => RingtoetsCommonFormsResources.CalculationOutput_DisplayName,
-                Image = output => RingtoetsCommonFormsResources.GeneralOutputIcon,
-                ForeColor = output => Color.FromKnownColor(KnownColor.GrayText),
-                ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
-                                                                                 .AddPropertiesItem()
-                                                                                 .Build()
-            };
         }
 
         private static FileFilterGenerator StochasticSoilModelFileFilter
@@ -747,20 +742,10 @@
                                                       macroStabilityInwardsCalculationScenarioContext.AvailableMacroStabilityInwardsSurfaceLines,
                                                       macroStabilityInwardsCalculationScenarioContext.AvailableStochasticSoilModels,
                                                       macroStabilityInwardsCalculationScenarioContext.FailureMechanism,
-                                                      macroStabilityInwardsCalculationScenarioContext.AssessmentSection)
+                                                      macroStabilityInwardsCalculationScenarioContext.AssessmentSection),
+                new MacroStabilityInwardsOutputContext(macroStabilityInwardsCalculationScenario)
             };
 
-            if (macroStabilityInwardsCalculationScenario.HasOutput)
-            {
-                childNodes.Add(new MacroStabilityInwardsOutputContext(
-                                   macroStabilityInwardsCalculationScenario.Output,
-                                   macroStabilityInwardsCalculationScenario.SemiProbabilisticOutput));
-            }
-            else
-            {
-                childNodes.Add(new EmptyMacroStabilityInwardsOutput());
-            }
-
             return childNodes.ToArray();
         }