Merge pull request 'Development' (#464) from Development into master

Merging all items through B2024-092 from development into master after successful testing.

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs

@@ -746,7 +746,6 @@ namespace ROEditor
 									break;
 								}
 							}
-							if (inusename == "u") found = true; //to handle unit designation
 							if (found == false)syntax(inusename+" invalid field name",strt,where);
 							// used to have procini def stuff here.
 							start=where+1;

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs

@@ -504,6 +504,7 @@ namespace ROEditor
 			// if a specific RO was passed in. Load the xml tree from it to the root & then
 			// edit it through the ctlXmledit.
 			// from the input tbl string, get a table name.
+
 			ArrayList levelRecids = new ArrayList();
 			int itbl = System.Convert.ToInt32(specificro.Substring(0,4),16);
 			string stbl = System.Convert.ToString(itbl,10);
@@ -593,6 +594,7 @@ namespace ROEditor
 				return;
 			}
 			roTreeView.SelectedNode = trnd;
+
 		}
 
 		protected void roTreeView_AfterSelect (object sender, 
@@ -674,14 +676,12 @@ namespace ROEditor
 				//if Ctrl/Shift Key is held down
 				if (ROsSelectedforMultiMove == null)
 					ROsSelectedforMultiMove = new List<TreeNode>();
-				// B2021-094 added check that Control and Alt keys were not pressed with shift key
-				//           if user does the <Ctrl><Shift><G> keystroke (Goto selected RO from step editor)
-				//           but only lifts up on the G key, it was dropping down into this code below
-				//           and getting a null reference error upon initial entry in to the RO Editor
-				if ((Control.ModifierKeys & Keys.Shift) != 0 && (Control.ModifierKeys & Keys.Control) == 0 && (Control.ModifierKeys & Keys.Alt) == 0)
+
+				if ((Control.ModifierKeys & Keys.Shift) != 0)
 				{
 					//if shift is held down, clear existing nodes then add the range of nodes
 					roTreeView_ClearAllMultiSelect();
+
 					if (PreviousNode.Index < CurrentNode.Index)
 					{
 						//Traverse Down

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

@@ -1129,7 +1129,7 @@ namespace ctlXMLEditLib
 			mylabel.BackColor = chlbckcolor; // PC Applic fields are shaded blue otherwise backcolor is transparent
 			mylabel.Location = new Point(screenx+indent, screeny);
 			mylabel.Name = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName); 
-			mylabel.Text = (applicLabel.Length > 0) ? applicLabel : CvtFldToUserFld(element.Name).Replace("Image_",""); // C2021-026  applicLabel is the P/C Child name
+			mylabel.Text = (applicLabel.Length > 0) ? applicLabel : CvtFldToUserFld(element.Name); // C2021-026  applicLabel is the P/C Child name
 			mylabel.AutoSize = true;
 			Controls.Add(mylabel);
 			// add 3 onto screeny so that textbox is slightly below label.
@@ -1696,7 +1696,7 @@ namespace ctlXMLEditLib
 				}
 				catch (Exception ee)
 				{
-					MessageBox.Show("The Height and Width cannot be empty fields. Enter a number in either field and the other will automatically adjust to a proportional size.", "Invalid Height Input");
+					MessageBox.Show("Invalid Height Input",ee.ToString());
 				}
 			}
 		}
@@ -1713,7 +1713,7 @@ namespace ctlXMLEditLib
 				}
 				catch (Exception ee)
 				{
-					MessageBox.Show("The Height and Width cannot be empty fields. Enter a number in either field and the other will automatically adjust to a proportional size.", "Invalid Width Input");
+					MessageBox.Show("Invalid Width Input", ee.ToString());
 				}
 			}
 		}					

PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs

@@ -139,9 +139,10 @@
 			// 
 			this.myTV.CheckBoxes = true;
 			this.myTV.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.myTV.Location = new System.Drawing.Point(0, 230);
+			this.myTV.Location = new System.Drawing.Point(0, 285);
+			this.myTV.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.myTV.Name = "myTV";
-            this.myTV.Size = new System.Drawing.Size(291, 310);
+			this.myTV.Size = new System.Drawing.Size(436, 475);
 			this.myTV.TabIndex = 4;
 			this.myTV.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck);
 			// 
@@ -149,6 +150,7 @@
 			// 
 			this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.splitContainer3.Location = new System.Drawing.Point(0, 0);
+			this.splitContainer3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.splitContainer3.Name = "splitContainer3";
 			this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
 			// 
@@ -164,8 +166,9 @@
 			// 
 			this.splitContainer3.Panel2.BackColor = System.Drawing.SystemColors.Control;
 			this.splitContainer3.Panel2.Controls.Add(this.panelEx4);
-            this.splitContainer3.Size = new System.Drawing.Size(1177, 586);
-            this.splitContainer3.SplitterDistance = 525;
+			this.splitContainer3.Size = new System.Drawing.Size(1766, 902);
+			this.splitContainer3.SplitterDistance = 809;
+			this.splitContainer3.SplitterWidth = 6;
 			this.splitContainer3.TabIndex = 2;
 			// 
 			// panelEx3
@@ -177,9 +180,10 @@
 			this.panelEx3.Controls.Add(this.label3);
 			this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty;
 			this.panelEx3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelEx3.Location = new System.Drawing.Point(688, 0);
+			this.panelEx3.Location = new System.Drawing.Point(1032, 0);
+			this.panelEx3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.panelEx3.Name = "panelEx3";
-            this.panelEx3.Size = new System.Drawing.Size(489, 525);
+			this.panelEx3.Size = new System.Drawing.Size(734, 809);
 			this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.panelEx3.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.panelEx3.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -194,11 +198,12 @@
 			// 
 			this.txtResults.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.txtResults.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtResults.Location = new System.Drawing.Point(0, 52);
+			this.txtResults.Location = new System.Drawing.Point(0, 79);
+			this.txtResults.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.txtResults.Multiline = true;
 			this.txtResults.Name = "txtResults";
 			this.txtResults.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtResults.Size = new System.Drawing.Size(489, 473);
+			this.txtResults.Size = new System.Drawing.Size(734, 730);
 			this.txtResults.TabIndex = 4;
 			// 
 			// panel1
@@ -206,17 +211,19 @@
 			this.panel1.Controls.Add(this.btnSave);
 			this.panel1.Controls.Add(this.btnClear);
 			this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Location = new System.Drawing.Point(0, 23);
+			this.panel1.Location = new System.Drawing.Point(0, 34);
+			this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(489, 29);
+			this.panel1.Size = new System.Drawing.Size(734, 45);
 			this.panel1.TabIndex = 3;
 			// 
 			// btnSave
 			// 
 			this.btnSave.Dock = System.Windows.Forms.DockStyle.Left;
-            this.btnSave.Location = new System.Drawing.Point(95, 0);
+			this.btnSave.Location = new System.Drawing.Point(142, 0);
+			this.btnSave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(95, 29);
+			this.btnSave.Size = new System.Drawing.Size(142, 45);
 			this.btnSave.TabIndex = 3;
 			this.btnSave.Text = "Save Results";
 			this.btnSave.UseVisualStyleBackColor = true;
@@ -226,8 +233,9 @@
 			// 
 			this.btnClear.Dock = System.Windows.Forms.DockStyle.Left;
 			this.btnClear.Location = new System.Drawing.Point(0, 0);
+			this.btnClear.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btnClear.Name = "btnClear";
-            this.btnClear.Size = new System.Drawing.Size(95, 29);
+			this.btnClear.Size = new System.Drawing.Size(142, 45);
 			this.btnClear.TabIndex = 2;
 			this.btnClear.Text = "Clear Results";
 			this.btnClear.UseVisualStyleBackColor = true;
@@ -239,8 +247,9 @@
 			this.label3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
 			this.label3.Dock = System.Windows.Forms.DockStyle.Top;
 			this.label3.Location = new System.Drawing.Point(0, 0);
+			this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(489, 23);
+			this.label3.Size = new System.Drawing.Size(734, 34);
 			this.label3.TabIndex = 2;
 			this.label3.Text = "Results";
 			this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -270,9 +279,10 @@
 			this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
 			this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
 			this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.expandableSplitter2.Location = new System.Drawing.Point(682, 0);
+			this.expandableSplitter2.Location = new System.Drawing.Point(1023, 0);
+			this.expandableSplitter2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.expandableSplitter2.Name = "expandableSplitter2";
-            this.expandableSplitter2.Size = new System.Drawing.Size(6, 525);
+			this.expandableSplitter2.Size = new System.Drawing.Size(9, 809);
 			this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
 			this.expandableSplitter2.TabIndex = 38;
 			this.expandableSplitter2.TabStop = false;
@@ -288,9 +298,10 @@
 			this.panelEx2.Controls.Add(this.label4);
 			this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty;
 			this.panelEx2.Dock = System.Windows.Forms.DockStyle.Left;
-            this.panelEx2.Location = new System.Drawing.Point(391, 0);
+			this.panelEx2.Location = new System.Drawing.Point(587, 0);
+			this.panelEx2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.panelEx2.Name = "panelEx2";
-            this.panelEx2.Size = new System.Drawing.Size(291, 525);
+			this.panelEx2.Size = new System.Drawing.Size(436, 809);
 			this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.panelEx2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.panelEx2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -306,19 +317,21 @@
 			this.txtProcess.AcceptsReturn = true;
 			this.txtProcess.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.txtProcess.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtProcess.Location = new System.Drawing.Point(0, 150);
+			this.txtProcess.Location = new System.Drawing.Point(0, 228);
+			this.txtProcess.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.txtProcess.Multiline = true;
 			this.txtProcess.Name = "txtProcess";
 			this.txtProcess.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtProcess.Size = new System.Drawing.Size(291, 375);
+			this.txtProcess.Size = new System.Drawing.Size(436, 581);
 			this.txtProcess.TabIndex = 5;
 			// 
 			// pbProcess
 			// 
 			this.pbProcess.Dock = System.Windows.Forms.DockStyle.Top;
-            this.pbProcess.Location = new System.Drawing.Point(0, 125);
+			this.pbProcess.Location = new System.Drawing.Point(0, 190);
+			this.pbProcess.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.pbProcess.Name = "pbProcess";
-            this.pbProcess.Size = new System.Drawing.Size(291, 25);
+			this.pbProcess.Size = new System.Drawing.Size(436, 38);
 			this.pbProcess.TabIndex = 6;
 			// 
 			// label6
@@ -326,9 +339,10 @@
 			this.label6.BackColor = System.Drawing.SystemColors.ActiveCaption;
 			this.label6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
 			this.label6.Dock = System.Windows.Forms.DockStyle.Top;
-            this.label6.Location = new System.Drawing.Point(0, 102);
+			this.label6.Location = new System.Drawing.Point(0, 156);
+			this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(291, 23);
+			this.label6.Size = new System.Drawing.Size(436, 34);
 			this.label6.TabIndex = 3;
 			this.label6.Text = "Process Status";
 			this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -338,10 +352,11 @@
 			this.panel3.Controls.Add(this.pnlLater);
 			this.panel3.Controls.Add(this.chkLater);
 			this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel3.Location = new System.Drawing.Point(0, 23);
+			this.panel3.Location = new System.Drawing.Point(0, 34);
+			this.panel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.panel3.Name = "panel3";
-            this.panel3.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.panel3.Size = new System.Drawing.Size(291, 79);
+			this.panel3.Padding = new System.Windows.Forms.Padding(9, 9, 9, 9);
+			this.panel3.Size = new System.Drawing.Size(436, 122);
 			this.panel3.TabIndex = 2;
 			// 
 			// pnlLater
@@ -351,18 +366,20 @@
 			this.pnlLater.Controls.Add(this.dtpDate);
 			this.pnlLater.Dock = System.Windows.Forms.DockStyle.Top;
 			this.pnlLater.Enabled = false;
-            this.pnlLater.Location = new System.Drawing.Point(6, 23);
+			this.pnlLater.Location = new System.Drawing.Point(9, 33);
+			this.pnlLater.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.pnlLater.Name = "pnlLater";
-            this.pnlLater.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.pnlLater.Size = new System.Drawing.Size(279, 37);
+			this.pnlLater.Padding = new System.Windows.Forms.Padding(9, 9, 9, 9);
+			this.pnlLater.Size = new System.Drawing.Size(418, 57);
 			this.pnlLater.TabIndex = 3;
 			// 
 			// label5
 			// 
 			this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(105, 15);
+			this.label5.Location = new System.Drawing.Point(158, 23);
+			this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(18, 13);
+			this.label5.Size = new System.Drawing.Size(25, 20);
 			this.label5.TabIndex = 5;
 			this.label5.Text = "@";
 			// 
@@ -372,27 +389,30 @@
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.dtpTime.CustomFormat = "HH:mm";
 			this.dtpTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpTime.Location = new System.Drawing.Point(129, 9);
+			this.dtpTime.Location = new System.Drawing.Point(194, 14);
+			this.dtpTime.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.dtpTime.Name = "dtpTime";
 			this.dtpTime.ShowUpDown = true;
-            this.dtpTime.Size = new System.Drawing.Size(133, 20);
+			this.dtpTime.Size = new System.Drawing.Size(198, 26);
 			this.dtpTime.TabIndex = 4;
 			// 
 			// dtpDate
 			// 
 			this.dtpDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dtpDate.Location = new System.Drawing.Point(9, 9);
+			this.dtpDate.Location = new System.Drawing.Point(14, 14);
+			this.dtpDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.dtpDate.Name = "dtpDate";
-            this.dtpDate.Size = new System.Drawing.Size(90, 20);
+			this.dtpDate.Size = new System.Drawing.Size(133, 26);
 			this.dtpDate.TabIndex = 3;
 			// 
 			// chkLater
 			// 
 			this.chkLater.AutoSize = true;
 			this.chkLater.Dock = System.Windows.Forms.DockStyle.Top;
-            this.chkLater.Location = new System.Drawing.Point(6, 6);
+			this.chkLater.Location = new System.Drawing.Point(9, 9);
+			this.chkLater.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.chkLater.Name = "chkLater";
-            this.chkLater.Size = new System.Drawing.Size(279, 17);
+			this.chkLater.Size = new System.Drawing.Size(418, 24);
 			this.chkLater.TabIndex = 4;
 			this.chkLater.Text = "Process Later";
 			this.chkLater.UseVisualStyleBackColor = true;
@@ -404,8 +424,9 @@
 			this.label4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
 			this.label4.Dock = System.Windows.Forms.DockStyle.Top;
 			this.label4.Location = new System.Drawing.Point(0, 0);
+			this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(291, 23);
+			this.label4.Size = new System.Drawing.Size(436, 34);
 			this.label4.TabIndex = 3;
 			this.label4.Text = "Process";
 			this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -435,9 +456,10 @@
 			this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
 			this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
 			this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.expandableSplitter1.Location = new System.Drawing.Point(385, 0);
+			this.expandableSplitter1.Location = new System.Drawing.Point(578, 0);
+			this.expandableSplitter1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.expandableSplitter1.Name = "expandableSplitter1";
-            this.expandableSplitter1.Size = new System.Drawing.Size(6, 525);
+			this.expandableSplitter1.Size = new System.Drawing.Size(9, 809);
 			this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
 			this.expandableSplitter1.TabIndex = 4;
 			this.expandableSplitter1.TabStop = false;
@@ -450,8 +472,9 @@
 			this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
 			this.panelEx1.Dock = System.Windows.Forms.DockStyle.Left;
 			this.panelEx1.Location = new System.Drawing.Point(0, 0);
+			this.panelEx1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.panelEx1.Name = "panelEx1";
-            this.panelEx1.Size = new System.Drawing.Size(385, 525);
+			this.panelEx1.Size = new System.Drawing.Size(578, 809);
 			this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -483,9 +506,10 @@
             this.sideNavItmDelete,
             this.sideNavItmExit});
 			this.sideNav1.Location = new System.Drawing.Point(0, 0);
+			this.sideNav1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.sideNav1.Name = "sideNav1";
-            this.sideNav1.Padding = new System.Windows.Forms.Padding(1, 1, 1, 1);
-            this.sideNav1.Size = new System.Drawing.Size(385, 525);
+			this.sideNav1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+			this.sideNav1.Size = new System.Drawing.Size(578, 809);
 			this.sideNav1.TabIndex = 3;
 			this.sideNav1.Text = "sideNav1";
 			// 
@@ -498,10 +522,10 @@
 			this.sideNavPanel4.Controls.Add(this.myTVdel);
 			this.sideNavPanel4.Controls.Add(this.btnDeleteItems);
 			this.sideNavPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel4.Location = new System.Drawing.Point(81, 31);
-            this.sideNavPanel4.MinimumSize = new System.Drawing.Size(0, 493);
+			this.sideNavPanel4.Location = new System.Drawing.Point(109, 40);
+			this.sideNavPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.sideNavPanel4.Name = "sideNavPanel4";
-            this.sideNavPanel4.Size = new System.Drawing.Size(300, 493);
+			this.sideNavPanel4.Size = new System.Drawing.Size(461, 767);
 			this.sideNavPanel4.TabIndex = 27;
 			// 
 			// swDeleteFolder
@@ -510,9 +534,10 @@
 			// 
 			// 
 			this.swDeleteFolder.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swDeleteFolder.Location = new System.Drawing.Point(10, 43);
+			this.swDeleteFolder.Location = new System.Drawing.Point(15, 66);
+			this.swDeleteFolder.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swDeleteFolder.Name = "swDeleteFolder";
-            this.swDeleteFolder.Size = new System.Drawing.Size(69, 22);
+			this.swDeleteFolder.Size = new System.Drawing.Size(104, 34);
 			this.swDeleteFolder.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140)));
 			this.swDeleteFolder.SwitchClickTogglesValue = true;
@@ -527,9 +552,10 @@
 			// 
 			this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX13.Location = new System.Drawing.Point(85, 42);
+			this.labelX13.Location = new System.Drawing.Point(128, 65);
+			this.labelX13.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX13.Name = "labelX13";
-            this.labelX13.Size = new System.Drawing.Size(168, 22);
+			this.labelX13.Size = new System.Drawing.Size(252, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140)));
 			this.labelX13.TabIndex = 38;
 			this.labelX13.Text = "Delete Folders";
@@ -540,9 +566,10 @@
 			// 
 			// 
 			this.swDeleteAnnotations.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swDeleteAnnotations.Location = new System.Drawing.Point(10, 15);
+			this.swDeleteAnnotations.Location = new System.Drawing.Point(15, 23);
+			this.swDeleteAnnotations.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swDeleteAnnotations.Name = "swDeleteAnnotations";
-            this.swDeleteAnnotations.Size = new System.Drawing.Size(69, 22);
+			this.swDeleteAnnotations.Size = new System.Drawing.Size(104, 34);
 			this.swDeleteAnnotations.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155)));
 			this.swDeleteAnnotations.SwitchClickTogglesValue = true;
@@ -559,9 +586,10 @@
 			// 
 			this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX14.Location = new System.Drawing.Point(85, 14);
+			this.labelX14.Location = new System.Drawing.Point(128, 22);
+			this.labelX14.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX14.Name = "labelX14";
-            this.labelX14.Size = new System.Drawing.Size(186, 22);
+			this.labelX14.Size = new System.Drawing.Size(279, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155)));
 			this.labelX14.TabIndex = 36;
 			this.labelX14.Text = "Delete Annotations";
@@ -570,9 +598,10 @@
 			// 
 			this.myTVdel.CheckBoxes = true;
 			this.myTVdel.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.myTVdel.Location = new System.Drawing.Point(0, 126);
+			this.myTVdel.Location = new System.Drawing.Point(0, 205);
+			this.myTVdel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.myTVdel.Name = "myTVdel";
-            this.myTVdel.Size = new System.Drawing.Size(300, 367);
+			this.myTVdel.Size = new System.Drawing.Size(461, 562);
 			this.myTVdel.TabIndex = 34;
 			this.myTVdel.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck_DelAnn);
 			// 
@@ -583,9 +612,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.btnDeleteItems.Checked = true;
 			this.btnDeleteItems.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnDeleteItems.Location = new System.Drawing.Point(39, 98);
+			this.btnDeleteItems.Location = new System.Drawing.Point(58, 151);
+			this.btnDeleteItems.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btnDeleteItems.Name = "btnDeleteItems";
-            this.btnDeleteItems.Size = new System.Drawing.Size(221, 23);
+			this.btnDeleteItems.Size = new System.Drawing.Size(343, 35);
 			this.btnDeleteItems.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.btnDeleteItems, new DevComponents.DotNetBar.SuperTooltipInfo("Process Deletions", "", resources.GetString("btnDeleteItems.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175)));
 			this.btnDeleteItems.TabIndex = 35;
@@ -606,10 +636,10 @@
 			this.sideNavPanel3.Controls.Add(this.myTV);
 			this.sideNavPanel3.Controls.Add(this.btnFixLinks);
 			this.sideNavPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel3.Location = new System.Drawing.Point(89, 31);
-            this.sideNavPanel3.MinimumSize = new System.Drawing.Size(0, 540);
+			this.sideNavPanel3.Location = new System.Drawing.Point(134, 48);
+			this.sideNavPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.sideNavPanel3.Name = "sideNavPanel3";
-            this.sideNavPanel3.Size = new System.Drawing.Size(291, 540);
+			this.sideNavPanel3.Size = new System.Drawing.Size(436, 760);
 			this.sideNavPanel3.TabIndex = 10;
 			this.sideNavPanel3.Visible = false;
 			// 
@@ -619,9 +649,10 @@
 			// 
 			// 
 			this.swCheckROLinks.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swCheckROLinks.Location = new System.Drawing.Point(10, 66);
+			this.swCheckROLinks.Location = new System.Drawing.Point(15, 102);
+			this.swCheckROLinks.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swCheckROLinks.Name = "swCheckROLinks";
-            this.swCheckROLinks.Size = new System.Drawing.Size(91, 22);
+			this.swCheckROLinks.Size = new System.Drawing.Size(136, 34);
 			this.swCheckROLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swCheckROLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swCheckROLinks.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
 			this.swCheckROLinks.SwitchClickTogglesValue = true;
@@ -636,9 +667,10 @@
 			// 
 			this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX12.Location = new System.Drawing.Point(107, 66);
+			this.labelX12.Location = new System.Drawing.Point(160, 102);
+			this.labelX12.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX12.Name = "labelX12";
-            this.labelX12.Size = new System.Drawing.Size(186, 22);
+			this.labelX12.Size = new System.Drawing.Size(279, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX12, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX12.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
 			this.labelX12.TabIndex = 32;
 			this.labelX12.Text = "Check RO Links";
@@ -648,20 +680,21 @@
 			this.warningBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
 			this.warningBox5.CloseButtonVisible = false;
 			this.warningBox5.Image = ((System.Drawing.Image)(resources.GetObject("warningBox5.Image")));
-            this.warningBox5.Location = new System.Drawing.Point(17, 145);
-            this.warningBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.warningBox5.Location = new System.Drawing.Point(26, 223);
+			this.warningBox5.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
 			this.warningBox5.Name = "warningBox5";
 			this.warningBox5.OptionsButtonVisible = false;
-            this.warningBox5.Size = new System.Drawing.Size(262, 32);
+			this.warningBox5.Size = new System.Drawing.Size(393, 49);
 			this.warningBox5.TabIndex = 31;
 			this.warningBox5.Text = "<b>NOTE</b> These tools can take a long time to run";
 			// 
 			// line3
 			// 
 			this.line3.BackColor = System.Drawing.Color.Transparent;
-            this.line3.Location = new System.Drawing.Point(6, 127);
+			this.line3.Location = new System.Drawing.Point(9, 195);
+			this.line3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.line3.Name = "line3";
-            this.line3.Size = new System.Drawing.Size(285, 12);
+			this.line3.Size = new System.Drawing.Size(428, 18);
 			this.line3.TabIndex = 30;
 			this.line3.Text = "line3";
 			// 
@@ -671,9 +704,10 @@
 			// 
 			// 
 			this.swUpdateROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swUpdateROVals.Location = new System.Drawing.Point(10, 10);
+			this.swUpdateROVals.Location = new System.Drawing.Point(15, 15);
+			this.swUpdateROVals.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swUpdateROVals.Name = "swUpdateROVals";
-            this.swUpdateROVals.Size = new System.Drawing.Size(91, 22);
+			this.swUpdateROVals.Size = new System.Drawing.Size(136, 34);
 			this.swUpdateROVals.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swUpdateROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("swUpdateROVals.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
 			this.swUpdateROVals.SwitchClickTogglesValue = true;
@@ -688,9 +722,10 @@
 			// 
 			// 
 			this.swRefreshTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swRefreshTrans.Location = new System.Drawing.Point(10, 38);
+			this.swRefreshTrans.Location = new System.Drawing.Point(15, 58);
+			this.swRefreshTrans.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swRefreshTrans.Name = "swRefreshTrans";
-            this.swRefreshTrans.Size = new System.Drawing.Size(91, 22);
+			this.swRefreshTrans.Size = new System.Drawing.Size(136, 34);
 			this.swRefreshTrans.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swRefreshTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("swRefreshTrans.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175)));
 			this.swRefreshTrans.SwitchClickTogglesValue = true;
@@ -705,9 +740,10 @@
 			// 
 			this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX11.Location = new System.Drawing.Point(107, 10);
+			this.labelX11.Location = new System.Drawing.Point(160, 15);
+			this.labelX11.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX11.Name = "labelX11";
-            this.labelX11.Size = new System.Drawing.Size(186, 22);
+			this.labelX11.Size = new System.Drawing.Size(279, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX11, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("labelX11.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
 			this.labelX11.TabIndex = 28;
 			this.labelX11.Text = "Update RO Values";
@@ -720,9 +756,10 @@
 			// 
 			this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX6.Location = new System.Drawing.Point(107, 38);
+			this.labelX6.Location = new System.Drawing.Point(160, 58);
+			this.labelX6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX6.Name = "labelX6";
-            this.labelX6.Size = new System.Drawing.Size(186, 22);
+			this.labelX6.Size = new System.Drawing.Size(279, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX6, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX6.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175)));
 			this.labelX6.TabIndex = 28;
 			this.labelX6.Text = "Refresh Transitions";
@@ -732,11 +769,11 @@
 			this.warningBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
 			this.warningBox1.CloseButtonVisible = false;
 			this.warningBox1.Image = ((System.Drawing.Image)(resources.GetObject("warningBox1.Image")));
-            this.warningBox1.Location = new System.Drawing.Point(17, 181);
-            this.warningBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.warningBox1.Location = new System.Drawing.Point(26, 278);
+			this.warningBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
 			this.warningBox1.Name = "warningBox1";
 			this.warningBox1.OptionsButtonVisible = false;
-            this.warningBox1.Size = new System.Drawing.Size(262, 43);
+			this.warningBox1.Size = new System.Drawing.Size(393, 66);
 			this.warningBox1.TabIndex = 7;
 			this.warningBox1.Text = " Be sure there is a current backup of the \r\n database prior to running these func" +
     "tions";
@@ -746,9 +783,10 @@
 			this.btnFixLinks.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnFixLinks.Checked = true;
 			this.btnFixLinks.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnFixLinks.Location = new System.Drawing.Point(10, 98);
+			this.btnFixLinks.Location = new System.Drawing.Point(15, 151);
+			this.btnFixLinks.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btnFixLinks.Name = "btnFixLinks";
-            this.btnFixLinks.Size = new System.Drawing.Size(280, 23);
+			this.btnFixLinks.Size = new System.Drawing.Size(420, 35);
 			this.btnFixLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.btnFixLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Process Links", "", "This will run the selected RO Links or Transitions Links tool.\r\n\r\nClick on the on" +
             "/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" +
@@ -770,9 +808,10 @@
 			this.sideNavPanel1.Controls.Add(this.labelX1);
 			this.sideNavPanel1.Controls.Add(this.btnRunCheck);
 			this.sideNavPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel1.Location = new System.Drawing.Point(89, 31);
+			this.sideNavPanel1.Location = new System.Drawing.Point(134, 48);
+			this.sideNavPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.sideNavPanel1.Name = "sideNavPanel1";
-            this.sideNavPanel1.Size = new System.Drawing.Size(291, 494);
+			this.sideNavPanel1.Size = new System.Drawing.Size(436, 760);
 			this.sideNavPanel1.TabIndex = 2;
 			this.sideNavPanel1.Visible = false;
 			// 
@@ -781,11 +820,11 @@
 			this.warningBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
 			this.warningBox3.CloseButtonVisible = false;
 			this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image")));
-            this.warningBox3.Location = new System.Drawing.Point(17, 207);
-            this.warningBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.warningBox3.Location = new System.Drawing.Point(26, 318);
+			this.warningBox3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
 			this.warningBox3.Name = "warningBox3";
 			this.warningBox3.OptionsButtonVisible = false;
-            this.warningBox3.Size = new System.Drawing.Size(264, 32);
+			this.warningBox3.Size = new System.Drawing.Size(396, 49);
 			this.warningBox3.TabIndex = 29;
 			this.warningBox3.Text = "<b>NOTE</b> These tools can take a long time to run";
 			// 
@@ -797,18 +836,20 @@
 			// 
 			this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX7.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX7.Location = new System.Drawing.Point(5, 3);
+			this.labelX7.Location = new System.Drawing.Point(8, 5);
+			this.labelX7.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX7.Name = "labelX7";
-            this.labelX7.Size = new System.Drawing.Size(251, 22);
+			this.labelX7.Size = new System.Drawing.Size(376, 34);
 			this.labelX7.TabIndex = 19;
 			this.labelX7.Text = "Check for these Data Issues:";
 			// 
 			// line1
 			// 
 			this.line1.BackColor = System.Drawing.Color.Transparent;
-            this.line1.Location = new System.Drawing.Point(8, 179);
+			this.line1.Location = new System.Drawing.Point(12, 275);
+			this.line1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.line1.Name = "line1";
-            this.line1.Size = new System.Drawing.Size(285, 12);
+			this.line1.Size = new System.Drawing.Size(428, 18);
 			this.line1.TabIndex = 18;
 			this.line1.Text = "line1";
 			// 
@@ -818,9 +859,10 @@
 			// 
 			// 
 			this.swCkObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swCkObsoleteROData.Location = new System.Drawing.Point(10, 99);
+			this.swCkObsoleteROData.Location = new System.Drawing.Point(15, 152);
+			this.swCkObsoleteROData.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swCkObsoleteROData.Name = "swCkObsoleteROData";
-            this.swCkObsoleteROData.Size = new System.Drawing.Size(91, 22);
+			this.swCkObsoleteROData.Size = new System.Drawing.Size(136, 34);
 			this.swCkObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swCkObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("swCkObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
 			this.swCkObsoleteROData.SwitchClickTogglesValue = true;
@@ -835,9 +877,10 @@
 			// 
 			// 
 			this.swHiddenDataLocs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swHiddenDataLocs.Location = new System.Drawing.Point(10, 71);
+			this.swHiddenDataLocs.Location = new System.Drawing.Point(15, 109);
+			this.swHiddenDataLocs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swHiddenDataLocs.Name = "swHiddenDataLocs";
-            this.swHiddenDataLocs.Size = new System.Drawing.Size(91, 22);
+			this.swHiddenDataLocs.Size = new System.Drawing.Size(136, 34);
 			this.swHiddenDataLocs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swHiddenDataLocs, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("swHiddenDataLocs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.swHiddenDataLocs.SwitchClickTogglesValue = true;
@@ -854,9 +897,10 @@
 			// 
 			this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX3.Location = new System.Drawing.Point(107, 99);
+			this.labelX3.Location = new System.Drawing.Point(160, 152);
+			this.labelX3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX3.Name = "labelX3";
-            this.labelX3.Size = new System.Drawing.Size(154, 22);
+			this.labelX3.Size = new System.Drawing.Size(231, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX3, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("labelX3.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
 			this.labelX3.TabIndex = 11;
 			this.labelX3.Text = "Obsolete RO Data";
@@ -869,9 +913,10 @@
 			// 
 			this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX2.Location = new System.Drawing.Point(107, 71);
+			this.labelX2.Location = new System.Drawing.Point(160, 109);
+			this.labelX2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX2.Name = "labelX2";
-            this.labelX2.Size = new System.Drawing.Size(140, 22);
+			this.labelX2.Size = new System.Drawing.Size(210, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("labelX2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.labelX2.TabIndex = 12;
 			this.labelX2.Text = "Hidden Data Locations";
@@ -882,9 +927,10 @@
 			// 
 			// 
 			this.swCkOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swCkOrphanDataRecs.Location = new System.Drawing.Point(10, 43);
+			this.swCkOrphanDataRecs.Location = new System.Drawing.Point(15, 66);
+			this.swCkOrphanDataRecs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swCkOrphanDataRecs.Name = "swCkOrphanDataRecs";
-            this.swCkOrphanDataRecs.Size = new System.Drawing.Size(91, 22);
+			this.swCkOrphanDataRecs.Size = new System.Drawing.Size(136, 34);
 			this.swCkOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swCkOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("swCkOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 193)));
 			this.swCkOrphanDataRecs.SwitchClickTogglesValue = true;
@@ -901,9 +947,10 @@
 			// 
 			this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX1.Location = new System.Drawing.Point(107, 43);
+			this.labelX1.Location = new System.Drawing.Point(160, 66);
+			this.labelX1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX1.Name = "labelX1";
-            this.labelX1.Size = new System.Drawing.Size(172, 22);
+			this.labelX1.Size = new System.Drawing.Size(258, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 190)));
 			this.labelX1.TabIndex = 8;
 			this.labelX1.Text = "Orphan Data Records";
@@ -914,9 +961,10 @@
 			this.btnRunCheck.Checked = true;
 			this.btnRunCheck.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
 			this.btnRunCheck.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnRunCheck.Location = new System.Drawing.Point(5, 150);
+			this.btnRunCheck.Location = new System.Drawing.Point(8, 231);
+			this.btnRunCheck.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btnRunCheck.Name = "btnRunCheck";
-            this.btnRunCheck.Size = new System.Drawing.Size(286, 23);
+			this.btnRunCheck.Size = new System.Drawing.Size(429, 35);
 			this.btnRunCheck.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.btnRunCheck, new DevComponents.DotNetBar.SuperTooltipInfo("Run Check", "", "This will run the database check tools selected.\r\n\r\nClick on the on/off switches " +
             "to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 100)));
@@ -942,9 +990,10 @@
 			this.sideNavPanel2.Controls.Add(this.line2);
 			this.sideNavPanel2.Controls.Add(this.btnRunRepair);
 			this.sideNavPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel2.Location = new System.Drawing.Point(89, 31);
+			this.sideNavPanel2.Location = new System.Drawing.Point(134, 48);
+			this.sideNavPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.sideNavPanel2.Name = "sideNavPanel2";
-            this.sideNavPanel2.Size = new System.Drawing.Size(291, 494);
+			this.sideNavPanel2.Size = new System.Drawing.Size(436, 760);
 			this.sideNavPanel2.TabIndex = 6;
 			this.sideNavPanel2.Visible = false;
 			// 
@@ -954,9 +1003,10 @@
 			// 
 			// 
 			this.swRefreshTblsForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swRefreshTblsForSrch.Location = new System.Drawing.Point(10, 153);
+			this.swRefreshTblsForSrch.Location = new System.Drawing.Point(15, 235);
+			this.swRefreshTblsForSrch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swRefreshTblsForSrch.Name = "swRefreshTblsForSrch";
-            this.swRefreshTblsForSrch.Size = new System.Drawing.Size(91, 22);
+			this.swRefreshTblsForSrch.Size = new System.Drawing.Size(136, 34);
 			this.swRefreshTblsForSrch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swRefreshTblsForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("swRefreshTblsForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
 			this.swRefreshTblsForSrch.SwitchClickTogglesValue = true;
@@ -973,9 +1023,10 @@
 			// 
 			this.lblRefreshTblForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.lblRefreshTblForSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblRefreshTblForSrch.Location = new System.Drawing.Point(107, 153);
+			this.lblRefreshTblForSrch.Location = new System.Drawing.Point(160, 235);
+			this.lblRefreshTblForSrch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.lblRefreshTblForSrch.Name = "lblRefreshTblForSrch";
-            this.lblRefreshTblForSrch.Size = new System.Drawing.Size(186, 22);
+			this.lblRefreshTblForSrch.Size = new System.Drawing.Size(279, 34);
 			this.superTooltip1.SetSuperTooltip(this.lblRefreshTblForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("lblRefreshTblForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
 			this.lblRefreshTblForSrch.TabIndex = 31;
 			this.lblRefreshTblForSrch.Text = "Refresh Tables For Search";
@@ -985,11 +1036,11 @@
 			this.warningBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
 			this.warningBox4.CloseButtonVisible = false;
 			this.warningBox4.Image = ((System.Drawing.Image)(resources.GetObject("warningBox4.Image")));
-            this.warningBox4.Location = new System.Drawing.Point(12, 264);
-            this.warningBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.warningBox4.Location = new System.Drawing.Point(18, 406);
+			this.warningBox4.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
 			this.warningBox4.Name = "warningBox4";
 			this.warningBox4.OptionsButtonVisible = false;
-            this.warningBox4.Size = new System.Drawing.Size(264, 32);
+			this.warningBox4.Size = new System.Drawing.Size(396, 49);
 			this.warningBox4.TabIndex = 30;
 			this.warningBox4.Text = "<b>NOTE</b> These tools can take a long time to run";
 			// 
@@ -998,11 +1049,11 @@
 			this.warningBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
 			this.warningBox2.CloseButtonVisible = false;
 			this.warningBox2.Image = ((System.Drawing.Image)(resources.GetObject("warningBox2.Image")));
-            this.warningBox2.Location = new System.Drawing.Point(12, 302);
-            this.warningBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.warningBox2.Location = new System.Drawing.Point(18, 465);
+			this.warningBox2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
 			this.warningBox2.Name = "warningBox2";
 			this.warningBox2.OptionsButtonVisible = false;
-            this.warningBox2.Size = new System.Drawing.Size(264, 43);
+			this.warningBox2.Size = new System.Drawing.Size(396, 66);
 			this.warningBox2.TabIndex = 28;
 			this.warningBox2.Text = " Be sure there is a current backup of the \r\n database prior to running these func" +
     "tions";
@@ -1013,9 +1064,10 @@
 			// 
 			// 
 			this.swRmObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swRmObsoleteROData.Location = new System.Drawing.Point(10, 66);
+			this.swRmObsoleteROData.Location = new System.Drawing.Point(15, 102);
+			this.swRmObsoleteROData.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swRmObsoleteROData.Name = "swRmObsoleteROData";
-            this.swRmObsoleteROData.Size = new System.Drawing.Size(91, 22);
+			this.swRmObsoleteROData.Size = new System.Drawing.Size(136, 34);
 			this.swRmObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swRmObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Obsolete RO Data", "", resources.GetString("swRmObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(230, 205)));
 			this.swRmObsoleteROData.SwitchClickTogglesValue = true;
@@ -1030,9 +1082,10 @@
 			// 
 			// 
 			this.swRefreshWordAttmts.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swRefreshWordAttmts.Location = new System.Drawing.Point(10, 122);
+			this.swRefreshWordAttmts.Location = new System.Drawing.Point(15, 188);
+			this.swRefreshWordAttmts.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swRefreshWordAttmts.Name = "swRefreshWordAttmts";
-            this.swRefreshWordAttmts.Size = new System.Drawing.Size(91, 22);
+			this.swRefreshWordAttmts.Size = new System.Drawing.Size(136, 34);
 			this.swRefreshWordAttmts.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swRefreshWordAttmts, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("swRefreshWordAttmts.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
 			this.swRefreshWordAttmts.SwitchClickTogglesValue = true;
@@ -1047,9 +1100,10 @@
 			// 
 			// 
 			this.swStandardHypenChars.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swStandardHypenChars.Location = new System.Drawing.Point(10, 94);
+			this.swStandardHypenChars.Location = new System.Drawing.Point(15, 145);
+			this.swStandardHypenChars.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swStandardHypenChars.Name = "swStandardHypenChars";
-            this.swStandardHypenChars.Size = new System.Drawing.Size(91, 22);
+			this.swStandardHypenChars.Size = new System.Drawing.Size(136, 34);
 			this.swStandardHypenChars.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swStandardHypenChars, new DevComponents.DotNetBar.SuperTooltipInfo("Standardize Hyphen Characters", "", resources.GetString("swStandardHypenChars.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(225, 129)));
 			this.swStandardHypenChars.SwitchClickTogglesValue = true;
@@ -1066,9 +1120,10 @@
 			// 
 			this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX4.Location = new System.Drawing.Point(107, 66);
+			this.labelX4.Location = new System.Drawing.Point(160, 102);
+			this.labelX4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX4.Name = "labelX4";
-            this.labelX4.Size = new System.Drawing.Size(167, 22);
+			this.labelX4.Size = new System.Drawing.Size(250, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX4, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Obsolete RO Data", "", resources.GetString("labelX4.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(230, 205)));
 			this.labelX4.TabIndex = 24;
 			this.labelX4.Text = "Remove Obsolete RO Data";
@@ -1081,9 +1136,10 @@
 			// 
 			this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX5.Location = new System.Drawing.Point(107, 122);
+			this.labelX5.Location = new System.Drawing.Point(160, 188);
+			this.labelX5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX5.Name = "labelX5";
-            this.labelX5.Size = new System.Drawing.Size(186, 22);
+			this.labelX5.Size = new System.Drawing.Size(279, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX5, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("labelX5.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
 			this.labelX5.TabIndex = 25;
 			this.labelX5.Text = "Refresh Word Attachments";
@@ -1096,9 +1152,10 @@
 			// 
 			this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX9.Location = new System.Drawing.Point(107, 94);
+			this.labelX9.Location = new System.Drawing.Point(160, 145);
+			this.labelX9.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX9.Name = "labelX9";
-            this.labelX9.Size = new System.Drawing.Size(186, 22);
+			this.labelX9.Size = new System.Drawing.Size(279, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX9, new DevComponents.DotNetBar.SuperTooltipInfo("Standardize Hyphen Characters", "", resources.GetString("labelX9.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(225, 129)));
 			this.labelX9.TabIndex = 25;
 			this.labelX9.Text = "Standardize Hyphen Characters";
@@ -1109,9 +1166,10 @@
 			// 
 			// 
 			this.swRmOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swRmOrphanDataRecs.Location = new System.Drawing.Point(10, 38);
+			this.swRmOrphanDataRecs.Location = new System.Drawing.Point(15, 58);
+			this.swRmOrphanDataRecs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swRmOrphanDataRecs.Name = "swRmOrphanDataRecs";
-            this.swRmOrphanDataRecs.Size = new System.Drawing.Size(91, 22);
+			this.swRmOrphanDataRecs.Size = new System.Drawing.Size(136, 34);
 			this.swRmOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swRmOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Orphan Data Records", "", resources.GetString("swRmOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(325, 140)));
 			this.swRmOrphanDataRecs.SwitchClickTogglesValue = true;
@@ -1128,9 +1186,10 @@
 			// 
 			this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX10.Location = new System.Drawing.Point(107, 38);
+			this.labelX10.Location = new System.Drawing.Point(160, 58);
+			this.labelX10.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX10.Name = "labelX10";
-            this.labelX10.Size = new System.Drawing.Size(184, 22);
+			this.labelX10.Size = new System.Drawing.Size(276, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX10, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Orphan Data Records", "", resources.GetString("labelX10.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(325, 140)));
 			this.labelX10.TabIndex = 22;
 			this.labelX10.Text = "Remove Orphan Data Records";
@@ -1143,18 +1202,20 @@
 			// 
 			this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX8.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX8.Location = new System.Drawing.Point(5, 3);
+			this.labelX8.Location = new System.Drawing.Point(8, 5);
+			this.labelX8.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX8.Name = "labelX8";
-            this.labelX8.Size = new System.Drawing.Size(251, 22);
+			this.labelX8.Size = new System.Drawing.Size(376, 34);
 			this.labelX8.TabIndex = 21;
 			this.labelX8.Text = "Repair these Data Issues:";
 			// 
 			// line2
 			// 
 			this.line2.BackColor = System.Drawing.Color.Transparent;
-            this.line2.Location = new System.Drawing.Point(4, 237);
+			this.line2.Location = new System.Drawing.Point(6, 365);
+			this.line2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.line2.Name = "line2";
-            this.line2.Size = new System.Drawing.Size(281, 12);
+			this.line2.Size = new System.Drawing.Size(422, 18);
 			this.line2.TabIndex = 20;
 			this.line2.Text = "line2";
 			// 
@@ -1164,9 +1225,10 @@
 			this.btnRunRepair.Checked = true;
 			this.btnRunRepair.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
 			this.btnRunRepair.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnRunRepair.Location = new System.Drawing.Point(5, 198);
+			this.btnRunRepair.Location = new System.Drawing.Point(8, 305);
+			this.btnRunRepair.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btnRunRepair.Name = "btnRunRepair";
-            this.btnRunRepair.Size = new System.Drawing.Size(280, 23);
+			this.btnRunRepair.Size = new System.Drawing.Size(420, 35);
 			this.btnRunRepair.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.btnRunRepair, new DevComponents.DotNetBar.SuperTooltipInfo("Run Repair", "", "This will run the database repair tools selected.\r\n\r\nClick on the on/off switches" +
             " to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 103)));
@@ -1178,9 +1240,10 @@
 			// 
 			this.sideNavPanel5.Controls.Add(this.btn_ShowUsers);
 			this.sideNavPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel5.Location = new System.Drawing.Point(81, 31);
+			this.sideNavPanel5.Location = new System.Drawing.Point(122, 48);
+			this.sideNavPanel5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.sideNavPanel5.Name = "sideNavPanel5";
-            this.sideNavPanel5.Size = new System.Drawing.Size(299, 494);
+			this.sideNavPanel5.Size = new System.Drawing.Size(448, 760);
 			this.sideNavPanel5.TabIndex = 14;
 			this.sideNavPanel5.Visible = false;
 			// 
@@ -1189,9 +1252,10 @@
 			this.btn_ShowUsers.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btn_ShowUsers.Checked = true;
 			this.btn_ShowUsers.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btn_ShowUsers.Location = new System.Drawing.Point(57, 37);
+			this.btn_ShowUsers.Location = new System.Drawing.Point(86, 57);
+			this.btn_ShowUsers.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btn_ShowUsers.Name = "btn_ShowUsers";
-            this.btn_ShowUsers.Size = new System.Drawing.Size(171, 23);
+			this.btn_ShowUsers.Size = new System.Drawing.Size(256, 35);
 			this.btn_ShowUsers.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.btn_ShowUsers, new DevComponents.DotNetBar.SuperTooltipInfo("Show Users", "", "This will return all of the users currently with open sessions in the database an" +
             "d the details of any items they have checked out.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 80)));
@@ -1274,8 +1338,9 @@
 			this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty;
 			this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.panelEx4.Location = new System.Drawing.Point(0, 0);
+			this.panelEx4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.panelEx4.Name = "panelEx4";
-            this.panelEx4.Size = new System.Drawing.Size(1177, 57);
+			this.panelEx4.Size = new System.Drawing.Size(1766, 87);
 			this.panelEx4.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.panelEx4.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.panelEx4.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -1302,9 +1367,10 @@
             this.stepItem3,
             this.stepItem4});
 			this.progressSteps1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
-            this.progressSteps1.Location = new System.Drawing.Point(123, 18);
+			this.progressSteps1.Location = new System.Drawing.Point(184, 28);
+			this.progressSteps1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.progressSteps1.Name = "progressSteps1";
-            this.progressSteps1.Size = new System.Drawing.Size(1032, 26);
+			this.progressSteps1.Size = new System.Drawing.Size(1548, 40);
 			this.progressSteps1.TabIndex = 18;
 			// 
 			// stepItem1
@@ -1343,9 +1409,10 @@
 			// 
 			this.lblAdmToolProgressType.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.lblAdmToolProgressType.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblAdmToolProgressType.Location = new System.Drawing.Point(19, 10);
+			this.lblAdmToolProgressType.Location = new System.Drawing.Point(28, 15);
+			this.lblAdmToolProgressType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.lblAdmToolProgressType.Name = "lblAdmToolProgressType";
-            this.lblAdmToolProgressType.Size = new System.Drawing.Size(98, 34);
+			this.lblAdmToolProgressType.Size = new System.Drawing.Size(147, 52);
 			this.lblAdmToolProgressType.TabIndex = 19;
 			this.lblAdmToolProgressType.Text = "Checking:";
 			// 
@@ -1361,10 +1428,11 @@
 			// 
 			// frmBatchRefresh
 			// 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1177, 586);
+			this.ClientSize = new System.Drawing.Size(1766, 902);
 			this.Controls.Add(this.splitContainer3);
+			this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.MaximizeBox = false;
 			this.MinimizeBox = false;
 			this.Name = "frmBatchRefresh";

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -178,8 +178,6 @@ namespace VEPROMS
 			myDocVersions.Clear();
 			FolderInfo fi = FolderInfo.GetTop();
 
-			fi.RefreshChildFolders();
-
 			if (fi.ChildFolderCount > 0)
 			{
 				TreeNode tn = new TreeNode(fi.Name);
@@ -235,7 +233,7 @@ namespace VEPROMS
 				loadedWorkingDraft = true;
 			}
 
-			if (tn.Parent != null && !loadedWorkingDraft && fi.FolderDocVersionCount == 0)
+			if (tn.Parent != null && !loadedWorkingDraft)
 			{
 				tn.Remove();
 			}
@@ -483,14 +481,12 @@ namespace VEPROMS
 		// B2018-002 - Invalid Transitions - Define Transition Refresh Statistics
 		private int numTransProcessed = 0;
 		private int numTransFixed = 0;
-		private int numTransCantFix = 0;
 		private int numTransConverted = 0;
 		// B2018-002 - Invalid Transitions - Initialize Transition Refresh Statistics
 		private void ResetTransNumbers()
 		{
 			numTransProcessed = 0;
 			numTransFixed = 0;
-			numTransCantFix = 0;
 			numTransConverted = 0;
 		}
 		private void RefreshTransitions()
@@ -539,12 +535,11 @@ namespace VEPROMS
 						numTransConverted += ProcedureInfo.TranConvertCount;
 						numTransProcessed += ProcedureInfo.TranCheckCount;
 						numTransFixed += ProcedureInfo.TranFixCount;
-						numTransCantFix += ProcedureInfo.TranCantFixCount; //Bad Transition Link
 						pbProcess.PerformStep();
 						Application.DoEvents();
 					}
 				}
-				if (numTransFixed == 0 && numTransConverted == 0 && numTransCantFix == 0)
+				if (numTransFixed == 0 && numTransConverted == 0)
 				{
 					txtResults.AppendText("No Transitions Needed Updated.");
 					txtResults.AppendText(Environment.NewLine);
@@ -556,18 +551,16 @@ namespace VEPROMS
 				txtProcess.AppendText(string.Format("Transitions Checked: {0}", numTransProcessed));
 				txtProcess.AppendText(Environment.NewLine);
 				// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
-				txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}", numTransProcessed - (numTransConverted + numTransFixed + numTransCantFix)));
+				txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}", numTransProcessed - (numTransConverted + numTransFixed)));
 				txtProcess.AppendText(Environment.NewLine);
 				txtProcess.AppendText(string.Format("Transitions Modified: {0}", numTransFixed));
 				txtProcess.AppendText(Environment.NewLine);
 				txtProcess.AppendText(string.Format("Transitions Converted to text: {0}", numTransConverted));
-				txtProcess.AppendText(Environment.NewLine);
-				txtProcess.AppendText(string.Format("Transitions Unable to be Automatically Fixed (Annotation: Bad Transition Link): {0}", numTransCantFix));
 				Application.DoEvents();
 				if (pil.Count > 0)
 				{
 					StringBuilder sb = new StringBuilder();
-					sb.AppendLine("The batch refresh process was not successful for all procedures selected.");
+					sb.AppendLine("The batch refresh process was not usccessful for all procedures selected.");
 					sb.AppendLine("The following procedures were not able to be refreshed...");
 					sb.AppendLine();
 					sb.AppendLine(sbProcs.ToString());
@@ -586,11 +579,11 @@ namespace VEPROMS
 				}
 			}
 			this.Cursor = Cursors.Default;
-            // B2018-002 - Invalid Transitions - Display Transition Refresh Statistic
-            if (numTransFixed == 0 && numTransConverted == 0 && numTransCantFix == 0)
+			// B2018-002 - Invalid Transitions - Display Transition Refresh Statisitic
+			if (numTransFixed == 0 && numTransConverted == 0)
 				MessageBox.Show(string.Format("{0} Transitions Checked.\n\nNo Transitions Modified.", numTransProcessed), "Refresh Transitions Completed");
 			else
-				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.\n\n {4} Transitions unable to be automatically fixed (Annotation: Bad Transition Link).", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted + numTransCantFix), numTransFixed, numTransConverted, numTransCantFix), "Refresh Transitions Completed");
+				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted), numTransFixed, numTransConverted), "Refresh Transitions Completed");
 		}
 
 		// C2017-030 - new Admin Tools user interface
@@ -1110,7 +1103,8 @@ namespace VEPROMS
 			ProcedureInfo.RefreshTransitions(pq);//, transitionsToDisconnected, transitionsToNonEditable);
 			TimeSpan ts = DateTime.Now - start;
 			// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
-			txtProcess.AppendText(string.Format("Procedure:  {1}{0}Checked {2} Transitions{0}Fixed {3} Transitions{0}Converted to Text {4} Transitions{0}Cant Fix (Annotation: Bad Transition Link) {5} Transitions{0}Elapsed Seconds:{6}{0}{0}", Environment.NewLine, pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ProcedureInfo.TranCantFixCount, ts.TotalSeconds));
+			txtProcess.AppendText(string.Format("Procedure:  {1}{0}Checked {2} Transitions{0}Fixed {3} Transitions{0}Converted to Text {4} Transitions{0}Elapsed Seconds:{5}{0}{0}", Environment.NewLine, pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ts.TotalSeconds));
+			//Console.WriteLine("\"{0}\"\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}", pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ts.TotalSeconds, numTransProcessed, numTransFixed, numTransConverted);
 			if (myFixes.Length > 0)
 			{
 				txtResults.AppendText(myFixes.ToString());

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -183,19 +183,19 @@ It is recommended that this be done during off hours.
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="warningBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
-        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
-        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
-        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
-        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
-        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
-        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
-        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
-        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
-        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
-        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
-        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
-        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
+        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
+        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
+        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
+        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
+        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
+        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
+        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
+        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
+        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
+        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
+        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
+        zJwL4b/EAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="swUpdateROVals.SuperTooltip" xml:space="preserve">
@@ -230,36 +230,36 @@ If more than one procedure is selected, it is recommended that this be performed
   </data>
   <data name="warningBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
-        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
-        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
-        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
-        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
-        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
-        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
-        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
-        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
-        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
-        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
-        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
-        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
+        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
+        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
+        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
+        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
+        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
+        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
+        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
+        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
+        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
+        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
+        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
+        zJwL4b/EAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
-        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
-        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
-        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
-        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
-        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
-        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
-        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
-        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
-        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
-        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
-        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
-        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
+        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
+        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
+        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
+        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
+        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
+        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
+        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
+        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
+        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
+        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
+        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
+        zJwL4b/EAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="swCkObsoleteROData.SuperTooltip" xml:space="preserve">
@@ -324,36 +324,36 @@ This function will remove all of the saved attachment PDFS stored in the databas
   </data>
   <data name="warningBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
-        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
-        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
-        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
-        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
-        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
-        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
-        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
-        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
-        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
-        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
-        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
-        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
+        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
+        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
+        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
+        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
+        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
+        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
+        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
+        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
+        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
+        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
+        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
+        zJwL4b/EAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="warningBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
-        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
-        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
-        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
-        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
-        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
-        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
-        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
-        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
-        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
-        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
-        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
-        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
+        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
+        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
+        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
+        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
+        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
+        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
+        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
+        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
+        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
+        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
+        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
+        zJwL4b/EAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="swRmObsoleteROData.SuperTooltip" xml:space="preserve">

PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs

@@ -687,46 +687,19 @@ namespace VEPROMS.CSLA.Library
 								myLength += mg.Groups[3].Length;
 							}
 							string gg = MyGrid.Data.Substring(myIndex, myLength);
-							//CSM B2024-003 Updating RO Values inside a text Grid, adding a karat
-							// and/or dash into the RO value changes to question marks in the UI,
 							if (newvalue.Contains(@"\u8209?"))
 							{
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
 								if (m == null)
 									newvalue = newvalue.Replace(@"\u8209?", "-");
-								else if (m.Groups[1].Value == "")
-									newvalue = newvalue.Replace(@"\u8209?", "-");
 								else
 									newvalue = newvalue.Replace(@"\u8209?", m.Groups[1].Value + @"\u8209?" + m.Groups[3].Value);
 							}
-							int indx_to_addfont = -1;
-							if (newvalue.Contains(@"\u916?"))
-							{
-								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
-								if (m == null)
-									newvalue = newvalue.Replace(@"\u916?", "^");
-								else if (m.Groups[1].Value == "" && !ContentItems[0].MyItem.MyItemInfo.MyDocVersion.MyFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
-									newvalue = newvalue.Replace(@"\u916?", "^");
-								else if (m.Groups[1].Value == "")
-                                {
-									//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
-									//  adding a caret and/or dash into the RO value and then updating RO values changed to question marks in the UI.
-									//  This is to handle if ConvertCaretToDelta is true
-									//  since delta is not part of the standard ascii
-									//  may need to add a font to handle it.
-									newvalue = newvalue.Replace(@"\u916?", @"\f9\u916?\f0 ");
-									indx_to_addfont = GetLocationToInsertFontInGrid(myIndex);
-								}
-								else
-									newvalue = newvalue.Replace(@"\u916?", m.Groups[1].Value + @"\u916?" + m.Groups[3].Value);
-							}
 							if (newvalue.Contains(@"\u8593?"))
 							{
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
 								if (m == null)
 									newvalue = newvalue.Replace(@"\u8593?", "^");
-								else if (m.Groups[1].Value == "")
-									newvalue = newvalue.Replace(@"\u8593?", "^");
 								else
 									newvalue = newvalue.Replace(@"\u8593?", m.Groups[1].Value + @"\u8593?" + m.Groups[3].Value);
 							}
@@ -735,8 +708,6 @@ namespace VEPROMS.CSLA.Library
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
 								if (m == null)
 									newvalue = newvalue.Replace(@"\u9586?", @"\\");
-								else if (m.Groups[1].Value == "")
-									newvalue = newvalue.Replace(@"\u9586?", @"\\");
 								else
 									newvalue = newvalue.Replace(@"\u9586?", m.Groups[1].Value + @"\u9586?" + m.Groups[3].Value);
 							}
@@ -748,17 +719,7 @@ namespace VEPROMS.CSLA.Library
 							if (gg != newvalue)
 							{
 								retval = gg;
-								//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
-								//  adding a caret and/or dash into the RO value and then updating RO values changed to question marks in the UI.
-								//  This is to handle if ConvertCaretToDelta is true
-								//  since delta is not part of the standard ascii
-								//  may need to add a font to handle it.
-								string begin_str = MyGrid.Data.Substring(0, myIndex);
-								if (indx_to_addfont > -1)
-									begin_str = begin_str.Insert(indx_to_addfont, @"{\f9\fnil\fcharset0 FreeMono;}");
-
-								MyGrid.Data = begin_str + newvalue + MyGrid.Data.Substring(myIndex + myLength);
-								MyGrid.Save();
+								MyGrid.Data = MyGrid.Data.Substring(0, myIndex) + newvalue + MyGrid.Data.Substring(myIndex + myLength);
 								break;
 							}
 						}
@@ -768,64 +729,6 @@ namespace VEPROMS.CSLA.Library
 			return retval;
 		}
 
-		//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
-		//  adding a caret and/or dash into the RO value and then updating RO values changed to question marks in the UI.
-		//  This is to handle if ConvertCaretToDelta is true
-		//  since delta is not part of the standard ascii
-		//  may need to add a font to handle it.
-		// startIndex = Index in the Grid at which the text we want to replace is starting
-		//basic Grid data partitioning using the variables in this sub is as follows:
-		//
-		//                                 [indexOfPrefix]               [indx]
-		//                                        |                         |
-		// [text before last occurrence of prefix]  {prefix} [rest of fonts]  [text after fonts]
-		private int GetLocationToInsertFontInGrid(int startIndex)
-        {
-			//searches backwards from the srtIndex for the last previous occurrence of the prefix
-			string prefix = @"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{";
-			int indexOfPrefix = MyGrid.Data.LastIndexOf(prefix, startIndex);
-
-			//find the end of the font section
-			//by passing in the Grid data 
-			//with the following removed:
-			// - Everything before the last occurrence of the prefix
-			// - the prefix itself removed
-			int indx = GetIndexOfCloseBracket(MyGrid.Data.Substring(indexOfPrefix + prefix.Length, startIndex - indexOfPrefix - prefix.Length));
-
-			if (indx > -1)
-			{
-				indx += indexOfPrefix;
-				indx += prefix.Length;
-			}
-
-			//indx will contain last spot inside the font section
-			return indx;
-
-		}
-
-		//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
-		//  this function will find the corresponding occurrence of a closing bracket :
-		// usage is you pass in some text after an opening bracket, and it will tell you what the index is for it closing
-		private int GetIndexOfCloseBracket(string text)
-        {
-			int indx = 0;
-			Stack<char> stk = new System.Collections.Generic.Stack<char>();
-
-			foreach (char c in text)
-			{
-				if (c == '{')
-					stk.Push('{');
-				else if (c == '}' && stk.Count == 0)
-					return indx;
-				else if (c == '}')
-					stk.Pop();
-
-				indx++;
-			}
-
-			return -1;
-        }
-
 		public static string MakeConsistentFormat(string gg)
 		{
 			// replace degree, bullet dash, hardspace
@@ -1352,16 +1255,6 @@ namespace VEPROMS.CSLA.Library
 						{
 							gg = ItemInfo.ConvertToDisplayText(gg);
 							newvalue = ItemInfo.ConvertToDisplayText(newvalue);
-
-							//CSM B2024-094 - Carats (as Deltas) print as question marks in tables when unit <u> is used in RO Definition Value
-							//If there is a grid, need to keep these as the \u code
-							//Otherwise they will not use the correct font and end up as question marks
-							if (MyGrid != null)
-                            {
-								gg = gg.Replace($"{(char)916}", @"\u916?");
-								newvalue = newvalue.Replace($"{(char)916}", @"\u916?");
-							}
-
 							// Debug  - jsj 5-19-2017 - left in for initial check-in
 							//string xx_gg = gg_org.Replace(@"\'b0", @"\'B0").Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
 							//string xx_nv = newval_org.Replace(@"\'b0", @"\'B0").Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
@@ -1414,19 +1307,7 @@ namespace VEPROMS.CSLA.Library
 								else
 									newvalue = newvalue.Replace(@"\u8209?", m.Groups[1].Value + @"\u8209?" + m.Groups[3].Value);
 							}
-							//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
-							//  This will handle if there is a delta and the column/row of the grid is removed
-							//then restored from history
-							if (newvalue.Contains(@"\u916?"))
-							{
-								Match m = Regex.Match(gg, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
-								if (m.Groups.Count < 3 && !ContentItems[0].MyDocVersion.MyFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
-									newvalue = newvalue.Replace(@"\u916?", "^");
-								else if (m.Groups.Count < 3)
-									newvalue = newvalue.Replace(@"\u916?", $"{(char)916}");
-								else
-									newvalue = newvalue.Replace(@"\u916?", m.Groups[1].Value + @"\u916?" + m.Groups[3].Value);
-							}
+
 							if (newvalue.Contains(@"\u8593?"))
 							{
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");

PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -11,7 +11,6 @@ using System.Xml;
 using System.Drawing;
 using System.Text.RegularExpressions;
 using Volian.Base.Library;
-using System.Linq;
 
 namespace VEPROMS.CSLA.Library
 {
@@ -403,99 +402,6 @@ namespace VEPROMS.CSLA.Library
 			return tmpForLink;
 		}
 
-		//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
-		// This will be used to simulate the non-high level part of a tab
-		// for case where sorting and all other fields match
-		// Note: This is cut down to improve the sort's performance
-		// but congruent to Volian.Print.Library.PDFReport-> BuildStepTab(ItemInfo item)
-		public string BuildStepTab()
-		{
-			StringBuilder sret = new StringBuilder();
-			ItemInfo pitem = this;
-
-			while (!pitem.IsSection && !pitem.IsHigh)
-            {
-                using (StepInfo stpinfo = StepInfo.Get(pitem.ItemID))
-                {
-                    string thisTab = stpinfo.MyTab.CleanText;
-
-                    string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;
-
-                    if (!string.IsNullOrEmpty(thisTab))
-                    {
-                        thisTab = thisTab.Trim();
-                    }
-
-                    // if the tab is null or
-                    // if the the tab is not a letter or number OR
-                    // the tab is an AND or OR type and is the letter "o"
-                    // then reset the tab an empty string so that the type name along with the count of that type 
-                    // (ex. "AND 2", "OR 3")
-                    if (string.IsNullOrEmpty(thisTab) || (thisTab != string.Empty && (!(char.IsLetterOrDigit(thisTab[0])) || ((pitem.IsAnd || pitem.IsOr || pitem.IsCaution || pitem.IsNote) && thisTab.Contains("o")))))
-                    {
-                        thisTab = string.Empty;
-                    }
-
-                    if (pitem.IsRNOPart)
-                    {
-                        if (string.IsNullOrEmpty(thisTab))
-                        {
-                            sret.Insert(0, "RNO.");
-                        }
-                        else
-                        {
-                            thisTab = thisTab.Trim();
-
-                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
-                            {
-                                thisTab += ".";
-                            }
-
-                            sret.Insert(0, "RNO." + thisTab);
-                        }
-                    }
-                    else if (pitem.IsCaution || pitem.IsNote)
-                    {
-                        // add the Caution or Note count to the tab (ex "Caution 1", "Note 2")
-                        if (string.IsNullOrEmpty(thisTab))
-                        {
-                            sret.Append("{" + typeName + " " + pitem.Ordinal.ToString() + "}");
-                        }
-                        else
-                        {
-                            thisTab = thisTab.Trim(" ".ToCharArray());
-                            sret.Append(thisTab + " " + pitem.Ordinal.ToString() + sret);
-                        }
-                    }
-                    else
-                    {
-                        if (!string.IsNullOrEmpty(thisTab))
-                        {
-                            thisTab = thisTab.Trim(" ".ToCharArray());
-
-                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
-                            {
-                                thisTab += ".";
-                            }
-                        }
-                        else
-                        {
-                            thisTab = "{" + typeName + " " + pitem.Ordinal.ToString() + "}.";
-                        }
-
-                        sret.Insert(0, thisTab);
-                    }
-                }
-
-                pitem = pitem.ActiveParent as ItemInfo;
-
-                if (pitem == null)
-                    break;
-            }
-
-            return sret.ToString().Trim(" .)".ToCharArray());
-		}
-
 		public void SetHeader(VE_Font myFont, string myText)
 		{
 			_MyHeader = new MetaTag(myFont);
@@ -713,14 +619,12 @@ namespace VEPROMS.CSLA.Library
 		{
 			TranCheckCount = 0;
 			TranFixCount = 0;
-			TranCantFixCount = 0;
 			TranConvertCount = 0;// B2018-002 - Invalid Transitions - Initialize Transition Conversion Count
 		}
 
 		public static int TranCheckCount = 0;
 		public static int TranFixCount = 0;
 		public static int TranConvertCount = 0;// B2018-002 - Invalid Transitions - Declare Transition Conversion Count
-		public static int TranCantFixCount = 0;
 		internal static TransitionInfoList TransitionsToDisconnected;
 		internal static TransitionInfoList TransitionsToNonEditable;
 
@@ -827,15 +731,6 @@ namespace VEPROMS.CSLA.Library
 								content.Save();
 							}
 						}
-						else if (newText.Contains("<CTID=-"))
-						{
-							//CSM C2024-028 - Bad Transition Link - Make an annotation					
-							using (Item itm = Item.Get(itemInfo.ItemID))
-							{
-								TranCantFixCount++;
-								Annotation.MakeAnnotation(itm, AnnotationType.GetByNameOrCreate("Bad Transition Link"), "", $"Invalid Transition Link: ({ItemInfo.ConvertToDisplayText(newValue)})", null);
-							}
-						}
 					}
 				}
 			}
@@ -3239,24 +3134,6 @@ namespace VEPROMS.CSLA.Library
 			//get { return ConvertToDisplayText(MyContent.Number); }
 		}
 
-		//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
-		//Get Numeric part of HLS Tab
-		//Used for Certain sorting situations
-		//If no numeric part then use 999 (will be at end of that level of the sort if there are other items with numbered HLS)
-		public int NumericSortNumber
-		{
-			get
-			{
-				string numericpart = null;
-				if (MyHLS != null)
-					numericpart = new string(MyHLS?.MyTab?.CleanTextNoSymbols.TakeWhile(Char.IsDigit).ToArray());
-				if (!string.IsNullOrEmpty(numericpart) && numericpart.All(char.IsNumber))
-					return int.Parse(numericpart);
-				else
-					return 999;
-			}
-		}
-
 		// for step designators (a redefined caution type used in Comanche Peak with the SameRowAsParentMultiLines format flag)
 		// we what to allow for a hard return to allow for multiple designator lines - jsj 5/21/2015
 		public static string ConvertToMulitLineStepDesignatorDisplayText(string txt)
@@ -6262,168 +6139,6 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
 			}
 		}
-
-        //CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
-        // Found various inconsistencies in the reports so adding this to manually sort
-		//instead of binding the sort to 1 or 2 individual fields
-        public List<ItemInfo> SortedList(bool sortbyFoundRoid = false)
-		{
-			List<ItemInfo> tmp = new List<ItemInfo>(this);
-			if (sortbyFoundRoid)
-			{
-				// Priority of Sorting order:
-				// 1. FoundRoid (by Referenced Object ID)
-				// 2. SearchDVPath_clean (Which Procedure Set it is in - I.E. EOPs, Background, SAMGs, etc...)
-				// 3. Keep in order of the Procedures within the set
-				// 4. Keep in the order of the Section within the Procedure
-				// 5. NumericSortNumber - numeric part of the HLS if there is one
-				// 6. Substep Tab - will sort as a string since combined numbers/text
-				tmp.Sort(comparison: delegate (ItemInfo x, ItemInfo y)
-				{
-					int cmp = 0;
-					int FoundROID_cmp = x.FoundROID.CompareTo(y.FoundROID);
-					switch (FoundROID_cmp)
-					{
-						case int result when result < 0:
-							cmp -= 10000000;
-							break;
-						case int result when result == 0:
-							break;
-						case int result when result > 0:
-							cmp += 10000000;
-							break;
-						default:
-							break;
-					}
-
-					int DVPath_cmp = x.SearchDVPath_clean.CompareTo(y.SearchDVPath_clean);
-					switch (DVPath_cmp)
-					{
-						case int result when result < 0:
-							cmp -= 1000000;
-							break;
-						case int result when result == 0:
-							break;
-						case int result when result > 0:
-							cmp += 1000000;
-							break;
-						default:
-							break;
-					}
-
-					if (x.MyProcedure != null && y.MyProcedure != null)
-					{
-						cmp += (x.MyProcedure.Ordinal.CompareTo(y.MyProcedure.Ordinal) * 100000);
-					}
-
-					if (x.ActiveSection != null && y.ActiveSection != null)
-					{
-						cmp += (x.ActiveSection.Ordinal.CompareTo(y.ActiveSection.Ordinal) * 100000);
-					}
-
-					cmp += x.NumericSortNumber.CompareTo(y.NumericSortNumber) * 10;
-
-					if (cmp == 0)
-					{
-						int StepTab_cmp = (x.BuildStepTab()).CompareTo(y.BuildStepTab());
-						switch (StepTab_cmp)
-						{
-							case int result when result < 0:
-								cmp -= 1;
-								break;
-							case int result when result == 0:
-								break;
-							case int result when result > 0:
-								cmp += 1;
-								break;
-							default:
-								break;
-						}
-					}
-
-					return cmp;
-				});
-			}
-            else 
-			{
-				// Priority of Sorting order:
-				// 1. SearchDVPath_clean (Which Procedure Set it is in - I.E. EOPs, Background, SAMGs, etc...)
-				// 2. Keep in order of the Procedures within the set
-				// 3. Keep in the order of the Section within the Procedure
-				// 4. NumericSortNumber - numeric part of the HLS if there is one
-				// 5. Substep Tab - will sort as a string since combined numbers/text
-				// 6. FoundRoid (by Referenced Object ID)
-				tmp.Sort(comparison: delegate (ItemInfo x, ItemInfo y)
-				{
-					int cmp = 0;
-
-					int DVPath_cmp = x.SearchDVPath_clean.CompareTo(y.SearchDVPath_clean);
-					switch (DVPath_cmp)
-					{
-						case int result when result < 0:
-							cmp -= 10000000;
-							break;
-						case int result when result == 0:
-							break;
-						case int result when result > 0:
-							cmp += 10000000;
-							break;
-						default:
-							break;
-					}
-
-					if (x.MyProcedure != null && y.MyProcedure != null)
-					{
-						cmp += (x.MyProcedure.Ordinal.CompareTo(y.MyProcedure.Ordinal) * 1000000);
-					}
-
-					if (x.ActiveSection != null && y.ActiveSection != null)
-					{
-						cmp += (x.ActiveSection.Ordinal.CompareTo(y.ActiveSection.Ordinal) * 100000);
-					}
-
-					cmp += (x.NumericSortNumber.CompareTo(y.NumericSortNumber) * 100);
-
-					if (cmp == 0)
-					{
-						int StepTab_cmp = (x.BuildStepTab()).CompareTo(y.BuildStepTab());
-						switch (StepTab_cmp)
-						{
-							case int result when result < 0:
-								cmp -= 10;
-								break;
-							case int result when result == 0:
-								break;
-							case int result when result > 0:
-								cmp += 10;
-								break;
-							default:
-								break;
-						}
-					}
-
-					int FoundROID_cmp = x.FoundROID.CompareTo(y.FoundROID);
-					switch (FoundROID_cmp)
-					{
-						case int result when result < 0:
-							cmp -= 1;
-							break;
-						case int result when result == 0:
-							break;
-						case int result when result > 0:
-							cmp += 1;
-							break;
-						default:
-							break;
-					}
-
-					return cmp;
-				});
-			}
-
-			return tmp;
-        }
-
 		[Serializable()]
 		private class MoveItemCriteria
 		{
@@ -8447,7 +8162,97 @@ namespace VEPROMS.CSLA.Library
 				Dr = dr;
 			}
 		}
+		public static DataTable GetDisplayTabs(int itemID) //, string displayTabID, string displayTabName)
+		{
+			try
+			{
+				DataTable tmp = DataPortal.Fetch<DataTable>(new DisplayTabs(itemID, "", "")); //, displayTabID, displayTabName));
+																								  //ItemInfo.AddList(tmp);
+																								  //tmp.AddEvents();
+				return tmp;
+			}
+			catch (Exception ex)
+			{
+				throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
+			}
+		}
+		private DataTable dt = new DataTable();
+		private DataTable DataPortal_Fetch(DisplayTabs criteria)
+		{
 			
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "GetDisplayTabData";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						SqlDataAdapter da = new SqlDataAdapter(cm);
+						da.Fill(dt);
+						cn.Close();
+						da.Dispose();
+						return dt;
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
+						throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
+					}
+
+				}			
+			}
+
+		}
+		//public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
+		//{
+		//	try
+		//	{
+		//		//DisplayTabs tmp = 
+		//		DataPortal.Fetch<DisplayTabs>(new DisplayTabs(itemID, displayTabID, displayTabName)); //, displayTabID, displayTabName));
+		//																											  //ItemInfo.AddList(tmp);
+		//																											  //tmp.AddEvents();
+		//		//return tmp;
+		//	}
+		//	catch (Exception ex)
+		//	{
+		//		throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
+		//	}
+		//}
+		//private DataTable dt = new DataTable();
+		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
+		//{
+
+		//	using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+		//	{
+		//		using (SqlCommand cm = cn.CreateCommand())
+		//		{
+		//			try
+		//			{
+		//				cm.CommandType = CommandType.StoredProcedure;
+		//				cm.CommandText = "AddDisplayTabState";
+		//				cm.CommandTimeout = Database.DefaultTimeout;
+		//				cm.Parameters.AddWithValue("@ItemID", ItemID);
+		//				cm.Parameters.AddWithValue("@displayTabID", displayTabID);
+		//				cm.Parameters.AddWithValue("@displayTabName", displayTabName);
+		//				cm.ExecuteNonQuery();
+		//				//SqlDataAdapter da = new SqlDataAdapter(cm);
+		//				//da.Fill(dt);
+		//				//cn.Close();
+		//				//da.Dispose();
+		//				//return dt; // fix
+		//			}
+		//			catch (Exception ex)
+		//			{
+		//				//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
+		//				throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
+		//			}
+
+		//		}
+		//	}
+
+		//}
 		public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
 		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
 		{

PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs

@@ -2650,12 +2650,10 @@ namespace VEPROMS.CSLA.Library
 			firstTrans = false;
 			if (!CanDeleteObject())
 				throw new System.Security.SecurityException("User not authorized to remove a Item");
-			// B2016-009 check source and destination types and display message box if needed
+			// B2016-009 check source and desintation types and display message box if needed
 			// C2022-017 moved the CheckSourceDestinationType call to  btnPasteReplace_Click in StepTabRibbon
 			// B2023-101 Handle Paste Replace when procedure to be replaced has Incoming Transitions, i.e. do a separate try/catch for this case
 			ItemInfo newItemInfo = null;
-			using (ItemInfo copyItemInfo = ItemInfo.Get(copyStartID))
-			{
 			try
 			{
 				// C2017-031:  Support for paste/replace an enhanced step, if this is replacing enhanced, do a specific query
@@ -2664,80 +2662,6 @@ namespace VEPROMS.CSLA.Library
 					newItemInfo = ItemInfo.CopyPasteReplaceEnhancedItemInfoFetch(copyStartID, itemInfo);
 					if (newItemInfo == null) return null;
 				}
-					//C2025-003 Enhanced Copy/Paste Upgrade - Added support for paste/replace on a master step
-					else if (itemInfo.HasEnhancedLinkedStep || copyItemInfo.HasEnhancedLinkedStep)
-					{
-						DialogResult rslt = DialogResult.No;
-
-						SectionConfig secCfg = itemInfo.ActiveSection.MyConfig as SectionConfig;
-						if (copyItemInfo.HasEnhancedLinkedStep && secCfg.MyEnhancedDocuments.Count > 0)
-							rslt = FlexibleMessageBox.Show("The step you are copying contains linked background documents." +
-									"\r\n\r\nDo you also wish to make a copy of the background documents?",
-									"Paste background documents", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-
-						//unlink and remove any background documents attached to where you are copying to
-						//and then delete them
-						//if selected want to replace BG step (DialogResult.Yes)
-						if (itemInfo.HasEnhancedLinkedStep && rslt == DialogResult.Yes)
-						{
-							foreach (EnhancedDocument ed in itemInfo.GetMyEnhancedDocuments())
-							{
-								using (ItemInfo exEnh = ItemInfo.Get(ed.ItemID))
-								{
-									exEnh.DoUnlinkEnhanced(exEnh, 0, false);
-									DeleteItemAndChildren(exEnh);
-								}
-
-							}
-						}
-
-						//do copy/paste replace of the master step
-						newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo);
-						if (newItemInfo == null) return null;
-
-						//copy any background documents
-						//if selected want to replace BG step (DialogResult.Yes)
-						if (copyItemInfo.HasEnhancedLinkedStep && rslt == DialogResult.Yes)
-						{
-							foreach (EnhancedDocument ed in copyItemInfo.GetMyEnhancedDocuments())
-							{
-								using (ItemInfo exEnh = newItemInfo.DoAddMissingEnhancedItems(ed.Type))
-								{
-									PasteReplace(exEnh, ed.ItemID, chgid, ref firstTrans);
-								}
-
-							}
-						}
-						else if (rslt == DialogResult.No)
-						{
-							//if selected didn't want to copy BG documents (DialogResult.No)
-							//need to unlink BG doc from old removed content (what was pasted over top of)
-							//re-link BG document to new paste replace master doc
-							//this should also auto update the text of the main linked item
-							//to match the new master doc wording
-
-							//get original BG documents
-							EnhancedDocuments orig_eds = itemInfo.GetMyEnhancedDocuments();
-
-							//remove link from pre-existing BG docs
-							foreach (EnhancedDocument ed in orig_eds)
-							{
-								using (ItemInfo exEnh = ItemInfo.Get(ed.ItemID))
-									{ exEnh.DoUnlinkEnhanced(exEnh, 0, false); }
-							}
-
-							//remove link from steps just copied
-							ItemInfo.PasteClearEnhanced(newItemInfo);
-
-							//re-link pre-existing BG docs to newly replaced master step
-							foreach (EnhancedDocument ed in orig_eds)
-							{
-								using (ItemInfo orig_ed_item = ItemInfo.Get(ed.ItemID))
-									{ newItemInfo.DoCreateLinksEnhancedSingleItem(orig_ed_item, ed.Type); }
-							}
-
-						}
-					}
 				else
 				{
 					newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); if (newItemInfo == null) return null;
@@ -2760,7 +2684,7 @@ namespace VEPROMS.CSLA.Library
 				ItemInfo.DeleteItemInfoAndChildren(itemInfo.ItemID); // Dispose ItemInfo and Children
 				using (Item item = Get(newItemInfo.ItemID)) ItemInfo.Refresh(item);
 				ItemInfo.PasteSetChangeId(newItemInfo, chgid);
-					if (!copyItemInfo.HasEnhancedLinkedStep && !itemInfo.HasEnhancedLinkedStep) ItemInfo.PasteClearEnhanced(newItemInfo);
+				ItemInfo.PasteClearEnhanced(newItemInfo);
 				if (newItemInfo.NextItem != null) using (Item item = newItemInfo.NextItem.Get()) ItemInfo.Refresh(item);
 				newItemInfo.RefreshNextItems();
 				// if inserting after a caution or note, refreshes tabs.  This will adjust bullets
@@ -2809,9 +2733,9 @@ namespace VEPROMS.CSLA.Library
           if (ex.Message.Contains("has External Transitions and has no next step")
 						|| ex.Message.Contains("has External Transitions to Procedure")
 						|| ex.Message.Contains("has External Transitions to it's children")
-							|| ex.Message.Contains("This step has been deleted"))
+            || ex.Message.Contains("This step has been deleted")
+            )
             throw ex;
-
 					FlexibleMessageBox.Show("Details were written to the Error Log.", "Paste Replace Failed", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
           return itemInfo;
         }
@@ -2819,7 +2743,6 @@ namespace VEPROMS.CSLA.Library
           return itemInfo;
 			}
 		}
-		}
 		#endregion
     private static bool HandleSqlExceptionOnCopy(Exception ex)
     {

PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs

@@ -6213,36 +6213,6 @@ public StepData Equation		// equation has a parent of embedded object.
 			}
 		}
 
-		// F2024-078 adjusts the the spacing before the Note/Caution tab - the space betwee the top of the box and the tab text
-		private LazyLoad<float?> _AdjSpB4Tab;
-		public float? AdjSpB4Tab
-		{
-			get
-			{
-				return LazyLoad(ref _AdjSpB4Tab, "@AdjSpB4Tab");
-			}
-		}
-
-		// F2024-078 adjusts the the spacing after the Note/Caution tab - the space betwee the tab text and the first line of of Note/Caution text
-		private LazyLoad<float?> _AdjSpAftTab;
-		public float? AdjSpAftTab
-		{
-			get
-			{
-				return LazyLoad(ref _AdjSpAftTab, "@AdjSpAftTab");
-			}
-		}
-
-		// F2024-078 adjusts the the spacing after the last line of Note/Caution text - between the last line of text and the bottom of the box
-		private LazyLoad<float?> _AdjLastBlnkLn;
-		public float? AdjLastBlnkLn
-		{
-			get
-			{
-				return LazyLoad(ref _AdjLastBlnkLn, "@AdjLastBlnkLn");
-			}
-		}
-
 		// this will adjust the line spacing when an extra thick line is used for a box, so that the text below the box doesn't hit up against the bottom of the box
 		private LazyLoad<bool> _ThickDouble;    // F2021-026: Barakah single column 2 thick double lines around Warnings
 		public bool ThickDouble

PROMS/VEPROMS.CSLA.Library/Generated/Item.cs

@@ -1148,7 +1148,8 @@ namespace VEPROMS.CSLA.Library
 					}
 					catch (Exception ex)
 					{
-						Database.LogException("ItemExt.DeactivateStateDisplayTabTmp", ex);
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
+						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
 					}
 
 				}
@@ -1175,7 +1176,8 @@ namespace VEPROMS.CSLA.Library
 					}
 					catch (Exception ex)
 					{
-						Database.LogException("ItemExt.AddDisplayTabsState", ex);
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.AddDisplayTabsState", ex);
+						throw new DbCslaException("ItemExt.AddDisplayTabsState", ex);
 					}
 				}
 			}
@@ -1193,7 +1195,12 @@ namespace VEPROMS.CSLA.Library
 						cm.CommandText = "GetDisplayTabdata";
 						cm.CommandTimeout = Database.DefaultTimeout;
 						cm.Parameters.AddWithValue("@UserID", UserID);
+						//cm.ExecuteNonQuery();						
 						SqlDataAdapter da = new SqlDataAdapter(cm);
+						//da.Fill(dt);
+						//cn.Close();
+						//da.Dispose();
+						//return dt; // fix
 
 						SqlDataReader reader = cm.ExecuteReader();
 						DataTable dt = new DataTable();
@@ -1203,10 +1210,8 @@ namespace VEPROMS.CSLA.Library
 					}
 					catch (Exception ex)
 					{
-						//B2025-004
-						//if it fails loading previously open tabs, simply treat it as if no tabs were open
-						//instead of crashing
-						return new DataTable();
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
+						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
 					}
 
 				}

PROMS/VEPROMS.CSLA.Library/Minimal/UserSettings.cs

@@ -48,6 +48,7 @@ namespace VEPROMS.CSLA.Library
 			catch (Exception ex)
 			{
 				Database.LogException("UserSettings_GetData", ex);
+				throw new DbCslaException("UserSettings_GetData", ex);
 			}
 
 		}

PROMS/Volian.Base.Library/RtfTools.cs

@@ -128,6 +128,29 @@ namespace Volian.Base.Library
 			rtnStr = rtnStr.Replace(@"\'ae",@"\u174?");
 			// convert \'a9 to \u169? this is for the copyright symbol.  RTF converts the unicode character to \'a9
 			rtnStr = rtnStr.Replace(@"\'a9",@"\u169?");
+			// B2021-039: paste of the greek symbols was not working correctly, RTF was converting unicode, similar to above
+			// B2022-052: Division symbol converted to an x, caused by fix B2021-039. The code below was translating the division 
+			//	symbol but it should only be translated if the character's font is Greek or Baltic.  Unfortunately this is not
+			//	a complete solution since it converts characters it shouldn't, for example, using the following steps: all
+			//	of Proms symbols are entered into a step; a ctrl-a/ctrl-c is used to copy these and then ctrl-v to paste
+			//	into another new step. The paste (from the underlying richtextbox) causes some characters to be in plain
+			//	arial font, and others to be in arial with Greek flag. Some character codes exist in each font, for example f7.
+			//	The code below does not look into what font is used, just converts the character.  Since any kind of font
+			//	can occur during paste, if from an external program, a message will be given stating that a symbol may be incorrect
+			//	because an unsupported font was pasted. It was felt that this was sufficient based on estimate of fix versus chance of
+			//	occurrence.  Note that the message was moved into StepRTB since this code is called by non-UI code (5/26/22)
+			if (str.ToUpper().Contains("GREEK") || str.ToUpper().Contains("BALTIC"))
+			{
+				//System.Windows.Forms.MessageBox.Show("Pasted text may use an unsupported font so some characters may not paste correctly and may require delete/reenter of character from within Proms.",
+				//	"Paste Font Issue", System.Windows.Forms.MessageBoxButtons.OK);
+				for (int i = 0; i < 26; i++)
+				{
+					rtnStr = rtnStr.Replace(string.Format("\\'{0:x2}", 0xc0 + i)        // upper case Greek
+						, string.Format("\\u{0}?", 912 + i));
+					rtnStr = rtnStr.Replace(string.Format("\\'{0:x2}", 0xe0 + i)        // lower case Greek
+						, string.Format("\\u{0}?", 944 + i));
+				}
+			}
 			return rtnStr;
 		}
 	}

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -1078,13 +1078,7 @@ namespace Volian.Controls.Library
 					}
 					else if (searchValue.Contains("#Link:ReferencedObject")) // RO Link (roid)
 					{
-						// we where only removing the END if the searchValue ended in "1[END>"
-						// but sometimes it ended in "2[END>" and cause a null reference error
-						// - was seen only running via Visual Studio debugger
-						// I cleaned up the code to remove in ether case so that we get the expected roid value  - jsj 11-18-2024
-						string substr = searchValue.Substring(searchValue.LastIndexOf(" "));
-						if (substr.Contains("[END>"))
-							searchValue = searchValue.Substring(0, searchValue.Length - substr.Length);
+						searchValue = searchValue.Replace("1[END>", string.Empty).Trim();
 						string roid = ROFSTLookup.FormatRoidKey(searchValue.Substring(searchValue.LastIndexOf(" ")), true);
 
 						if (roid != selectedChld.roid)

PROMS/Volian.Controls.Library/DisplayReports.cs

@@ -805,9 +805,17 @@ namespace Volian.Controls.Library
 				string SearchString = GetListOfROs(true);// Include the RODbID in the RO list
 				ItemInfoList SearchResults = ItemInfoList.GetListFromROReport(DocVersionList, "", SearchString, "");
 
-				List<ItemInfo> sortedResults = SearchResults.SortedList(!usageSortedByProcedure);
+				if (!usageSortedByProcedure) // sort on ROs
+				{
+					Csla.SortedBindingList<ItemInfo> sortedResults = new Csla.SortedBindingList<ItemInfo>(SearchResults);
+					sortedResults.ApplySort("FoundROID", ListSortDirection.Ascending);
 					OnPrintRequest(new DisplayReportsEventArgs("Referenced Objects Usage By RO", "RO Usage", sortedResults, usageSortedByProcedure, cbxIncldMissingROs.Checked, paperSize));
 				}
+				else
+				{
+					OnPrintRequest(new DisplayReportsEventArgs("Referenced Objects Usage By Procedure", "RO Usage", SearchResults, usageSortedByProcedure, cbxIncldMissingROs.Checked, paperSize));
+				}
+			}
 			else if (cbxTransFromProcs.Checked)
 			{
 			}

PROMS/Volian.Controls.Library/FormatUtility.cs

@@ -30,8 +30,7 @@ namespace Volian.Controls.Library
                 //We need to check to see if the current database has been updated with the necessary changes
                 //to the folder configuration value.  If so then build the list of available to be returned
                 //to the calling code
-                // added check for a list count of zero.  Was getting null error from data gotten from customer
-                if (fList == null || fList.Count == 0)
+                if (fList == null)
                 {
                     _MyLog.InfoFormat("Filtered format list not available: Database update needed for config value of top folder record");
                     return RawList;

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -11,7 +11,6 @@ using System.Text.RegularExpressions;
 using VEPROMS.CSLA.Library;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
-using System.Linq;
 
 namespace Volian.Controls.Library
 {
@@ -2856,10 +2855,7 @@ namespace Volian.Controls.Library
 			return false;
 		}
 
-		//CSM B2023-095/U2022-004 When Copy/Pasting Symbols, some of the symbols paste in an incorrect font
-		//   Changed this to put in the unicode code for any symbols outside the normal ascii range
-		// if supplied convertunicode flag is true
-		public string GetPasteText(bool PasteNoReturnsSetting, IDataObject myDO, bool convertunicode = false)
+		public string GetPasteText(bool PasteNoReturnsSetting, IDataObject myDO)
 		{
 			// B2021-0039: symbols not pasting correctly from ctrl-v:
 			//	get base list of valid symbols, use base format if MyItemInfo is null.  Use symbols from
@@ -2876,27 +2872,36 @@ namespace Volian.Controls.Library
 			if (PasteNoReturnsSetting) ptext = ptext.Replace("\r\n", " ");
 
 			StringBuilder sb = new StringBuilder();
+			bool didCharReplace = false;
 			bool hasBadChar = false;
-			foreach (char c in ptext)
+			for (int i = 0; i < ptext.Length; i++)
 			{
-				if ((c > 0x7e))
+				didCharReplace = false;
+				string sym = string.Format(@"{0}", Convert.ToInt32(ptext[i]));
+				if ((ptext[i] > 0x7e))
 				{
 					// is this an allowable symbol/character:
-					if (allowableSymbols.Any(x => x == $@"{(short)c}"))
+					for (int j = 0; j < sl.Count; j++)
 				{
-						if (convertunicode)
-							sb.Append($"\\u{(short) c}?");
-						else
-							sb.Append(c);
+						if (sym == allowableSymbols[j])
+						{
+							sb = sb.Append((char)(Convert.ToInt32(allowableSymbols[j])));
+							didCharReplace = true;
+							break;
 						}
-					else
+					}
+					// if not allowable, put in a "?" and give a message to user (below)
+					if (!didCharReplace)
 					{
+						sb = sb.Append("?");
+					didCharReplace = true;
 						hasBadChar = true;
-						sb.Append("?");
 				}
+				if (!didCharReplace)
+					sb = sb.Append(ptext[i]);
 			}
-				else
-					sb.Append(c);
+				if (!didCharReplace)
+					sb = sb.Append(ptext[i]);
 			}
 			ptext = sb.ToString();
 			ptext = ptext.Replace("\u2013", "-"); // Replace EN Dash with hyphen

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -1376,9 +1376,7 @@ namespace Volian.Controls.Library
 		public static String GetDefaultKeyValue(String key)
 		{
 			object xxx = null;
-			// fixed null reference error - appeared only while debugged - for user was handled via Try/Catch and ignored
-			object gtval = Registry.GetValue(key, "", xxx);
-			return (string)((gtval != null) ? gtval.ToString() : gtval);
+			return Registry.GetValue(key, "", xxx).ToString();
 		}
 		private EditItem FindStepAfter(string types, int contenttype)
 		{
@@ -1806,7 +1804,7 @@ namespace Volian.Controls.Library
 			//B20170-158 Don't allow a step to replace a linked step
 			//B2017-180:  The fix for B2017-158 also needed the 'HasEnhancedLinkedStep' to check if the copied step is a source step
 			// C2017-031:  Support for paste/replace an enhanced step, enable button
-			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable;
+			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable && ((!MyItemInfo.IsEnhancedStep && !MyItemInfo.HasEnhancedLinkedStep) || (MyItemInfo.IsEnhancedStep));
 		}
 		private void SetPasteButtonEnabled()
     {
@@ -1866,6 +1864,25 @@ namespace Volian.Controls.Library
 					if (stepToCfg.MyEnhancedDocuments != null && stepToCfg.MyEnhancedDocuments.Count > 0 && stepToCfg.MyEnhancedDocuments[0].Type != 0) toSourceHasEnhancedLinks = true;
 				}
 			}
+			// enhanced: if 'from' step is not enhanced, only allow paste before/after
+			if (MyItemInfo.IsHigh && !MyItemInfo.IsEnhancedStep)
+			{
+				stepToCfg = MyItemInfo.MyConfig as StepConfig;
+				if (stepToCfg.MyEnhancedDocuments != null && stepToCfg.MyEnhancedDocuments.Count > 0 && stepToCfg.MyEnhancedDocuments[0].Type != 0)
+				{
+					// Current selected step is source (i.e. has enhanced links to enhanced steps)
+					// check if 'from' step is non.  If so, allow paste before/after but not replace
+					if (tmp.MyDisplayTabControl.MyCopyStep.IsHigh)
+					{
+						StepConfig fromCfg = tmp.MyDisplayTabControl.MyCopyStep.MyConfig as StepConfig;
+						if (fromCfg != null && (fromCfg.MyEnhancedDocuments==null || fromCfg.MyEnhancedDocuments.Count==0))
+						{
+							btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = false;
+							return;
+						}
+					}
+				}
+			}
       //copy item is high level step
 			// Allow a High Level step to be pasted to a sub-step, but not to a table, figure, section or procedure type
       if (tmp.MyDisplayTabControl.MyCopyStep.IsHigh && (MyItemInfo.IsTable || MyItemInfo.IsFigure || MyItemInfo.IsSection || MyItemInfo.IsProcedure))
@@ -2869,14 +2886,7 @@ namespace Volian.Controls.Library
 
 			}
 			else if (myDO.GetDataPresent(DataFormats.Text))
-            {
-				//CSM B2023-095/U2022-004 When Copy/Pasting Symbols, some of the symbols paste in an incorrect font
-				//   Changed this to put in the unicode code for any symbols outside the normal ascii range
-				//   Also need to input as an RTF so that correct font is used with these
-				//   and unicode is converted to actual text
-				string clipboardtext = _MyStepRTB.GetPasteText(PasteNoReturnsSetting, myDO, true);
-				myRtb.SelectedRtf = _MyStepRTB.RtfPrefixForSymbols + clipboardtext + @"}";
-			}
+				myRtb.SelectedText = _MyStepRTB.GetPasteText(PasteNoReturnsSetting, myDO);
 			if (myRtb.SelectionLength == 0 && myRtb is StepRTB) myRtb.SelectionFont = (myRtb as StepRTB).MyStyleFont.WindowsFont;
 			_PastePlainTextOvrRide = false;
 			_PasteStepTextOvrRide = false;
@@ -3122,13 +3132,7 @@ namespace Volian.Controls.Library
 			// a referenced object, bring up ReferencedObject Editor (for now, just put up a message box.
 			if (_MyStepRTB.MyLinkText != null && _MyStepRTB.MyLinkText.IndexOf("Transition") > -1)
 			{
-				// B2021-094 fix for <Shift><Ctrl><G> key stroke for GoTo Transition or RO link
-				//           Needed to clear the selection of the link or it will be used the next time
-				//           <Shift><Ctrl><G> is used
-				string lnkText = _MyStepRTB.MyLinkText; // save the transition link information
-				_MyStepRTB.SetSelection(0, 0); // Clear the selection of the transition link
-											   // note _MyStepRTB.DeselectAll() did not work all the time
-				_MyEditItem.MyStepPanel.OnLinkClicked(sender, new StepPanelLinkEventArgs(lnkText));
+				_MyEditItem.MyStepPanel.OnLinkClicked(sender, new StepPanelLinkEventArgs(_MyStepRTB.MyLinkText));
 			}
 			else
 			{
@@ -3151,12 +3155,7 @@ namespace Volian.Controls.Library
 				}
 				else
 				{
-					LinkText lt = new LinkText(_MyStepRTB.MyLinkText); // save the RO link information
-					// B2021-094 fix for <Shift><Ctrl><G> key stroke for GoTo Transition or RO link
-					//           Needed to clear the selection of the link or it will be used the next time
-					//           <Shift><Ctrl><G> is used
-					_MyStepRTB.SetSelection(0, 0); // clear the selection of the RO link
-												   // note _MyStepRTB.DeselectAll() did not work all the time
+					LinkText lt = new LinkText(_MyStepRTB.MyLinkText);
 					//B2023-104 If we could not get the MyRoUsageInfo then we have a bad RO Link. Tell user to re-link the RO
 					if (lt.MyRoUsageInfo != null)
 					{
@@ -3796,7 +3795,7 @@ namespace Volian.Controls.Library
       ProcedureInfo.RefreshTransitions(MyItemInfo.MyProcedure as ProcedureInfo);
       this.Cursor = Cursors.Default;
 			// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
-			FlexibleMessageBox.Show(this, string.Format("Checked {0} transitions, modified {1} transitions, converted to text {2} transitions, {3} transitions unable to be fixed (Annotation: Bad Transition Link)", ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ProcedureInfo.TranCantFixCount), "Results of Refresh Transitions", MessageBoxButtons.OK, MessageBoxIcon.Information);
+			FlexibleMessageBox.Show(this, string.Format("Checked {0} transitions, modified {1} transitions, converted to text {2} transitions", ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount), "Results of Refresh Transitions", MessageBoxButtons.OK, MessageBoxIcon.Information);
     }
     private void btnRefObjRefresh_Click(object sender, System.EventArgs e)
     {

PROMS/Volian.Print.Library/PDFChronologyReport.cs

@@ -308,7 +308,7 @@ namespace Volian.Print.Library
 				h.Font = f3;
 				string actionWhat = (cai.ActionWhat == "Added" && cai.DTS <= MyProc.ChangeBarDate) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.ChangeBarDate ? cai.ActionWhat : "Original";
 				if (actionWhat == "Deleted" || actionWhat == "Restored")
-					h.Add(actionWhat + "\r\n" + (cai.ActionWhen < cai.DTS ? cai.DTS.ToString("M/dd/yyyy") : cai.ActionWhen.ToString()));
+					h.Add(actionWhat + "\r\n" + cai.ActionWhen.ToString());
 				else
 					h.Add(actionWhat);
 				if (cai.DTS > maxDTS)
@@ -1465,7 +1465,7 @@ namespace Volian.Print.Library
 				//				h.Add(cai.ActionWhen > MyProc.DTS ? cai.ActionWhat : "Original");
 				string actionWhat = ((cai.ActionWhat == "Added" || cai.ActionWhat == "Changed") && cai.DTS <= MyProc.ChangeBarDate) ? "Original" : cai.ActionWhat;	//(cai.ActionWhat == "Added" && cai.DTS <= MyProc.DTS) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.DTS ? cai.ActionWhat : "Original";
 				if (actionWhat == "Deleted" || actionWhat == "Restored")
-					h.Add(actionWhat + "\r\n" + (cai.ActionWhen < cai.DTS ? cai.DTS.ToString("M/dd/yyyy") : cai.ActionWhen.ToString()));
+					h.Add(actionWhat + "\r\n" + cai.ActionWhen.ToString());
 				else
 					h.Add(actionWhat);
 				c = new PdfPCell(h);

PROMS/Volian.Print.Library/PDFReport.cs

@@ -1074,9 +1074,7 @@ namespace Volian.Print.Library
 
 			string lastProcNum = string.Empty;
 			string lastSection = string.Empty;
-			//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
-			//setting this to something other than empty - otherwise will not print first initial header
-			string lastDVPath = "start"; 
+			string lastDVPath = string.Empty;
 			if (_ResultList.Count > 0)
 			{
 				foreach (ItemInfo item in _ResultList)
@@ -1090,12 +1088,6 @@ namespace Volian.Print.Library
 					// procedure set title at the top of the report (once).
 					if (lastDVPath != "" && lastDVPath != item.SearchDVPath)
 					{
-						//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
-						//was placing last item from the precious section in the new section
-						//place it before starting the new section and then clear items
-						PutROusageForProcedure(datatable, roUse, headerwidths);
-						roUse.Clear();
-
 						subTable = new PdfPTable(headerwidths);
 						AddMainPathGroup(datatable, item.SearchDVPath, splitAt, f2, Color.LIGHT_GRAY, 0);
 						lastProcNum = string.Empty;
@@ -1146,7 +1138,7 @@ namespace Volian.Print.Library
 			document.Add(datatable);
 		}
 
-		private void AddProcROUse(ItemInfo item, Dictionary<string, List<ItemInfo>> procRoUse)
+		private void AddProcROUse(ItemInfo item, SortedDictionary<string, List<ItemInfo>> procRoUse)
 		{
 			string dictKey = GetCurProcNum(item.SearchPath) + " " + GetCurSectionNumTitle(item);
 
@@ -1165,7 +1157,7 @@ namespace Volian.Print.Library
 			}
 		}
 
-		private void PutStepListForProcedure(PdfPTable rotable, Dictionary<string, ItemInfo> sortedStepList)
+		private void PutStepListForProcedure(PdfPTable rotable, SortedDictionary<string, ItemInfo> sortedStepList)
 		{
 			// C2017-036 get best available proportional font for symbols that looks close to Arial
 			//           Note that Microsoft no longer supplies Arial Unicode MS as of Word16
@@ -1181,13 +1173,13 @@ namespace Volian.Print.Library
 			sortedStepList.Clear();
 		}
 
-		private void PutROusageForROID(PdfPTable curTable, Dictionary<string, List<ItemInfo>> procRoUse, float[] headerwidths, int splitAt, bool moreThanOneProcSet)
+		private void PutROusageForROID(PdfPTable curTable, SortedDictionary<string, List<ItemInfo>> procRoUse, float[] headerwidths, int splitAt, bool moreThanOneProcSet)
 		{
 			// C2017-036 get best available proportional font for symbols that looks close to Arial
 			//           Note that Microsoft no longer supplies Arial Unicode MS as of Word16
 			iTextSharp.text.Font f2 = pdf.GetFont(Volian.Base.Library.vlnFont.ReportsFont, 10, 0, Color.BLACK);
 
-			Dictionary<string, ItemInfo> sortedStepList = new Dictionary<string, ItemInfo>();
+			SortedDictionary<string, ItemInfo> sortedStepList = new SortedDictionary<string, ItemInfo>();
 			string lastProcKey = string.Empty;
 			string lastProcNumTitle = string.Empty;
 			string lastDVPath = string.Empty;
@@ -1301,7 +1293,7 @@ namespace Volian.Print.Library
 
 		private void BuildROUsageTableByRO(iTextSharp.text.Document document)
 		{
-			Dictionary<string, List<ItemInfo>> procRoUse = new Dictionary<string, List<ItemInfo>>();
+			SortedDictionary<string, List<ItemInfo>> procRoUse = new SortedDictionary<string, List<ItemInfo>>();
 
 			float[] headerwidths = { 20, 80 };
 			PdfPTable datatable = new PdfPTable(1);

PROMS/Volian.Print.Library/PromsPrinter.cs

@@ -2953,7 +2953,7 @@ namespace Volian.Print.Library
 			if (ii.Sections == null) return;        // B2021-067 crash on null reference
 			foreach (SectionInfo si in ii.Sections)
 			{
-				if (MyPromsPrinter.PrtSectID == -1 || (MyPromsPrinter.PrtSectID > -1 && (ii.ItemID == MyPromsPrinter.PrtSectID || si.ItemID == MyPromsPrinter.PrtSectID)))
+				if (MyPromsPrinter.PrtSectID == -1 || (MyPromsPrinter.PrtSectID > -1 && si.ItemID == MyPromsPrinter.PrtSectID))
 				{
 				if (si.IsStepSection)
 					{

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -226,8 +226,6 @@ namespace Volian.Print.Library
 									else
 										yoff += vlnPrintObject.SixLinesPerInch;
 								}
-								if (box.MyBox != null)
-									yoff += (float)(box.MyBox.AdjSpB4Tab ?? 0); // F2024-078 adjust space above the Note/Caution box tab
 							}
 							bxIndex = bxIndx;
 						}
@@ -275,8 +273,6 @@ namespace Volian.Print.Library
 								box.YOffset = yoff + ((ln - 1) * vlnPrintObject.SixLinesPerInch);
 								if (childItemInfo.FormatStepData.OneLineBeforeTab) ln++;
 								yoff += ln * vlnPrintObject.SixLinesPerInch;
-								if (box.MyBox != null)
-									yoff += (float)(box.MyBox.AdjSpB4Tab ?? 0); // F2024-078 adjust space above the Note/Caution box tab
 							}
 						}
 						bxIndex = bxIndx;
@@ -5501,23 +5497,7 @@ namespace Volian.Print.Library
 			//		code looks up parents to see if they have next before returning a 0 (no blank line)
 			// B2022-042: double Caution followed by Critical Step missing bullet
 			// F2022-010: substeps in multiple notes, cautions, warning print differently
-			if (MyItemInfo.IsInCautionOrNote)
-			{
-				float adjLastBlankLineInNoteCautionWarning = 0;
-				// Get the box information for the Note, Caution, or Warning
-				ItemInfo tifo = (MyItemInfo.IsCaution || MyItemInfo.IsNote) ? MyItemInfo : MyItemInfo.ParentNoteOrCaution;
-				int typ = ((int)tifo.MyContent.Type) % 10000;
-				int? bxIndx = tifo.ActiveFormat.PlantFormat.FormatData.StepDataList[typ].StepLayoutData.STBoxindex;
-				if (bxIndx != null)
-				{
-					Box bx = tifo.ActiveFormat.PlantFormat.FormatData.BoxList[(int)bxIndx];
-					// F2024-078 save the adjustment of the last blank line - this value will be added to the SixLinesPerInch value (a blank line)
-					adjLastBlankLineInNoteCautionWarning = (float)(bx.AdjLastBlnkLn ?? 0); 
-				}
-				//}
-				//			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn && (MyItemInfo.IsInCautionOrNote))
-				// F2024-078 added check for adjustment of the last blank line in the Note/Caution box
-				if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn || adjLastBlankLineInNoteCautionWarning != 0)
+			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn && (MyItemInfo.IsInCautionOrNote))
 			{
 				if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && (MyItemInfo.NextItem == null))    // there are no sub-steps, see if any parents have next
 				{
@@ -5530,22 +5510,9 @@ namespace Volian.Print.Library
 						if ((par.NextItem == null) || (par.MyContent.Type != par.NextItem.MyContent.Type)) par = par.MyParent;
 						else break;
 					}
-						if (!par.IsInCautionOrNote || (par != null && par.MyContent.Type != par.NextItem.MyContent.Type))
-						{
-							if (adjLastBlankLineInNoteCautionWarning != 0)
-								return SixLinesPerInch + adjLastBlankLineInNoteCautionWarning; // F2024-078 adjust the size of the last blank line of Note/Caution box
-							else
-								return 0; // no blank line after last text line of Note/Caution/Warning
-						}
-					}
-					if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && MyItemInfo.NextItem != null && MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type)
-					{
-						if (adjLastBlankLineInNoteCautionWarning != 0)
-							return SixLinesPerInch + adjLastBlankLineInNoteCautionWarning;
-						else
-							return 0; // no blank line after last text line of Note/Caution/Warning
-					}
+					if (!par.IsInCautionOrNote || (par != null && par.MyContent.Type != par.NextItem.MyContent.Type)) return 0;
 				}
+				if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && MyItemInfo.NextItem != null && MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type) return 0;
 			}
 			if (MyItemInfo.Ordinal % everyNLines == 0 || MyItemInfo.NextItem == null) return SixLinesPerInch;
 			// B2022-003: BNPP Alarms (BNPPalr) - incorrect line spacing for substeps off substeps. Added a format flag so as not to affect other plants. 
@@ -5830,7 +5797,6 @@ namespace Volian.Print.Library
 			float hdrWidth = (itemInfo.MyHeader.CleanText == null) ? 0 : itemInfo.MyHeader.CleanText.Length * 6;
 			int typ = ((int)itemInfo.MyContent.Type) % 10000;
 			int? bxIndx = formatInfo.PlantFormat.FormatData.StepDataList[typ].StepLayoutData.STBoxindex;
-			float adjmentAfterBoxedNoteCautionTab = 0; // F2024-078 used to save the adjustment of the space after the Note/Caution tab
 
 			if (itemInfo.MyHeader.Justify == System.Drawing.ContentAlignment.MiddleCenter)
 			{
@@ -5841,7 +5807,6 @@ namespace Volian.Print.Library
 						xoff += (float)bx.TabPos;							// xoff starts as left margin
 					else
 						xoff += (float)((bx.TxtStart + _MyBoxLeftAdj + XOffsetBox + (bx.TxtWidth / 2)) - (hdrWidth / 2));	// xoff starts as left margin
-					adjmentAfterBoxedNoteCautionTab = (float) (bx.AdjSpAftTab ?? 0); // F2024-078 save the adjustment of the space (line) after the Note/Caution tab
 				}
 				else if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && itemInfo.IsInRNO && (itemInfo.IsCaution || itemInfo.IsNote))	// C2014-009
 					xoff = XOffset + (para.Width / 2) - (hdrWidth / 2);
@@ -5876,7 +5841,7 @@ namespace Volian.Print.Library
 			// F2022-121 added SpecialStepsFoldoutKeepWhiteSpace flag to allow for all of the other special foldout formatting, but 
 			//           not compress the page - this need to handle explicit OR and AND sub-steps to ensure there are blank lines before and after
 			//           the separator text.
-			return myHeader.Height + (!MyItemInfo.MyDocStyle.SpecialStepsFoldout || (MyItemInfo.MyDocStyle.SpecialStepsFoldout && MyItemInfo.MyDocStyle.SpecialStepsFoldoutKeepWhiteSpace) || (MyItemInfo.MyDocStyle.ExtraLineHeader && (MyItemInfo.IsCaution || MyItemInfo.IsNote)) ? bSpaceIn ? SixLinesPerInch : 0 : 0) + adjmentAfterBoxedNoteCautionTab; // F2024-078 add adjustment to the space after the Note/Caution tab
+			return myHeader.Height + (!MyItemInfo.MyDocStyle.SpecialStepsFoldout || (MyItemInfo.MyDocStyle.SpecialStepsFoldout && MyItemInfo.MyDocStyle.SpecialStepsFoldoutKeepWhiteSpace) || (MyItemInfo.MyDocStyle.ExtraLineHeader && (MyItemInfo.IsCaution || MyItemInfo.IsNote)) ? bSpaceIn ? SixLinesPerInch : 0 : 0);
 		}
 		private float AdjustToCharPosition(float position, float? CPI)
 		{
@@ -6887,13 +6852,7 @@ namespace Volian.Print.Library
 			}
 			else if (itemInfo.IsSection)
 			{
-				// B2023-074 The itemInfo we are processing is a section (number and title). Change maxRNO to zero to getting the width.
-				//           The Width is used when printing the section number and title (when the check box on the properties page is checked)
-				//           and is assumemed the section is a single column section (maxRNO = 0) and uses the format variable WidSTablePrint
-				//           which holds the widths for then the section has one column, two column, or three column.
-				//           For printing section numbers and titles like this, we always want to accomodate for lone section title text.
-				//           So the initial width should always be set to the one column width value so that it can spane across the page.
-				Width = ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, 0);
+				Width = ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, maxRNO);
 				float adjwidths = 0;
 				adjwidths = AdjustMetaWidth(itemInfo, formatInfo, adjwidths, false);
 				Width += (adjwidths + _WidthAdjust);