diff --git a/WebWindowComplex/Compo/AreaHwOption.razor b/WebWindowComplex/Compo/AreaHwOption.razor
index 18130ab..f468647 100644
--- a/WebWindowComplex/Compo/AreaHwOption.razor
+++ b/WebWindowComplex/Compo/AreaHwOption.razor
@@ -9,32 +9,46 @@
     </div>
 </div>
 <div class="row mt-2">
+    @if (!hwOptCollapsed)
+    {
         @if (IsLoadingHwOpt)
         {
-            <EgwCoreLib.Razor.LoadingData DisplaySize="EgwCoreLib.Razor.LoadingData.CtrlSize.Small"></EgwCoreLib.Razor.LoadingData>
+        <div class="col justify-content-start">
+                <p class="placeholder-glow">
+                <span class="placeholder col-12 bg-secondary placeholder-lg my-2"></span>
+                <span class="placeholder col-4 bg-secondary placeholder-lg my-2"></span>
+                <span class="placeholder col-6 bg-secondary placeholder-lg my-2"></span>
+                <span class="placeholder col-7 bg-secondary placeholder-lg my-2"></span>
+                <span class="placeholder col-6 bg-secondary placeholder-lg my-2"></span>
+                <span class="placeholder col-4 bg-secondary placeholder-lg my-2"></span>
+                <span class="placeholder col-8 bg-secondary placeholder-lg my-2"></span>
+                <span class="placeholder col-12 bg-secondary placeholder-lg my-2"></span>
+                </p>
+            </div>
         }
-        <div class="scrollspy" tabindex="0"
-             style="position: relative; height: 15rem; overflow-y: auto;">
-            @foreach (var currOpt in CurrSash.HwOptionList)
-            {
-                switch (currOpt.Type)
+        else 
+        {
+            <div class="scrollspy my-2" tabindex="0"
+                 style="position: relative; height: 15rem; overflow-y: auto;">
+                @foreach (var currOpt in CurrSash.HwOptionList)
                 {
-                    case HwOptionTypes.COMBO:
-                        {
-                            AGBOptionCombo currOptCombo = (AGBOptionCombo)currOpt;
-                            <EditOptionCombo CurrOpt="currOptCombo" EC_Update="RaiseOptCombo"></EditOptionCombo>
-                            break;
-                        }
-                    case HwOptionTypes.TEXT:
-                        {
-                            AGBOptionText currOptText = (AGBOptionText)currOpt;
-                            <EditOptionText CurrOpt="currOptText" EC_Update="RaiseOptText"></EditOptionText>
-                            break;
-                        }
+                    switch (currOpt.Type)
+                    {
+                        case HwOptionTypes.COMBO:
+                            {
+                                AGBOptionCombo currOptCombo = (AGBOptionCombo)currOpt;
+                                <EditOptionCombo CurrOpt="currOptCombo" EC_Update="RaiseOptCombo"></EditOptionCombo>
+                                break;
+                            }
+                        case HwOptionTypes.TEXT:
+                            {
+                                AGBOptionText currOptText = (AGBOptionText)currOpt;
+                                <EditOptionText CurrOpt="currOptText" EC_Update="RaiseOptText"></EditOptionText>
+                                break;
+                            }
+                    }
                 }
-            }
-        </div>
-    @* @if (!hwOptCollapsed)
-    {
-    } *@
+            </div>
+        }
+    }
 </div>
\ No newline at end of file
diff --git a/WebWindowComplex/Compo/AreaHwOption.razor.cs b/WebWindowComplex/Compo/AreaHwOption.razor.cs
index 86b36de..386be5f 100644
--- a/WebWindowComplex/Compo/AreaHwOption.razor.cs
+++ b/WebWindowComplex/Compo/AreaHwOption.razor.cs
@@ -34,23 +34,22 @@ namespace WebWindowComplex.Compo
 
         [CascadingParameter(Name = "IsLoading")]
         public List<string> IsLoading { get; set; } = new List<string>();
+   
+        private bool hwOptCollapsed { get; set; } = true;
 
-        private bool hwOptCollapsed { get; set; } = false;
-
-        //protected override void OnAfterRender(bool firstRender)
-        //{
-        //    if(firstRender)
-        //    {
-        //        hwOptCollapsed = true;
-        //    }
-        //}
+        protected override void OnAfterRender(bool firstRender)
+        {
+            if (firstRender)
+            {
+                hwOptCollapsed = true;
+            }
+        }
 
         private async Task changeCollapsed()
         {
-            //hwOptCollapsed = !hwOptCollapsed;
+            hwOptCollapsed = !hwOptCollapsed;
             if (CurrSash.HwOptionList.Count == 0)
             {
-                //IsLoadingHwOpt = true;
                 await EC_FirstHwOptionList.InvokeAsync(CurrSash.GroupId);
             }
         }
diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs
index 9d9617b..1ba799b 100644
--- a/WebWindowComplex/Models/Sash.cs
+++ b/WebWindowComplex/Models/Sash.cs
@@ -328,7 +328,11 @@ namespace WebWindowComplex.Models
             set
             {
                 m_SelHardware = value;
-                ReqRefreshHwOption();
+                if (HwOptionList.Count != 0)
+                {
+                    RefreshHardwareOptionList();
+                    ReqRefreshHwOption();
+                }
             }
         }
 
@@ -341,12 +345,12 @@ namespace WebWindowComplex.Models
             set
             {
                 m_SelHardware = m_HardwareList.FirstOrDefault(x => !string.IsNullOrEmpty(value) && x.Id.Equals(value)) ?? new Hardware(CustomHwId, "", "", Enums.OpeningTypes.Null, "", 0, 0);
+                HwOptionList.Clear();
                 if (SelHardware.Id == CustomHwId)
                 {
-                    HwOptionList.Clear();
                     SelHwOptionList.Clear();
                 }
-                //ReqRefreshHwOption();
+                ReqRefreshHwOption();
                 //ParentWindow.OnUpdatePreview(ParentWindow.sSerialized());
             }
         }
@@ -451,14 +455,6 @@ namespace WebWindowComplex.Models
                                                            )
                                                     .ToList() ?? new List<Hardware>();
                 m_HardwareList = new List<Hardware>(rawList);
-                //if (rawList != null && rawList.Count > 0)
-                //{
-                //    m_HardwareList = new List<Hardware>(rawList);
-                //}
-                //else
-                //{
-                //    m_HardwareList = new List<Hardware>();
-                //}
             }
         }
 
@@ -505,6 +501,11 @@ namespace WebWindowComplex.Models
                 RefreshHardwareList();
             }
             SetFirstHardware();
+            if (HwOptionList.Count != 0)
+            {
+                RefreshHardwareOptionList();
+                ReqRefreshHwOption();
+            }
         }
 
         /// <summary>
@@ -686,7 +687,6 @@ namespace WebWindowComplex.Models
             if (m_HardwareList.Count > 0)
             {
                 m_SelHardware = m_HardwareList.First();
-                //ReqRefreshHwOption();
             }
         }