diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs
index cd1e70a3..62ecf049 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs	
@@ -2852,7 +2852,6 @@ namespace VEPROMS
 			// 
 			// displayRO
 			// 
-			this.displayRO.CurItem = null;
 			this.displayRO.CurROLink = null;
 			this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.displayRO.Location = new System.Drawing.Point(1, 1);
@@ -2902,6 +2901,7 @@ namespace VEPROMS
 			this.displayTransition.RangeColor = System.Drawing.Color.Aquamarine;
 			this.displayTransition.Size = new System.Drawing.Size(202, 546);
 			this.displayTransition.TabIndex = 0;
+			this.displayTransition.RangeColor = VEPROMS.Properties.Settings.Default.TransitionRangeColor;
 			// 
 			// infotabTransition
 			// 
diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index 6e9bf96b..761f1fbe 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -1106,7 +1106,6 @@ namespace VEPROMS
 			if (dtp == null) return;
 			ROFST rofst = new ROFST("g:\\vehlp\\ro\\ro.fst");
 			displayRO.MyROFST = rofst;
-			displayRO.CurItem = dtp.ItemSelected;
 			displayRO.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB;
 		}
 		#endregion
@@ -1118,7 +1117,6 @@ namespace VEPROMS
 			if (dtp == null) return;
 			displayTransition.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB;
 			displayTransition.CurTrans = null;
-			displayTransition.RangeColor = Settings.Default.TransitionRangeColor;
 		}
 		private void btnInsTrans_Click(object sender, EventArgs e)
 		{
@@ -1128,7 +1126,6 @@ namespace VEPROMS
 			if (dtp == null) return;
 			displayTransition.MyRTB = _MyRTB;
 			displayTransition.CurTrans = null;
-			displayTransition.RangeColor = Settings.Default.TransitionRangeColor;
 		}
 		#endregion
 		private void tc_ItemSelectedChanged(object sender, DisplayPanelEventArgs args)
@@ -1141,9 +1138,7 @@ namespace VEPROMS
 				DisplayTabPanel dtp = ((DisplayTabItem)tc.SelectedTab).MyTabPanel;
 				if (dtp == null) return;
 				displayTransition.MyRTB = dtp.MyPanel.DisplayRTB;
-				displayRO.CurItem = dtp.ItemSelected;
 				displayRO.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB;
-				displayTransition.RangeColor = Settings.Default.TransitionRangeColor;
 			}
 		}
 		private void itemAnnotationsBindingSource_DataSourceChanged(object sender, EventArgs e)
@@ -1166,13 +1161,37 @@ namespace VEPROMS
 		{
 			_MyRTB.SaveText();
 		}
-
+		private void tc_LinkActiveChanged(object sender, DisplayLinkEventArgs args)
+		{
+			// determine if any infotabs are visisble, and if it is the Transition,
+			// change the curitem for the transition to the current item.
+			if (infoPanel.Expanded == true && infoTabs.SelectedTab == infotabTransition)
+			{
+				displayTransition.CurTrans = null;
+			}
+		}
+		private void tc_LinkInsertTran(object sender, DisplayLinkEventArgs args)
+		{
+			infoPanel.Expanded = true;
+			infoTabs.SelectedTab = infotabTransition;
+			displayTransition.CurTrans = null;
+		}
+		private void tc_LinkInsertRO(object sender, DisplayLinkEventArgs args)
+		{
+			infoPanel.Expanded = true;
+			infoTabs.SelectedTab = infotabRO;
+			ROFST rofst = new ROFST("g:\\vehlp\\ro\\ro.fst");
+			displayRO.MyROFST = rofst;
+			DisplayTabPanel dtp = ((DisplayTabItem)tc.SelectedTab).MyTabPanel;
+			if (dtp == null) return;
+			displayRO.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB;
+			displayRO.CurROLink = null;
+		}
 		private void tc_LinkModifyTran(object sender, DisplayLinkEventArgs args)
 		{
 			infoPanel.Expanded = true;
 			infoTabs.SelectedTab = infotabTransition;
 			displayTransition.CurTrans = args.MyTransition;
-			displayTransition.RangeColor = Settings.Default.TransitionRangeColor;
 		}
 
 		private void tc_LinkModifyRO(object sender, DisplayLinkEventArgs args)
@@ -1183,7 +1202,6 @@ namespace VEPROMS
 			displayRO.MyROFST = rofst;
 			DisplayTabPanel dtp = ((DisplayTabItem)tc.SelectedTab).MyTabPanel;
 			if (dtp == null) return;
-			displayRO.CurItem = dtp.ItemSelected;
 			displayRO.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB;
 			displayRO.CurROLink = args.RoUsageid;		// this is wrong - use for now.
 		}