diff --git a/Scripts/Editor/NodeEditorGUILayout.cs b/Scripts/Editor/NodeEditorGUILayout.cs
index ec93cc1..f9333db 100644
--- a/Scripts/Editor/NodeEditorGUILayout.cs
+++ b/Scripts/Editor/NodeEditorGUILayout.cs
@@ -41,9 +41,7 @@ namespace XNodeEditor {
             else {
                 Rect rect = new Rect();
 
-                float spacePadding = 0;
-                SpaceAttribute spaceAttribute;
-                if (NodeEditorUtilities.GetCachedAttrib(port.node.GetType(), property.name, out spaceAttribute)) spacePadding = spaceAttribute.height;
+                List<PropertyAttribute> propertyAttributes = NodeEditorUtilities.GetCachedPropertyAttribs(port.node.GetType(), property.name);
 
                 // If property is an input, display a regular property field and put a port handle on the left side
                 if (port.direction == XNode.NodePort.IO.Input) {
@@ -56,13 +54,24 @@ namespace XNodeEditor {
                         showBacking = inputAttribute.backingValue;
                     }
 
-                    //Call GUILayout.Space if Space attribute is set and we are NOT drawing a PropertyField
-                    bool useLayoutSpace = dynamicPortList ||
+                    bool usePropertyAttributes = dynamicPortList ||
                         showBacking == XNode.Node.ShowBackingValue.Never ||
                         (showBacking == XNode.Node.ShowBackingValue.Unconnected && port.IsConnected);
-                    if (spacePadding > 0 && useLayoutSpace) {
-                        GUILayout.Space(spacePadding);
-                        spacePadding = 0;
+
+                    float spacePadding = 0;
+                    foreach (var attr in propertyAttributes) {
+                        if (attr is SpaceAttribute) {
+                            if (usePropertyAttributes) GUILayout.Space((attr as SpaceAttribute).height);
+                            else spacePadding += (attr as SpaceAttribute).height;
+                        } else if (attr is HeaderAttribute) {
+                            if (usePropertyAttributes) {
+                                //GUI Values are from https://github.com/Unity-Technologies/UnityCsReference/blob/master/Editor/Mono/ScriptAttributeGUI/Implementations/DecoratorDrawers.cs
+                                Rect position = GUILayoutUtility.GetRect(0, (EditorGUIUtility.singleLineHeight * 1.5f) - EditorGUIUtility.standardVerticalSpacing); //Layout adds standardVerticalSpacing after rect so we subtract it.
+                                position.yMin += EditorGUIUtility.singleLineHeight * 0.5f;
+                                position = EditorGUI.IndentedRect(position);
+                                GUI.Label(position, (attr as HeaderAttribute).header, EditorStyles.boldLabel);
+                            } else spacePadding += EditorGUIUtility.singleLineHeight * 1.5f;
+                        }
                     }
 
                     if (dynamicPortList) {
@@ -101,13 +110,24 @@ namespace XNodeEditor {
                         showBacking = outputAttribute.backingValue;
                     }
 
-                    //Call GUILayout.Space if Space attribute is set and we are NOT drawing a PropertyField
-                    bool useLayoutSpace = dynamicPortList ||
+                    bool usePropertyAttributes = dynamicPortList ||
                         showBacking == XNode.Node.ShowBackingValue.Never ||
                         (showBacking == XNode.Node.ShowBackingValue.Unconnected && port.IsConnected);
-                    if (spacePadding > 0 && useLayoutSpace) {
-                        GUILayout.Space(spacePadding);
-                        spacePadding = 0;
+
+                    float spacePadding = 0;
+                    foreach (var attr in propertyAttributes) {
+                        if (attr is SpaceAttribute) {
+                            if (usePropertyAttributes) GUILayout.Space((attr as SpaceAttribute).height);
+                            else spacePadding += (attr as SpaceAttribute).height;
+                        } else if (attr is HeaderAttribute) {
+                            if (usePropertyAttributes) {
+                                //GUI Values are from https://github.com/Unity-Technologies/UnityCsReference/blob/master/Editor/Mono/ScriptAttributeGUI/Implementations/DecoratorDrawers.cs
+                                Rect position = GUILayoutUtility.GetRect(0, (EditorGUIUtility.singleLineHeight * 1.5f) - EditorGUIUtility.standardVerticalSpacing); //Layout adds standardVerticalSpacing after rect so we subtract it.
+                                position.yMin += EditorGUIUtility.singleLineHeight * 0.5f;
+                                position = EditorGUI.IndentedRect(position);
+                                GUI.Label(position, (attr as HeaderAttribute).header, EditorStyles.boldLabel);
+                            } else spacePadding += EditorGUIUtility.singleLineHeight * 1.5f;
+                        }
                     }
 
                     if (dynamicPortList) {
diff --git a/Scripts/Editor/NodeEditorUtilities.cs b/Scripts/Editor/NodeEditorUtilities.cs
index bf92ba8..9973145 100644
--- a/Scripts/Editor/NodeEditorUtilities.cs
+++ b/Scripts/Editor/NodeEditorUtilities.cs
@@ -18,6 +18,9 @@ namespace XNodeEditor {
         /// Saves Attribute from Type+Field for faster lookup. Resets on recompiles.
         private static Dictionary<Type, Dictionary<string, Dictionary<Type, Attribute>>> typeAttributes = new Dictionary<Type, Dictionary<string, Dictionary<Type, Attribute>>>();
 
+        /// Saves ordered PropertyAttribute from Type+Field for faster lookup. Resets on recompiles.
+        private static Dictionary<Type, Dictionary<string, List<PropertyAttribute>>> typeOrderedPropertyAttributes = new Dictionary<Type, Dictionary<string, List<PropertyAttribute>>>();
+
         public static bool GetAttrib<T>(Type classType, out T attribOut) where T : Attribute {
             object[] attribs = classType.GetCustomAttributes(typeof(T), false);
             return GetAttrib(attribs, out attribOut);
@@ -84,6 +87,24 @@ namespace XNodeEditor {
             return true;
         }
 
+        public static List<PropertyAttribute> GetCachedPropertyAttribs(Type classType, string fieldName) {
+            Dictionary<string, List<PropertyAttribute>> typeFields;
+            if (!typeOrderedPropertyAttributes.TryGetValue(classType, out typeFields)) {
+                typeFields = new Dictionary<string, List<PropertyAttribute>>();
+                typeOrderedPropertyAttributes.Add(classType, typeFields);
+            }
+
+            List<PropertyAttribute> typeAttributes;
+            if (!typeFields.TryGetValue(fieldName, out typeAttributes)) {
+                FieldInfo field = classType.GetFieldInfo(fieldName);
+                object[] attribs = field.GetCustomAttributes(typeof(PropertyAttribute), true);
+                typeAttributes = attribs.Cast<PropertyAttribute>().Reverse().ToList(); //Unity draws them in reverse
+                typeFields.Add(fieldName, typeAttributes);
+            }
+
+            return typeAttributes;
+        }
+
         public static bool IsMac() {
 #if UNITY_2017_1_OR_NEWER
             return SystemInfo.operatingSystemFamily == OperatingSystemFamily.MacOSX;