diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js b/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js
index 203342ca7..ecca133ec 100644
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js
@@ -115,8 +115,8 @@
         shapeTracingContainer.resizable({
             handles: { n: '#shape-tracing-resize-handle' },
             grid: 20, // mitigates the number of calls to syncResize(), and aligns to the line height
-            resize: disableShapeTracing,
-            stop: enableShapeTracing
+            resize: shapeTracingEnabled = false,
+            stop: shapeTracingEnabled = true
         });
 
         var shapeNodes = {}; // represents the main index of shape nodes, indexed by id
diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ObjectDumper.cs b/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ObjectDumper.cs
index b31257936..193893e6f 100644
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ObjectDumper.cs
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ObjectDumper.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections;
+using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Xml.Linq;
@@ -113,42 +114,33 @@ namespace Orchard.DesignerTools.Services {
             }
 
             _node.Add(_node = new XElement("ul"));
-            foreach (var member in members.OrderBy(m => m.Name)) {
+            foreach (var member in members) {
                 if (o is ContentItem && member.Name == "ContentManager") {
                     // ignore Content Manager explicitly
                     continue;
                 }
 
+                try {
+                    DumpMember(o, member);
+                }
+                catch {
+                    // ignore members which can't be rendered
+                }
+
                 // process ContentItem.Parts specifically
                 if (o is ContentItem && member.Name == "Parts") {
                     foreach (var part in ((ContentItem)o).Parts) {
-                        try {
-                            Dump(part, part.PartDefinition.Name);
-                        }
-                        catch{
-                            // ignore dump issues
-                        }
+                        // Debug.WriteLine(_node.GetHashCode() + " " + o.GetHashCode() + " Parts: " + part.PartDefinition.Name);
+                        Dump(part, part.PartDefinition.Name);
                     }
                 }
 
                 // process ContentPart.Fields specifically
                 if (o is ContentPart && member.Name == "Fields") {
                     foreach (var field in ((ContentPart)o).Fields) {
-                        try {
-                            Dump(field, field.Name);
-                        }
-                        catch {
-                            // ignore dump issues
-                        }
+                        Dump(field, field.Name);
                     }
                 }
-                
-                try {
-                    DumpMember(o, member);
-                }
-                catch {
-                    // ignore members which can't be rendered
-                }
             }
 
             _node = _node.Parent;