diff --git a/Editor/Drawers/BasePropertyDrawer.cs b/Editor/Drawers/BasePropertyDrawer.cs
index e2caad6..0edc0ea 100644
--- a/Editor/Drawers/BasePropertyDrawer.cs
+++ b/Editor/Drawers/BasePropertyDrawer.cs
@@ -80,9 +80,10 @@ public sealed override VisualElement CreatePropertyGUI(SerializedProperty proper
             TypeHandlersBinder = HandlerBinderRegistry.GetMap<THandler>();
 
             PopulateContainer(container);
-
             container.Use();
-
+            
+            var subState = StyleDefinition.CombineSubState(typeof(TAttribute).Name, GetType().Name);
+            container.RootElement.AddToClassList(subState);
             return container.RootElement;
         }
 
diff --git a/Editor/Drawers/Container/ElementsContainer.cs b/Editor/Drawers/Container/ElementsContainer.cs
index cdcac6f..07be352 100644
--- a/Editor/Drawers/Container/ElementsContainer.cs
+++ b/Editor/Drawers/Container/ElementsContainer.cs
@@ -113,19 +113,27 @@ private void ScheduleUpdateGeometry(GeometryChangedEvent changedEvent)
         {
             if (changedEvent.target is not PropertyField element) return;
 
-            element.schedule.Execute(OnGeometryChanged);
+            element.schedule.Execute(() => OnGeometryChanged(element));
         }
 
-        private void OnGeometryChanged()
+        private void OnGeometryChanged(VisualElement element)
         {
-            var label = RootElement.Query<Label>().Class(PropertyField.labelUssClassName).First();
+            var propertyPath = SerializedProperty.propertyPath;
+            var propertyFields = element.Query<PropertyField>().Where(field => field.bindingPath.CompareOrdinal(propertyPath)).Build();
+            var parentField = propertyFields.First();
+            var labels = parentField.Query<Label>().Class(PropertyField.labelUssClassName).Where(field =>
+            {
+                var firstAncestor = field.GetFirstAncestorOfType<PropertyField>();
+                return firstAncestor != null && firstAncestor.Equals(parentField);
+            });
+            var label = labels.First();
             if (label != null)
             {
                 LabelContainer.Setup(label);
             }
             else
             {
-                LabelContainer.Reset();
+                LabelContainer.SoftReset();
             }
         }
     }
diff --git a/Editor/Helpers/LabelContainer.cs b/Editor/Helpers/LabelContainer.cs
index cd6bcc0..a6bae71 100644
--- a/Editor/Helpers/LabelContainer.cs
+++ b/Editor/Helpers/LabelContainer.cs
@@ -27,7 +27,7 @@ public void Setup(Label label)
             //TODO: Add validation for label
             _label = label;
             _styleContainer.Setup(_label.style);
-            
+
             Rebuild();
         }
 
@@ -47,5 +47,16 @@ public void Reset()
             _label = null;
             _styleContainer.Reset();
         }
+
+        public void SoftReset()
+        {
+            if (_label is { panel: not null })
+            {
+                return;
+            }
+
+            _label = null;
+            _styleContainer.Reset();
+        }
     }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index fe4a464..bc4cbb4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.tdw.better.commons",
   "displayName": "Better Commons",
-  "version": "0.0.40",
+  "version": "0.0.41",
   "unity": "2021.3",
   "description": " ",
   "dependencies": {