diff --git a/Jenkinsfile b/Jenkinsfile
index 7a2bd627..3a4aa07a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=644']) {
+        withEnv(['NEXT_BUILD_NUMBER=645']) {
           // env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
             env.APP_NAME = 'MAPO'
diff --git a/MP-Tablet/WebUserControls/mod_mappaStato.ascx b/MP-Tablet/WebUserControls/mod_mappaStato.ascx
index 8ebfe1f4..39a97280 100644
--- a/MP-Tablet/WebUserControls/mod_mappaStato.ascx
+++ b/MP-Tablet/WebUserControls/mod_mappaStato.ascx
@@ -4,7 +4,7 @@
     <div class="row">
       <asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
         <ItemTemplate>
-          <div class="col-12 col-sm-6 col-md-4 col-lg-3 col-xl-2 mb-3">
+          <div class="col-12 col-sm-6 col-md-4 col-lg-3 col-xl-2 mb-3 px-2">
             <asp:LinkButton ID="hlMacchina" runat="server" OnClick="hlMacchina_Click" CommandArgument='<%# Eval("IdxMacchina") %>'>
               <div class="card text-white mapBlock rCAll">
                 <img class="card-img bg-dark rCTop" src='<%# ImgUrl(Eval("url")) %>' alt='<%# Eval("CodMacchina") %>'>
@@ -21,24 +21,24 @@
                         <asp:Label runat="server" ID="lblTitle" Text='<%# Eval("Nome") %>' /></h4>
                     </div>
                     <div class='col-12 px-1 <%# Eval("Semaforo") %>'>
-                      <div class="row">
-                        <div class="col-6 pr-0">
+                      <div class="d-flex">
+                        <div class="p-1 mr-auto">
                           <b>
                             <asp:Label runat="server" ID="lblStato" Text='<%# Eval("DescrizioneStato") %>' /></b>
                         </div>
-                        <div class="col-6 pl-0 text-right">
+                        <div class="p-1">
                           <asp:Label runat="server" ID="lblDurata" Text='<%# formatDurata(Eval("Durata")) %>' />
                         </div>
                       </div>
                     </div>
                     <div class="col-12 px-1 pb-1">
-                      <div class="row">
-                        <div class="col-8">
+                      <div class="d-flex">
+                        <div class="p-1 mr-auto">
                           <asp:Label runat="server" ID="Label2" Text='<%# Eval("PezziProd","prod: {0}") %>' ToolTip="pz prodotti" />
                           /
                       <asp:Label runat="server" ID="lblPzLanciati" Text='<%# Eval("NumPezzi","tot: {0}") %>' ToolTip="pz lanciati" />
                         </div>
-                        <div class="col-4">
+                        <div class="p-1">
                           <asp:Label runat="server" ID="Label1" Text='<%# Eval("PezziConf","conf: {0}") %>' ToolTip="pz confermati" />
                         </div>
                       </div>
@@ -46,11 +46,7 @@
                   </div>
                 </div>
               </div>
-            </asp:LinkButton>
-          </div>
-        </ItemTemplate>
-      </asp:Repeater>
-      <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByRefreshData"
+            </asp:LinkButton></div></ItemTemplate></asp:Repeater><asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByRefreshData"
         TypeName="MapoDb.DS_ProdTempiTableAdapters.MappaStatoExplTableAdapter">
         <SelectParameters>
           <asp:Parameter DefaultValue="3001" Name="maxAgeSec" Type="Int32" />
diff --git a/MP-Tablet/WebUserControls/mod_title.ascx b/MP-Tablet/WebUserControls/mod_title.ascx
index f48a523c..cd6129a8 100644
--- a/MP-Tablet/WebUserControls/mod_title.ascx
+++ b/MP-Tablet/WebUserControls/mod_title.ascx
@@ -9,9 +9,6 @@
   </button>
   <div class="collapse navbar-collapse" id="navbarText">
     <ul class="navbar-nav mr-auto">
-      <%--<li class="nav-item active">
-        <a class="nav-link" href="."><b style="font-size: 1.2em;">MPTablet</b></a>
-      </li>--%>
       <asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
         <ItemTemplate>
           <li class='nav-item btn btn-lg py-0 <%# checkPage(Eval("NavigateUrl")) %>'>
@@ -24,12 +21,6 @@
           <asp:SessionParameter DefaultValue="-" Name="TipoLink" SessionField="TipoLink" Type="String" />
         </SelectParameters>
       </asp:ObjectDataSource>
-      <%--<li class="nav-item btn btn-lg">
-        <a class="nav-link" href="MappaStato"><i class="fa fa-globe fa-lg"></i> Mappa</a>
-      </li>
-      <li class="nav-item btn btn-lg">
-        <a class="nav-link" href="StoricoTC"><i class="fa fa-clock-o fa-lg"></i> Storico TC</a>
-      </li>--%>
     </ul>
     <div class="navbar-text my-0 py-0">
       <div class="text-right">
diff --git a/MP-Tablet/WebUserControls/mod_title.ascx.cs b/MP-Tablet/WebUserControls/mod_title.ascx.cs
index 5da9badd..dc589af8 100644
--- a/MP-Tablet/WebUserControls/mod_title.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_title.ascx.cs
@@ -186,7 +186,7 @@ namespace MoonProTablet.WebUserControls
       string answ = "";
       if (navUrl.ToString().Replace(".aspx", "").Replace("~/", "") == titolo.Replace(".aspx", ""))
       {
-        answ = "active";
+        answ = "active btn-primary";
       }
       return answ;
     }