diff --git a/EduNetworkBuilder/NetShape.cs b/EduNetworkBuilder/NetShape.cs
index 7607581..70ea2f3 100644
--- a/EduNetworkBuilder/NetShape.cs
+++ b/EduNetworkBuilder/NetShape.cs
@@ -85,7 +85,7 @@ namespace EduNetworkBuilder
             writer.WriteElementString("what", MyShape.ToString());
             RectangleConverter converter = new RectangleConverter();
             writer.WriteElementString("where", converter.ConvertToString(InArea));
-            writer.WriteElementString("color", WhatColor.ToString());
+            writer.WriteElementString("color", WhatColor.Name);
             writer.WriteEndElement();
         }
     }
diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index fcfff56..f684f36 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -799,6 +799,8 @@ namespace EduNetworkBuilder
                 SolidBrush theBrush = new SolidBrush(SystemColors.Control);
                 Graphics.FromImage(TheNetImage).FillRectangle(theBrush, new Rectangle(0,0, TheNetImage.Width, TheNetImage.Height));
                 //re-generate the image
+                foreach (NetShape shape in Shapes)
+                    shape.Draw(TheNetImage); //Draw any shapes
                 //Do all the links first
                 foreach (NetworkComponent NC in NetComponents)
                 {