diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ColorConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/ColorConfig.cs
index f23fb4c4..347e5ccc 100644
--- a/PROMS/VEPROMS.CSLA.Library/Config/ColorConfig.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Config/ColorConfig.cs
@@ -13,6 +13,7 @@ namespace VEPROMS.CSLA.Library
 		private static Regex byRGB = new Regex(@"[0-9]*,[0-9]*,[0-9]*");
 		public static Color ColorFromString(string sColor)
 		{
+			if (sColor == string.Empty) return Color.Empty;
 			Match myMatch = byARGB.Match(sColor); // New Format by ARGB
 			if (myMatch.Groups.Count == 5)
 				return FindKnownColor(Color.FromArgb(int.Parse(myMatch.Groups[1].Value), int.Parse(myMatch.Groups[2].Value), int.Parse(myMatch.Groups[3].Value), int.Parse(myMatch.Groups[4].Value)));
diff --git a/PROMS/Volian.Controls.Library/StepItem.cs b/PROMS/Volian.Controls.Library/StepItem.cs
index 75635a46..02827cea 100644
--- a/PROMS/Volian.Controls.Library/StepItem.cs
+++ b/PROMS/Volian.Controls.Library/StepItem.cs
@@ -1687,20 +1687,23 @@ namespace Volian.Controls.Library
 				_WatchThis=watchThis;
 				return;
 			}
-			if (RNOBelow) // Adjust substeps first
+			if (Visible) // Only Adjust Location if StepItem is visible
 			{
-				//Console.WriteLine("RNOBelow"); 
-				AdjustLocation();
-				MoveRNO();
-			}
-			else // Adjust RNO First
-			{
-				if (RNORight)
+				if (RNOBelow) // Adjust substeps first
 				{
-					//Console.WriteLine("RNORight");
+					//Console.WriteLine("RNOBelow"); 
+					AdjustLocation();
 					MoveRNO();
 				}
-				AdjustLocation();
+				else // Adjust RNO First
+				{
+					if (RNORight)
+					{
+						//Console.WriteLine("RNORight");
+						MoveRNO();
+					}
+					AdjustLocation();
+				}
 			}
 			Moving = false;
 			StepItem btm = BottomMostStepItem;