diff --git a/WebWindowComplex/Compo/AreaSash.razor b/WebWindowComplex/Compo/AreaSash.razor
index dd88553..b81e1a8 100644
--- a/WebWindowComplex/Compo/AreaSash.razor
+++ b/WebWindowComplex/Compo/AreaSash.razor
@@ -184,12 +184,19 @@
         <div class="row">
             <div class="col-lg-6 col-md-12">
                 <div class="row justify-content-between align-items-center" style="min-height: 2.5rem;">
-                    <div class="col d-flex justify-content-start align-items-center">
+                    <div class="col-md-4 d-flex justify-content-start align-items-center">
                         <h6>Joints</h6>
                     </div>
                     @if (!User)
                     {
-                        <div class="col d-flex justify-content-end align-items-center">
+                        <div class="col-md-8 d-flex justify-content-end align-items-center">
+                            <div class="btn-group" role="group">
+                                <button type="button" class="@ButtonJointCss(Json.WindowConst.Joints.ANGLED)" @onclick="() => ChangeAllJoints(WebWindowComplex.Json.WindowConst.Joints.ANGLED)">Angled</button>
+                                <button type="button" class="@ButtonJointCss(Json.WindowConst.Joints.FULL_H)" @onclick="() => ChangeAllJoints(WebWindowComplex.Json.WindowConst.Joints.FULL_H)">Horizontal</button>
+                                <button type="button" class="@ButtonJointCss(Json.WindowConst.Joints.FULL_V)" @onclick="() => ChangeAllJoints(WebWindowComplex.Json.WindowConst.Joints.FULL_V)">Vertical</button>
+                            </div>
+                        </div>
+                        @* <div class="col d-flex justify-content-end align-items-center">
                             <button class="btn btn-outline-secondary btn-sm" type="button" @onclick="() => ChangeAll()">
                                 ChangeAll
                             </button>
@@ -207,7 +214,7 @@
                                     <button class="@ButtonJointCss(Json.WindowConst.Joints.FULL_V)" @onclick="() => ChangeAllJoints(WebWindowComplex.Json.WindowConst.Joints.FULL_V)">Vertical</button>
                                 </div>
                             </div>
-                        }
+                        } *@
                         @* <div class="col d-flex justify-content-end align-items-center">
                             <div class="dropdown">
                                 <button class="btn btn-outline-secondary dropdown-toggle btn-sm" type="button" data-bs-toggle="dropdown">
diff --git a/WebWindowComplex/Compo/CardFrame.razor b/WebWindowComplex/Compo/CardFrame.razor
index ac10d02..5b3cf51 100644
--- a/WebWindowComplex/Compo/CardFrame.razor
+++ b/WebWindowComplex/Compo/CardFrame.razor
@@ -100,12 +100,19 @@
         <div class="row">
             <div class="col-md-12 col-lg-6">
                 <div class="row justify-content-between align-items-center pb-2" style="min-height: 2.5rem;">
-                    <div class="col d-flex justify-content-start align-items-center">
+                    <div class="col-md-6 d-flex justify-content-start align-items-center">
                         <h6 class="fw-bold">Joints</h6>
                     </div>
                     @if (!User)
                     {
-                        <div class="col d-flex justify-content-end align-items-center">
+                        <div class="col-md-6 d-flex justify-content-end align-items-center">
+                            <div class="btn-group" role="group">
+                                <button type="button" class="@ButtonJointCss(Json.WindowConst.Joints.ANGLED)" @onclick="() => ChangeAllJoints(WebWindowComplex.Json.WindowConst.Joints.ANGLED)">Angled</button>
+                                <button type="button" class="@ButtonJointCss(Json.WindowConst.Joints.FULL_H)" @onclick="() => ChangeAllJoints(WebWindowComplex.Json.WindowConst.Joints.FULL_H)">Horizontal</button>
+                                <button type="button" class="@ButtonJointCss(Json.WindowConst.Joints.FULL_V)" @onclick="() => ChangeAllJoints(WebWindowComplex.Json.WindowConst.Joints.FULL_V)">Vertical</button>
+                            </div>
+                        </div>
+                        @* <div class="col d-flex justify-content-end align-items-center">
                             <button class="btn btn-outline-secondary btn-sm" type="button" @onclick="()=>ChangeAll()">
                                 ChangeAll
                             </button>
@@ -123,17 +130,7 @@
                                     <button class="@ButtonJointCss(Json.WindowConst.Joints.FULL_V)" @onclick="() => ChangeAllJoints(WebWindowComplex.Json.WindowConst.Joints.FULL_V)">Vertical</button>
                                 </div>
                             </div>
-                        }
-                        @* <div class="col d-flex justify-content-end align-items-center">
-                            <div class="input-group mb-2">
-                                <label class="input-group-text">All</label>
-                                <select class="form-select" @bind="ChangeAllJoints">
-                                    <option value="@(Json.WindowConst.Joints.ANGLED)">Angled</option>
-                                    <option value="@(Json.WindowConst.Joints.FULL_H)">Horizontal</option>
-                                    <option value="@(Json.WindowConst.Joints.FULL_V)">Vertical</option>
-                                </select>
-                            </div>
-                        </div> *@
+                        } *@
                         @* <div class="col d-flex justify-content-end align-items-center">
                             <div class="dropdown">
                                 <button class="btn btn-outline-secondary dropdown-toggle btn-sm" type="button" data-bs-toggle="dropdown">
diff --git a/WebWindowComplex/Compo/CardSashGroup.razor b/WebWindowComplex/Compo/CardSashGroup.razor
index df1f2e5..0fb450a 100644
--- a/WebWindowComplex/Compo/CardSashGroup.razor
+++ b/WebWindowComplex/Compo/CardSashGroup.razor
@@ -146,7 +146,20 @@
 <div class="card shadow-sm rounded mb-4">
     <div class="card-body py-2">
         <div class="d-flex justify-content-end align-items-center">
-            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#MeasureSettingModal">
+            <div class="col-md-3">
+                <select class="form-select" @bind="@MeasureType">
+                    <option value="@MeasureTypes.ABSOLUTE">Absolute (mm)</option>
+                    <option value="@MeasureTypes.PROPORTIONAL">Proportional (*)</option>
+                    <option value="@MeasureTypes.PERCENTAGE">Percentage (%)</option>
+                </select>
+            </div>
+            <div class="col-md-2">
+                <select class="form-select" @bind="@ChangeType">
+                    <option value="0">Sash</option>
+                    <option value="1">Glass</option>
+                </select>
+            </div>
+            @* <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#MeasureSettingModal">
                 <i class="fa-solid fa-gear"></i>
             </button>
             <div class="modal fade" id="MeasureSettingModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-hidden="true">
@@ -175,7 +188,7 @@
                         </div>
                     </div>
                 </div>
-            </div>
+            </div> *@
             @* <div class="dropdown px-4">
                 <button class="btn btn-outline-secondary dropdown-toggle btn-sm" type="button" data-bs-toggle="dropdown">
                     Unità misura
diff --git a/WebWindowComplex/Compo/CardSplit.razor b/WebWindowComplex/Compo/CardSplit.razor
index 11a8b3d..708fb7c 100644
--- a/WebWindowComplex/Compo/CardSplit.razor
+++ b/WebWindowComplex/Compo/CardSplit.razor
@@ -13,21 +13,6 @@
     </div>
     <div class="card-body py-2">
      @*<div class="d-flex justify-content-end align-items-center pb-2">
-            <div class="col-md-2">
-                Misure:
-            </div>
-            <div class="col-md-3">
-                <select class="form-select" @bind="@MeasureType">
-                    <option value="@MeasureTypes.ABSOLUTE">Absolute (mm)</option>
-                    <option value="@MeasureTypes.PROPORTIONAL">Proportional (*)</option>
-                    <option value="@MeasureTypes.PERCENTAGE">Percentage (%)</option>
-                </select>
-            </div>
-            <div class="col-md-2">
-                <select class="form-select">
-                    <option value="1">Glass</option>
-                </select>
-            </div>
             <div class="dropdown px-4">
                 <button class="btn btn-outline-secondary dropdown-toggle btn-sm" type="button" data-bs-toggle="dropdown">
                     Unità misura
@@ -47,7 +32,21 @@
                 </ul>
             </div>
         </div> *@
-        <div class="d-flex justify-content-between align-items-center">
+        <div class="d-flex justify-content-end align-items-center">
+            <div class="col-md-3">
+                <select class="form-select" @bind="@MeasureType">
+                    <option value="@MeasureTypes.ABSOLUTE">Absolute (mm)</option>
+                    <option value="@MeasureTypes.PROPORTIONAL">Proportional (*)</option>
+                    <option value="@MeasureTypes.PERCENTAGE">Percentage (%)</option>
+                </select>
+            </div>
+            <div class="col-md-2">
+                <select class="form-select">
+                    <option value="1">Glass</option>
+                </select>
+            </div>
+        </div>
+        <div class="d-flex justify-content-between align-items-center pt-2">
             <h5>Split</h5>
             @if (!User)
             {
@@ -61,11 +60,11 @@
                     <button class="btn btn-outline-secondary btn-sm" @onclick="() => RemoveArea()">Remove split</button>
                 </div>
             }
-            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#MeasureSettingModal">
+            @* <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#MeasureSettingModal">
                 <i class="fa-solid fa-gear"></i>
             </button>
             <div class="modal fade" id="MeasureSettingModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-hidden="true">
-                <div class="modal-dialog modal-dialog-centered">
+                <div class="modal-dialog">
                     <div class="modal-content">
                         <div class="modal-header">
                             <h1 class="modal-title fs-5" id="staticBackdropLabel">Measure settings</h1>
@@ -89,7 +88,7 @@
                         </div>
                     </div>
                 </div>
-            </div>
+            </div> *@
         </div>
         <div class="row">
             <div class="col-md-12 col-lg-6">
diff --git a/WebWindowComplex/Compo/CardSplit.razor.cs b/WebWindowComplex/Compo/CardSplit.razor.cs
index e4980ac..297f25e 100644
--- a/WebWindowComplex/Compo/CardSplit.razor.cs
+++ b/WebWindowComplex/Compo/CardSplit.razor.cs
@@ -357,10 +357,10 @@ namespace WebWindowComplex.Compo
                 else
                     type = CurrSplit.SplitHorizList.First().SelMeasureType;
                 for (int i = 1; i < CurrSplit.SplitVertList.Count; i++)
-                    {
-                        if (CurrSplit.SplitVertList.ElementAt(i).SelMeasureType != type)
-                            return MeasureTypes.NULL;
-                    }
+                {
+                    if (CurrSplit.SplitVertList.ElementAt(i).SelMeasureType != type)
+                        return MeasureTypes.NULL;
+                }
                 for (int i = 1; i < CurrSplit.SplitHorizList.Count; i++)
                 {
                     if (CurrSplit.SplitHorizList.ElementAt(i).SelMeasureType != type)
@@ -372,20 +372,20 @@ namespace WebWindowComplex.Compo
             {
                 foreach (var item in CurrSplit.SplitVertList)
                 {
-                    item.SelMeasureType = value;
-                    //item.SetSelMeasureType(type);
+                    item.SelMeasureTypeIndex = (int)value;
+                    //item.SetSelMeasureType(value);
                 }
                 foreach (var item in CurrSplit.SplitHorizList)
                 {
-                    item.SelMeasureType = value;
-                    //item.SetSelMeasureType(type);
+                    item.SelMeasureTypeIndex = (int)value;
+                    //item.SetSelMeasureType(value);
                 }
                 var args = new DataUpdateSplit()
                 {
                     currSplit = CurrSplit,
                     noSvg = true
                 };
-                _= EC_UpdateSplit.InvokeAsync(args);
+                _ = EC_UpdateSplit.InvokeAsync(args);
             }
         }
 
@@ -432,14 +432,14 @@ namespace WebWindowComplex.Compo
             for (int i = 0; i < CurrSplit.SplitVertList.Count; i++)
             {
                 if (!CurrSplit.SplitVertList.ElementAt(i).MeasureType.Equals(type))
-                    return "dropdown-item";
+                    return "btn btn-outline-secondary";
             }
             for (int i = 0; i < CurrSplit.SplitHorizList.Count; i++)
             {
                 if (!CurrSplit.SplitHorizList.ElementAt(i).MeasureType.Equals(type))
-                    return "dropdown-item";
+                    return "btn btn-outline-secondary";
             }
-            return "dropdown-item fw-bold";
+            return "btn btn-secondary";
         }
     }
 
diff --git a/WebWindowComplex/Models/SplitDimension.cs b/WebWindowComplex/Models/SplitDimension.cs
index 6053e0b..caa9874 100644
--- a/WebWindowComplex/Models/SplitDimension.cs
+++ b/WebWindowComplex/Models/SplitDimension.cs
@@ -629,9 +629,9 @@ namespace WebWindowComplex.Models
                     {
                         splitList = m_Parent.SplitHorizList;
                         if (Parent.bSplitStartVert)
-                            splitElemList = m_Parent.ElemDimHorizList;
-                        else
                             splitElemList = m_Parent.ElemDimHorizList.Where(x => x.nSubArea == 1).ToList();
+                        else
+                            splitElemList = m_Parent.ElemDimHorizList;
                         dimSplitGroup = (CalculateHeightSplitGroup(frame, frame.AvailHeightArea(), new AreaFound(-1, false))).m_Dimension;
                     }
                     AreaDimension ad = new AreaDimension(dDimension, SelMeasureType, Parent);
@@ -644,7 +644,14 @@ namespace WebWindowComplex.Models
                     {
                         dimSplitGroup = dimSplitGroup - item.dDimension;
                     }
-                    m_dDimension = ad.ConvertDimension(adList, m_SelMeasureType, newType, dimSplitGroup, splitList.IndexOf(this));
+                    if (newType is MeasureTypes.PROPORTIONAL)
+                    {
+                        adList = ad.CalculatePropVal(adList, splitList.IndexOf(this), dimSplitGroup);
+                        for (int i = 0; i < adList.Count; i++)
+                            splitList.ElementAt(i).SetDimension(adList.ElementAt(i).dDimension);
+                    }
+                    else
+                        m_dDimension = ad.ConvertDimension(adList, m_SelMeasureType, newType, dimSplitGroup, splitList.IndexOf(this));
                     m_SelMeasureType = (MeasureTypes)value;
                 }
             }
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index 18aec2e..032a03c 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -6,7 +6,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>3.1.3.917</Version>
+    <Version>3.1.3.1009</Version>
     <Authors>Annamaria Sassi</Authors>
     <Company>Egalware</Company>
     <Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -319,6 +319,9 @@
 
 
 
+
+
+
 
 
 
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index c1cb9ca..60edf00 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -6,7 +6,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>3.1.3.918</Version>
+        <Version>3.1.3.1009</Version>
         <Authors>Annamaria Sassi</Authors>
         <Company>Egalware</Company>
         <Description>Componente gestione JWD per LUX</Description>
@@ -342,6 +342,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+