diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index 54e62a0..e9791ac 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -271,6 +271,7 @@
     <Compile Include="Views\DictionaryEditor.xaml.cs">
       <DependentUpon>DictionaryEditor.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\DisplayAttribute.cs" />
     <Compile Include="Views\ObjectCollectionEditor.xaml.cs">
       <DependentUpon>ObjectCollectionEditor.xaml</DependentUpon>
     </Compile>
diff --git a/Torch/Views/DisplayAttribute.cs b/Torch/Views/DisplayAttribute.cs
new file mode 100644
index 0000000..9dda943
--- /dev/null
+++ b/Torch/Views/DisplayAttribute.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Torch.Views
+{
+    public class DisplayAttribute : Attribute
+    {
+        public string Name;
+        public string Description;
+        public string ToolTip;
+        public string GroupName;
+        public int Order;
+        public bool Enabled = true;
+        public bool Visible = true;
+        public bool ReadOnly = false;
+
+        public DisplayAttribute()
+        { }
+
+        public static implicit operator DisplayAttribute(System.ComponentModel.DataAnnotations.DisplayAttribute da)
+        {
+            if (da == null)
+                return null;
+
+            return new DisplayAttribute()
+                   {
+                       Name = da.GetName(),
+                       Description = da.GetDescription(),
+                       GroupName = da.GetGroupName(),
+                       Order = da.GetOrder() ?? 0
+                   };
+        }
+    }
+}
diff --git a/Torch/Views/PropertyGrid.xaml b/Torch/Views/PropertyGrid.xaml
index 273c84f..78b24d5 100644
--- a/Torch/Views/PropertyGrid.xaml
+++ b/Torch/Views/PropertyGrid.xaml
@@ -17,7 +17,7 @@
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" Text="Filter: " Margin="3"/>
-            <TextBox Grid.Column="1" Margin="3" TextChanged="UpdateFilter"/>
+            <TextBox Name="TbFilter" Grid.Column="1" Margin="3" TextChanged="UpdateFilter" IsEnabled="False"/>
         </Grid>
         <ScrollViewer Grid.Row="1" x:Name="ScrollViewer"/>
         <TextBlock x:Name="TbDescription" Grid.Row="2" MinHeight="18"/>
diff --git a/Torch/Views/PropertyGrid.xaml.cs b/Torch/Views/PropertyGrid.xaml.cs
index 23e2ef6..9e0bd39 100644
--- a/Torch/Views/PropertyGrid.xaml.cs
+++ b/Torch/Views/PropertyGrid.xaml.cs
@@ -49,12 +49,14 @@ namespace Torch.Views
             if (e.NewValue == null)
             {
                 ScrollViewer.Content = null;
+                TbFilter.IsEnabled = false;
                 return;
             }
 
             var content = GenerateForType(e.NewValue.GetType());
             content.DataContext = e.NewValue;
             ScrollViewer.Content = content;
+            TbFilter.IsEnabled = true;
         }
 
         public Grid GenerateForType(Type t)
@@ -73,9 +75,13 @@ namespace Torch.Views
 
             foreach (var property in properties)
             {
+                //Attempt to load our custom DisplayAttribute
                 var a = property.GetCustomAttribute<DisplayAttribute>();
-                if (IgnoreDisplay)
-                    a = null;
+                //If not found and IgnoreDisplay is not set, fall back to system DisplayAttribute
+                if (a == null && !IgnoreDisplay)
+                    a = property.GetCustomAttribute<System.ComponentModel.DataAnnotations.DisplayAttribute>();
+                if (a?.Visible == false)
+                    continue;
                 descriptors[property] = a;
                 string category = a?.GroupName ?? "Misc";
 
@@ -104,7 +110,13 @@ namespace Torch.Views
                 grid.Children.Add(cl);
                 curRow++;
 
-                c.Value.Sort((a,b)=> string.Compare((descriptors[a]?.Name ?? a.Name), descriptors[b]?.Name ?? b.Name, StringComparison.Ordinal));
+                c.Value.Sort((a, b) =>
+                             {
+                                 var c1 = descriptors[a]?.Order.CompareTo(descriptors[b]?.Order);
+                                 if (c1.HasValue && c1.Value != 0)
+                                     return c1.Value;
+                                 return string.Compare((descriptors[a]?.Name ?? a.Name), descriptors[b]?.Name ?? b.Name, StringComparison.Ordinal);
+                             });
 
                 foreach (var property in c.Value)
                 {
@@ -120,7 +132,7 @@ namespace Torch.Views
                     var text = new TextBlock
                                {
                                    Text = displayName ?? property.Name,
-                                   ToolTip = displayName,
+                                   ToolTip = descriptor?.ToolTip ?? displayName,
                                    VerticalAlignment = VerticalAlignment.Center
                                };
                     text.SetValue(Grid.ColumnProperty, 0);
@@ -128,10 +140,12 @@ namespace Torch.Views
                     text.Margin = new Thickness(3);
                     text.Tag = $"{text.Text}: {descriptor?.Description}";
                     text.IsMouseDirectlyOverChanged += Text_IsMouseDirectlyOverChanged;
+                    //if (descriptor?.Enabled == false)
+                    //    text.IsEnabled = false;
                     grid.Children.Add(text);
 
                     FrameworkElement valueControl;
-                    if (property.GetSetMethod() == null)
+                    if (property.GetSetMethod() == null || descriptor?.ReadOnly == true)
                     {
                         valueControl = new TextBlock();
                         var binding = new Binding(property.Name)
@@ -218,6 +232,8 @@ namespace Torch.Views
                     valueControl.SetValue(Grid.ColumnProperty, 1);
                     valueControl.SetValue(Grid.RowProperty, curRow);
                     valueControl.IsMouseDirectlyOverChanged += Text_IsMouseDirectlyOverChanged;
+                    if (descriptor?.Enabled == false)
+                        valueControl.IsEnabled = false;
                     grid.Children.Add(valueControl);
 
                     curRow++;
@@ -260,6 +276,8 @@ namespace Torch.Views
         {
             var filterText = ((TextBox)sender).Text;
             var grid = (Grid)ScrollViewer.Content;
+            if (grid == null)
+                return;
             foreach (var child in grid.Children)
             {
                 if (!(child is TextBlock block))