diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor
index afb31fb5..6fa4103f 100644
--- a/MP.Stats/Pages/Controlli.razor
+++ b/MP.Stats/Pages/Controlli.razor
@@ -4,19 +4,10 @@
 @using MP.Stats.Components
 
 <div class="card">
-    <div class="card-header table-primary">
-        <div class="row">
-            <div class="col-6 h2">Registro Controlli</div>
-            <div class="col-6">
-            </div>
-        </div>
+    <div class="card-header table-primary py-1">
+        <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
     </div>
-    <div class="card-body py-0">
-        <div class="row">
-            <div class="col-12 table-secondary">
-                <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
-            </div>
-        </div>
+    <div class="card-body py-0 px-1">
         @if (ListRecords == null)
         {
             <LoadingData></LoadingData>
diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor
index e31d0977..313bd370 100644
--- a/MP.Stats/Pages/Diario.razor
+++ b/MP.Stats/Pages/Diario.razor
@@ -3,19 +3,10 @@
 @using MP.Stats.Components
 
 <div class="card">
-    <div class="card-header table-primary">
-        <div class="row">
-            <div class="col-6 h2">Diario Produzione</div>
-            <div class="col-6">
-            </div>
-        </div>
+    <div class="card-header table-primary py-1">
+        <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
     </div>
-    <div class="card-body py-0">
-        <div class="row">
-            <div class="col-12 table-secondary">
-                <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
-            </div>
-        </div>
+    <div class="card-body py-0 px-1">
         @if (ListRecords == null)
         {
             <LoadingData></LoadingData>
diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor
index bafa7164..ba17de50 100644
--- a/MP.Stats/Pages/Index.razor
+++ b/MP.Stats/Pages/Index.razor
@@ -23,17 +23,12 @@
 <div class="shortcuts mt-2">
     <div class="row">
         <div class="col-12">
-            <div class="card">
-                <div class="card-header table-primary h1">Main Topics</div>
-                <div class="card-body py-0">
-                    <HomeButton NavLink="oee" Icon="oi oi-monitor" Descript="TRS/OEE %" />
-                    <HomeButton NavLink="reportodl" Icon="oi oi-book" Descript="Report ODL" />
-                    <HomeButton NavLink="diario" Icon="oi oi-clipboard" Descript="Diario Produzione" />
-                    <HomeButton NavLink="userlog" Icon="oi oi-document" Descript="User ActionLog" />
-                    <HomeButton NavLink="controlli" Icon="oi oi-beaker" Descript="Controlli" />
-                    <HomeButton NavLink="scarti" Icon="oi oi-warning" Descript="Scarti" />
-                </div>
-            </div>
+            <HomeButton NavLink="oee" Icon="oi oi-monitor" Descript="TRS/OEE %" />
+            <HomeButton NavLink="reportodl" Icon="oi oi-book" Descript="Report ODL" />
+            <HomeButton NavLink="diario" Icon="oi oi-clipboard" Descript="Diario Produzione" />
+            <HomeButton NavLink="userlog" Icon="oi oi-document" Descript="User ActionLog" />
+            <HomeButton NavLink="controlli" Icon="oi oi-beaker" Descript="Controlli" />
+            <HomeButton NavLink="scarti" Icon="oi oi-warning" Descript="Scarti" />
         </div>
     </div>
 </div>
diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor
index 0a661c25..598eb0c3 100644
--- a/MP.Stats/Pages/Oee.razor
+++ b/MP.Stats/Pages/Oee.razor
@@ -3,73 +3,64 @@
 @using MP.Stats.Components
 
 <div class="card">
-    <div class="card-header table-primary">
-        <div class="row">
-            <div class="col-6 h2">TRS / OEE %</div>
-            <div class="col-6">
-            </div>
-        </div>
+    <div class="card-header table-primary py-1">
+        <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
     </div>
-    <div class="card-body py-0">
-        <div class="row">
-            <div class="col-12 table-secondary">
-                <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
-            </div>
-        </div>
+    <div class="card-body py-0 px-1">
         @if (currRecord != null)
         {
-            <DetailOee currRecord="@currRecord"></DetailOee>
+        <DetailOee currRecord="@currRecord"></DetailOee>
         }
         @if (ListRecords == null)
         {
-            <LoadingData></LoadingData>
+        <LoadingData></LoadingData>
         }
         else if (totalCount == 0)
         {
-            <div class="alert alert-warning text-center display-4">Nessun record trovato</div>
+        <div class="alert alert-warning text-center display-4">Nessun record trovato</div>
         }
         else
         {
-            <div class="row">
-                <div class="col-12">
-                    <table class="table table-sm table-striped">
-                        <thead>
-                            <tr>
-                                @*<th><button class="btn btn-sm btn-primary" @onclick="() => ResetData()"><span class="oi oi-loop-circular"></span></button></th>*@
-                                <th>Data</th>
-                                <th>Turno</th>
-                                <th>Macchina</th>
-                                <th>Articolo</th>
-                                <th class="text-right">Durata</th>
-                                <th class="text-right">Pezzi</th>
-                                <th class="text-right">OEE %</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            @foreach (var record in ListRecords)
+        <div class="row">
+            <div class="col-12">
+                <table class="table table-sm table-striped">
+                    <thead>
+                        <tr>
+                            @*<th><button class="btn btn-sm btn-primary" @onclick="() => ResetData()"><span class="oi oi-loop-circular"></span></button></th>*@
+                            <th>Data</th>
+                            <th>Turno</th>
+                            <th>Macchina</th>
+                            <th>Articolo</th>
+                            <th class="text-right">Durata</th>
+                            <th class="text-right">Pezzi</th>
+                            <th class="text-right">OEE %</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var record in ListRecords)
                             {
-                                <tr class="@checkSelect(record.DataRif, record.Turno, @record.IdxMacchina)">
+                        <tr class="@checkSelect(record.DataRif, record.Turno, @record.IdxMacchina)">
 
-                                    @*<td><button class="btn btn-sm btn-primary" @onclick="() => Select(record)"><span class="oi oi-magnifying-glass"></span></button></td>*@
-                                    <td>
-                                        <div>@record.DataRif.ToString("yyyy.MM.dd")</div>
-                                        <div class="small">@record.DataRif.ToString("dddd")</div>
-                                    </td>
-                                    <td>@record.Turno</td>
-                                    <td>
-                                        <div>@record.CodMacchina</div>
-                                        <div class="small">@record.IdxMacchina</div>
-                                    </td>
-                                    <td>@record.CodArticolo</td>
-                                    <td class="text-right">@record.TotPeriodo.ToString("N2")</td>
-                                    <td class="text-right">@record.TotPz</td>
-                                    <td class="text-right">@record.OEE.ToString("P2")</td>
-                                </tr>
+                            @*<td><button class="btn btn-sm btn-primary" @onclick="() => Select(record)"><span class="oi oi-magnifying-glass"></span></button></td>*@
+                            <td>
+                                <div>@record.DataRif.ToString("yyyy.MM.dd")</div>
+                                <div class="small">@record.DataRif.ToString("dddd")</div>
+                            </td>
+                            <td>@record.Turno</td>
+                            <td>
+                                <div>@record.CodMacchina</div>
+                                <div class="small">@record.IdxMacchina</div>
+                            </td>
+                            <td>@record.CodArticolo</td>
+                            <td class="text-right">@record.TotPeriodo.ToString("N2")</td>
+                            <td class="text-right">@record.TotPz</td>
+                            <td class="text-right">@record.OEE.ToString("P2")</td>
+                        </tr>
                             }
-                        </tbody>
-                    </table>
-                </div>
+                    </tbody>
+                </table>
             </div>
+        </div>
         }
     </div>
     <div class="card-footer py-1">
diff --git a/MP.Stats/Pages/ReportODL.razor b/MP.Stats/Pages/ReportODL.razor
index 05f9aed3..ebf165af 100644
--- a/MP.Stats/Pages/ReportODL.razor
+++ b/MP.Stats/Pages/ReportODL.razor
@@ -3,19 +3,10 @@
 @using MP.Stats.Components
 
 <div class="card">
-    <div class="card-header table-primary">
-        <div class="row">
-            <div class="col-6 h2">Report ODL/Comm.</div>
-            <div class="col-6">
-            </div>
-        </div>
+    <div class="card-header table-primary py-1">
+        <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
     </div>
-    <div class="card-body py-0">
-        <div class="row">
-            <div class="col-12 table-secondary">
-                <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
-            </div>
-        </div>
+    <div class="card-body py-0 px-1">
         @if (ListRecords == null)
         {
             <LoadingData></LoadingData>
diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor
index 05b81ddf..6e1d4d55 100644
--- a/MP.Stats/Pages/Scarti.razor
+++ b/MP.Stats/Pages/Scarti.razor
@@ -3,19 +3,10 @@
 @using MP.Stats.Components
 
 <div class="card">
-    <div class="card-header table-primary">
-        <div class="row">
-            <div class="col-6 h2">Registro Scarti</div>
-            <div class="col-6">
-            </div>
-        </div>
+    <div class="card-header table-primary py-1">
+        <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
     </div>
-    <div class="card-body py-0">
-        <div class="row">
-            <div class="col-12 table-secondary">
-                <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
-            </div>
-        </div>
+    <div class="card-body py-0 px-1">
         @if (ListRecords == null)
         {
             <LoadingData></LoadingData>
diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor
index 614e1f2a..29465fa5 100644
--- a/MP.Stats/Pages/UserLog.razor
+++ b/MP.Stats/Pages/UserLog.razor
@@ -3,19 +3,10 @@
 @using MP.Stats.Components
 
 <div class="card">
-    <div class="card-header table-primary">
-        <div class="row">
-            <div class="col-6 h2">User ActionLog</div>
-            <div class="col-6">
-            </div>
-        </div>
+    <div class="card-header table-primary py-1">
+        <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
     </div>
-    <div class="card-body py-0">
-        <div class="row">
-            <div class="col-12 table-secondary">
-                <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
-            </div>
-        </div>
+    <div class="card-body py-0 px-1">
         @if (ListRecords == null)
         {
             <LoadingData></LoadingData>