Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r6820 -r6821
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 6820)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 6821)
@@ -277,10 +277,15 @@
 
             // 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)
                 {
@@ -289,9 +294,11 @@
             }
             if (projectData.DamProjectType == DamProjectType.Design)
             {
-                mainForm.DynamicImageControl.TabIndex = 1;
-                ((mainForm.DynamicImageControl.Parent.Parent) as DockPanel).Visibility= DockVisibility.Visible;
-                mainForm.UseImage(false);
+                // 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.CalculationMenu.Visibility = BarItemVisibility.Always;
             }
         }
@@ -573,8 +580,10 @@
             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>