Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs
===================================================================
diff -u -r6817 -r6822
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 6817)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 6822)
@@ -231,8 +231,6 @@
                 return ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType, FailureMechanismSystemType.Piping);
             case "FailureMechanismSystemType":
                 return ConfigurationManager.Instance.GetAvailableFailureMechanisms(DamProjectType);
-            case "StabilityKernelType":
-                return ConfigurationManager.Instance.GetAvailableFailureMechanisms(DamProjectType);
             default: return null;
         }
     }
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r6821 -r6822
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 6821)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 6822)
@@ -79,7 +79,6 @@
         private readonly Panel materialPanel = new Panel();
         private readonly Panel locationJobPanel = new Panel();
         private readonly Panel calculationSpecificationPanel = new Panel();
-        private readonly Panel stabilityKernelTypeSpecificationPanel = new Panel();
         private readonly Panel sensorPanel = new Panel();
 
         private readonly GridViewControl locationsControl = new GridViewControl
@@ -277,15 +276,10 @@
 
             // Read the Waterlevel Timeseries
             damProject.ImportWaterLevelTimeSeries();
-            // Find the view|Image menu option
-            BarItemLink imagesItem = mainForm.ViewMenu.ItemLinks.First(bi => bi.Item.Name.Equals("ImageMenu"));
+
             if (projectData.DamProjectType == DamProjectType.DamLiveConfiguration)
             {
-                // When view|Image menu option, make it invisible
-                imagesItem.Item.Visibility = BarItemVisibility.Never;
-                // Make sure that the tab for the Image view itself is not shown
                 ((mainForm.DynamicImageControl.Parent.Parent) as DockPanel).Visibility= DockVisibility.Hidden;
-                // Make sure that the entire Calculation menu is not shown
                 mainForm.CalculationMenu.Visibility = BarItemVisibility.Never;
                 if (projectData.SensorData != null)
                 {
@@ -294,11 +288,9 @@
             }
             if (projectData.DamProjectType == DamProjectType.Design)
             {
-                // When view|Image menu option, make it visible
-                imagesItem.Item.Visibility = BarItemVisibility.Always;
-                // Make sure that the tab for the Image view itself is shown
-                (mainForm.DynamicImageControl.Parent.Parent as DockPanel).Visibility= DockVisibility.Visible;
-                // Make sure that the entire Calculation menu is not shown
+                mainForm.DynamicImageControl.TabIndex = 1;
+                ((mainForm.DynamicImageControl.Parent.Parent) as DockPanel).Visibility= DockVisibility.Visible;
+                mainForm.UseImage(false);
                 mainForm.CalculationMenu.Visibility = BarItemVisibility.Always;
             }
         }
@@ -580,10 +572,8 @@
             BindSupport.Bind<DamPlugin>(panel, showCalculationOptionsItem, dp => dp.ShowCalculationOptions());
             BindSupport.Bind<DamPlugin>(panel, manualItem, dp => GetUserManual());
 
-            BindSupport.Bind<DamProjectData>(projectPanel, projectTypeBarItem, x => x.DamProjectType, 
-                                             BindingType.LabelAndValue);
-            BindSupport.Bind<DamProjectCalculationSpecification>(calculationSpecificationPanel, designAnalysisBarItem, 
-              x => DamProjectCalculationSpecification.SelectedAnalysisType, BindingType.LabelAndValue);
+            BindSupport.Bind<DamProjectData>(projectPanel, projectTypeBarItem, x => x.DamProjectType, BindingType.LabelAndValue);
+            BindSupport.Bind<DamProjectCalculationSpecification>(calculationSpecificationPanel, designAnalysisBarItem, x => DamProjectCalculationSpecification.SelectedAnalysisType, BindingType.LabelAndValue);
         }
 
         /// <summary>