diff --git a/WebWindowConfigurator/WebWindowMaker.razor b/WebWindowConfigurator/WebWindowMaker.razor
index 6ca6ec3..14a118a 100644
--- a/WebWindowConfigurator/WebWindowMaker.razor
+++ b/WebWindowConfigurator/WebWindowMaker.razor
@@ -3,75 +3,43 @@
     <div class="@mainCss">
         <div class="card text-center table-svg">
             <div class="card-header" style="background-color: #d5f1f2;">
-                <ul class="nav nav-tabs card-header-tabs">
-                    <li class="nav-item">
-                        @if (currStep == CompileStep.Template)
-                        {
-                            <a data-target="#Template" class="nav-link active fw-bold" aria-current="true" @onclick="() => AdvStep(CompileStep.Template)">Template</a>
-                        }
-                        else
-                        {
-                            <a data-target="#Template" class="nav-link text-secondary" @onclick="() => AdvStep(CompileStep.Template)">Template</a>
-                        }
-                    </li>
-                    @if (SelTemplateDTO != null)
-                    {
-                        <li class="nav-item">
-                            <a data-target="#Frame" class="@tabNavCss(CompileStep.Frame)" aria-current="true" @onclick="() => AdvStep(CompileStep.Frame)">Frame</a>
-                        </li>
-                        <li class="nav-item">
-                            <a data-target="#Split" class="@tabNavCss(CompileStep.Split)" aria-current="true" @onclick="() => AdvStep(CompileStep.Split)">Split</a>
-                        </li>
-                        <li class="nav-item">
-                            <a data-target="#Sash" class="@tabNavCss(CompileStep.Sash)" aria-current="true" @onclick="() => AdvStep(CompileStep.Sash)">Sash</a>
-                        </li>
-                        <li class="nav-item">
-                            <a data-target="#Fill" class="@tabNavCss(CompileStep.Fill)" aria-current="true" @onclick="() => AdvStep(CompileStep.Fill)">Fill</a>
-                        </li>
-                        @*  <li class="nav-item">
-                    @if (currStep == CompileStep.Frame)
-                    {
-                        <a data-target="#Frame" class="nav-link active fw-bold" aria-current="true" @onclick="() => AdvStep(CompileStep.Frame)">Frame</a>
-                    }
-                    else
-                    {
-                        <a data-target="#Frame" class="nav-link text-secondary" @onclick="() => AdvStep(CompileStep.Frame)">Frame</a>
-                    }
-                </li>
-                <li class="nav-item">
-                    @if (currStep == CompileStep.Split)
-                    {
-                        <a data-target="#Split" class="nav-link active fw-bold" aria-current="true" @onclick="() => AdvStep(CompileStep.Split)">Split</a>
-                    }
-                    else
-                    {
-                        <a data-target="#Split" class="nav-link text-secondary" @onclick="() => AdvStep(CompileStep.Split)">Split</a>
-                    }
-                </li>
-                <li class="nav-item">
-                    @if (currStep == CompileStep.Sash)
-                    {
-                        <a data-target="#Sash" class="nav-link active fw-bold" aria-current="true" @onclick="() => AdvStep(CompileStep.Sash)">Sash</a>
-                    }
-                    else
-                    {
-                        <a data-target="#Sash" class="nav-link text-secondary" @onclick="() => AdvStep(CompileStep.Sash)">Sash</a>
-                    }
-                </li>  
-                <li class="nav-item">
-                    @if (currStep == CompileStep.Fill)
-                    {
-                        <a data-target="#Fill" class="nav-link active fw-bold" aria-current="true" @onclick="() => AdvStep(CompileStep.Fill)">Fill</a>
-                    }
-                    else
-                    {
-                        <a data-target="#Fill" class="nav-link text-secondary" @onclick="() => AdvStep(CompileStep.Fill)">Fill</a>
-                    }
-            </li> *@
-                    }
-                </ul>
+                <div class="row">
+                    <div class="col-6">
+                        <ul class="nav nav-tabs card-header-tabs">
+                            <li class="nav-item">
+                                @if (currStep == CompileStep.Template)
+                                {
+                                    <a data-target="#Template" class="nav-link active fw-bold" aria-current="true" @onclick="() => AdvStep(CompileStep.Template)">Template</a>
+                                }
+                                else
+                                {
+                                    <a data-target="#Template" class="nav-link text-secondary" @onclick="() => AdvStep(CompileStep.Template)">Template</a>
+                                }
+                            </li>
+                            @if (SelTemplateDTO != null)
+                            {
+                                <li class="nav-item">
+                                    <a data-target="#Frame" class="@tabNavCss(CompileStep.Frame)" aria-current="true" @onclick="() => AdvStep(CompileStep.Frame)">Frame</a>
+                                </li>
+                                <li class="nav-item">
+                                    <a data-target="#Split" class="@tabNavCss(CompileStep.Split)" aria-current="true" @onclick="() => AdvStep(CompileStep.Split)">Split</a>
+                                </li>
+                                <li class="nav-item">
+                                    <a data-target="#Sash" class="@tabNavCss(CompileStep.Sash)" aria-current="true" @onclick="() => AdvStep(CompileStep.Sash)">Sash</a>
+                                </li>
+                                <li class="nav-item">
+                                    <a data-target="#Fill" class="@tabNavCss(CompileStep.Fill)" aria-current="true" @onclick="() => AdvStep(CompileStep.Fill)">Fill</a>
+                                </li>
+                            }
+                        </ul>
+                    </div>
+                    <div class="col-6 d-grid gap-2 d-md-flex justify-content-md-end">
+                        <button class="btn btn-lg btn-primary btn-sm" @onclick="DoSave">Save</button>
+                        <button class="btn btn-lg btn-primary btn-sm" @onclick="DoClose">Close</button>
+                    </div>
+                </div>
             </div>
-            <div class="card-body">
+            <div class="card-body bg-transparent">
                 <div class="alert alert-light text-center display-4">
                     @if (currStep == CompileStep.Template)
                     {
@@ -105,7 +73,7 @@
                     {
                         <div class="container">
                             <div class="row">
-                                <div class="alert alert-light text-start p-1 display-4 w-75">
+                                <div class="alert alert-light text-start p-1 display-4 w-50">
                                     <div class="input-group mb-2">
                                         <label class="input-group-text" for="FrameShape">Shape</label>
                                         <select class="form-select" @bind="@m_Frame.SelShapeIndex">
@@ -174,7 +142,7 @@
                     {
                         <div class="container">
                             <div class="row">
-                                <div class="alert alert-light text-start p-1 display-4 w-75">
+                                <div class="alert alert-light text-start p-1 display-4 w-50">
                                     @foreach (var item in SplitList)
                                     {
                                         <div class="border mb-2">
@@ -211,7 +179,7 @@
                     {
                         <div class="container">
                             <div class="row">
-                                 <div class="alert alert-light text-start p-1 display-4 w-75">
+                                 <div class="alert alert-light text-start p-1 display-4 w-50">
                                     @foreach (var item in SashList)
                                     {
                                         <div class="input-group mb-2">
@@ -314,7 +282,7 @@
                     {
                         <div class="container">
                             <div class="row">
-                                <div class="alert alert-light text-start p-1 display-4 w-75">
+                                <div class="alert alert-light text-start p-1 display-4 w-50">
                                     @foreach (var Fill in FillList)
                                     {
                                         <div class="border mb-2">
@@ -348,10 +316,6 @@
                     }
                 </div>
             </div>
-            <div class="card-footer">
-                <button class="btn btn-lg btn-primary" @onclick="DoSave">Save</button>
-                <button class="btn btn-lg btn-primary" @onclick="DoClose">Close</button>
-            </div>
         </div>
     </div>
     @if (SelTemplateDTO != null)
diff --git a/WebWindowConfigurator/Window.cs b/WebWindowConfigurator/Window.cs
index f197736..d64207d 100644
--- a/WebWindowConfigurator/Window.cs
+++ b/WebWindowConfigurator/Window.cs
@@ -441,6 +441,7 @@ namespace WebWindowConfigurator
             set
             {
                 m_bBottomRail = value;
+                //m_ParentWindow.OnUpdatePreview(m_ParentWindow.sSerialized());
             }
         }
         internal void SetBottomRail(bool bBottomRail)