diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
index 7846bca3..9401aa31 100644
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
@@ -1310,15 +1310,16 @@ namespace Volian.Controls.Library
 		{
 			string xml = null;
 			string srchtxt = null;
-			using (VlnFlexGrid myGrid = new VlnFlexGrid())
+			Content content = (Content)sender;
+			using (VlnFlexGrid myGrid = new VlnFlexGrid(content.ContentItems[0]))
 			{
 				using (StringReader sr = new StringReader(args.OldGridXml))
 				{
 					myGrid.ReadXml(sr);
 					sr.Close();
 				}
-				string roid = myGrid.ROID;
-				int rodbid = myGrid.RODbId;
+				string roid = content.ContentRoUsages[0].ROID; //myGrid.ROID;
+				int rodbid = content.ContentRoUsages[0].RODbID; //myGrid.RODbId;
 				////Font GridFont = myGrid.Font;
 				//myGrid.MergedRanges.Clear();
 				//myGrid.Clear();
@@ -1329,7 +1330,11 @@ namespace Volian.Controls.Library
 				//myGrid.RODbId = rodbid;
 				//myGrid.ROID = roid;
 				//myGrid.IsRoTable = true;
+				myGrid.Visible = false;
 				myGrid.ConvertTableROToGrid(args.ROText, rodbid, roid);
+				myGrid.FixTableCellsHeightWidth();
+				myGrid.AdjustGridControlSize();
+				myGrid.Visible = true;
 				using (StringWriter sw = new StringWriter())
 				{
 					myGrid.WriteXml(sw);
diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
index a27ce852..8e471edb 100644
--- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
+++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
@@ -282,6 +282,12 @@ namespace Volian.Controls.Library
 			InitializeComponent();
 			SetupGrid(1, 1);
 		}
+	  public VlnFlexGrid(ContentItem ci)
+	  {
+		  InitializeComponent();
+		  SetupGrid(4, 3); // use a default row and column count
+		  _MyItemInfo = ci.MyItem.MyItemInfo;
+	  }
 		//public VlnFlexGrid(IContainer container)
 		//{
 		//    container.Add(this);
@@ -3217,6 +3223,7 @@ namespace Volian.Controls.Library
 	  {
 		  // we need to convert some RTF command to DOS so that we can
 		  // figure out the table size
+		  stepText = stepText.Replace("\r", "");
 		  stepText = stepText.Replace("\xF8", @"\'f8");
 		  stepText = stepText.Replace(@"\par ", "\r\n");
 		  stepText = _ReplaceTokenSpaceToken.Replace(stepText, "");