diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index abdbdd2..c5be8fe 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -137,8 +137,8 @@ Public Class MainWindowM
       EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
       EgtSetKey(sKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(823, 19, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(823, 19, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(823, 3101, 10, m_nKeyLevel) And
+                            EgtGetKeyOptions(823, 3101, 10, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_sLogFile = m_sTempDir & "\" & LOG_FILE_NAME
       Dim sLogMsg As String = "User " & Environment.MachineName & "\" & Environment.UserName & vbLf &
diff --git a/MainWindow/Objects.vb b/MainWindow/Objects.vb
index 89bf3f0..9145092 100644
--- a/MainWindow/Objects.vb
+++ b/MainWindow/Objects.vb
@@ -228,9 +228,10 @@ Public Class Licence
       Get
          If ProductVersion.Length > 3 Then
             ' Es. se ProductVersion = 2402 la licenza scade il 01/02/2023, dove 2023 è 24 + 1999
-            Dim nYear As Integer = CInt(ProductVersion.Substring(0, 2)) + 1999
+            Dim nVer As Integer = CInt(ProductVersion.Substring(0, 2))
+            Dim nYear As Integer = nVer + 1999 + If( nVer < 31, 0, -3)
             Dim nMonth As Integer = CInt(ProductVersion.Substring(2, 2))
-            Return New Date(nYear, nMonth, 1)
+            Return New Date(nYear, nMonth, DateTime.DaysInMonth(nYear, nMonth))
          End If
          Return Nothing
       End Get
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 792edcc..3ab4fbf 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -17,9 +17,9 @@ Imports System.Windows
 <Assembly: AssemblyTitle("LicenceManager")>
 <Assembly: AssemblyDescription("LicenceManager")>
 #End If
-<Assembly: AssemblyCompany("Egalware srl")>
+<Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("LicenceManager")>
-<Assembly: AssemblyCopyright("Copyright ©  2018-2025")>
+<Assembly: AssemblyCopyright("Copyright ©  2018-2026")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(false)>
 
@@ -59,5 +59,5 @@ Imports System.Windows
 ' usando l'asterisco '*' come illustrato di seguito:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.7.9.1")>
-<Assembly: AssemblyFileVersion("2.7.9.1")>
+<Assembly: AssemblyVersion("3.1.1.1")>
+<Assembly: AssemblyFileVersion("3.1.1.1")>
diff --git a/SearchLicencePage/SearchLicencePageV.xaml b/SearchLicencePage/SearchLicencePageV.xaml
index 90136ba..c95726b 100644
--- a/SearchLicencePage/SearchLicencePageV.xaml
+++ b/SearchLicencePage/SearchLicencePageV.xaml
@@ -247,26 +247,26 @@
 
             <DataGridTextColumn Header="ProductName"
                                 Binding="{Binding ProductName, Mode=OneWay}"
-                                Width="0.7*"/>
+                                Width="0.4*"/>
             <DataGridTextColumn Header="ProductVersion"
                                 Binding="{Binding ProductVersion, Mode=OneWay}"
                                 Width="SizeToHeader"/>
             <DataGridTextColumn Header="ProductLevel"
                                 Binding="{Binding ProductLevel, Mode=OneWay}"
                                 Width="SizeToHeader"/>
-            <DataGridTextColumn Header="Option 1"
+            <DataGridTextColumn Header="Option 1 "
                                 Binding="{Binding Option1, Mode=OneWay}"
                                 Width="SizeToHeader"/>
-            <DataGridTextColumn Header="Option 2"
+            <DataGridTextColumn Header="Option 2 "
                                 Binding="{Binding Option2, Mode=OneWay}"
                                 Width="SizeToHeader"/>
             <DataGridTextColumn Header="LockID"
                                 Binding="{Binding Number, Mode=OneWay}"
-                                Width="1*"/>
+                                Width="0.8*"/>
             <DataGridTextColumn Header="File"
                                 Binding="{Binding File, Mode=OneWay}"
                                 Width="2*"/>
-            <DataGridTextColumn Header="License Date"
+            <DataGridTextColumn Header="License Date  "
                                 Binding="{Binding LicenseDate, Mode=OneWay, StringFormat=\{0:dd/MM/yyyy\}}"
                                 Width="SizeToHeader"/>
             <!--<DataGridTextColumn Header="License File Content"
@@ -277,7 +277,7 @@
                                 Width="SizeToHeader"/>
             <DataGridTextColumn Header="Note"
                                 Binding="{Binding Note, Mode=OneWay}"
-                                Width="2*"/>
+                                Width="2.6*"/>
          </DataGrid.Columns>
       </DataGrid>