From a95cdde29f86ac2ff806a4ceeb801168f3406e0b Mon Sep 17 00:00:00 2001
From: poi-vrc <77053052+poi-vrc@users.noreply.github.com>
Date: Wed, 1 Jan 2025 16:30:30 +0800
Subject: [PATCH] refactor(ui): make UI element-aware, respond to attach detach

---
 .github/workflows/unity-tests.yml             |   1 -
 .../Cabinet/OneConfCabinetProvider.cs         |   4 +-
 .../Configurator/Views/OneConfCabinetView.cs  |   9 +-
 Editor/Inspector/EditorBase.cs                |   3 -
 .../Inspector/Views/AnimatorParametersView.cs |  28 +---
 Editor/Inspector/Views/GroupDynamicsView.cs   |  34 ++---
 Editor/Inspector/Views/MenuGroupView.cs       |  30 +---
 Editor/Inspector/Views/MenuInstallView.cs     |  16 +-
 Editor/Inspector/Views/MenuItemView.cs        |  74 ++++-----
 Editor/Inspector/Views/ParameterSlotView.cs   |  40 ++---
 .../SmartControlPropertyGroupComponentView.cs |  36 ++---
 .../Views/SmartControlPropertyGroupView.cs    |  56 +++----
 Editor/Inspector/Views/SmartControlView.cs    | 141 +++++++-----------
 Editor/UI/DTLegacyEditorWindow.cs             |  17 +--
 Editor/UI/DTMainEditorWindow.cs               |   9 +-
 Editor/UI/MappingEditorWindow.cs              |   2 -
 .../OneConfWearableConfigPresenter.cs         |   8 -
 Editor/UI/Views/AvatarSubView.cs              |  25 ++--
 Editor/UI/Views/ElementView.cs                |  63 ++++----
 Editor/UI/Views/IEditorView.cs                |  10 --
 .../Views/{IMGUIViewBase.cs => IMGUIView.cs}  |  91 +++++------
 ...MGUIViewBase.cs.meta => IMGUIView.cs.meta} |   0
 Editor/UI/Views/LegacyView.cs                 |   2 +-
 Editor/UI/Views/MainView.cs                   |  38 ++---
 Editor/UI/Views/MappingEditorView.cs          |   2 +-
 .../Modules/WearableModuleEditorIMGUI.cs      |   2 +-
 Editor/UI/Views/OneConfDressSubView.cs        |  25 +---
 Editor/UI/Views/OneConfWearableConfigView.cs  | 124 +++++++--------
 Editor/UI/Views/ToolSettingsSubView.cs        |  27 +---
 29 files changed, 328 insertions(+), 589 deletions(-)
 rename Editor/UI/Views/{IMGUIViewBase.cs => IMGUIView.cs} (70%)
 rename Editor/UI/Views/{IMGUIViewBase.cs.meta => IMGUIView.cs.meta} (100%)

diff --git a/.github/workflows/unity-tests.yml b/.github/workflows/unity-tests.yml
index ad0829b1..2378ca97 100644
--- a/.github/workflows/unity-tests.yml
+++ b/.github/workflows/unity-tests.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - upgrade-u22-cs8
     paths:
       - "**/*.cs"
       - ".github/unity-project/**/*"
diff --git a/Editor/Configurator/Cabinet/OneConfCabinetProvider.cs b/Editor/Configurator/Cabinet/OneConfCabinetProvider.cs
index b2ab98a0..62ae0195 100644
--- a/Editor/Configurator/Cabinet/OneConfCabinetProvider.cs
+++ b/Editor/Configurator/Cabinet/OneConfCabinetProvider.cs
@@ -35,9 +35,7 @@ public OneConfCabinetProvider(GameObject avatarGameObject)
 
         public VisualElement CreateView()
         {
-            var view = new OneConfCabinetView(_avatarGameObject);
-            view.OnEnable();
-            return view;
+            return new OneConfCabinetView(_avatarGameObject);
         }
 
         public List<IConfigurableOutfit> GetOutfits()
diff --git a/Editor/Configurator/Views/OneConfCabinetView.cs b/Editor/Configurator/Views/OneConfCabinetView.cs
index 51e33128..386c6e39 100644
--- a/Editor/Configurator/Views/OneConfCabinetView.cs
+++ b/Editor/Configurator/Views/OneConfCabinetView.cs
@@ -60,6 +60,8 @@ internal class OneConfCabinetView : ElementView, IOneConfCabinetView
         public OneConfCabinetView(GameObject avatarGameObject)
         {
             _presenter = new OneConfCabinetPresenter(this, avatarGameObject);
+            InitVisualTree();
+            t.LocalizeElement(this);
         }
 
         private void InitVisualTree()
@@ -98,13 +100,6 @@ private void InitVisualTree()
             Add(_savedToggle);
         }
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-            t.LocalizeElement(this);
-            RaiseLoadEvent();
-        }
-
         public override void Repaint()
         {
             _armatureNameField.value = ArmatureName;
diff --git a/Editor/Inspector/EditorBase.cs b/Editor/Inspector/EditorBase.cs
index 9ac20460..36db99a5 100644
--- a/Editor/Inspector/EditorBase.cs
+++ b/Editor/Inspector/EditorBase.cs
@@ -91,7 +91,6 @@ private void CleanUp()
         {
             if (_view != null)
             {
-                _view.OnDisable();
                 if (_viewContainer != null && _viewContainer.Contains(_view))
                 {
                     _viewContainer.Remove(_view);
@@ -123,7 +122,6 @@ private void CreateNewView()
 
             _view = CreateView();
             _viewContainer.Add(_view);
-            _view.OnEnable();
             _view.Bind(new SerializedObject(target));
         }
 
@@ -132,7 +130,6 @@ private void CreateNewView()
         public void OnDisable()
         {
             _view?.Unbind();
-            _view?.OnDisable();
             _view = null;
         }
     }
diff --git a/Editor/Inspector/Views/AnimatorParametersView.cs b/Editor/Inspector/Views/AnimatorParametersView.cs
index 1272f88c..3681a997 100644
--- a/Editor/Inspector/Views/AnimatorParametersView.cs
+++ b/Editor/Inspector/Views/AnimatorParametersView.cs
@@ -52,6 +52,11 @@ public AnimatorParametersView()
             Configs = new List<AnimatorParametersConfig>();
             _presenter = new AnimatorParametersPresenter(this);
             _animParamTextFields = new List<AnimatorParameterTextField>();
+
+            InitVisualTree();
+            RegisterCallback<MouseEnterEvent>(evt => MouseEnter?.Invoke());
+            RegisterCallback<MouseLeaveEvent>(evt => MouseLeave?.Invoke());
+            t.LocalizeElement(this);
         }
 
         private void InitVisualTree()
@@ -64,30 +69,13 @@ private void InitVisualTree()
                 styleSheets.Add(styleSheet);
             }
 
-            _helpBoxContainer = Q<VisualElement>("helpbox-container").First();
+            _helpBoxContainer = Q<VisualElement>("helpbox-container");
             _helpBoxContainer.Add(CreateHelpBox(t._("inspector.animParams.helpbox.description"), MessageType.Info));
-            _configsContainer = Q<VisualElement>("configs-container").First();
-            var addConfigBtn = Q<Button>("add-config-btn").First();
+            _configsContainer = Q<VisualElement>("configs-container");
+            var addConfigBtn = Q<Button>("add-config-btn");
             addConfigBtn.clicked += AddConfig;
         }
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-
-            t.LocalizeElement(this);
-
-            RegisterCallback<MouseEnterEvent>(evt => MouseEnter?.Invoke());
-            RegisterCallback<MouseLeaveEvent>(evt => MouseLeave?.Invoke());
-
-            RaiseLoadEvent();
-        }
-
-        public override void OnDisable()
-        {
-            base.OnDisable();
-        }
-
         private Box MakeConfigBox(int idx, AnimatorParametersConfig config)
         {
             var box = new Box();
diff --git a/Editor/Inspector/Views/GroupDynamicsView.cs b/Editor/Inspector/Views/GroupDynamicsView.cs
index f09f8d5f..ef977e5b 100644
--- a/Editor/Inspector/Views/GroupDynamicsView.cs
+++ b/Editor/Inspector/Views/GroupDynamicsView.cs
@@ -54,6 +54,13 @@ public GroupDynamicsView()
             SearchMode = 0;
             IncludeTransforms = new List<Transform>();
             ExcludeTransforms = new List<Transform>();
+
+            InitVisualTree();
+            InitSearchModePopup();
+            InitIncludes();
+            InitExcludes();
+
+            t.LocalizeElement(this);
         }
 
         private void InitVisualTree()
@@ -89,7 +96,7 @@ private void MakeAddField<T>(VisualElement container, Action<T> newCompAction) w
 
         private void InitSearchModePopup()
         {
-            var popupContainer = Q<VisualElement>("search-mode-popup-container").First();
+            var popupContainer = Q<VisualElement>("search-mode-popup-container");
             var choices = new List<string>() { t._("inspector.groupDynamics.searchMode.controlRoot"), t._("inspector.groupDynamics.searchMode.componentRoot") };
             _searchModePopup = new PopupField<string>(t._("inspector.groupDynamics.popup.searchMode"), choices, 0);
             _searchModePopup.RegisterValueChangedCallback(evt =>
@@ -102,35 +109,18 @@ private void InitSearchModePopup()
 
         private void InitIncludes()
         {
-            _includesListContainer = Q<VisualElement>("includes-list-container").First();
-            var addFieldContainer = Q<VisualElement>("includes-add-field-container").First();
+            _includesListContainer = Q<VisualElement>("includes-list-container");
+            var addFieldContainer = Q<VisualElement>("includes-add-field-container");
             MakeAddField<Transform>(addFieldContainer, (t) => AddInclude?.Invoke(t));
         }
 
         private void InitExcludes()
         {
-            _excludesListContainer = Q<VisualElement>("excludes-list-container").First();
-            var addFieldContainer = Q<VisualElement>("excludes-add-field-container").First();
+            _excludesListContainer = Q<VisualElement>("excludes-list-container");
+            var addFieldContainer = Q<VisualElement>("excludes-add-field-container");
             MakeAddField<Transform>(addFieldContainer, (t) => AddExclude?.Invoke(t));
         }
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-            InitSearchModePopup();
-            InitIncludes();
-            InitExcludes();
-
-            t.LocalizeElement(this);
-
-            RaiseLoadEvent();
-        }
-
-        public override void OnDisable()
-        {
-            base.OnDisable();
-        }
-
         private void RepaintSearchModePopup()
         {
             _searchModePopup.index = SearchMode;
diff --git a/Editor/Inspector/Views/MenuGroupView.cs b/Editor/Inspector/Views/MenuGroupView.cs
index 815ac6d8..093da74a 100644
--- a/Editor/Inspector/Views/MenuGroupView.cs
+++ b/Editor/Inspector/Views/MenuGroupView.cs
@@ -47,6 +47,9 @@ public MenuGroupView()
         {
             _subViews = new List<MenuItemView>();
             _presenter = new MenuGroupPresenter(this);
+
+            InitVisualTree();
+            t.LocalizeElement(this);
         }
 
         private void InitVisualTree()
@@ -59,29 +62,15 @@ private void InitVisualTree()
                 styleSheets.Add(styleSheet);
             }
 
-            _itemsContainer = Q<VisualElement>("items-container").First();
+            _itemsContainer = Q<VisualElement>("items-container");
 
-            _addItemBtn = Q<Button>("add-item-btn").First();
+            _addItemBtn = Q<Button>("add-item-btn");
             _addItemBtn.clicked += AddItem;
 
-            _addSmartControlBtn = Q<Button>("add-smart-control-btn").First();
+            _addSmartControlBtn = Q<Button>("add-smart-control-btn");
             _addSmartControlBtn.clicked += AddSmartControl;
         }
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-
-            t.LocalizeElement(this);
-
-            RaiseLoadEvent();
-        }
-
-        public override void OnDisable()
-        {
-            base.OnDisable();
-        }
-
         private Box MakeMenuItemBox<T>(int i, T comp) where T : Component
         {
             var box = new Box();
@@ -112,12 +101,6 @@ private Box MakeMenuItemBox<T>(int i, T comp) where T : Component
         private void UpdateItems()
         {
             _itemsContainer.Clear();
-
-            // disable existing views
-            foreach (var view in _subViews)
-            {
-                view.OnDisable();
-            }
             _subViews.Clear();
 
             var len = Target.transform.childCount;
@@ -153,7 +136,6 @@ private void UpdateItems()
                 else
                 {
                     var view = new MenuItemView() { Target = menuItem };
-                    view.OnEnable();
                     _subViews.Add(view);
                     box.Add(view);
                 }
diff --git a/Editor/Inspector/Views/MenuInstallView.cs b/Editor/Inspector/Views/MenuInstallView.cs
index 50fee8a8..fb3f822c 100644
--- a/Editor/Inspector/Views/MenuInstallView.cs
+++ b/Editor/Inspector/Views/MenuInstallView.cs
@@ -50,6 +50,8 @@ internal class MenuInstallView : ElementView, IMenuInstallView
         public MenuInstallView()
         {
             _presenter = new MenuInstallPresenter(this);
+            InitVisualTree();
+            t.LocalizeElement(this);
         }
 
         private void InitVisualTree()
@@ -71,20 +73,6 @@ private void InitVisualTree()
             Add(_installPathField);
         }
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-
-            t.LocalizeElement(this);
-
-            RaiseLoadEvent();
-        }
-
-        public override void OnDisable()
-        {
-            base.OnDisable();
-        }
-
         public override void Repaint()
         {
             _menuGroupControlledHelpbox.style.display = HasMenuGroupComponent ? DisplayStyle.Flex : DisplayStyle.None;
diff --git a/Editor/Inspector/Views/MenuItemView.cs b/Editor/Inspector/Views/MenuItemView.cs
index 043d9a15..6fc0bef7 100644
--- a/Editor/Inspector/Views/MenuItemView.cs
+++ b/Editor/Inspector/Views/MenuItemView.cs
@@ -117,6 +117,10 @@ public MenuItemView()
             AxisDownLabel = new AxisLabel();
             AxisLeftLabel = new AxisLabel();
             _presenter = new MenuItemPresenter(this);
+            InitVisualTree();
+            InitInfoPanel();
+            InitDetailsFoldout();
+            t.LocalizeElement(this);
         }
 
         private void InitVisualTree()
@@ -132,8 +136,8 @@ private void InitVisualTree()
 
         private void InitInfoPanel()
         {
-            _itemInfoIconContainer = Q<VisualElement>("item-icon").First();
-            var iconObjFieldContainer = Q<VisualElement>("item-icon-objfield-container").First();
+            _itemInfoIconContainer = Q<VisualElement>("item-icon");
+            var iconObjFieldContainer = Q<VisualElement>("item-icon-objfield-container");
             _itemInfoIconObjField = new ObjectField()
             {
                 objectType = typeof(Texture2D)
@@ -145,11 +149,11 @@ private void InitInfoPanel()
             });
             iconObjFieldContainer.Add(_itemInfoIconObjField);
 
-            _itemInfoNameLabel = Q<Label>("item-info-name-label").First();
-            _itemInfoNameField = Q<TextField>("item-info-name-field").First();
+            _itemInfoNameLabel = Q<Label>("item-info-name-label");
+            _itemInfoNameField = Q<TextField>("item-info-name-field");
             _itemInfoNameField.RegisterValueChangedCallback((evt) => NameChanged?.Invoke());
 
-            var itemTypePopupContainer = Q<VisualElement>("item-info-item-type-popup-container").First();
+            var itemTypePopupContainer = Q<VisualElement>("item-info-item-type-popup-container");
             var itemTypeChoices = new List<string>() { t._("inspector.menu.item.info.itemType.button"), t._("inspector.menu.item.info.itemType.toggle"), t._("inspector.menu.item.info.itemType.subMenu"), t._("inspector.menu.item.info.itemType.twoAxis"), t._("inspector.menu.item.info.itemType.fourAxis"), t._("inspector.menu.item.info.itemType.radial") };
             _itemTypePopup = new PopupField<string>(t._("inspector.menu.item.info.popup.itemType"), itemTypeChoices, 0);
             _itemTypePopup.RegisterValueChangedCallback((evt) =>
@@ -159,8 +163,8 @@ private void InitInfoPanel()
             });
             itemTypePopupContainer.Add(_itemTypePopup);
 
-            _itemInfoParameterNameField = Q<AnimatorParameterTextField>("item-info-parameter-name-field").First();
-            _itemInfoParameterValueField = Q<FloatField>("item-info-parameter-value-field").First();
+            _itemInfoParameterNameField = Q<AnimatorParameterTextField>("item-info-parameter-name-field");
+            _itemInfoParameterValueField = Q<FloatField>("item-info-parameter-value-field");
             _itemInfoParameterNameField.RegisterValueChangedCallback(evt =>
             {
                 ParameterName = evt.newValue;
@@ -172,7 +176,7 @@ private void InitInfoPanel()
                 InfoParameterFieldsChanged?.Invoke();
             });
 
-            var subMenuTypePopupContainer = Q<VisualElement>("item-info-submenu-type-popup-container").First();
+            var subMenuTypePopupContainer = Q<VisualElement>("item-info-submenu-type-popup-container");
             var subMenuTypeChoices = new List<string>() { t._("inspector.menu.item.info.subMenuType.children"), t._("inspector.menu.item.info.subMenuType.dtMenuGroupComponent"), t._("inspector.menu.item.info.subMenuType.vrcMenuAsset") };
             _subMenuTypePopup = new PopupField<string>(t._("inspector.menu.item.info.popup.subMenuType"), subMenuTypeChoices, 0);
             _subMenuTypePopup.RegisterValueChangedCallback((evt) =>
@@ -182,7 +186,7 @@ private void InitInfoPanel()
             });
             subMenuTypePopupContainer.Add(_subMenuTypePopup);
 
-            var dtSubMenuObjFieldContainer = Q<VisualElement>("item-info-dtsubmenu-objfield-container").First();
+            var dtSubMenuObjFieldContainer = Q<VisualElement>("item-info-dtsubmenu-objfield-container");
             _dtSubMenuObjField = new ObjectField(t._("inspector.menu.item.info.objectField.subMenu"))
             {
                 objectType = typeof(DTMenuGroup)
@@ -195,7 +199,7 @@ private void InitInfoPanel()
             dtSubMenuObjFieldContainer.Add(_dtSubMenuObjField);
 
 #if DT_VRCSDK3A
-            var vrcSubMenuObjFieldContainer = Q<VisualElement>("item-info-vrcsubmenu-objfield-container").First();
+            var vrcSubMenuObjFieldContainer = Q<VisualElement>("item-info-vrcsubmenu-objfield-container");
             _vrcSubMenuObjField = new ObjectField(t._("inspector.menu.item.info.objectField.subMenu"))
             {
                 objectType = typeof(VRCExpressionsMenu)
@@ -214,12 +218,12 @@ private void InitDetailsFoldout()
             _itemInfoParameterNameField.style.display = DisplayStyle.None;
             _itemInfoParameterValueField.style.display = DisplayStyle.None;
 
-            _itemDetailsFoldout = Q<Foldout>("details-foldout").First();
-            _itemDetailsContainer = Q<VisualElement>("details-container").First();
+            _itemDetailsFoldout = Q<Foldout>("details-foldout");
+            _itemDetailsContainer = Q<VisualElement>("details-container");
             BindFoldoutHeaderAndContainerWithPrefix("details");
 
-            _itemDetailsParameterNameField = Q<AnimatorParameterTextField>("details-parameter-name-field").First();
-            _itemDetailsParameterValueField = Q<FloatField>("details-parameter-value-field").First();
+            _itemDetailsParameterNameField = Q<AnimatorParameterTextField>("details-parameter-name-field");
+            _itemDetailsParameterValueField = Q<FloatField>("details-parameter-value-field");
             _itemDetailsParameterNameField.RegisterValueChangedCallback(evt =>
             {
                 ParameterName = evt.newValue;
@@ -231,24 +235,24 @@ private void InitDetailsFoldout()
                 DetailsParameterFieldsChanged?.Invoke();
             });
 
-            _itemDetailsHorizontalParameterField = Q<AnimatorParameterTextField>("details-horizontal-parameter-text-field").First();
-            _itemDetailsVerticalParameterField = Q<AnimatorParameterTextField>("details-vertical-parameter-text-field").First();
+            _itemDetailsHorizontalParameterField = Q<AnimatorParameterTextField>("details-horizontal-parameter-text-field");
+            _itemDetailsVerticalParameterField = Q<AnimatorParameterTextField>("details-vertical-parameter-text-field");
             _itemDetailsHorizontalParameterField.RegisterValueChangedCallback(evt => TwoAxisControllerChanged?.Invoke());
             _itemDetailsVerticalParameterField.RegisterValueChangedCallback(evt => TwoAxisControllerChanged?.Invoke());
 
-            _axisPanel = Q<VisualElement>("axis-panel").First();
-            _paramsPanel = Q<VisualElement>("params-panel").First();
+            _axisPanel = Q<VisualElement>("axis-panel");
+            _paramsPanel = Q<VisualElement>("params-panel");
 
-            _itemDetailsUpParameterField = Q<AnimatorParameterTextField>("details-up-parameter-text-field").First();
-            _itemDetailsRightParameterField = Q<AnimatorParameterTextField>("details-right-parameter-text-field").First();
-            _itemDetailsDownParameterField = Q<AnimatorParameterTextField>("details-down-parameter-text-field").First();
-            _itemDetailsLeftParameterField = Q<AnimatorParameterTextField>("details-left-parameter-text-field").First();
+            _itemDetailsUpParameterField = Q<AnimatorParameterTextField>("details-up-parameter-text-field");
+            _itemDetailsRightParameterField = Q<AnimatorParameterTextField>("details-right-parameter-text-field");
+            _itemDetailsDownParameterField = Q<AnimatorParameterTextField>("details-down-parameter-text-field");
+            _itemDetailsLeftParameterField = Q<AnimatorParameterTextField>("details-left-parameter-text-field");
             _itemDetailsUpParameterField.RegisterValueChangedCallback(evt => FourAxisControllerChanged?.Invoke());
             _itemDetailsRightParameterField.RegisterValueChangedCallback(evt => FourAxisControllerChanged?.Invoke());
             _itemDetailsDownParameterField.RegisterValueChangedCallback(evt => FourAxisControllerChanged?.Invoke());
             _itemDetailsLeftParameterField.RegisterValueChangedCallback(evt => FourAxisControllerChanged?.Invoke());
 
-            _itemDetailsRadialParameterField = Q<AnimatorParameterTextField>("details-radial-parameter-text-field").First();
+            _itemDetailsRadialParameterField = Q<AnimatorParameterTextField>("details-radial-parameter-text-field");
             _itemDetailsRadialParameterField.RegisterValueChangedCallback(evt => RadialControllerChanged?.Invoke());
 
             InitAxisLabels();
@@ -271,10 +275,10 @@ private void InitAxisLabel(ref VisualElement axisContainer, ref VisualElement ic
 
         private void InitAxisLabels()
         {
-            var axisUpContainer = Q<VisualElement>("axis-up-container").First();
-            var axisLeftContainer = Q<VisualElement>("axis-left-container").First();
-            var axisRightContainer = Q<VisualElement>("axis-right-container").First();
-            var axisDownContainer = Q<VisualElement>("axis-down-container").First();
+            var axisUpContainer = Q<VisualElement>("axis-up-container");
+            var axisLeftContainer = Q<VisualElement>("axis-left-container");
+            var axisRightContainer = Q<VisualElement>("axis-right-container");
+            var axisDownContainer = Q<VisualElement>("axis-down-container");
 
             InitAxisLabel(ref axisUpContainer, ref _axisUpIcon, ref _axisUpIconObjField, ref _axisUpLabelField, () =>
             {
@@ -442,22 +446,6 @@ private void UpdateAxisLabel(VisualElement iconContainer, ObjectField objField,
             textField.value = data.name;
         }
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-            InitInfoPanel();
-            InitDetailsFoldout();
-
-            t.LocalizeElement(this);
-
-            RaiseLoadEvent();
-        }
-
-        public override void OnDisable()
-        {
-            base.OnDisable();
-        }
-
         public void RepaintInfoParameterFields()
         {
             _itemInfoParameterNameField.value = ParameterName;
diff --git a/Editor/Inspector/Views/ParameterSlotView.cs b/Editor/Inspector/Views/ParameterSlotView.cs
index b108b9df..ad3e4265 100644
--- a/Editor/Inspector/Views/ParameterSlotView.cs
+++ b/Editor/Inspector/Views/ParameterSlotView.cs
@@ -64,6 +64,13 @@ public ParameterSlotView(DTSmartControl currentCtrl = null, bool showDescription
             Mappings = new List<ParameterSlotMapping>();
             _currentCtrl = currentCtrl;
             _showDescriptionHelpbox = showDescriptionHelpbox;
+            InitVisualTree();
+            InitHelpboxes();
+            InitValueType();
+            InitDefValFields();
+            InitMappingsContainer();
+            InitMappingAddField();
+            t.LocalizeElement(this);
         }
 
         private void InitVisualTree()
@@ -79,7 +86,7 @@ private void InitVisualTree()
 
         private void InitHelpboxes()
         {
-            var helpboxContainer = Q<VisualElement>("description-helpbox-container").First();
+            var helpboxContainer = Q<VisualElement>("description-helpbox-container");
             if (_showDescriptionHelpbox)
             {
                 helpboxContainer.Add(CreateHelpBox(t._("inspector.parameterSlot.helpbox.description"), UnityEditor.MessageType.Info));
@@ -96,7 +103,7 @@ private void UpdateValueTypeDisplay()
 
         private void InitValueType()
         {
-            var popupContainer = Q<VisualElement>("value-type-popup-container").First();
+            var popupContainer = Q<VisualElement>("value-type-popup-container");
             var choices = new List<string>() { "Int", "Float" };
             _valueTypePopupField = new PopupField<string>(t._("inspector.parameterSlot.popup.valueType"), choices, 0);
             _valueTypePopupField.RegisterValueChangedCallback(evt =>
@@ -109,13 +116,13 @@ private void InitValueType()
 
         private void InitDefValFields()
         {
-            _defValFloatField = Q<FloatField>("parameter-defval-float-field").First();
+            _defValFloatField = Q<FloatField>("parameter-defval-float-field");
             _defValFloatField.RegisterValueChangedCallback(evt =>
             {
                 _defValIntField.value = (int)_defValFloatField.value;
                 ConfigChanged?.Invoke();
             });
-            _defValIntField = Q<IntegerField>("parameter-defval-int-field").First();
+            _defValIntField = Q<IntegerField>("parameter-defval-int-field");
             _defValIntField.RegisterValueChangedCallback(evt =>
             {
                 _defValFloatField.value = _defValIntField.value;
@@ -125,13 +132,13 @@ private void InitDefValFields()
 
         private void InitMappingsContainer()
         {
-            _mappingsHelpboxContainer = Q<VisualElement>("mappings-helpbox-container").First();
-            _mappingsContainer = Q<VisualElement>("mappings-container").First();
+            _mappingsHelpboxContainer = Q<VisualElement>("mappings-helpbox-container");
+            _mappingsContainer = Q<VisualElement>("mappings-container");
         }
 
         private void InitMappingAddField()
         {
-            _mappingsAddFieldContainer = Q<VisualElement>("mappings-add-field-container").First();
+            _mappingsAddFieldContainer = Q<VisualElement>("mappings-add-field-container");
             _mappingsAddFieldContainer.AddToClassList("add-field-container");
             var label = new Label("+");
             _mappingsAddFieldContainer.Add(label);
@@ -239,25 +246,6 @@ private void RepaintMappings()
             }
         }
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-            InitHelpboxes();
-            InitValueType();
-            InitDefValFields();
-            InitMappingsContainer();
-            InitMappingAddField();
-
-            t.LocalizeElement(this);
-
-            RaiseLoadEvent();
-        }
-
-        public override void OnDisable()
-        {
-            base.OnDisable();
-        }
-
         public override void Repaint()
         {
             UpdateValueTypeDisplay();
diff --git a/Editor/Inspector/Views/SmartControlPropertyGroupComponentView.cs b/Editor/Inspector/Views/SmartControlPropertyGroupComponentView.cs
index 4b677455..1dd3bb7f 100644
--- a/Editor/Inspector/Views/SmartControlPropertyGroupComponentView.cs
+++ b/Editor/Inspector/Views/SmartControlPropertyGroupComponentView.cs
@@ -76,6 +76,11 @@ public SmartControlPropertyGroupComponentView(ISmartControlPropertyGroupComponen
             HasMaterialProperties = false;
             HasGenericProperties = false;
             _presenter = new SmartControlPropertyGroupComponentPresenter(this);
+            InitVisualTree();
+            InitComponentsObjFields();
+            InitPropertyTypeBtns();
+            InitSearch();
+            t.LocalizeElement(this);
         }
 
         private void InitVisualTree()
@@ -91,7 +96,7 @@ private void InitVisualTree()
 
         private void InitComponentsObjFields()
         {
-            var container = Q<VisualElement>("component-obj-fields-container").First();
+            var container = Q<VisualElement>("component-obj-fields-container");
 
             var objField = new ObjectField()
             {
@@ -112,10 +117,10 @@ private void InitComponentsObjFields()
 
         private void InitSearch()
         {
-            _searchField = Q<TextField>("search-field").First();
+            _searchField = Q<TextField>("search-field");
             _searchField.RegisterValueChangedCallback((evt) => SearchQueryChange?.Invoke());
-            _searchResultContainer = Q<VisualElement>("search-result-container").First();
-            var propertiesContainer = Q<VisualElement>("properties-container").First();
+            _searchResultContainer = Q<VisualElement>("search-result-container");
+            var propertiesContainer = Q<VisualElement>("properties-container");
             _propertiesTableModel = new TableView.TableModel(new string[] {
                 t._("inspector.smartcontrol.propertyGroups.column.property"),
                 t._("inspector.smartcontrol.propertyGroups.column.current"),
@@ -167,32 +172,15 @@ private void UpdateActiveResultMode()
 
         private void InitPropertyTypeBtns()
         {
-            _blendshapeBtn = Q<ToolbarButton>("blendshapes-btn").First();
-            _materialBtn = Q<ToolbarButton>("material-btn").First();
-            _genericBtn = Q<ToolbarButton>("generic-btn").First();
+            _blendshapeBtn = Q<ToolbarButton>("blendshapes-btn");
+            _materialBtn = Q<ToolbarButton>("material-btn");
+            _genericBtn = Q<ToolbarButton>("generic-btn");
 
             _blendshapeBtn.clicked += () => SetResultModeOrNoMode(SmartControlComponentViewResultMode.Blendshapes);
             _materialBtn.clicked += () => SetResultModeOrNoMode(SmartControlComponentViewResultMode.Material);
             _genericBtn.clicked += () => SetResultModeOrNoMode(SmartControlComponentViewResultMode.Generic);
         }
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-            InitComponentsObjFields();
-            InitPropertyTypeBtns();
-            InitSearch();
-
-            t.LocalizeElement(this);
-
-            RaiseLoadEvent();
-        }
-
-        public override void OnDisable()
-        {
-            base.OnDisable();
-        }
-
         private VisualElement MakeAddEntry(string name, Type type, object value, Action onAdd)
         {
             var elem = new VisualElement();
diff --git a/Editor/Inspector/Views/SmartControlPropertyGroupView.cs b/Editor/Inspector/Views/SmartControlPropertyGroupView.cs
index fcbc6782..fb64c5e8 100644
--- a/Editor/Inspector/Views/SmartControlPropertyGroupView.cs
+++ b/Editor/Inspector/Views/SmartControlPropertyGroupView.cs
@@ -68,6 +68,14 @@ public SmartControlPropertyGroupView(ISmartControlPropertyGroupViewParent parent
             _presenter = new SmartControlPropertyGroupPresenter(this);
             SelectionGameObjects = new List<GameObject>();
             FoundComponents = new List<Component>();
+            InitVisualTree();
+            InitTitleContainer();
+            InitSelectionTypePopup();
+            InitSearchFromObjField();
+            InitSelectionObjs();
+            InitObjAddField();
+            InitComponentsContainer();
+            t.LocalizeElement(this);
         }
 
         private void InitVisualTree()
@@ -83,10 +91,10 @@ private void InitVisualTree()
 
         private void InitTitleContainer()
         {
-            _titleLabel = Q<Label>("title-label").First();
+            _titleLabel = Q<Label>("title-label");
             _titleLabel.text = _title;
 
-            _removeBtn = Q<Button>("remove-btn").First();
+            _removeBtn = Q<Button>("remove-btn");
             _removeBtn.clicked += _onRemove;
         }
 
@@ -98,7 +106,7 @@ private void UpdateSelectionTypeUI()
 
         private void InitSelectionTypePopup()
         {
-            var popupContainer = Q<VisualElement>("selection-type-popup-container").First();
+            var popupContainer = Q<VisualElement>("selection-type-popup-container");
             var choices = new List<string>() { t._("inspector.smartcontrol.propertyGroup.selectionType.normal"), t._("inspector.smartcontrol.propertyGroup.selectionType.inverted"), t._("inspector.smartcontrol.propertyGroup.selectionType.avatarWide") };
             _selectionTypePopup = new PopupField<string>(t._("inspector.smartcontrol.propertyGroup.popup.selectionType"), choices, 0);
             _selectionTypePopup.RegisterValueChangedCallback((evt) =>
@@ -111,7 +119,7 @@ private void InitSelectionTypePopup()
 
         private void InitSearchFromObjField()
         {
-            var searchFromObjFieldContainer = Q<VisualElement>("search-from-objfield-container").First();
+            var searchFromObjFieldContainer = Q<VisualElement>("search-from-objfield-container");
             _searchFromObjField = new ObjectField(t._("inspector.smartcontrol.propertyGroup.objectField.searchObjectsFrom"))
             {
                 objectType = typeof(Transform)
@@ -125,13 +133,13 @@ private void InitSearchFromObjField()
 
         private void InitSelectionObjs()
         {
-            _includeExcludeLabel = Q<Label>("include-exclude-objs-label").First();
-            _selectionObjsContainer = Q<VisualElement>("selection-objs-container").First();
+            _includeExcludeLabel = Q<Label>("include-exclude-objs-label");
+            _selectionObjsContainer = Q<VisualElement>("selection-objs-container");
         }
 
         private void InitObjAddField()
         {
-            _selectionObjAddFieldContainer = Q<VisualElement>("selection-obj-add-field-container").First();
+            _selectionObjAddFieldContainer = Q<VisualElement>("selection-obj-add-field-container");
             _selectionObjAddFieldContainer.AddToClassList("add-field-container");
             var label = new Label("+");
             _selectionObjAddFieldContainer.Add(label);
@@ -152,7 +160,7 @@ private void InitObjAddField()
 
         private void InitComponentsContainer()
         {
-            var pickFromObjFieldContainer = Q<VisualElement>("pick-from-objfield-container").First();
+            var pickFromObjFieldContainer = Q<VisualElement>("pick-from-objfield-container");
             _pickFromObjField = new ObjectField(t._("inspector.smartcontrol.propertyGroup.objectField.pickPropertiesFrom"))
             {
                 objectType = typeof(Transform),
@@ -163,7 +171,7 @@ private void InitComponentsContainer()
             {
                 SettingsChanged?.Invoke();
             });
-            _compsContainer = Q<VisualElement>("components-container").First();
+            _compsContainer = Q<VisualElement>("components-container");
         }
 
         private void RepaintSelectionObjects()
@@ -199,15 +207,6 @@ private void RepaintComponentsContainer()
         {
             _compsContainer.Clear();
 
-            // disable existing views
-            foreach (var elem in _compsContainer.Children())
-            {
-                if (elem is SmartControlPropertyGroupComponentView propGpCompView)
-                {
-                    propGpCompView.OnDisable();
-                }
-            }
-
             if (FoundComponents.Count > 10)
             {
                 _compsContainer.Add(CreateHelpBox(t._("inspector.smartcontrol.propertyGroup.helpbox.tooManyComponentsFound", FoundComponents.Count), MessageType.Warning));
@@ -217,7 +216,6 @@ private void RepaintComponentsContainer()
                 foreach (var comp in FoundComponents)
                 {
                     var view = new SmartControlPropertyGroupComponentView(this, comp, Target.PropertyValues);
-                    view.OnEnable();
                     _compsContainer.Add(view);
                 }
             }
@@ -231,26 +229,6 @@ public override void Repaint()
             RepaintComponentsContainer();
         }
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-            InitTitleContainer();
-            InitSelectionTypePopup();
-            InitSearchFromObjField();
-            InitSelectionObjs();
-            InitObjAddField();
-            InitComponentsContainer();
-
-            t.LocalizeElement(this);
-
-            RaiseLoadEvent();
-        }
-
-        public override void OnDisable()
-        {
-            base.OnDisable();
-        }
-
         public void RaisePropertiesChangedEvent()
         {
             PropertiesChanged?.Invoke();
diff --git a/Editor/Inspector/Views/SmartControlView.cs b/Editor/Inspector/Views/SmartControlView.cs
index 1bc179d9..216997bb 100644
--- a/Editor/Inspector/Views/SmartControlView.cs
+++ b/Editor/Inspector/Views/SmartControlView.cs
@@ -148,8 +148,14 @@ public SmartControlView()
             CrossControlValuesOnDisabled = new List<SmartControlCrossControlValue>();
             PropertyGroups = new List<DTSmartControl.PropertyGroup>();
             _driverParamSlotView = null;
-
             _presenter = new SmartControlPresenter(this);
+            InitVisualTree();
+            InitDriverFoldout();
+            InitControlFoldout();
+            InitObjectTogglesFoldout();
+            InitPropertyGroupsFoldout();
+            InitCrossCtrlFoldout();
+            t.LocalizeElement(this);
         }
 
         private void InitVisualTree()
@@ -179,14 +185,14 @@ private void UpdateMenuItemTypeDisplay()
 
         private void InitDriverMenuItem()
         {
-            _driverMenuItemContainer = Q<VisualElement>("menu-item-driver-container").First();
-            _driverMenuItemNameField = Q<TextField>("menu-item-name-field").First();
+            _driverMenuItemContainer = Q<VisualElement>("menu-item-driver-container");
+            _driverMenuItemNameField = Q<TextField>("menu-item-name-field");
             _driverMenuItemNameField.RegisterValueChangedCallback(evt =>
             {
                 MenuItemConfigChanged?.Invoke();
             });
 
-            var iconObjFieldContainer = Q<VisualElement>("menu-icon-obj-field-container").First();
+            var iconObjFieldContainer = Q<VisualElement>("menu-icon-obj-field-container");
             _driverMenuItemIconObjField = new ObjectField(t._("inspector.smartcontrol.driver.menuItem.objectField.icon"))
             {
                 objectType = typeof(Texture2D)
@@ -197,7 +203,7 @@ private void InitDriverMenuItem()
             });
             iconObjFieldContainer.Add(_driverMenuItemIconObjField);
 
-            var popupContainer = Q<VisualElement>("menu-item-type-popup-container").First();
+            var popupContainer = Q<VisualElement>("menu-item-type-popup-container");
             var choices = new List<string>() {
                 t._("inspector.smartcontrol.driver.menuItem.itemType.button"),
                 t._("inspector.smartcontrol.driver.menuItem.itemType.toggle"),
@@ -214,12 +220,12 @@ private void InitDriverMenuItem()
 
         private void InitDriverAnimParam()
         {
-            _driverAnimParamContainer = Q<VisualElement>("anim-param-driver-container").First();
+            _driverAnimParamContainer = Q<VisualElement>("anim-param-driver-container");
 
-            _driverAnimParamDefaultValueBoolToggle = Q<Toggle>("anim-param-defval-bool-toggle").First();
-            _driverAnimParamDefaultValueFloatContainer = Q<VisualElement>("anim-param-defval-float-container").First();
-            _driverAnimParamDefaultValueFloatSlider = Q<Slider>("anim-param-defval-float-slider").First();
-            _driverAnimParamDefaultValueFloatField = Q<FloatField>("anim-param-defval-float-field").First();
+            _driverAnimParamDefaultValueBoolToggle = Q<Toggle>("anim-param-defval-bool-toggle");
+            _driverAnimParamDefaultValueFloatContainer = Q<VisualElement>("anim-param-defval-float-container");
+            _driverAnimParamDefaultValueFloatSlider = Q<Slider>("anim-param-defval-float-slider");
+            _driverAnimParamDefaultValueFloatField = Q<FloatField>("anim-param-defval-float-field");
 
             _driverAnimParamDefaultValueBoolToggle.RegisterValueChangedCallback((evt) =>
             {
@@ -242,15 +248,15 @@ private void InitDriverAnimParam()
 
         private void InitDriverParameterSlot()
         {
-            _driverParamSlotContainer = Q<VisualElement>("parameter-slot-driver-container").First();
+            _driverParamSlotContainer = Q<VisualElement>("parameter-slot-driver-container");
 
-            var descHelpboxContainer = Q<VisualElement>("parameter-slot-description-helpbox-container").First();
+            var descHelpboxContainer = Q<VisualElement>("parameter-slot-description-helpbox-container");
             descHelpboxContainer.Add(CreateHelpBox(t._("inspector.parameterSlot.helpbox.description"), MessageType.Info));
 
-            _driverParamSlotNotAssignedHelpboxContainer = Q<VisualElement>("parameter-slot-not-assigned-helpbox-container").First();
+            _driverParamSlotNotAssignedHelpboxContainer = Q<VisualElement>("parameter-slot-not-assigned-helpbox-container");
             _driverParamSlotNotAssignedHelpboxContainer.Add(CreateHelpBox(t._("inspector.smartcontrol.driver.parameterSlot.helpbox.notAssigned"), MessageType.Error));
 
-            var objFieldContainer = Q<VisualElement>("parameter-slot-obj-field-container").First();
+            var objFieldContainer = Q<VisualElement>("parameter-slot-obj-field-container");
             _driverParamSlotObjField = new ObjectField(t._("inspector.smartcontrol.driver.parameterSlot.objField.parameterSlot"))
             {
                 objectType = typeof(DTParameterSlot)
@@ -261,22 +267,22 @@ private void InitDriverParameterSlot()
             });
             objFieldContainer.Add(_driverParamSlotObjField);
 
-            _driverParamSlotGenerateMenuItemToggle = Q<Toggle>("parameter-slot-generate-menu-item-toggle").First();
+            _driverParamSlotGenerateMenuItemToggle = Q<Toggle>("parameter-slot-generate-menu-item-toggle");
             _driverParamSlotGenerateMenuItemToggle.RegisterValueChangedCallback(evt =>
             {
                 UpdateParamSlot();
                 ParameterSlotConfigChanged?.Invoke();
             });
 
-            _driverParamSlotMenuItemBox = Q<Box>("parameter-slot-menu-item-box").First();
+            _driverParamSlotMenuItemBox = Q<Box>("parameter-slot-menu-item-box");
 
-            _driverParamSlotMenuItemNameField = Q<TextField>("parameter-slot-menu-item-name-field").First();
+            _driverParamSlotMenuItemNameField = Q<TextField>("parameter-slot-menu-item-name-field");
             _driverParamSlotMenuItemNameField.RegisterValueChangedCallback(evt =>
             {
                 ParameterSlotConfigChanged?.Invoke();
             });
 
-            var iconObjFieldContainer = Q<VisualElement>("parameter-slot-menu-icon-obj-field-container").First();
+            var iconObjFieldContainer = Q<VisualElement>("parameter-slot-menu-icon-obj-field-container");
             _driverParamSlotMenuItemIconObjField = new ObjectField(t._("inspector.smartcontrol.driver.parameterSlot.objectField.menuItemIcon"))
             {
                 objectType = typeof(Texture2D)
@@ -287,7 +293,7 @@ private void InitDriverParameterSlot()
             });
             iconObjFieldContainer.Add(_driverParamSlotMenuItemIconObjField);
 
-            var popupContainer = Q<VisualElement>("parameter-slot-menu-item-type-popup-container").First();
+            var popupContainer = Q<VisualElement>("parameter-slot-menu-item-type-popup-container");
             var choices = new List<string>() {
                 t._("inspector.smartcontrol.driver.parameterSlot.menuItemType.button"),
                 t._("inspector.smartcontrol.driver.parameterSlot.menuItemType.toggle")
@@ -299,7 +305,7 @@ private void InitDriverParameterSlot()
             });
             popupContainer.Add(_driverParamSlotMenuItemPopup);
 
-            _driverParamSlotViewContainer = Q<VisualElement>("parameter-slot-view-container").First();
+            _driverParamSlotViewContainer = Q<VisualElement>("parameter-slot-view-container");
         }
 
         private void UpdateDriverVRCPhysBoneDisplay()
@@ -333,13 +339,13 @@ private void UpdateDriverVRCPhysBoneObjHelpboxDisplay()
 
         private void InitDriverVRCPhysBone()
         {
-            _driverVRCPhysBoneContainer = Q<VisualElement>("vrcphysbone-driver-container").First();
+            _driverVRCPhysBoneContainer = Q<VisualElement>("vrcphysbone-driver-container");
 
-            _objFieldHelpboxContainer = Q<VisualElement>("vrcphysbone-obj-field-helpbox-container").First();
+            _objFieldHelpboxContainer = Q<VisualElement>("vrcphysbone-obj-field-helpbox-container");
             _objFieldHelpboxContainer.style.display = DisplayStyle.None;
             _objFieldHelpboxContainer.Add(CreateHelpBox(t._("inspector.smartcontrol.driver.vrcPhysBone.helpbox.emptyPhysbone"), MessageType.Error));
 
-            var objFieldContainer = Q<VisualElement>("vrcphysbone-obj-field-container").First();
+            var objFieldContainer = Q<VisualElement>("vrcphysbone-obj-field-container");
 #if DT_VRCSDK3A
             _driverVRCPhysBoneObjField = new ObjectField(t._("inspector.smartcontrol.driver.vrcPhysBone.objField.physBone"))
             {
@@ -355,10 +361,10 @@ private void InitDriverVRCPhysBone()
             objFieldContainer.Add(CreateHelpBox(t._("inspector.smartcontrol.driver.vrcPhysBone.helpbox.vrcsdkNotDetected"), MessageType.Error));
 #endif
 
-            var paramHelpboxContainer = Q<VisualElement>("vrcphysbone-parameter-prefix-helpbox-container").First();
+            var paramHelpboxContainer = Q<VisualElement>("vrcphysbone-parameter-prefix-helpbox-container");
             paramHelpboxContainer.Add(CreateHelpBox(t._("inspector.smartcontrol.driver.vrcPhysBone.helpbox.emptyParameterPrefixAutoGenerated"), MessageType.Info));
 
-            _condSrcHelpboxContainer = Q<VisualElement>("vrcphysbone-condition-source-helpbox-container").First();
+            _condSrcHelpboxContainer = Q<VisualElement>("vrcphysbone-condition-source-helpbox-container");
             _condSrcHelpboxContainer.Add(CreateHelpBox(t._("inspector.smartcontrol.driver.vrcPhysBone.helpbox.noneCondNoneSrc"), MessageType.Error));
 
             var conditionChoices = new List<string>()
@@ -368,7 +374,7 @@ private void InitDriverVRCPhysBone()
                 t._("inspector.smartcontrol.driver.vrcPhysBone.popup.condition.posed"),
                 t._("inspector.smartcontrol.driver.vrcPhysBone.popup.condition.grabbedOrPosed")
             };
-            var conditionPopupContainer = Q<VisualElement>("vrcphysbone-condition-popup-container").First();
+            var conditionPopupContainer = Q<VisualElement>("vrcphysbone-condition-popup-container");
             _driverVRCPhysBoneConditionPopup = new PopupField<string>(t._("inspector.smartcontrol.driver.vrcPhysBone.popup.condition"), conditionChoices, 0);
             _driverVRCPhysBoneConditionPopup.RegisterValueChangedCallback(evt =>
             {
@@ -384,7 +390,7 @@ private void InitDriverVRCPhysBone()
                 t._("inspector.smartcontrol.driver.vrcPhysBone.popup.source.stretch"),
                 t._("inspector.smartcontrol.driver.vrcPhysBone.popup.source.squish")
             };
-            var sourcePopupContainer = Q<VisualElement>("vrcphysbone-source-popup-container").First();
+            var sourcePopupContainer = Q<VisualElement>("vrcphysbone-source-popup-container");
             _driverVRCPhysBoneSourcePopup = new PopupField<string>(t._("inspector.smartcontrol.driver.vrcPhysBone.popup.source"), sourceChoices, 0);
             _driverVRCPhysBoneSourcePopup.RegisterValueChangedCallback(evt =>
             {
@@ -396,14 +402,14 @@ private void InitDriverVRCPhysBone()
 
         private void InitDriverFoldout()
         {
-            _driverFoldout = Q<Foldout>("driver-foldout").First();
-            _driverContainer = Q<VisualElement>("driver-container").First();
+            _driverFoldout = Q<Foldout>("driver-foldout");
+            _driverContainer = Q<VisualElement>("driver-container");
             BindFoldoutHeaderAndContainerWithPrefix("driver");
 
-            var helpboxContainer = Q<VisualElement>("anim-param-helpbox-container").First();
+            var helpboxContainer = Q<VisualElement>("anim-param-helpbox-container");
             helpboxContainer.Add(CreateHelpBox(t._("inspector.smartcontrol.driver.animatorParameter.helpbox.emptyParameterAutoGenerated"), MessageType.Info));
 
-            _driverTypePopupContainer = Q<VisualElement>("driver-type-popup-container").First();
+            _driverTypePopupContainer = Q<VisualElement>("driver-type-popup-container");
             var choices = new List<string>() {
                 t._("inspector.smartcontrol.driver.animatorParameter"),
                 t._("inspector.smartcontrol.driver.menuItem"),
@@ -426,14 +432,14 @@ private void InitDriverFoldout()
 
         private void InitControlFoldout()
         {
-            _controlFoldout = Q<Foldout>("control-foldout").First();
-            _controlContainer = Q<VisualElement>("control-container").First();
+            _controlFoldout = Q<Foldout>("control-foldout");
+            _controlContainer = Q<VisualElement>("control-container");
             BindFoldoutHeaderAndContainerWithPrefix("control");
 
-            _controlBinaryContainer = Q<VisualElement>("control-binary-container").First();
-            _controlMotionTimeContainer = Q<VisualElement>("control-motion-time-container").First();
+            _controlBinaryContainer = Q<VisualElement>("control-binary-container");
+            _controlMotionTimeContainer = Q<VisualElement>("control-motion-time-container");
 
-            _controlTypePopupContainer = Q<VisualElement>("control-type-popup-container").First();
+            _controlTypePopupContainer = Q<VisualElement>("control-type-popup-container");
             var choices = new List<string>() { t._("inspector.smartcontrol.control.controlType.binary"), t._("inspector.smartcontrol.control.controlType.motionTime") };
             _controlTypePopupField = new PopupField<string>(t._("inspector.smartcontrol.control.popup.controlType"), choices, 0);
             _controlTypePopupContainer.Add(_controlTypePopupField);
@@ -466,11 +472,11 @@ private void MakeAddField<T>(VisualElement container, Action<T> newCompAction) w
 
         private void InitObjectTogglesFoldout()
         {
-            _objectTogglesFoldout = Q<Foldout>("object-toggles-foldout").First();
-            _objectTogglesContainer = Q<VisualElement>("object-toggles-container").First();
+            _objectTogglesFoldout = Q<Foldout>("object-toggles-foldout");
+            _objectTogglesContainer = Q<VisualElement>("object-toggles-container");
             BindFoldoutHeaderAndContainerWithPrefix("object-toggles");
 
-            var objectTogglesListContainer = Q<VisualElement>("object-toggles-list-container").First();
+            var objectTogglesListContainer = Q<VisualElement>("object-toggles-list-container");
             _objectTogglesTableModel = new TableView.TableModel(new string[] {
                 t._("inspector.smartcontrol.objectToggles.column.object"),
                 t._("inspector.smartcontrol.objectToggles.column.current"),
@@ -479,64 +485,45 @@ private void InitObjectTogglesFoldout()
             });
             _objectTogglesTable = new TableView(_objectTogglesTableModel);
             objectTogglesListContainer.Add(_objectTogglesTable);
-            _objectTogglesAddFieldContainer = Q<VisualElement>("object-toggles-add-field-container").First();
+            _objectTogglesAddFieldContainer = Q<VisualElement>("object-toggles-add-field-container");
             MakeAddField<Component>(_objectTogglesAddFieldContainer, (comp) => AddObjectToggle?.Invoke(comp));
         }
 
         private void InitPropertyGroupsFoldout()
         {
-            _propGpsFoldout = Q<Foldout>("prop-gps-foldout").First();
-            _propGpsContainer = Q<VisualElement>("prop-gps-container").First();
+            _propGpsFoldout = Q<Foldout>("prop-gps-foldout");
+            _propGpsContainer = Q<VisualElement>("prop-gps-container");
             BindFoldoutHeaderAndContainerWithPrefix("prop-gps");
 
-            _propGpsListContainer = Q<VisualElement>("prop-gps-list-container").First();
-            _propGpAddBtn = Q<Button>("prop-gp-add-btn").First();
+            _propGpsListContainer = Q<VisualElement>("prop-gps-list-container");
+            _propGpAddBtn = Q<Button>("prop-gp-add-btn");
             _propGpAddBtn.clicked += AddNewPropertyGroup;
         }
 
         private void InitCrossCtrlValuesFoldout()
         {
-            _crossCtrlValuesFoldout = Q<Foldout>("cross-ctrl-values-foldout").First();
-            _crossCtrlValuesContainer = Q<VisualElement>("cross-ctrl-values-container").First();
+            _crossCtrlValuesFoldout = Q<Foldout>("cross-ctrl-values-foldout");
+            _crossCtrlValuesContainer = Q<VisualElement>("cross-ctrl-values-container");
             BindFoldoutHeaderAndContainerWithPrefix("cross-ctrl-values");
 
-            _crossCtrlValuesOnEnabledContainer = Q<VisualElement>("cross-ctrl-values-on-enabled-container").First();
-            _crossCtrlValuesOnEnabledAddFieldContainer = Q<VisualElement>("cross-ctrl-values-on-enabled-add-field-container").First();
+            _crossCtrlValuesOnEnabledContainer = Q<VisualElement>("cross-ctrl-values-on-enabled-container");
+            _crossCtrlValuesOnEnabledAddFieldContainer = Q<VisualElement>("cross-ctrl-values-on-enabled-add-field-container");
             MakeAddField<DTSmartControl>(_crossCtrlValuesOnEnabledAddFieldContainer, (ctrl) => AddCrossControlValueOnEnabled?.Invoke(ctrl));
 
-            _crossCtrlValuesOnDisabledContainer = Q<VisualElement>("cross-ctrl-values-on-disabled-container").First();
-            _crossCtrlValuesOnDisabledAddFieldContainer = Q<VisualElement>("cross-ctrl-values-on-disabled-add-field-container").First();
+            _crossCtrlValuesOnDisabledContainer = Q<VisualElement>("cross-ctrl-values-on-disabled-container");
+            _crossCtrlValuesOnDisabledAddFieldContainer = Q<VisualElement>("cross-ctrl-values-on-disabled-add-field-container");
             MakeAddField<DTSmartControl>(_crossCtrlValuesOnDisabledAddFieldContainer, (ctrl) => AddCrossControlValueOnDisabled?.Invoke(ctrl));
         }
 
         private void InitCrossCtrlFoldout()
         {
-            _crossCtrlFoldout = Q<Foldout>("cross-ctrl-foldout").First();
-            _crossCtrlContainer = Q<VisualElement>("cross-ctrl-container").First();
+            _crossCtrlFoldout = Q<Foldout>("cross-ctrl-foldout");
+            _crossCtrlContainer = Q<VisualElement>("cross-ctrl-container");
             BindFoldoutHeaderAndContainerWithPrefix("cross-ctrl");
 
             InitCrossCtrlValuesFoldout();
         }
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-            InitDriverFoldout();
-            InitControlFoldout();
-            InitObjectTogglesFoldout();
-            InitPropertyGroupsFoldout();
-            InitCrossCtrlFoldout();
-
-            t.LocalizeElement(this);
-
-            RaiseLoadEvent();
-        }
-
-        public override void OnDisable()
-        {
-            base.OnDisable();
-        }
-
         private void UpdateDriverConfigDisplay()
         {
             _driverMenuItemContainer.style.display = DisplayStyle.None;
@@ -581,7 +568,6 @@ private void UpdateParamSlot()
             if (_driverParamSlotView != null)
             {
                 _driverParamSlotView.Unbind();
-                _driverParamSlotView.OnDisable();
                 if (_driverParamSlotViewContainer.Contains(_driverParamSlotView))
                 {
                     _driverParamSlotViewContainer.Remove(_driverParamSlotView);
@@ -594,7 +580,6 @@ private void UpdateParamSlot()
                 _driverParamSlotView = new ParameterSlotView(Target) { Target = ParameterSlot };
                 _driverParamSlotView.Bind(new SerializedObject(ParameterSlot));
                 _driverParamSlotViewContainer.Add(_driverParamSlotView);
-                _driverParamSlotView.OnEnable();
             }
         }
 
@@ -791,15 +776,6 @@ private void RepaintPropertyGroups()
         {
             _propGpsFoldout.text = t._("inspector.smartcontrol.foldout.propertyGroups", PropertyGroups.Count);
 
-            // disable existing views
-            foreach (var elem in _propGpsListContainer.Children())
-            {
-                if (elem is SmartControlPropertyGroupView propGpView)
-                {
-                    propGpView.OnDisable();
-                }
-            }
-
             // TODO: selectively repaint
             _propGpsListContainer.Clear();
             var copy = new List<DTSmartControl.PropertyGroup>(PropertyGroups);
@@ -811,7 +787,6 @@ private void RepaintPropertyGroups()
                 {
                     RemovePropertyGroup?.Invoke(propGp);
                 });
-                view.OnEnable();
 
                 _propGpsListContainer.Add(view);
             }
diff --git a/Editor/UI/DTLegacyEditorWindow.cs b/Editor/UI/DTLegacyEditorWindow.cs
index ab97765c..d4569db3 100644
--- a/Editor/UI/DTLegacyEditorWindow.cs
+++ b/Editor/UI/DTLegacyEditorWindow.cs
@@ -29,8 +29,6 @@ public class DTLegacyEditorWindow : EditorWindow
     {
         private static readonly I18nTranslator t = I18n.ToolTranslator;
 
-        private LegacyView _view;
-
         [MenuItem("Tools/chocopoi/DT Legacy Editor", false, 0)]
         public static void ShowWindow()
         {
@@ -39,20 +37,9 @@ public static void ShowWindow()
             window.Show();
         }
 
-        public DTLegacyEditorWindow()
-        {
-        }
-
-        public void OnEnable()
-        {
-            _view = new LegacyView();
-            rootVisualElement.Add(_view);
-            _view.OnEnable();
-        }
-
-        public void OnDisable()
+        public void CreateGUI()
         {
-            _view.OnDisable();
+            rootVisualElement.Add(new LegacyView());
         }
     }
 }
diff --git a/Editor/UI/DTMainEditorWindow.cs b/Editor/UI/DTMainEditorWindow.cs
index 30079c0b..c910c3c0 100644
--- a/Editor/UI/DTMainEditorWindow.cs
+++ b/Editor/UI/DTMainEditorWindow.cs
@@ -99,7 +99,6 @@ private void CleanUp()
         {
             if (_view != null)
             {
-                _view.OnDisable();
                 if (rootVisualElement.Contains(_view))
                 {
                     rootVisualElement.Remove(_view);
@@ -113,18 +112,12 @@ private void CreateNewView()
             CleanUp();
             _view = new MainView();
             rootVisualElement.Add(_view);
-            _view.OnEnable();
             AddLanguagePopup();
         }
 
-        public void OnEnable()
+        public void CreateGUI()
         {
             CreateNewView();
         }
-
-        public void OnDisable()
-        {
-            _view.OnDisable();
-        }
     }
 }
diff --git a/Editor/UI/MappingEditorWindow.cs b/Editor/UI/MappingEditorWindow.cs
index 3a689433..addb42c0 100644
--- a/Editor/UI/MappingEditorWindow.cs
+++ b/Editor/UI/MappingEditorWindow.cs
@@ -77,12 +77,10 @@ public void OnEnable()
         {
             _view = new MappingEditorView();
             rootVisualElement.Add(_view);
-            _view.OnEnable();
         }
 
         public void OnDisable()
         {
-            _view.OnDisable();
         }
 
         public MappingEditorView GetView()
diff --git a/Editor/UI/Presenters/OneConfWearableConfigPresenter.cs b/Editor/UI/Presenters/OneConfWearableConfigPresenter.cs
index f5ad4799..bfd48a96 100644
--- a/Editor/UI/Presenters/OneConfWearableConfigPresenter.cs
+++ b/Editor/UI/Presenters/OneConfWearableConfigPresenter.cs
@@ -496,10 +496,6 @@ private void UpdateAdvancedModulesView()
             }
 
             // call unload before we clear the list
-            foreach (var moduleData in _view.AdvancedModuleViewDataList)
-            {
-                moduleData.editor.OnDisable();
-            }
             _view.AdvancedModuleViewDataList.Clear();
 
             foreach (var module in _view.Config.modules)
@@ -519,16 +515,12 @@ private void UpdateAdvancedModulesView()
                 };
                 moduleData.removeButtonOnClick = () =>
                 {
-                    moduleData.editor.OnDisable();
                     _view.Config.modules.Remove(module);
                     _view.AdvancedModuleViewDataList.Remove(moduleData);
                     UpdateAdvancedModulesView();
                     _view.RepaintAdvancedModeModules();
                 };
                 _view.AdvancedModuleViewDataList.Add(moduleData);
-
-                // call enable
-                moduleData.editor.OnEnable();
             }
         }
 
diff --git a/Editor/UI/Views/AvatarSubView.cs b/Editor/UI/Views/AvatarSubView.cs
index 28cec527..22129c57 100644
--- a/Editor/UI/Views/AvatarSubView.cs
+++ b/Editor/UI/Views/AvatarSubView.cs
@@ -59,10 +59,13 @@ public AvatarSubView(IMainView mainView)
         {
             _mainView = mainView;
             _avatarPresenter = new AvatarPresenter(this);
-
             InstalledOutfitPreviews = new List<OutfitPreview>();
 
             SettingsAnimationWriteDefaultsMode = 0;
+
+            InitVisualTree();
+            InitAvatarContent();
+            t.LocalizeElement(this);
         }
 
         public void SelectTab(int selectedTab)
@@ -78,7 +81,7 @@ public void StartDressing(GameObject outfitGameObject = null, GameObject avatarG
         private void InitSettings()
         {
             // TODO: Create view from avatar settings directly?
-            var container = Q<VisualElement>("settings-container").First();
+            var container = Q<VisualElement>("settings-container");
             container.Clear();
 
             var choices = new List<string>() {
@@ -106,12 +109,12 @@ private void BindFoldouts()
 
         private void InitAvatarContent()
         {
-            _conceptChangedHelpboxContainer = Q<VisualElement>("concept-changed-helpbox-container").First();
+            _conceptChangedHelpboxContainer = Q<VisualElement>("concept-changed-helpbox-container");
             _conceptChangedHelpboxContainer.Add(CreateHelpBox(t._("editor.main.avatar.settings.avatar.helpbox.conceptAndLocationChanged"), MessageType.Info));
 
-            _createAvatarContainer = Q<VisualElement>("create-avatar-container").First();
-            _avatarContentContainer = Q<VisualElement>("avatar-content-container").First();
-            _installedOutfitContainer = Q<VisualElement>("outfits-container").First();
+            _createAvatarContainer = Q<VisualElement>("create-avatar-container");
+            _avatarContentContainer = Q<VisualElement>("avatar-content-container");
+            _installedOutfitContainer = Q<VisualElement>("outfits-container");
 
             InitSettings();
             BindFoldouts();
@@ -128,16 +131,6 @@ private void InitVisualTree()
             }
         }
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-            InitAvatarContent();
-
-            t.LocalizeElement(this);
-
-            RaiseLoadEvent();
-        }
-
         private VisualElement CreateAddPlaceholderElement()
         {
             if (s_addWearablePlaceholderVisualTree == null)
diff --git a/Editor/UI/Views/ElementView.cs b/Editor/UI/Views/ElementView.cs
index 12ee095f..a4987bec 100644
--- a/Editor/UI/Views/ElementView.cs
+++ b/Editor/UI/Views/ElementView.cs
@@ -27,46 +27,37 @@ public abstract class ElementView : VisualElement, IEditorView
         public event Action Load;
         public event Action Unload;
 
-        public abstract void Repaint();
-
-        public virtual void RaiseForceUpdateViewEvent()
-        {
-            ForceUpdateView?.Invoke();
-        }
-
-        public virtual void OnEnable()
+        public ElementView()
         {
-            RaiseLoadEvent();
+            RegisterCallback<AttachToPanelEvent>(evt => Load?.Invoke());
+            RegisterCallback<DetachFromPanelEvent>(evt => Unload?.Invoke());
         }
 
-        public virtual void OnDisable()
-        {
-            RaiseUnloadEvent();
-        }
+        public abstract void Repaint();
 
-        protected void RaiseLoadEvent()
+        public virtual void RaiseForceUpdateViewEvent()
         {
-            Load?.Invoke();
+            ForceUpdateView?.Invoke();
         }
 
-        protected void RaiseUnloadEvent()
+        public T Q<T>(string name = null, params string[] classes) where T : VisualElement
         {
-            Unload?.Invoke();
+            return UQueryExtensions.Query<T>(this, name, classes).Build().First();
         }
 
-        public UQueryBuilder<T> Q<T>() where T : VisualElement
+        public VisualElement Q(string name = null, params string[] classes)
         {
-            return UQueryExtensions.Query<T>(this);
+            return UQueryExtensions.Query<VisualElement>(this, name, classes).Build().First();
         }
 
-        public UQueryBuilder<T> Q<T>(string name, string className) where T : VisualElement
+        public T Q<T>(string name = null, string className = null) where T : VisualElement
         {
-            return UQueryExtensions.Query<T>(this, name, className);
+            return UQueryExtensions.Query<T>(this, name, className).Build().First();
         }
 
-        public UQueryBuilder<T> Q<T>(string name, params string[] classes) where T : VisualElement
+        public VisualElement Q(string name = null, string className = null)
         {
-            return UQueryExtensions.Query<T>(this, name, classes);
+            return UQueryExtensions.Query<VisualElement>(this, name, className).Build().First();
         }
 
         /// <summary>
@@ -76,8 +67,8 @@ public UQueryBuilder<T> Q<T>(string name, params string[] classes) where T : Vis
         /// <param name="containerName">Container name</param>
         public void BindFoldoutHeaderWithContainer(string foldoutName, string containerName)
         {
-            var foldout = Q<Foldout>(foldoutName).First();
-            var container = Q<VisualElement>(containerName).First();
+            var foldout = Q<Foldout>(foldoutName);
+            var container = Q<VisualElement>(containerName);
             foldout.RegisterValueChangedCallback((ChangeEvent<bool> evt) => container.style.display = evt.newValue ? DisplayStyle.Flex : DisplayStyle.None);
         }
 
@@ -87,15 +78,29 @@ public void BindFoldoutHeaderAndContainerWithPrefix(string prefix)
         }
 
         /// <summary>
-        /// Creates a HelpBox element (Unity 2019.4 not yet have helpbox in UXML yet)
+        /// Creates a HelpBox element (Legacy code, please use Unity 2022 HelpBox instead)
         /// </summary>
         /// <param name="msg">Message</param>
         /// <param name="msgType">Message type</param>
         /// <returns>Element</returns>
-        public VisualElement CreateHelpBox(string msg, MessageType msgType)
+        public static VisualElement CreateHelpBox(string msg, MessageType msgType)
         {
-            // unity 2019.4 not yet have helpbox in uxml
-            return new IMGUIContainer(() => EditorGUILayout.HelpBox(msg, msgType));
+            // Unity 2019.4 not yet have helpbox in uxml, but now 2022 has it.
+            // return new IMGUIContainer(() => EditorGUILayout.HelpBox(msg, msgType));
+            // TODO: remove this legacy code and replace everywhere using this with the below snippet.
+            var helpBoxMsgType = msgType switch
+            {
+                MessageType.Info => HelpBoxMessageType.Info,
+                MessageType.Warning => HelpBoxMessageType.Warning,
+                MessageType.Error => HelpBoxMessageType.Error,
+                _ => HelpBoxMessageType.None,
+            };
+            var helpBox = new HelpBox
+            {
+                text = msg,
+                messageType = helpBoxMsgType
+            };
+            return helpBox;
         }
     }
 }
diff --git a/Editor/UI/Views/IEditorView.cs b/Editor/UI/Views/IEditorView.cs
index eb88f0f5..f01611b5 100644
--- a/Editor/UI/Views/IEditorView.cs
+++ b/Editor/UI/Views/IEditorView.cs
@@ -44,16 +44,6 @@ public interface IEditorView
         /// </summary>
         void RaiseForceUpdateViewEvent();
 
-        /// <summary>
-        /// On this view enable
-        /// </summary>
-        void OnEnable();
-
-        /// <summary>
-        /// On this view disable
-        /// </summary>
-        void OnDisable();
-
         /// <summary>
         /// Request the view to repaint
         /// </summary>
diff --git a/Editor/UI/Views/IMGUIViewBase.cs b/Editor/UI/Views/IMGUIView.cs
similarity index 70%
rename from Editor/UI/Views/IMGUIViewBase.cs
rename to Editor/UI/Views/IMGUIView.cs
index f479641f..feb32205 100644
--- a/Editor/UI/Views/IMGUIViewBase.cs
+++ b/Editor/UI/Views/IMGUIView.cs
@@ -27,43 +27,28 @@ namespace Chocopoi.DressingTools.UI.Views
     /// Unity IMGUI view base
     /// </summary>
     [ExcludeFromCodeCoverage]
-    public abstract class IMGUIViewBase : VisualElement, IEditorView
+    public abstract class IMGUIView : ElementView
     {
-        public event Action ForceUpdateView;
-        public event Action Load;
-        public event Action Unload;
-
-        public virtual void RaiseForceUpdateViewEvent()
+        public IMGUIView()
         {
-            ForceUpdateView?.Invoke();
+            Add(new IMGUIContainer(OnGUI));
         }
 
         /// <summary>
         /// This does nothing since we are using IMGUI
         /// </summary>
-        public void Repaint() { }
+        public sealed override void Repaint() { }
 
         /// <summary>
         /// Render IMGUI content
         /// </summary>
         public abstract void OnGUI();
 
-        public virtual void OnEnable()
-        {
-            Add(new IMGUIContainer(OnGUI));
-            Load?.Invoke();
-        }
-
-        public virtual void OnDisable()
-        {
-            Unload?.Invoke();
-        }
-
         /// <summary>
         /// Draw a horizontal line
         /// </summary>
         /// <param name="height">Height</param>
-        public void HorizontalLine(int height = 1)
+        public static void HorizontalLine(int height = 1)
         {
             //Reference: https://forum.unity.com/threads/horizontal-line-in-editor-window.520812/#post-3416790
             EditorGUILayout.Separator();
@@ -73,7 +58,7 @@ public void HorizontalLine(int height = 1)
             EditorGUILayout.Separator();
         }
 
-        public void ReadOnlyTextField(string label, string text)
+        public static void ReadOnlyTextField(string label, string text)
         {
             EditorGUILayout.BeginHorizontal();
             {
@@ -83,17 +68,17 @@ public void ReadOnlyTextField(string label, string text)
             EditorGUILayout.EndHorizontal();
         }
 
-        public void Label(string text, params GUILayoutOption[] options)
+        public static void Label(string text, params GUILayoutOption[] options)
         {
             GUILayout.Label(text, options);
         }
 
-        public void Label(string text, GUIStyle style, params GUILayoutOption[] options)
+        public static void Label(string text, GUIStyle style, params GUILayoutOption[] options)
         {
             GUILayout.Label(text, style, options);
         }
 
-        public void Button(string text, Action onClickEvent = null, params GUILayoutOption[] options)
+        public static void Button(string text, Action onClickEvent = null, params GUILayoutOption[] options)
         {
             if (GUILayout.Button(text, options))
             {
@@ -101,7 +86,7 @@ public void Button(string text, Action onClickEvent = null, params GUILayoutOpti
             }
         }
 
-        public void Button(string text, GUIStyle style, Action onClickEvent = null, params GUILayoutOption[] options)
+        public static void Button(string text, GUIStyle style, Action onClickEvent = null, params GUILayoutOption[] options)
         {
             if (GUILayout.Button(text, style, options))
             {
@@ -109,7 +94,7 @@ public void Button(string text, GUIStyle style, Action onClickEvent = null, para
             }
         }
 
-        public void TextField(string label, ref string text, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static void TextField(string label, ref string text, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             var newValue = EditorGUILayout.TextField(label, text, options);
             var modified = text != newValue;
@@ -120,7 +105,7 @@ public void TextField(string label, ref string text, Action onChangeEvent = null
             }
         }
 
-        public void DelayedTextField(string label, ref string text, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static void DelayedTextField(string label, ref string text, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             var newValue = EditorGUILayout.DelayedTextField(label, text, options);
             var modified = text != newValue;
@@ -131,7 +116,7 @@ public void DelayedTextField(string label, ref string text, Action onChangeEvent
             }
         }
 
-        public UnityEngine.Object ObjectField(string label, UnityEngine.Object obj, Type objType, bool allowSceneObjs, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static UnityEngine.Object ObjectField(string label, UnityEngine.Object obj, Type objType, bool allowSceneObjs, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             var newObj = EditorGUILayout.ObjectField(label, obj, objType, allowSceneObjs, options);
             if (newObj != obj)
@@ -141,7 +126,7 @@ public UnityEngine.Object ObjectField(string label, UnityEngine.Object obj, Type
             return newObj;
         }
 
-        public void GameObjectField(ref GameObject go, bool allowSceneObjs, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static void GameObjectField(ref GameObject go, bool allowSceneObjs, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             var newObj = (GameObject)EditorGUILayout.ObjectField(go, typeof(GameObject), allowSceneObjs, options);
             var modified = newObj != go;
@@ -152,7 +137,7 @@ public void GameObjectField(ref GameObject go, bool allowSceneObjs, Action onCha
             }
         }
 
-        public void GameObjectField(string label, ref GameObject go, bool allowSceneObjs, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static void GameObjectField(string label, ref GameObject go, bool allowSceneObjs, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             var newObj = (GameObject)EditorGUILayout.ObjectField(label, go, typeof(GameObject), allowSceneObjs, options);
             var modified = newObj != go;
@@ -163,7 +148,7 @@ public void GameObjectField(string label, ref GameObject go, bool allowSceneObjs
             }
         }
 
-        public void Toggle(string label, ref bool value, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static void Toggle(string label, ref bool value, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             var newValue = EditorGUILayout.Toggle(label, value);
             var modified = newValue != value;
@@ -174,7 +159,7 @@ public void Toggle(string label, ref bool value, Action onChangeEvent = null, pa
             }
         }
 
-        public void Toggle(ref bool value, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static void Toggle(ref bool value, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             var newValue = EditorGUILayout.Toggle(value);
             var modified = newValue != value;
@@ -185,7 +170,7 @@ public void Toggle(ref bool value, Action onChangeEvent = null, params GUILayout
             }
         }
 
-        public void ToggleLeft(string label, ref bool value, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static void ToggleLeft(string label, ref bool value, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             var newValue = EditorGUILayout.ToggleLeft(label, value);
             var modified = newValue != value;
@@ -196,7 +181,7 @@ public void ToggleLeft(string label, ref bool value, Action onChangeEvent = null
             }
         }
 
-        public void Slider(ref float value, float leftValue, float rightValue, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static void Slider(ref float value, float leftValue, float rightValue, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             var newValue = EditorGUILayout.Slider(value, leftValue, rightValue, options);
             var modified = newValue != value;
@@ -207,7 +192,7 @@ public void Slider(ref float value, float leftValue, float rightValue, Action on
             }
         }
 
-        public void Slider(string label, ref float value, float leftValue, float rightValue, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static void Slider(string label, ref float value, float leftValue, float rightValue, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             var newValue = EditorGUILayout.Slider(label, value, leftValue, rightValue, options);
             var modified = newValue != value;
@@ -218,7 +203,7 @@ public void Slider(string label, ref float value, float leftValue, float rightVa
             }
         }
 
-        public void Popup(ref int selectedIndex, string[] keys, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static void Popup(ref int selectedIndex, string[] keys, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             int newSelectedIndex = EditorGUILayout.Popup(selectedIndex, keys, options);
             var modified = newSelectedIndex != selectedIndex;
@@ -229,7 +214,7 @@ public void Popup(ref int selectedIndex, string[] keys, Action onChangeEvent = n
             }
         }
 
-        public void Popup(string label, ref int selectedIndex, string[] keys, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static void Popup(string label, ref int selectedIndex, string[] keys, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             int newSelectedIndex = EditorGUILayout.Popup(label, selectedIndex, keys, options);
             var modified = newSelectedIndex != selectedIndex;
@@ -240,24 +225,24 @@ public void Popup(string label, ref int selectedIndex, string[] keys, Action onC
             }
         }
 
-        public void HelpBox(string message, MessageType type)
+        public static void HelpBox(string message, MessageType type)
         {
             EditorGUILayout.HelpBox(message, type);
         }
 
-        public void Foldout(ref bool foldout, string label)
+        public static void Foldout(ref bool foldout, string label)
         {
             foldout = EditorGUILayout.Foldout(foldout, label);
         }
 
-        public void BeginFoldoutBox(ref bool foldout, string label)
+        public static void BeginFoldoutBox(ref bool foldout, string label)
         {
             EditorGUILayout.BeginVertical(EditorStyles.helpBox);
             foldout = EditorGUILayout.BeginFoldoutHeaderGroup(foldout, label);
             EditorGUILayout.EndFoldoutHeaderGroup();
         }
 
-        public void BeginFoldoutBoxWithButtonRight(ref bool foldout, string foldoutLabel, string btnLabel, Action btnOnClickEvent = null)
+        public static void BeginFoldoutBoxWithButtonRight(ref bool foldout, string foldoutLabel, string btnLabel, Action btnOnClickEvent = null)
         {
             EditorGUILayout.BeginVertical(EditorStyles.helpBox);
             EditorGUILayout.BeginHorizontal();
@@ -267,57 +252,57 @@ public void BeginFoldoutBoxWithButtonRight(ref bool foldout, string foldoutLabel
             EditorGUILayout.EndFoldoutHeaderGroup();
         }
 
-        public void EndFoldoutBox()
+        public static void EndFoldoutBox()
         {
             EditorGUILayout.EndVertical();
         }
 
-        public void BeginHorizontal()
+        public static void BeginHorizontal()
         {
             EditorGUILayout.BeginHorizontal();
         }
 
-        public void BeginHorizontal(GUIStyle style, params GUILayoutOption[] options)
+        public static void BeginHorizontal(GUIStyle style, params GUILayoutOption[] options)
         {
             EditorGUILayout.BeginHorizontal(style, options);
         }
 
-        public void EndHorizontal()
+        public static void EndHorizontal()
         {
             EditorGUILayout.EndHorizontal();
         }
 
-        public void BeginVertical()
+        public static void BeginVertical()
         {
             EditorGUILayout.BeginVertical();
         }
 
-        public void BeginVertical(GUIStyle style, params GUILayoutOption[] options)
+        public static void BeginVertical(GUIStyle style, params GUILayoutOption[] options)
         {
             EditorGUILayout.BeginVertical(style, options);
         }
 
-        public void EndVertical()
+        public static void EndVertical()
         {
             EditorGUILayout.EndVertical();
         }
 
-        public void BeginDisabled(bool disabled)
+        public static void BeginDisabled(bool disabled)
         {
             EditorGUI.BeginDisabledGroup(disabled);
         }
 
-        public void EndDisabled()
+        public static void EndDisabled()
         {
             EditorGUI.EndDisabledGroup();
         }
 
-        public void Separator()
+        public static void Separator()
         {
             EditorGUILayout.Separator();
         }
 
-        public void Toolbar(ref int selected, string[] keys, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static void Toolbar(ref int selected, string[] keys, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             var newSelected = GUILayout.Toolbar(selected, keys, options);
             var modified = newSelected != selected;
@@ -328,7 +313,7 @@ public void Toolbar(ref int selected, string[] keys, Action onChangeEvent = null
             }
         }
 
-        public void TextArea(ref string text, Action onChangeEvent = null, params GUILayoutOption[] options)
+        public static void TextArea(ref string text, Action onChangeEvent = null, params GUILayoutOption[] options)
         {
             var newValue = EditorGUILayout.TextArea(text, options);
             var modified = newValue != text;
diff --git a/Editor/UI/Views/IMGUIViewBase.cs.meta b/Editor/UI/Views/IMGUIView.cs.meta
similarity index 100%
rename from Editor/UI/Views/IMGUIViewBase.cs.meta
rename to Editor/UI/Views/IMGUIView.cs.meta
diff --git a/Editor/UI/Views/LegacyView.cs b/Editor/UI/Views/LegacyView.cs
index e1d7456f..4ef5fe28 100644
--- a/Editor/UI/Views/LegacyView.cs
+++ b/Editor/UI/Views/LegacyView.cs
@@ -27,7 +27,7 @@
 namespace Chocopoi.DressingTools.UI.Views
 {
     [ExcludeFromCodeCoverage]
-    internal class LegacyView : IMGUIViewBase, ILegacyView
+    internal class LegacyView : IMGUIView, ILegacyView
     {
         private static readonly I18nTranslator t = I18n.ToolTranslator;
 
diff --git a/Editor/UI/Views/MainView.cs b/Editor/UI/Views/MainView.cs
index 8aa0dca7..715e24ff 100644
--- a/Editor/UI/Views/MainView.cs
+++ b/Editor/UI/Views/MainView.cs
@@ -96,6 +96,10 @@ public MainView()
             ShowExitPlayModeHelpbox = false;
             SelectedAvatarIndex = -1;
             AvailableAvatars = new List<GameObject>();
+
+            InitVisualTree();
+            BindTabs();
+            t.LocalizeElement(this);
         }
 
         public void StartDressing(GameObject outfitGameObject = null, GameObject avatarGameObject = null)
@@ -116,19 +120,6 @@ public void ForceUpdateCabinetSubView()
             _avatarSubView.RaiseForceUpdateViewEvent();
         }
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-            BindTabs();
-
-            t.LocalizeElement(this);
-
-            RaiseLoadEvent();
-            _avatarSubView.OnEnable();
-            _dressSubView.OnEnable();
-            _toolSettingsSubView.OnEnable();
-        }
-
         private void InitVisualTree()
         {
             var tree = Resources.Load<VisualTreeAsset>("MainView");
@@ -144,20 +135,20 @@ private void InitVisualTree()
             _dressSubView.style.display = DisplayStyle.None;
             _toolSettingsSubView.style.display = DisplayStyle.None;
 
-            _helpboxContainer = Q<VisualElement>("helpbox-container").First();
-            _tabContainer = Q<VisualElement>("tab").First();
+            _helpboxContainer = Q<VisualElement>("helpbox-container");
+            _tabContainer = Q<VisualElement>("tab");
 
-            _tabContentContainer = Q<VisualElement>("tab-content").First();
+            _tabContentContainer = Q<VisualElement>("tab-content");
             _tabContentContainer.Add(_avatarSubView);
             _tabContentContainer.Add(_dressSubView);
             _tabContentContainer.Add(_toolSettingsSubView);
 
-            _updateAvailableFoldout = Q<Foldout>("update-available-foldout").First();
-            var updateBtn = Q<Button>("update-available-update-btn").First();
+            _updateAvailableFoldout = Q<Foldout>("update-available-foldout");
+            var updateBtn = Q<Button>("update-available-update-btn");
             updateBtn.clicked += UpdateAvailableUpdateButtonClick;
 
-            _avatarSelectionPopupContainer = Q<VisualElement>("popup-avatar-selection").First();
-            _debugInfoContainer = Q<VisualElement>("debug-info").First();
+            _avatarSelectionPopupContainer = Q<VisualElement>("popup-avatar-selection");
+            _debugInfoContainer = Q<VisualElement>("debug-info");
 
             RegisterCallback((MouseMoveEvent evt) => MouseMove?.Invoke());
         }
@@ -212,13 +203,6 @@ private void UpdateTabs()
             }
         }
 
-        public override void OnDisable()
-        {
-            base.OnDisable();
-            _avatarSubView.OnDisable();
-            _dressSubView.OnDisable();
-            _toolSettingsSubView.OnDisable();
-        }
         public void OpenUrl(string url) => Application.OpenURL(url);
 
         private void RepaintHelpboxes()
diff --git a/Editor/UI/Views/MappingEditorView.cs b/Editor/UI/Views/MappingEditorView.cs
index 46199a7e..16810246 100644
--- a/Editor/UI/Views/MappingEditorView.cs
+++ b/Editor/UI/Views/MappingEditorView.cs
@@ -27,7 +27,7 @@
 namespace Chocopoi.DressingTools.UI.Views
 {
     [ExcludeFromCodeCoverage]
-    internal class MappingEditorView : IMGUIViewBase, IMappingEditorView
+    internal class MappingEditorView : IMGUIView, IMappingEditorView
     {
         private static readonly I18nTranslator t = I18n.ToolTranslator;
 
diff --git a/Editor/UI/Views/Modules/WearableModuleEditorIMGUI.cs b/Editor/UI/Views/Modules/WearableModuleEditorIMGUI.cs
index 3b883b17..318f0f75 100644
--- a/Editor/UI/Views/Modules/WearableModuleEditorIMGUI.cs
+++ b/Editor/UI/Views/Modules/WearableModuleEditorIMGUI.cs
@@ -23,7 +23,7 @@ namespace Chocopoi.DressingTools.UI.Views.Modules
     /// <summary>
     /// Wearable module editor base class for IMGUI
     /// </summary>
-    internal abstract class WearableModuleEditorIMGUI : IMGUIViewBase, IWearableModuleEditor
+    internal abstract class WearableModuleEditorIMGUI : IMGUIView, IWearableModuleEditor
     {
         /// <summary>
         /// Human-readable friendly name of this module editor
diff --git a/Editor/UI/Views/OneConfDressSubView.cs b/Editor/UI/Views/OneConfDressSubView.cs
index cfb64dc4..7b0857b2 100644
--- a/Editor/UI/Views/OneConfDressSubView.cs
+++ b/Editor/UI/Views/OneConfDressSubView.cs
@@ -66,6 +66,9 @@ public OneConfDressSubView(IMainView mainView)
             Config = new WearableConfig();
 
             _configView = new OneConfWearableConfigView(this);
+
+            InitVisualTree();
+            t.LocalizeElement(this);
         }
 
         public void ForceUpdateConfigView()
@@ -117,20 +120,6 @@ public void ResetWizardAndConfigView()
         // asks config view to apply the UI changes to the config instance
         public void ApplyToConfig() => _configView.ApplyToConfig();
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-            t.LocalizeElement(this);
-            _configView.OnEnable();
-            RaiseLoadEvent();
-        }
-
-        public override void OnDisable()
-        {
-            base.OnDisable();
-            _configView.OnDisable();
-        }
-
         private void InitVisualTree()
         {
             var tree = Resources.Load<VisualTreeAsset>("OneConfDressSubView");
@@ -141,7 +130,7 @@ private void InitVisualTree()
                 styleSheets.Add(styleSheet);
             }
 
-            _wearableObjectField = Q<ObjectField>("objectfield-wearable").First();
+            _wearableObjectField = Q<ObjectField>("objectfield-wearable");
             _wearableObjectField.objectType = typeof(GameObject);
             _wearableObjectField.value = TargetWearable;
             _wearableObjectField.RegisterValueChangedCallback((ChangeEvent<UnityEngine.Object> evt) =>
@@ -150,12 +139,12 @@ private void InitVisualTree()
                 TargetWearableChange?.Invoke();
             });
 
-            _helpboxContainer = Q<VisualElement>("helpbox-container").First();
+            _helpboxContainer = Q<VisualElement>("helpbox-container");
 
-            _configViewContainer = Q<VisualElement>("config-view-container").First();
+            _configViewContainer = Q<VisualElement>("config-view-container");
             _configViewContainer.Add(_configView);
 
-            _btnAddToCabinet = Q<Button>("btn-add-to-cabinet").First();
+            _btnAddToCabinet = Q<Button>("btn-add-to-cabinet");
             _btnAddToCabinet.clicked += AddToCabinetButtonClick;
 
             BindFoldoutHeaderWithContainer("foldout-setup", "setup-container");
diff --git a/Editor/UI/Views/OneConfWearableConfigView.cs b/Editor/UI/Views/OneConfWearableConfigView.cs
index 29006452..91fc5721 100644
--- a/Editor/UI/Views/OneConfWearableConfigView.cs
+++ b/Editor/UI/Views/OneConfWearableConfigView.cs
@@ -195,17 +195,24 @@ public OneConfWearableConfigView(IOneConfDressSubView dressingSubView)
 
             _dressSubView.TargetAvatarChange += () => TargetAvatarOrWearableChange?.Invoke();
             _dressSubView.TargetWearableChange += () => TargetAvatarOrWearableChange?.Invoke();
+
+            InitVisualTree();
+            InitWearableInfoFoldout();
+            InitSimpleMode();
+            InitAdvancedMode();
+            InitToolbar();
+            t.LocalizeElement(this);
         }
 
         private void InitWearableInfoInfoPanel()
         {
-            _infoThumbnail = Q<VisualElement>("wearable-info-thumbnail").First();
+            _infoThumbnail = Q<VisualElement>("wearable-info-thumbnail");
 
-            _infoPanel = Q<VisualElement>("wearable-info-info-panel").First();
+            _infoPanel = Q<VisualElement>("wearable-info-info-panel");
 
-            _infoWearableNameLabel = Q<Label>("wearable-info-name-label").First();
+            _infoWearableNameLabel = Q<Label>("wearable-info-name-label");
 
-            _infoCustomNameField = Q<TextField>("wearable-info-custom-name-field").First();
+            _infoCustomNameField = Q<TextField>("wearable-info-custom-name-field");
             _infoCustomNameField.RegisterValueChangedCallback((ChangeEvent<string> evt) =>
             {
                 var val = _infoCustomNameField.value;
@@ -218,7 +225,7 @@ private void InitWearableInfoInfoPanel()
                 InfoCustomWearableName = _infoCustomNameField.text;
             });
 
-            _infoUseCustomNameToggle = Q<Toggle>("wearable-info-custom-name-toggle").First();
+            _infoUseCustomNameToggle = Q<Toggle>("wearable-info-custom-name-toggle");
             _infoUseCustomNameToggle.RegisterValueChangedCallback((ChangeEvent<bool> evt) =>
             {
                 if (!InfoUseCustomWearableName && TargetWearable != null)
@@ -229,20 +236,20 @@ private void InitWearableInfoInfoPanel()
                 InfoUseCustomWearableName = evt.newValue;
             });
 
-            _infoCaptureNewThumbBtn = Q<Button>("wearable-info-capture-new-thumbnail-btn").First();
+            _infoCaptureNewThumbBtn = Q<Button>("wearable-info-capture-new-thumbnail-btn");
             _infoCaptureNewThumbBtn.clicked += InfoNewThumbnailButtonClick;
         }
 
         private void InitWearableInfoCapturePanel()
         {
-            _capturePanel = Q<VisualElement>("wearable-info-capture-panel").First();
+            _capturePanel = Q<VisualElement>("wearable-info-capture-panel");
 
-            _captureWearableOnlyToggle = Q<Toggle>("wearable-info-capture-wearable-only-toggle").First();
-            _captureRmvBgToggle = Q<Toggle>("wearable-info-capture-remove-background-toggle").First();
+            _captureWearableOnlyToggle = Q<Toggle>("wearable-info-capture-wearable-only-toggle");
+            _captureRmvBgToggle = Q<Toggle>("wearable-info-capture-remove-background-toggle");
 
-            _captureThumbBtn = Q<Button>("wearable-info-thumbnail-capture-btn").First();
+            _captureThumbBtn = Q<Button>("wearable-info-thumbnail-capture-btn");
             _captureThumbBtn.clicked += CaptureThumbnailButtonClick;
-            _captureCancelBtn = Q<Button>("wearable-info-thumbnail-cancel-btn").First();
+            _captureCancelBtn = Q<Button>("wearable-info-thumbnail-cancel-btn");
             _captureCancelBtn.clicked += CaptureCancelButtonClick;
 
             _captureWearableOnlyToggle.value = CaptureWearableOnly;
@@ -263,17 +270,17 @@ private void InitWearableInfoOthersFoldout()
         {
             BindFoldoutHeaderWithContainer("wearable-info-others-foldout", "wearable-info-others-container");
 
-            _infoOthersUuidLabel = Q<Label>("wearable-info-uuid-label").First();
-            _infoOthersCreatedTimeLabel = Q<Label>("wearable-info-created-time-label").First();
-            _infoOthersUpdatedTimeLabel = Q<Label>("wearable-info-updated-time-label").First();
-            _infoOthersAuthorField = Q<TextField>("wearable-info-author-field").First();
+            _infoOthersUuidLabel = Q<Label>("wearable-info-uuid-label");
+            _infoOthersCreatedTimeLabel = Q<Label>("wearable-info-created-time-label");
+            _infoOthersUpdatedTimeLabel = Q<Label>("wearable-info-updated-time-label");
+            _infoOthersAuthorField = Q<TextField>("wearable-info-author-field");
             _infoOthersAuthorField.RegisterValueChangedCallback((ChangeEvent<string> evt) =>
             {
                 var val = _infoOthersAuthorField.value;
                 if (string.IsNullOrEmpty(val)) return;
                 InfoAuthor = val;
             });
-            _infoOthersDescField = Q<TextField>("wearable-info-desc-field").First();
+            _infoOthersDescField = Q<TextField>("wearable-info-desc-field");
             _infoOthersDescField.RegisterValueChangedCallback((ChangeEvent<string> evt) =>
             {
                 var val = _infoOthersDescField.value;
@@ -332,16 +339,16 @@ private void UpdateToolbarModes()
 
         private void InitToolbar()
         {
-            var autoSetupBtn = Q<Button>("toolbar-auto-setup-btn").First();
+            var autoSetupBtn = Q<Button>("toolbar-auto-setup-btn");
             autoSetupBtn.clicked += ToolbarAutoSetupButtonClick;
 
-            _toolbarPreviewBtn = Q<Button>("toolbar-preview-btn").First();
+            _toolbarPreviewBtn = Q<Button>("toolbar-preview-btn");
             _toolbarPreviewBtn.clicked += ToolbarPreviewButtonClick;
 
-            var importBtn = Q<Button>("toolbar-import-btn").First();
+            var importBtn = Q<Button>("toolbar-import-btn");
             importBtn.clicked += ToolbarImportButtonClick;
 
-            var exportBtn = Q<Button>("toolbar-export-btn").First();
+            var exportBtn = Q<Button>("toolbar-export-btn");
             exportBtn.clicked += ToolbarExportButtonClick;
 
             BindToolbarModes();
@@ -388,38 +395,38 @@ private void UpdateSimpleCategories()
 
         private void InitSimpleCategoryMapping()
         {
-            _simpleCategoryMappingContainer = Q<VisualElement>("simple-category-mapping-container").First();
+            _simpleCategoryMappingContainer = Q<VisualElement>("simple-category-mapping-container");
 
             BindFoldoutHeaderWithContainer("simple-armature-mapping-foldout", "simple-armature-mapping-container");
-            _simpleArmatureMappingToggle = Q<Toggle>("simple-armature-mapping-toggle").First();
+            _simpleArmatureMappingToggle = Q<Toggle>("simple-armature-mapping-toggle");
             _simpleArmatureMappingToggle.RegisterValueChangedCallback((ChangeEvent<bool> evt) => SimpleUseArmatureMapping = evt.newValue);
-            _simpleArmatureMappingContainer = Q<VisualElement>("simple-armature-mapping-container").First();
+            _simpleArmatureMappingContainer = Q<VisualElement>("simple-armature-mapping-container");
 
             BindFoldoutHeaderWithContainer("simple-move-root-foldout", "simple-move-root-container");
-            _simpleMoveRootToggle = Q<Toggle>("simple-move-root-toggle").First();
+            _simpleMoveRootToggle = Q<Toggle>("simple-move-root-toggle");
             _simpleMoveRootToggle.RegisterValueChangedCallback((ChangeEvent<bool> evt) => SimpleUseMoveRoot = evt.newValue);
-            _simpleMoveRootContainer = Q<VisualElement>("simple-move-root-container").First();
+            _simpleMoveRootContainer = Q<VisualElement>("simple-move-root-container");
         }
 
         private void InitSimpleCategoryAnimate()
         {
-            _simpleCategoryAnimateContainer = Q<VisualElement>("simple-category-animate-container").First();
+            _simpleCategoryAnimateContainer = Q<VisualElement>("simple-category-animate-container");
 
             BindFoldoutHeaderWithContainer("simple-cabinet-anim-foldout", "simple-cabinet-anim-container");
-            _simpleAnimGenToggle = Q<Toggle>("simple-cabinet-anim-toggle").First();
+            _simpleAnimGenToggle = Q<Toggle>("simple-cabinet-anim-toggle");
             _simpleAnimGenToggle.RegisterValueChangedCallback((ChangeEvent<bool> evt) => SimpleUseCabinetAnim = evt.newValue);
-            _simpleAnimGenContainer = Q<VisualElement>("simple-cabinet-anim-container").First();
+            _simpleAnimGenContainer = Q<VisualElement>("simple-cabinet-anim-container");
 
             BindFoldoutHeaderWithContainer("simple-blendshape-sync-foldout", "simple-blendshape-sync-container");
-            _simpleBlendshapeSyncToggle = Q<Toggle>("simple-blendshape-sync-toggle").First();
+            _simpleBlendshapeSyncToggle = Q<Toggle>("simple-blendshape-sync-toggle");
             _simpleBlendshapeSyncToggle.RegisterValueChangedCallback((ChangeEvent<bool> evt) => SimpleUseBlendshapeSync = evt.newValue);
-            _simpleBlendshapeSyncContainer = Q<VisualElement>("simple-blendshape-sync-container").First();
+            _simpleBlendshapeSyncContainer = Q<VisualElement>("simple-blendshape-sync-container");
         }
 
         private void InitSimpleMode()
         {
-            _simpleContainer = Q<VisualElement>("simple-container").First();
-            _simpleHelpBoxContainer = Q<VisualElement>("simple-helpbox-container").First();
+            _simpleContainer = Q<VisualElement>("simple-container");
+            _simpleHelpBoxContainer = Q<VisualElement>("simple-helpbox-container");
 
             InitSimpleCategoryMapping();
             InitSimpleCategoryAnimate();
@@ -430,7 +437,7 @@ private void InitAdvancedModules()
         {
             BindFoldoutHeaderWithContainer("advanced-modules-foldout", "advanced-modules-container");
 
-            var popupContainer = Q<VisualElement>("advanced-modules-popup-container").First();
+            var popupContainer = Q<VisualElement>("advanced-modules-popup-container");
             _modulesPopup = new PopupField<string>(AdvancedModuleNames, 0);
             _modulesPopup.RegisterValueChangedCallback((ChangeEvent<string> evt) =>
             {
@@ -438,17 +445,17 @@ private void InitAdvancedModules()
             });
             popupContainer.Add(_modulesPopup);
 
-            var moduleAddBtn = Q<Button>("advanced-module-add-btn").First();
+            var moduleAddBtn = Q<Button>("advanced-module-add-btn");
             moduleAddBtn.clicked += AdvancedModuleAddButtonClick;
 
-            _advancedModuleEditorsContainer = Q<VisualElement>("advanced-modules-editors-container").First();
+            _advancedModuleEditorsContainer = Q<VisualElement>("advanced-modules-editors-container");
         }
 
         private void InitAdvancedAvatarConfig()
         {
             BindFoldoutHeaderWithContainer("advanced-avatar-config-foldout", "advanced-avatar-config-container");
 
-            _advancedAvatarConfigGuidRefObjField = Q<ObjectField>("advanced-avatar-config-guid-ref-objectfield").First();
+            _advancedAvatarConfigGuidRefObjField = Q<ObjectField>("advanced-avatar-config-guid-ref-objectfield");
             _advancedAvatarConfigGuidRefObjField.objectType = typeof(GameObject);
             _advancedAvatarConfigGuidRefObjField.allowSceneObjects = true;
             _advancedAvatarConfigGuidRefObjField.RegisterValueChangedCallback((ChangeEvent<UnityEngine.Object> evt) =>
@@ -457,14 +464,14 @@ private void InitAdvancedAvatarConfig()
                 AvatarConfigChange?.Invoke();
             });
 
-            _advancedAvatarConfigGuidLabel = Q<Label>("advanced-avatar-config-guid-label").First();
-            _advancedAvatarConfigUseAvatarObjNameToggle = Q<Toggle>("advanced-avatar-config-use-obj-name-toggle").First();
+            _advancedAvatarConfigGuidLabel = Q<Label>("advanced-avatar-config-guid-label");
+            _advancedAvatarConfigUseAvatarObjNameToggle = Q<Toggle>("advanced-avatar-config-use-obj-name-toggle");
             _advancedAvatarConfigUseAvatarObjNameToggle.RegisterValueChangedCallback((ChangeEvent<bool> evt) =>
             {
                 AdvancedAvatarConfigUseAvatarObjName = evt.newValue;
                 AvatarConfigChange?.Invoke();
             });
-            _advancedAvatarConfigCustomNameField = Q<TextField>("advanced-avatar-config-custom-name-field").First();
+            _advancedAvatarConfigCustomNameField = Q<TextField>("advanced-avatar-config-custom-name-field");
             _advancedAvatarConfigCustomNameField.RegisterValueChangedCallback((ChangeEvent<string> evt) =>
             {
                 var val = _advancedAvatarConfigCustomNameField.value;
@@ -473,16 +480,16 @@ private void InitAdvancedAvatarConfig()
                 AdvancedAvatarConfigCustomName = val;
                 AvatarConfigChange?.Invoke();
             });
-            _advancedAvatarConfigArmatureNameLabel = Q<Label>("advanced-avatar-config-armature-name-label").First();
-            _advancedAvatarConfigDeltaWorldPosLabel = Q<Label>("advanced-avatar-config-delta-world-pos-label").First();
-            _advancedAvatarConfigDeltaWorldRotLabel = Q<Label>("advanced-avatar-config-delta-world-rot-label").First();
-            _advancedAvatarConfigAvatarLossyScaleLabel = Q<Label>("advanced-avatar-config-avatar-lossy-scale-label").First();
-            _advancedAvatarConfigWearableLossyScaleLabel = Q<Label>("advanced-avatar-config-wearable-lossy-scale-label").First();
+            _advancedAvatarConfigArmatureNameLabel = Q<Label>("advanced-avatar-config-armature-name-label");
+            _advancedAvatarConfigDeltaWorldPosLabel = Q<Label>("advanced-avatar-config-delta-world-pos-label");
+            _advancedAvatarConfigDeltaWorldRotLabel = Q<Label>("advanced-avatar-config-delta-world-rot-label");
+            _advancedAvatarConfigAvatarLossyScaleLabel = Q<Label>("advanced-avatar-config-avatar-lossy-scale-label");
+            _advancedAvatarConfigWearableLossyScaleLabel = Q<Label>("advanced-avatar-config-wearable-lossy-scale-label");
         }
 
         private void InitAdvancedMode()
         {
-            _advancedContainer = Q<VisualElement>("advanced-container").First();
+            _advancedContainer = Q<VisualElement>("advanced-container");
 
             InitAdvancedModules();
             InitAdvancedAvatarConfig();
@@ -506,28 +513,6 @@ private void InitVisualTree()
             });
         }
 
-        public override void OnEnable()
-        {
-            InitVisualTree();
-            InitWearableInfoFoldout();
-            InitSimpleMode();
-            InitAdvancedMode();
-            InitToolbar();
-
-            t.LocalizeElement(this);
-
-            RaiseLoadEvent();
-        }
-
-        public override void OnDisable()
-        {
-            base.OnDisable();
-            _simpleArmatureMappingEditor.OnDisable();
-            _simpleMoveRootEditor.OnDisable();
-            _simpleAnimGenEditor.OnDisable();
-            _simpleBlendshapeSyncEditor.OnDisable();
-        }
-
         private void RepaintWearableInfo()
         {
             if (ThumbnailPlaceholderImage == null)
@@ -586,11 +571,6 @@ private void RepaintSimpleModuleEditors()
             _simpleAnimGenEditor = new CabinetAnimWearableModuleEditor(this, null, SimpleCabinetAnimConfig);
             _simpleBlendshapeSyncEditor = new BlendshapeSyncWearableModuleEditor(this, null, SimpleBlendshapeSyncConfig);
 
-            _simpleArmatureMappingEditor.OnEnable();
-            _simpleMoveRootEditor.OnEnable();
-            _simpleAnimGenEditor.OnEnable();
-            _simpleBlendshapeSyncEditor.OnEnable();
-
             _simpleArmatureMappingContainer.Clear();
             _simpleMoveRootContainer.Clear();
             _simpleAnimGenContainer.Clear();
diff --git a/Editor/UI/Views/ToolSettingsSubView.cs b/Editor/UI/Views/ToolSettingsSubView.cs
index fae69355..1e9d0808 100644
--- a/Editor/UI/Views/ToolSettingsSubView.cs
+++ b/Editor/UI/Views/ToolSettingsSubView.cs
@@ -52,6 +52,10 @@ public ToolSettingsSubView(IMainView mainView)
             UpdaterShowHelpboxUpdateNotChecked = true;
 
             _presenter = new ToolSettingsPresenter(this);
+
+            InitVisualTree();
+            InitUpdateChecker();
+            t.LocalizeElement(this);
         }
 
         private void InitVisualTree()
@@ -67,13 +71,13 @@ private void InitVisualTree()
 
         private void InitUpdateChecker()
         {
-            _updaterCurrentVerLabel = Q<Label>("updater-current-ver-label").First();
-            _updaterHelpboxContainer = Q<VisualElement>("updater-helpbox-container").First();
+            _updaterCurrentVerLabel = Q<Label>("updater-current-ver-label");
+            _updaterHelpboxContainer = Q<VisualElement>("updater-helpbox-container");
 
-            var updaterCheckUpdateBtn = Q<Button>("updater-check-update-btn").First();
+            var updaterCheckUpdateBtn = Q<Button>("updater-check-update-btn");
             updaterCheckUpdateBtn.clicked += UpdaterCheckUpdateButtonClicked;
 
-            var resetToDefaultsBtn = Q<Button>("reset-defaults-btn").First();
+            var resetToDefaultsBtn = Q<Button>("reset-defaults-btn");
             resetToDefaultsBtn.clicked += ResetToDefaultsButtonClicked;
         }
 
@@ -92,20 +96,5 @@ public override void Repaint()
         {
             RepaintUpdateChecker();
         }
-
-        public override void OnEnable()
-        {
-            InitVisualTree();
-            InitUpdateChecker();
-
-            t.LocalizeElement(this);
-
-            RaiseLoadEvent();
-        }
-
-        public override void OnDisable()
-        {
-            base.OnDisable();
-        }
     }
 }