diff --git a/Test.UI/Components/Pages/EditJWD.razor b/Test.UI/Components/Pages/EditJWD.razor
index 6a95742..177c798 100644
--- a/Test.UI/Components/Pages/EditJWD.razor
+++ b/Test.UI/Components/Pages/EditJWD.razor
@@ -84,7 +84,6 @@ else
             <button class="btn btn-primary" @onclick="SetEdit">Click per editare</button>
         </div>
         <div class="px-0">
-            <small class="text-secondary">@txtEmpty</small>
             <button class="btn btn-primary" @onclick="() => ToggleJwd()">Toggle JWD</button>
         </div>
     </div>
diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor
index 38ddee9..39451b7 100644
--- a/WebWindowComplex/TableComp.razor
+++ b/WebWindowComplex/TableComp.razor
@@ -1,4 +1,5 @@
-@using static WebWindowComplex.LayoutConst
+@using EgwCoreLib.Razor
+@using static WebWindowComplex.LayoutConst
 <div class="row">
     @if (isLoading)
     {
@@ -7,27 +8,27 @@
     else if (!okParams)
     {
         <div class="d-flex flex-column">
-             <div class="card text-center shadow rounded">
+            <div class="card text-center shadow rounded">
                 <div class="col-md-12 d-grid gap-4 p-2 d-md-flex justify-content-end flex-wrap">
                     <button class="btn btn-lg btn-primary px-4" style="font-size: 1rem;" @onclick="DoClose">Close</button>
                 </div>
                 <div class="alert alert-warning">
                     <div class="fs-3">Parametri Mancanti!</div>
                 </div>
-             </div> 
+            </div>
         </div>
     }
     else if (!okJwd)
     {
         <div class="d-flex flex-column">
-             <div class="card text-center  shadow rounded">
+            <div class="card text-center  shadow rounded">
                 <div class="col-md-12 d-grid gap-4 p-2 d-md-flex justify-content-end flex-wrap">
                     <button class="btn btn-lg btn-primary px-4" style="font-size: 1rem;" @onclick="DoClose">Close</button>
                 </div>
                 <div class="alert alert-warning">
                     <div class="fs-3">JWD Mancante!</div>
                 </div>
-             </div> 
+            </div>
         </div>
         
     }
@@ -99,8 +100,8 @@
                             <div class="col-md-6 col-lg-6">
                                 @if (currStep == CompileStep.Tree)
                                 {
-                                    <CardTree ItemTableList="m_ItemTableList" 
-                                              maxCol="m_maxCol" 
+                                    <CardTree ItemTableList="m_ItemTableList"
+                                              maxCol="m_maxCol"
                                               RowCollapsedDict="RowCollapsed"
                                               ChildDict="Child"
                                               SashGroupList="SashGroupList"
@@ -131,7 +132,7 @@
                                                     <CardFrame EC_ReqResetDict="ReqResetDict"
                                                                EC_ReqOptionHw="UpdateHwOptionsFrame"
                                                                EC_ReqElement="UpdateElementFrame"
-                                                               EC_UpdateFrame="UpdatePreviewFrame" 
+                                                               EC_UpdateFrame="UpdatePreviewFrame"
                                                                EC_ReqClose="ReturnTree">
                                                     </CardFrame>
                                                 </CascadingValue>
@@ -186,7 +187,7 @@
                                                 </CascadingValue>
                                             </CascadingValue>
                                         </CascadingValue>
-                                    }   
+                                    }
                                 }
                                 else if (currStep == CompileStep.Fill)
                                 {
@@ -196,8 +197,8 @@
                                     }
                                     else
                                     {
-                                        <CardFill CurrIndex="currFillIndex" 
-                                                  CurrFill="FillList[currFillIndex]" 
+                                        <CardFill CurrIndex="currFillIndex"
+                                                  CurrFill="FillList[currFillIndex]"
                                                   User="baseUser"
                                                   EC_UpdateFill="UpdatePreviewFill"
                                                   EC_ReqClose="ReturnTree">
@@ -231,10 +232,10 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        @if(!baseUser && SplittedList != null && SplittedList.Count > 0)
+                                        @if (!baseUser && SplittedList != null && SplittedList.Count > 0)
                                         {
                                             Splitted? currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currFillIndex])).FirstOrDefault();
-                                            @if(currSplitted != null)
+                                            @if (currSplitted != null)
                                             {
                                                 @if (currSplitted.ParentArea != null && currSplitted.ParentWindow != null)
                                                 {
@@ -251,8 +252,8 @@
                                 else if (currStep == CompileStep.General)
                                 {
                                     <General CurrWindow="m_CurrWindow"
-                                             ListPayload="ListPayload" 
-                                             ListWarnings="listWarnings" 
+                                             ListPayload="ListPayload"
+                                             ListWarnings="listWarnings"
                                              User="baseUser"
                                              EC_UpdateGeneral="UpdatePreviewGeneral"
                                              EC_ReqClose="ReturnTree">
@@ -268,7 +269,14 @@
                                 } *@
                             </div>
                             <div class="col-md-6 col-lg-6">
-                                @outSvg
+                                @if (string.IsNullOrWhiteSpace(LiveData.SvgPreview))
+                                {
+                                    <LoadingData DisplayMode="LoadingData.SpinMode.BounceLine" DisplaySize="LoadingData.CtrlSize.Large"></LoadingData>
+                                }
+                                else
+                                {
+                                    @outSvg
+                                }
                             </div>
                         </div>
                     </div>
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index 35f67f3..8b02bb2 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -59,5 +59,6 @@
 
 
 
+
 
 
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index e3899b2..9d35a03 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -60,5 +60,6 @@
 
 
 
+