diff --git a/src/WHMapper.Tests/Models/Graph/GraphModelsTest.cs b/src/WHMapper.Tests/Models/Graph/GraphModelsTest.cs
index 83ba2541..e1df2e1e 100644
--- a/src/WHMapper.Tests/Models/Graph/GraphModelsTest.cs
+++ b/src/WHMapper.Tests/Models/Graph/GraphModelsTest.cs
@@ -109,7 +109,7 @@ public void Eve_System_Link_Model()
         {
             var node = new EveSystemNodeModel(new WHSystem(DEFAULT_MAP_ID,SOLAR_SYSTEM_JITA_ID, SOLAR_SYSTEM_JITA_NAME, SOLAR_SYSTEM_JITA_SECURITY), null, REGION_JITA_NAME, CONSTELLATION_JITA_NAME);
                 Assert.Equal(WHSystemStatus.Unknown,node.SystemStatus);
-            var node2 = new EveSystemNodeModel(new WHSystem(DEFAULT_MAP_ID, SOLAR_SYSTEM_WH_ID, SOLAR_SYSTEM_WH_NAME, -1.0F), null, REGION_WH_NAME, CONSTELLATION_WH_NAME,SOLAR_SYSTEM_WH_CLASS, SOLAR_SYSTEM_WH_EFFECT,null, new List<WHStatic>() { new WHStatic(SOLAR_SYSTEM_WH_STATICS,EveSystemType.C3) }) ;
+            var node2 = new EveSystemNodeModel(new WHSystem(DEFAULT_MAP_ID, SOLAR_SYSTEM_WH_ID, SOLAR_SYSTEM_WH_NAME, -1.0F), null, REGION_WH_NAME, CONSTELLATION_WH_NAME,SOLAR_SYSTEM_WH_CLASS, SOLAR_SYSTEM_WH_EFFECT,null, new List<WormholeType>() { new WormholeType(SOLAR_SYSTEM_WH_STATICS,EveSystemType.C3) }) ;
    
 
             var link = new EveSystemLinkModel(new WHSystemLink(1, 2), node, node2);
diff --git a/src/WHMapper.Tests/Services/EveOnlineAPI/PublicEveOnlineAPITest.cs b/src/WHMapper.Tests/Services/EveOnlineAPI/PublicEveOnlineAPITest.cs
index acdd9f74..aa81c89e 100644
--- a/src/WHMapper.Tests/Services/EveOnlineAPI/PublicEveOnlineAPITest.cs
+++ b/src/WHMapper.Tests/Services/EveOnlineAPI/PublicEveOnlineAPITest.cs
@@ -278,9 +278,9 @@ public async Task Get_Route()
         var route = await _routeServices.GetRoute(SOLAR_SYSTEM_JITA_ID, SOLAR_SYSTEM_AMARR_ID);
         Assert.NotNull(route);
         Assert.NotEmpty(route);
-        Assert.Equal(24, route.Length);
+        Assert.Equal(12, route.Length);
         Assert.Equal(SOLAR_SYSTEM_JITA_ID, route[0]);
-        Assert.Equal(SOLAR_SYSTEM_AMARR_ID, route[23]);
+        Assert.Equal(SOLAR_SYSTEM_AMARR_ID, route[11]);
 
         //WH route to Jita without connections
         route = await _routeServices.GetRoute(SOLAR_SYSTEM_WH_ID, SOLAR_SYSTEM_JITA_ID);
@@ -292,10 +292,10 @@ public async Task Get_Route()
         route = await _routeServices.GetRoute(SOLAR_SYSTEM_WH_ID, SOLAR_SYSTEM_JITA_ID, connections);
         Assert.NotNull(route);
         Assert.NotEmpty(route);
-        Assert.Equal(25, route.Length);
+        Assert.Equal(13, route.Length);
         Assert.Equal(SOLAR_SYSTEM_WH_ID, route[0]);
         Assert.Equal(SOLAR_SYSTEM_AMARR_ID, route[1]);
-        Assert.Equal(SOLAR_SYSTEM_JITA_ID, route[24]);
+        Assert.Equal(SOLAR_SYSTEM_JITA_ID, route[12]);
 
         //wh route from jita to amarr with avoid Ahbazon
         var avoid = new int[] { SOLAR_SYSTEM_AHBAZON_ID };
diff --git a/src/WHMapper.Tests/WHHelper/EveWHMapperEntityTest.cs b/src/WHMapper.Tests/WHHelper/EveWHMapperEntityTest.cs
index 11a97ba5..be54bc41 100644
--- a/src/WHMapper.Tests/WHHelper/EveWHMapperEntityTest.cs
+++ b/src/WHMapper.Tests/WHHelper/EveWHMapperEntityTest.cs
@@ -53,8 +53,8 @@ public class EveWHMapperEntityTest
     private const int WH_TYPE_ID1 = 30583;
     private const int WH_TYPE_ID2 = 30584;
 
-    private readonly IEveMapperService _eveMapperService;
-    private readonly IEveMapperCacheService _eveMapperCacheService;
+    private readonly IEveMapperService _eveMapperService  = null!;
+    private readonly IEveMapperCacheService _eveMapperCacheService = null!;
 
     public EveWHMapperEntityTest()
     {
diff --git a/src/WHMapper.Tests/WHHelper/WHColorHelperTest.cs b/src/WHMapper.Tests/WHHelper/WHColorHelperTest.cs
index cd098937..7cd84ab4 100644
--- a/src/WHMapper.Tests/WHHelper/WHColorHelperTest.cs
+++ b/src/WHMapper.Tests/WHHelper/WHColorHelperTest.cs
@@ -84,6 +84,11 @@ public class WHColorHelperTest
     private const string NODE_STATUS_HOSTILE_COLOR = "#be0000";
     private const string NODE_STATUS_UNKNOWN_COLOR = IWHColorHelper.DEFAULT_COLOR;
 
+
+    private const string WH_SIGNATURE_ADD_COLOR = "#5cb85c";
+    private const string WH_SIGNATURE_UPDATE_COLOR = IWHColorHelper.DEFAULT_COLOR;
+    private const string WH_SIGNATURE_DELETE_COLOR = "#a52521";
+
     private IWHColorHelper _whHelper;
 
     public WHColorHelperTest()
@@ -174,6 +179,15 @@ public void Get_Node_Status_Color()
         Assert.Equal(NODE_STATUS_UNKNOWN_COLOR, _whHelper.GetNodeStatusColor(WHSystemStatus.Unknown));
         Assert.Equal(IWHColorHelper.DEFAULT_COLOR, _whHelper.GetNodeStatusColor((WHSystemStatus)28));
     }
+
+    [Fact]
+    public void Get_Analyzed_Signature_Color()
+    {
+        Assert.Equal(WH_SIGNATURE_ADD_COLOR, _whHelper.GetWHAnalyzedSignatureColor(WHAnalizedSignatureEnums.toAdd));
+        Assert.Equal(WH_SIGNATURE_DELETE_COLOR, _whHelper.GetWHAnalyzedSignatureColor(WHAnalizedSignatureEnums.toDelete));
+        Assert.Equal(WH_SIGNATURE_UPDATE_COLOR, _whHelper.GetWHAnalyzedSignatureColor(WHAnalizedSignatureEnums.toUpdate));
+        Assert.Equal(IWHColorHelper.DEFAULT_COLOR, _whHelper.GetWHAnalyzedSignatureColor((WHAnalizedSignatureEnums)28));
+    }
 }
 
 
diff --git a/src/WHMapper.Tests/WHHelper/WHSignatureHelperTest.cs b/src/WHMapper.Tests/WHHelper/WHSignatureHelperTest.cs
index ab99ff60..115b7278 100644
--- a/src/WHMapper.Tests/WHHelper/WHSignatureHelperTest.cs
+++ b/src/WHMapper.Tests/WHHelper/WHSignatureHelperTest.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.ObjectModel;
+using WHMapper.Models.Db;
 using WHMapper.Models.Db.Enums;
+using WHMapper.Models.DTO.EveMapper.Enums;
 using WHMapper.Services.WHColor;
 using WHMapper.Services.WHSignature;
 using WHMapper.Services.WHSignatures;
@@ -66,6 +68,61 @@ public async Task Parse_Scan_Result_Test()
         Assert.Equal(UNSTABLE_WORMHOLE, lastSig.Type);
     }
 
+    [Fact]
+    public async Task Import_Scan_Result_Test()
+    {
+        var ex = await Assert.ThrowsAsync<Exception>(() =>  _whHelper.ImportScanResult(SCAN_USER, WH_ID, string.Empty, false));
+        Assert.Equal("Bad signatures format", ex.Message);
+
+        /*
+        bool valideScan = await _whHelper.ImportScanResult(SCAN_USER, WH_ID, DSCAN, false);
+        Assert.True(valideScan);
+
+        bool invalidateScan = await _whHelper.ImportScanResult(SCAN_USER, WH_ID, SCAN_USER, false);
+        Assert.False(invalidateScan);
+
+        bool valideScan2 = await _whHelper.ImportScanResult(SCAN_USER, WH_ID, DSCAN, true);
+        Assert.True(valideScan2);*/
+    }
+
+    [Fact]
+    public async Task Analyzed_Signature_Test()
+    {
+        var currentSystemSigs = new Collection<WHMapper.Models.Db.WHSignature>
+        {
+            new WHSignature(0, FIRST_SIG_NAME,WHSignatureGroup.Unknow,string.Empty,SCAN_USER),
+            new WHSignature(0, LAST_SIG_NAME,WHSignatureGroup.Wormhole,UNSTABLE_WORMHOLE,SCAN_USER)
+        };
+
+        var parsedSigs = new Collection<WHMapper.Models.Db.WHSignature>
+        {
+            new WHSignature(0, FIRST_SIG_NAME, WHSignatureGroup.Unknow,string.Empty,SCAN_USER),
+            new WHMapper.Models.Db.WHSignature(0, LAST_SIG_NAME, WHSignatureGroup.Wormhole,UNSTABLE_WORMHOLE,SCAN_USER)      
+        };
+
+        var analyzedSigs = await _whHelper.AnalyzedSignatures(parsedSigs, currentSystemSigs, false);
+        Assert.NotNull(analyzedSigs);
+        Assert.NotEmpty(analyzedSigs);
+        Assert.Equal(2, analyzedSigs.Count());
+
+        var firstSig = analyzedSigs.First();
+        Assert.Equal(FIRST_SIG_NAME, firstSig.Name);
+        Assert.Equal(WHAnalizedSignatureEnums.toUpdate, firstSig.Status);
+        Assert.Equal(WHSignatureGroup.Unknow.ToString(), firstSig.Group);
+        Assert.Equal(string.Empty, firstSig.Type);
+
+        parsedSigs.RemoveAt(0);
+        parsedSigs.Add(new WHSignature(0, "NEW_SIG", WHSignatureGroup.Unknow, string.Empty, SCAN_USER));
+
+        analyzedSigs = await _whHelper.AnalyzedSignatures(parsedSigs, currentSystemSigs, true);
+        Assert.NotNull(analyzedSigs);
+        Assert.NotEmpty(analyzedSigs);
+        Assert.Equal(3, analyzedSigs.Count());
+        Assert.Equal(WHAnalizedSignatureEnums.toAdd, analyzedSigs.First().Status);
+        Assert.Equal(WHAnalizedSignatureEnums.toUpdate, analyzedSigs.ElementAt(1).Status);
+        Assert.Equal(WHAnalizedSignatureEnums.toDelete, analyzedSigs.Last().Status);
+    }
+
 }
 
 
diff --git a/src/WHMapper/App.razor b/src/WHMapper/App.razor
index 032f5016..3dc1943c 100644
--- a/src/WHMapper/App.razor
+++ b/src/WHMapper/App.razor
@@ -30,7 +30,6 @@
     {
         TokenProvider.AccessToken = InitialState?.AccessToken;
         TokenProvider.RefreshToken = InitialState?.RefreshToken;
-        TokenProvider.XsrfToken = InitialState?.XsrfToken;
 
         return base.OnInitializedAsync();
     }
diff --git a/src/WHMapper/Models/Custom/Node/EveSystemNodeModel.cs b/src/WHMapper/Models/Custom/Node/EveSystemNodeModel.cs
index 4a14c4e4..1e6f0c1e 100644
--- a/src/WHMapper/Models/Custom/Node/EveSystemNodeModel.cs
+++ b/src/WHMapper/Models/Custom/Node/EveSystemNodeModel.cs
@@ -115,13 +115,13 @@ public WHSystemStatus SystemStatus
         public EveSystemType SystemType { get; private set; } 
         public WHEffect Effect { get; private set; } = WHEffect.None;
         public IList<EveSystemEffect>? EffectDetails { get; private set; } = null!;
-        public IList<WHStatic>? Statics { get; private set; } = null!;
+        public IList<WormholeType>? Statics { get; private set; } = null!;
         public BlockingCollection<string> ConnectedUsers { get; private set; } = new BlockingCollection<string>();
 
         public bool IsRouteWaypoint{get;set;} = false;
 
 
-        public EveSystemNodeModel(WHSystem wh, WHNote? note, string regionName, string constellationName, EveSystemType systemType, WHEffect whEffect, IList<EveSystemEffect>? effectDetails, IList<WHStatic>? whStatics) 
+        public EveSystemNodeModel(WHSystem wh, WHNote? note, string regionName, string constellationName, EveSystemType systemType, WHEffect whEffect, IList<EveSystemEffect>? effectDetails, IList<WormholeType>? whStatics) 
         {
             this._wh = wh;
             if(note != null)
diff --git a/src/WHMapper/Models/DTO/EveMapper/Enums/WHAnalizedSignatureEnums.cs b/src/WHMapper/Models/DTO/EveMapper/Enums/WHAnalizedSignatureEnums.cs
new file mode 100644
index 00000000..2ad2c4f5
--- /dev/null
+++ b/src/WHMapper/Models/DTO/EveMapper/Enums/WHAnalizedSignatureEnums.cs
@@ -0,0 +1,10 @@
+namespace WHMapper.Models.DTO.EveMapper.Enums
+{
+
+    public enum WHAnalizedSignatureEnums
+    {
+        toAdd,
+        toUpdate,
+        toDelete
+    }
+}
\ No newline at end of file
diff --git a/src/WHMapper/Models/DTO/EveMapper/EveEntity/WHEntity.cs b/src/WHMapper/Models/DTO/EveMapper/EveEntity/WHEntity.cs
index 60043f1a..4ace4681 100644
--- a/src/WHMapper/Models/DTO/EveMapper/EveEntity/WHEntity.cs
+++ b/src/WHMapper/Models/DTO/EveMapper/EveEntity/WHEntity.cs
@@ -6,23 +6,47 @@ namespace WHMapper.Models.DTO.EveMapper.EveEntity;
 
 public class WHEntity : AEveEntity
 {    private const int DOGMA_ATTR_TARGET_SYSTEM_CLASS_FOR_WORMHOLES_ID = 1381;
-    //private const int DOGMA_ATTR_DISTRIBUTION_ID_OF_TARGET_WORMHOLE_DISTRIBUTION_ID = 1457;
-    
+     private const int DOGMA_ATTR_WORMHOLE_MAX_STABLE_MASS = 1383;
+     private const int DOGMA_ATTR_WORMHOLE_MAX_JUMP_MASS = 1385;
+     private const int DOGMA_ATTR_WORMHOLE_MAX_STABLE_TIME = 1382; //unit8id 3 value 1440 = 24h???
+
+
     public float SystemTypeValue { get; private set; }
+    public float MassMax {get; private set;}
+    public float JumpMassMax {get; private set;}
+
+    /// <summary>
+    /// Time in minutes
+    /// 24h = 1440
+    /// 18h = 1080
+    /// </summary>
+    public float StableTime {get;private set;}
 
     public WHEntity(int id, WHMapper.Models.DTO.EveAPI.Universe.Type type)
         : base(id, type.Name[9..].Trim(), EveEntityEnums.Wormhole)
     {
         SystemTypeValue = 0;
+        MassMax = 0;
+        JumpMassMax = 0;
+        StableTime = 0;
         if (type.DogmaAttributes != null)
+        {
             SystemTypeValue = type.DogmaAttributes.Where(x => x.AttributeId == DOGMA_ATTR_TARGET_SYSTEM_CLASS_FOR_WORMHOLES_ID).Select(x => x.Value).FirstOrDefault(0);
+            MassMax = type.DogmaAttributes.Where(x => x.AttributeId == DOGMA_ATTR_WORMHOLE_MAX_STABLE_MASS).Select(x => x.Value).FirstOrDefault(0);
+            JumpMassMax = type.DogmaAttributes.Where(x => x.AttributeId == DOGMA_ATTR_WORMHOLE_MAX_JUMP_MASS).Select(x => x.Value).FirstOrDefault(0);
+            StableTime = type.DogmaAttributes.Where(x => x.AttributeId == DOGMA_ATTR_WORMHOLE_MAX_STABLE_TIME).Select(x => x.Value).FirstOrDefault(0);
+        }
     }
 
     [JsonConstructor]
-    public WHEntity(int id, string name,float systemTypeValue)
+    public WHEntity(int id, string name,float systemTypeValue, float massMax, float jumpMassMax, float stableTime)
         : base(id, name, EveEntityEnums.Wormhole)
     {
         SystemTypeValue = systemTypeValue;
+        MassMax = massMax;
+        JumpMassMax = jumpMassMax;
+        StableTime = stableTime;
     }
 
+
 }
diff --git a/src/WHMapper/Models/DTO/EveMapper/WHAnalizedSignature.cs b/src/WHMapper/Models/DTO/EveMapper/WHAnalizedSignature.cs
new file mode 100644
index 00000000..6a58af17
--- /dev/null
+++ b/src/WHMapper/Models/DTO/EveMapper/WHAnalizedSignature.cs
@@ -0,0 +1,23 @@
+using WHMapper.Models.DTO.EveMapper.Enums;
+
+namespace WHMapper.Models.DTO.EveMapper
+{
+
+
+    public class WHAnalizedSignature
+    {
+        private readonly WHMapper.Models.Db.WHSignature _signature;
+        public WHAnalizedSignatureEnums Status { get; private set;}
+
+        public string Name { get { return _signature.Name; } }
+        public string Group { get { return _signature.Group.ToString(); } }
+        public string? Type { get { return _signature.Type; } }
+        
+        public WHAnalizedSignature(WHMapper.Models.Db.WHSignature whsig,WHAnalizedSignatureEnums status)
+        {
+            _signature= whsig;
+            Status = status;
+        }
+    }
+}
+
diff --git a/src/WHMapper/Models/DTO/EveMapper/WHStatic.cs b/src/WHMapper/Models/DTO/EveMapper/WHStatic.cs
deleted file mode 100644
index 91111938..00000000
--- a/src/WHMapper/Models/DTO/EveMapper/WHStatic.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.ComponentModel;
-using WHMapper.Models.DTO.EveMapper.Enums;
-
-namespace WHMapper.Models.DTO.EveMapper
-{
-    public class WHStatic
-    {
-		public string WHName { get; private set; }
-        public EveSystemType EveSystemDestinationType { get; private set; }
-
-        public WHStatic(string whName, EveSystemType destType)
-		{
-            WHName = whName;
-            EveSystemDestinationType = destType;
-		}
-	}
-}
-
-
diff --git a/src/WHMapper/Models/DTO/EveMapper/WormholeType.cs b/src/WHMapper/Models/DTO/EveMapper/WormholeType.cs
index 3546c7e2..137982b3 100644
--- a/src/WHMapper/Models/DTO/EveMapper/WormholeType.cs
+++ b/src/WHMapper/Models/DTO/EveMapper/WormholeType.cs
@@ -1,5 +1,6 @@
 using System;
 using WHMapper.Models.DTO.EveMapper.Enums;
+using WHMapper.Models.DTO.EveMapper.EveEntity;
 
 namespace WHMapper.Models.DTO.EveMapper
 {
@@ -7,15 +8,33 @@ public class WormholeType
 	{
         public string Name { private set; get; }
         public EveSystemType Destination { private set; get; }
-        public EveSystemType[]? Sources { private set; get; }
 
-        public WormholeType(string name, EveSystemType dest, EveSystemType[]? srcs)
+        public float MassMax {get; private set;}
+        public float JumpMassMax {get; private set;}
+
+        /// <summary>
+        /// Time in minutes
+        /// 24h = 1440
+        /// 18h = 1080
+        /// </summary>
+        public float StableTime {get;private set;}
+
+        public WormholeType(string name, EveSystemType dest)
         {
             Name = name;
             Destination = dest;
-            Sources = srcs;
         }
 
+        public WormholeType(WHEntity entity)
+        {
+            Name = entity.Name;
+            Destination = (EveSystemType)entity.SystemTypeValue;
+            MassMax = entity.MassMax;
+            JumpMassMax = entity.JumpMassMax;
+            StableTime = entity.StableTime;
+        }
+
+  
         public override string ToString()
         {
             if (string.IsNullOrEmpty(Destination.ToString()))
diff --git a/src/WHMapper/Models/DTO/InitialApplicationState.cs b/src/WHMapper/Models/DTO/InitialApplicationState.cs
index d7814356..aacb7169 100644
--- a/src/WHMapper/Models/DTO/InitialApplicationState.cs
+++ b/src/WHMapper/Models/DTO/InitialApplicationState.cs
@@ -5,7 +5,6 @@ public class InitialApplicationState
     {
         public string? AccessToken { get; set; }
         public string? RefreshToken { get; set; }
-        public string? XsrfToken { get; set; }
     }
 }
 
diff --git a/src/WHMapper/Models/DTO/TokenProvider.cs b/src/WHMapper/Models/DTO/TokenProvider.cs
index e5a27bf8..79da1919 100644
--- a/src/WHMapper/Models/DTO/TokenProvider.cs
+++ b/src/WHMapper/Models/DTO/TokenProvider.cs
@@ -7,7 +7,6 @@ public class TokenProvider
     {
         public string? AccessToken { get; set; }
         public string? RefreshToken { get; set; }
-        public string? XsrfToken { get; set; }
     }
 }
 
diff --git a/src/WHMapper/Pages/Mapper/Add.cs b/src/WHMapper/Pages/Mapper/Add.cs
index 36c4b718..83e88b10 100644
--- a/src/WHMapper/Pages/Mapper/Add.cs
+++ b/src/WHMapper/Pages/Mapper/Add.cs
@@ -163,7 +163,6 @@ private async Task Submit()
             }
         }
 
-
         private void Cancel()
         {
             MudDialog.Cancel();
diff --git a/src/WHMapper/Pages/Mapper/Add.razor b/src/WHMapper/Pages/Mapper/Add.razor
index 32af71f8..2958159c 100644
--- a/src/WHMapper/Pages/Mapper/Add.razor
+++ b/src/WHMapper/Pages/Mapper/Add.razor
@@ -3,7 +3,7 @@
 <MudDialog>
     <DialogContent>
         <MudForm @bind-IsValid="@_success" @ref="@_form">
-            <MudAutocomplete T="SDESolarSystem" Label="System Name" @bind-Value="_searchResult" SearchFuncWithCancel="@EveMapperSearch.SearchSystem" 
+            <MudAutocomplete T="SDESolarSystem" Label="System Name" @bind-Value="_searchResult" SearchFunc="@EveMapperSearch.SearchSystem"
                 Margin="Margin.Dense" Dense="true"
                 Required="true" ResetValueOnEmptyText="true" CoerceValue="true" CoerceText="true"
                 Validation="@(new Func<string, IEnumerable<string>>(EveMapperSearch.ValidateSearchType))"
diff --git a/src/WHMapper/Pages/Mapper/Administration/Delete.razor b/src/WHMapper/Pages/Mapper/Administration/Delete.razor
index 5b00aa1f..03e217bf 100644
--- a/src/WHMapper/Pages/Mapper/Administration/Delete.razor
+++ b/src/WHMapper/Pages/Mapper/Administration/Delete.razor
@@ -2,12 +2,12 @@
     <DialogContent>
         @if (AccessId > 0)
         {
-            <MudText>@MSG_ACCESS_DELETE</MudText>
+            <MudText Class="pointer-events-none">@MSG_ACCESS_DELETE</MudText>
         }
 
         @if (AdminId > 0)
         {
-            <MudText>@MSG_ADMIN_DELETE</MudText>
+            <MudText Class="pointer-events-none">@MSG_ADMIN_DELETE</MudText>
         }
     </DialogContent>
     <DialogActions>
diff --git a/src/WHMapper/Pages/Mapper/Administration/Overview.cs b/src/WHMapper/Pages/Mapper/Administration/Overview.cs
index 3a00ef52..602c02a8 100644
--- a/src/WHMapper/Pages/Mapper/Administration/Overview.cs
+++ b/src/WHMapper/Pages/Mapper/Administration/Overview.cs
@@ -182,7 +182,7 @@ private async Task DeleteAccess(int id)
             var options = new DialogOptions() { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall };
 
             var dialog = await DialogService.ShowAsync<Delete>("Delete WHMapper Access", parameters, options);
-            DialogResult result = await dialog.Result;
+            DialogResult? result = await dialog.Result;
 
             if (result!=null && !result.Canceled)
                 await Restore();
@@ -197,7 +197,7 @@ private async Task DeleteAdmin(int id)
             var options = new DialogOptions() { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall };
 
             var dialog = await DialogService.ShowAsync<Delete>("Delete WHMapper Admin", parameters, options);
-            DialogResult result = await dialog.Result;
+            DialogResult? result = await dialog.Result;
 
             if (result != null && !result.Canceled)
                 await Restore();
diff --git a/src/WHMapper/Pages/Mapper/Administration/Overview.razor b/src/WHMapper/Pages/Mapper/Administration/Overview.razor
index 9c7245d5..844cc01a 100644
--- a/src/WHMapper/Pages/Mapper/Administration/Overview.razor
+++ b/src/WHMapper/Pages/Mapper/Administration/Overview.razor
@@ -36,38 +36,39 @@
                     </RowTemplate>
                 </MudTable>
 
-                <MudForm @bind-IsValid="@_successAccess" @ref="@_formAccess" class="d-flex align-center justify-end">
-                    <MudAutocomplete T="AEveEntity" Label="search eve character/corporation/alliance name"
-                        @bind-Value="_searchResultAccess" SearchFuncWithCancel="@EveMapperSearch.SearchEveEntities" 
-                        MinCharacters="@IEveMapperSearch.MIN_SEARCH_ENTITY_CHARACTERS"
-                        ShowProgressIndicator="true" Margin="Margin.Dense" Dense="true"
-                        Required="true" ResetValueOnEmptyText="true" CoerceText="true" CoerceValue="true"
-                        Validation="@(new Func<string, IEnumerable<string>>(EveMapperSearch.ValidateSearchType))"
-                        AdornmentIcon="@Icons.Material.Filled.Search" 
-                        AdornmentColor="Color.Primary" 
-                        ToStringFunc="@(x=> x==null ? null : $"{x.Name}")" 
-                        MaxItems="100">
-                        <ItemTemplate Context="item">
-                            <MudText>
-                                @if (item.EntityType == EveEntityEnums.Alliance)
-                                {
-                                    <MudIcon Icon="@Icons.Material.Filled.AccountBalance" Class="mb-n1 mr-3" />
-                                }
-                                else if (item.EntityType == EveEntityEnums.Corporation)
-                                {
-                                    <MudIcon Icon="@Icons.Material.Filled.Grade" Class="mb-n1 mr-3" />
-                                }
-                                else
-                                {
-                                    <MudIcon Icon="@Icons.Material.Filled.Person" Class="mb-n1 mr-3" />
-                                }
-                                @item.Name
-                            </MudText>
-                        </ItemTemplate>
-                    </MudAutocomplete>
-                    <MudIconButton Icon="@Icons.Material.Filled.Add" Variant="Variant.Filled" Color="Color.Info" Size="Size.Small" OnClick="SubmitAccess" />
+                <MudForm @bind-IsValid="@_successAccess" @ref="@_formAccess">
+                    <div class="d-flex align-center justify-space-between">
+                        <MudAutocomplete T="AEveEntity" Label="search eve character/corporation/alliance name"
+                            @bind-Value="_searchResultAccess" SearchFunc="@EveMapperSearch.SearchEveEntities" 
+                            MinCharacters="@IEveMapperSearch.MIN_SEARCH_ENTITY_CHARACTERS"
+                            ShowProgressIndicator="true" Margin="Margin.Dense" Dense="true"
+                            Required="true" ResetValueOnEmptyText="true" CoerceText="true" CoerceValue="true"
+                            Validation="@(new Func<string, IEnumerable<string>>(EveMapperSearch.ValidateSearchType))"
+                            AdornmentIcon="@Icons.Material.Filled.Search" 
+                            AdornmentColor="Color.Primary" 
+                            ToStringFunc="@(x=> x==null ? null : $"{x.Name}")" 
+                            MaxItems="100">
+                            <ItemTemplate Context="item">
+                                <MudText>
+                                    @if (item.EntityType == EveEntityEnums.Alliance)
+                                    {
+                                        <MudIcon Icon="@Icons.Material.Filled.AccountBalance" Class="mb-n1 mr-3" />
+                                    }
+                                    else if (item.EntityType == EveEntityEnums.Corporation)
+                                    {
+                                        <MudIcon Icon="@Icons.Material.Filled.Grade" Class="mb-n1 mr-3" />
+                                    }
+                                    else
+                                    {
+                                        <MudIcon Icon="@Icons.Material.Filled.Person" Class="mb-n1 mr-3" />
+                                    }
+                                    @item.Name
+                                </MudText>
+                            </ItemTemplate>
+                        </MudAutocomplete>
+                        <MudIconButton Icon="@Icons.Material.Filled.Add" Variant="Variant.Filled" Color="Color.Info" Size="Size.Small" OnClick="SubmitAccess" />
+                    </div>
                 </MudForm>
-
             </MudPaper>
         </MudItem>
         <MudItem xs="6">
@@ -98,23 +99,25 @@
                     </RowTemplate>
                 </MudTable>
 
-                <MudForm @bind-IsValid="@_successAdmin" @ref="@_formAdmin" class="d-flex align-center justify-end">
-                    <MudAutocomplete T="CharactereEntity" Label="Search eve charactere name" 
-                    @bind-Value="_searchResultAdmin" SearchFuncWithCancel="@EveMapperSearch.SearchCharactere" 
-                                    MinCharacters="@IEveMapperSearch.MIN_SEARCH_ENTITY_CHARACTERS"
-                                    ShowProgressIndicator="true" Margin="Margin.Dense" Dense="true"
-                                    Required="true" ResetValueOnEmptyText="true" CoerceValue="true" CoerceText="true"
-                                    Validation="@(new Func<string, IEnumerable<string>>(EveMapperSearch.ValidateSearchType))"
-                                    AdornmentIcon="@Icons.Material.Filled.Search" AdornmentColor="Color.Primary" 
-                                    ToStringFunc="@(x=> x==null?null : $"{x.Name}")" MaxItems="100">
-                        <ItemTemplate Context="item">
-                            <MudText>
-                                <MudIcon Icon="@Icons.Material.Filled.Person" Class="mb-n1 mr-3" />
-                                    @item?.Name
-                            </MudText>
-                        </ItemTemplate>
-                    </MudAutocomplete>
-                    <MudIconButton Icon="@Icons.Material.Filled.Add" Variant="Variant.Filled" Color="Color.Info" Size="Size.Small" OnClick="SubmitAdmin" />
+                <MudForm @bind-IsValid="@_successAdmin" @ref="@_formAdmin">
+                    <div class="d-flex align-center justify-space-between">
+                        <MudAutocomplete T="CharactereEntity" Label="Search eve charactere name" 
+                        @bind-Value="_searchResultAdmin" SearchFunc="@EveMapperSearch.SearchCharactere" 
+                                        MinCharacters="@IEveMapperSearch.MIN_SEARCH_ENTITY_CHARACTERS"
+                                        ShowProgressIndicator="true" Margin="Margin.Dense" Dense="true"
+                                        Required="true" ResetValueOnEmptyText="true" CoerceValue="true" CoerceText="true"
+                                        Validation="@(new Func<string, IEnumerable<string>>(EveMapperSearch.ValidateSearchType))"
+                                        AdornmentIcon="@Icons.Material.Filled.Search" AdornmentColor="Color.Primary" 
+                                        ToStringFunc="@(x=> x==null?null : $"{x.Name}")" MaxItems="100">
+                            <ItemTemplate Context="item">
+                                <MudText>
+                                    <MudIcon Icon="@Icons.Material.Filled.Person" Class="mb-n1 mr-3" />
+                                        @item?.Name
+                                </MudText>
+                            </ItemTemplate>
+                        </MudAutocomplete>
+                        <MudIconButton Icon="@Icons.Material.Filled.Add" Variant="Variant.Filled" Color="Color.Info" Size="Size.Small" OnClick="SubmitAdmin" />
+                    </div>
                 </MudForm>
                 
             </MudPaper>
diff --git a/src/WHMapper/Pages/Mapper/CustomNode/EveSystemNode.razor b/src/WHMapper/Pages/Mapper/CustomNode/EveSystemNode.razor
index d60c63b1..2f24bbdf 100644
--- a/src/WHMapper/Pages/Mapper/CustomNode/EveSystemNode.razor
+++ b/src/WHMapper/Pages/Mapper/CustomNode/EveSystemNode.razor
@@ -69,7 +69,7 @@
             {
                 @foreach (var item in Node.Statics)
                 {
-                    <MudText Class="align-self-stretch mt-1 ml-1" Typo="Typo.body2" Style="@($"color:{WHColorHelper.GetSystemTypeColor(@item.EveSystemDestinationType)};")">@item.EveSystemDestinationType.ToString()</MudText>
+                    <MudText Class="align-self-stretch mt-1 ml-1" Typo="Typo.body2" Style="@($"color:{WHColorHelper.GetSystemTypeColor(@item.Destination)};")">@item.Destination.ToString()</MudText>
                 }
             }
         </div>
diff --git a/src/WHMapper/Pages/Mapper/LinkInfos/Overview.razor b/src/WHMapper/Pages/Mapper/LinkInfos/Overview.razor
index a4319bb6..c7070cc3 100644
--- a/src/WHMapper/Pages/Mapper/LinkInfos/Overview.razor
+++ b/src/WHMapper/Pages/Mapper/LinkInfos/Overview.razor
@@ -1,50 +1,51 @@
 @using WHMapper.Models.Db.Enums
 @using WHMapper.Services.WHColor
-<MudPaper Outlined="true" hidden="@(_showing==false)" class="d-flex flex-row justify-space-between">
-        <MudStack class="pa-2" Spacing="1" Justify="Justify.FlexStart">
+
+    <MudPaper Outlined="true" hidden="@(_showing==false)" class="d-flex flex-row justify-space-between">
+        <MudStack Class="pa-2" Spacing="1" Justify="Justify.FlexStart">
             <MudStack Row=true Justify="Justify.SpaceBetween">
-                <MudText Typo="Typo.body2" Style="font-weight:bold;">Size:</MudText>
-                <MudText Typo="Typo.body2">@(CurrentSystemLink?.Size)</MudText>
+                <MudText Class="pointer-events-none" Typo="Typo.body2" Style="font-weight:bold;">Size:</MudText>
+                <MudText Class="pointer-events-none" Typo="Typo.body2">@(CurrentSystemLink?.Size)</MudText>
             </MudStack>
 
             <MudStack Row=true Justify="Justify.SpaceBetween">
-                <MudText Typo="Typo.body2" Style="font-weight:bold;">Status:</MudText>
+                <MudText Class="pointer-events-none" Typo="Typo.body2" Style="font-weight:bold;">Status:</MudText>
                 @if(CurrentSystemLink?.MassStatus==SystemLinkMassStatus.Normal)
                 {
-                    <MudText Typo="Typo.body2" Style="font-weight:bold;" Color="Color.Success">@CurrentSystemLink?.MassStatus</MudText>
+                    <MudText Class="pointer-events-none" Typo="Typo.body2" Style="font-weight:bold;" Color="Color.Success">@CurrentSystemLink?.MassStatus</MudText>
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Style="@($"font-weight:bold;color:{((CurrentSystemLink==null) ? IWHColorHelper.DEFAULT_COLOR : WHColorHelper?.GetLinkStatusColor(CurrentSystemLink.MassStatus))};")">@CurrentSystemLink?.MassStatus</MudText>
+                    <MudText Class="pointer-events-none" Typo="Typo.body2" Style="@($"font-weight:bold;color:{((CurrentSystemLink==null) ? IWHColorHelper.DEFAULT_COLOR : WHColorHelper?.GetLinkStatusColor(CurrentSystemLink.MassStatus))};")">@CurrentSystemLink?.MassStatus</MudText>
                 }
                 @if(CurrentSystemLink?.IsEoL==true)
                 {
-                    <MudText Typo="Typo.body2" tyle="@($"font-weight:bold;color:{WHColorHelper?.GetLinkEOLColor()}")" Color="Color.Error">End Of Life</MudText>
+                    <MudText Class="pointer-events-none" Typo="Typo.body2" Style="@($"font-weight:bold;color:{WHColorHelper?.GetLinkEOLColor()}")" Color="Color.Error">End Of Life</MudText>
                 }  
             </MudStack> 
                            
                                 
             <MudDivider DividerType="DividerType.Middle" Class="my-2"/>
             <MudStack Justify="Justify.SpaceBetween">
-                <MudText Typo="Typo.body2" Style="font-weight:bold;">First Jump:</MudText>
+                <MudText Class="pointer-events-none" Typo="Typo.body2" Style="font-weight:bold;">First Jump:</MudText>
                 <MudStack Row=true Justify="Justify.SpaceBetween">
                     <MudStack Row=true Justify="Justify.SpaceBetween">
                         <MudIcon Icon="@Icons.Material.Filled.CalendarToday" Size="Size.Small"/>
-                        <MudText Typo="Typo.body2">@(FirstJumpLogDate?.ToString("dd/MM/yyyy"))</MudText>
+                        <MudText Class="pointer-events-none" Typo="Typo.body2">@(FirstJumpLogDate?.ToString("dd/MM/yyyy"))</MudText>
                     </MudStack>
                     <MudStack Row=true Justify="Justify.SpaceBetween">
                         <MudIcon Icon="@Icons.Material.Filled.AccessTime" Size="Size.Small"/>
-                        <MudText Typo="Typo.body2">@(FirstJumpLogDate?.ToString("HH:mm:ss"))</MudText>
+                        <MudText Class="pointer-events-none" Typo="Typo.body2">@(FirstJumpLogDate?.ToString("HH:mm:ss"))</MudText>
                     </MudStack>
                 </MudStack>
                 <MudStack Row=true Justify="Justify.SpaceBetween">
                     <MudStack Row=true Justify="Justify.SpaceBetween">
                         <MudIcon Icon="@Icons.Material.Filled.Person" Size="Size.Small"/>
-                        <MudText Typo="Typo.body2">@(FirstJumpLogCharacterName)</MudText>
+                        <MudText Class="pointer-events-none" Typo="Typo.body2">@(FirstJumpLogCharacterName)</MudText>
                     </MudStack>
                     <MudStack Row=true Justify="Justify.SpaceBetween">
                         <MudIcon Icon="@Icons.Material.Filled.Rocket" Size="Size.Small"/>
-                        <MudText Typo="Typo.body2">@(FirstJumpLogShipName)</MudText>
+                        <MudText Class="pointer-events-none" Typo="Typo.body2">@(FirstJumpLogShipName)</MudText>
                     </MudStack>
                 </MudStack>
             </MudStack>
@@ -54,21 +55,21 @@
                 <MudStack Row=true Justify="Justify.SpaceBetween">
                     <MudStack Row=true Justify="Justify.SpaceBetween">
                         <MudIcon Icon="@Icons.Material.Filled.CalendarToday" Size="Size.Small"/>
-                        <MudText Typo="Typo.body2">@(LastJumpLogDate?.ToString("dd/MM/yyyy"))</MudText>
+                        <MudText Class="pointer-events-none" Typo="Typo.body2">@(LastJumpLogDate?.ToString("dd/MM/yyyy"))</MudText>
                     </MudStack>
                     <MudStack Row=true Justify="Justify.SpaceBetween">
                         <MudIcon Icon="@Icons.Material.Filled.AccessTime" Size="Size.Small"/>
-                        <MudText Typo="Typo.body2">@(LastJumpLogDate?.ToString("HH:mm:ss"))</MudText>
+                        <MudText  Class="pointer-events-none"Typo="Typo.body2">@(LastJumpLogDate?.ToString("HH:mm:ss"))</MudText>
                     </MudStack>
                 </MudStack>
                 <MudStack Row=true Justify="Justify.SpaceBetween">
                     <MudStack Row=true Justify="Justify.SpaceBetween">
                         <MudIcon Icon="@Icons.Material.Filled.Person" Size="Size.Small"/>
-                        <MudText Typo="Typo.body2">@(LastJumpLogCharacterName)</MudText>
+                        <MudText Class="pointer-events-none" Typo="Typo.body2">@(LastJumpLogCharacterName)</MudText>
                     </MudStack>
                     <MudStack Row=true Justify="Justify.SpaceBetween">
                         <MudIcon Icon="@Icons.Material.Filled.Rocket" Size="Size.Small"/>
-                        <MudText Typo="Typo.body2">@(LastJumpLogShipName)</MudText>
+                        <MudText Class="pointer-events-none" Typo="Typo.body2">@(LastJumpLogShipName)</MudText>
                     </MudStack>
                 </MudStack>
             </MudStack>
diff --git a/src/WHMapper/Pages/Mapper/Overview.cs b/src/WHMapper/Pages/Mapper/Overview.cs
index 5aaee350..709838fd 100644
--- a/src/WHMapper/Pages/Mapper/Overview.cs
+++ b/src/WHMapper/Pages/Mapper/Overview.cs
@@ -161,17 +161,15 @@ private async Task Init()
             {
                 if (await InitNotificationHub())
                 {
-                    TrackerServices.SystemChanged+=OnSystemChanged;
-                    TrackerServices.ShipChanged+=OnShipChanged;
+                    InitTrackerServices();
                     await TrackerServices.StartTracking();
-
-                    PasteServices.Pasted+=OnPasted;
+                    InitPasteServices();
                 }
 
+                InitBlazorDiagramEvents();
+
                 _loading = false;
-                await InvokeAsync(() => {
-                    StateHasChanged();
-                });
+                await InvokeAsync(StateHasChanged);
             }
             else
             {
@@ -179,6 +177,24 @@ await InvokeAsync(() => {
             }
         }
 
+        private void InitTrackerServices()
+        {
+            TrackerServices.SystemChanged += OnSystemChanged;
+            TrackerServices.ShipChanged += OnShipChanged;
+        }
+
+        private void InitPasteServices()
+        {
+            PasteServices.Pasted += OnPasted;
+        }
+
+        private void InitBlazorDiagramEvents()
+        {
+            _blazorDiagram.SelectionChanged += async (item) => await OnDiagramSelectionChanged(item);
+            _blazorDiagram.KeyDown += async (kbevent) => await OnDiagramKeyDown(kbevent);
+            _blazorDiagram.PointerUp += async (item, pointerEvent) => await OnDiagramPointerUp(item, pointerEvent);
+        }
+
         #region Hub methodes
         private async Task<bool> InitNotificationHub()
         {
@@ -336,7 +352,7 @@ await Parallel.ForEachAsync(usersPosition, async (item, cancellationToken) =>
                                     EveSystemNodeModel? newSystemNodeFrom = (EveSystemNodeModel?)(_blazorDiagram?.Nodes?.FirstOrDefault(x => (x as EveSystemNodeModel)!.IdWH == link.IdWHSystemFrom));
                                     EveSystemNodeModel? newSystemNodeTo = (EveSystemNodeModel?)(_blazorDiagram?.Nodes?.FirstOrDefault(x => (x as EveSystemNodeModel)!.IdWH == link.IdWHSystemTo));
                                     if(newSystemNodeTo!=null && newSystemNodeFrom!=null)
-                                        _blazorDiagram.Links?.Add(new EveSystemLinkModel(link, newSystemNodeFrom, newSystemNodeTo));
+                                        _blazorDiagram?.Links?.Add(new EveSystemLinkModel(link, newSystemNodeFrom, newSystemNodeTo));
                                     else
                                     {
                                         Logger.LogWarning("On NotifyLinkAdded, unable to find system to add link");
@@ -512,7 +528,7 @@ await Parallel.ForEachAsync(usersPosition, async (item, cancellationToken) =>
                             if (_blazorDiagram!=null && _selectedWHMap != null && wormholeId > 0 && mapId == _selectedWHMap.Id)
                             {
                                 _selectedWHMap = await DbWHMaps.GetById(mapId);
-                                EveSystemNodeModel whChangeSystemStatus = (EveSystemNodeModel?)_blazorDiagram.Nodes.FirstOrDefault(x => ((EveSystemNodeModel)x).IdWH == wormholeId);
+                                EveSystemNodeModel? whChangeSystemStatus = _blazorDiagram?.Nodes?.FirstOrDefault(x => ((EveSystemNodeModel)x).IdWH == wormholeId) as EveSystemNodeModel;
                                 if(whChangeSystemStatus!=null)
                                 {
                                     whChangeSystemStatus.SystemStatus = systemStatus;
@@ -642,13 +658,6 @@ private Task<bool> InitDiagram()
                     _blazorDiagram.UnregisterBehavior<DragMovablesBehavior>();
                     _blazorDiagram.RegisterBehavior(new CustomDragMovablesBehavior(_blazorDiagram));
 
-
-                    _blazorDiagram.SelectionChanged += async (item) => await OnDiagramSelectionChanged(item);
-                    _blazorDiagram.KeyDown += async (kbevent) => await OnDiagramKeyDown(kbevent);
-                    _blazorDiagram.PointerUp += async (item, pointerEvent) => await OnDiagramPointerUp(item, pointerEvent);
-                    //_blazorDiagram.PointerEnter += async (item, pointerEvent) => await OnDiagramPointerEnter(item, pointerEvent);
-                    //_blazorDiagram.PointerLeave += async (item, pointerEvent) => await OnDiagramPointerLeave(item, pointerEvent);
-
                     _blazorDiagram.Options.Zoom.Enabled = true;
                     _blazorDiagram.Options.Zoom.Inverse = false;
                     _blazorDiagram.Options.Links.EnableSnapping = false;
@@ -917,7 +926,6 @@ private async Task OnDiagramPointerUp(Blazor.Diagrams.Core.Models.Base.Model? it
         }
         private async Task<bool> Restore()
         {
-            ParallelOptions options = new ParallelOptions { MaxDegreeOfParallelism = 4 };
             try
             {
                 if (DbWHMaps == null)
@@ -927,86 +935,120 @@ private async Task<bool> Restore()
                 }
 
                 Logger.LogInformation("Beginning Restore Mapper");
-                WHMaps = await DbWHMaps.GetAll();
-                if (WHMaps == null || WHMaps.Count() == 0)
-                {
-                    _selectedWHMap = await DbWHMaps.Create(new WHMap("Default Maps"));
-                    if (_selectedWHMap != null)
-                        WHMaps = await DbWHMaps.GetAll();
 
+                if (!await RetrieveMaps())
+                {
+                    return false;
                 }
-                else
+
+                if (_selectedWHMap != null && _selectedWHMap.WHSystems != null && _selectedWHMap.WHSystems.Count > 0)
                 {
-                    _selectedWHMap = WHMaps.FirstOrDefault();
+                    await InitializeSystemNodes();
+                    await InitializeSystemLinks();
                 }
 
-                if (_selectedWHMap != null && _selectedWHMap.WHSystems!=null &&_selectedWHMap.WHSystems.Count > 0)
+                Logger.LogInformation("Restore Mapper Success");
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(ex, "Mapper Restore");
+                return false;
+            }
+        }
+
+        private async Task<bool> RetrieveMaps()
+        {
+            WHMaps = await DbWHMaps.GetAll();
+            if (WHMaps == null || !WHMaps.Any())
+            {
+                _selectedWHMap = await DbWHMaps.Create(new WHMap("Default Maps"));
+                if (_selectedWHMap != null)
                 {
+                    WHMaps = await DbWHMaps.GetAll();
+                }
+            }
+            else
+            {
+                _selectedWHMap = WHMaps.FirstOrDefault();
+            }
 
-                    //await Parallel.ForEachAsync(_selectedWHMap.WHSystems, options, async (dbWHSys, token) =>
-                    //{
-                    foreach(var dbWHSys in _selectedWHMap.WHSystems)
-                    {
-                            EveSystemNodeModel whSysNode = await MapperServices.DefineEveSystemNodeModel(dbWHSys);
-                            whSysNode.OnLocked += OnWHSystemNodeLocked;
-                            whSysNode.OnSystemStatusChanged += OnWHSystemStatusChange;
-                            _blazorDiagram.Nodes.Add(whSysNode);
-                    }
-                    //});
-                    //StateHasChanged();
-                
+            return _selectedWHMap != null;
+        }
 
-                    if (_selectedWHMap.WHSystemLinks!=null && _selectedWHMap.WHSystemLinks.Count > 0)
-                    {
-                        EveSystemNodeModel? srcNode=null!;
-                        EveSystemNodeModel? targetNode=null!;
+        private async Task InitializeSystemNodes()
+        {
+            if (_selectedWHMap != null && _selectedWHMap.WHSystems != null)
+            {
+                foreach (var dbWHSys in _selectedWHMap.WHSystems)
+                {
+                    EveSystemNodeModel whSysNode = await MapperServices.DefineEveSystemNodeModel(dbWHSys);
+                    whSysNode.OnLocked += OnWHSystemNodeLocked;
+                    whSysNode.OnSystemStatusChanged += OnWHSystemStatusChange;
+                    _blazorDiagram.Nodes.Add(whSysNode);
+                }
+            }
+        }
 
-                        //await Parallel.ForEachAsync(_selectedWHMap.WHSystemLinks, options, async (dbWHSysLink, token) =>
-                        foreach(var dbWHSysLink in _selectedWHMap.WHSystemLinks)
-                        {
-                            var whFrom = await DbWHSystems.GetById(dbWHSysLink.IdWHSystemFrom);
-                            var whTo = await DbWHSystems.GetById(dbWHSysLink.IdWHSystemTo);
-                            if (whFrom != null && whTo != null)
-                            {
-                                srcNode= _blazorDiagram.Nodes.FirstOrDefault(x => string.Equals(x.Title, whFrom.Name, StringComparison.OrdinalIgnoreCase)) as EveSystemNodeModel;
-                                targetNode = _blazorDiagram.Nodes.FirstOrDefault(x => string.Equals(x.Title, whTo.Name, StringComparison.OrdinalIgnoreCase)) as EveSystemNodeModel;
+        private async Task InitializeSystemLinks()
+        {
+            if (_selectedWHMap?.WHSystemLinks == null || _selectedWHMap.WHSystemLinks.Count == 0)
+            {
+                return;
+            }
 
-                                if(srcNode!=null && targetNode!=null)
-                                    _blazorDiagram.Links.Add(new EveSystemLinkModel(dbWHSysLink, srcNode, targetNode));
-                                else
-                                {
-                                    Logger.LogWarning("Bad Link, srcNode or Targetnode is null, Auto remove");
-                                    if(await DbWHSystemLinks.DeleteById(dbWHSysLink.Id))
-                                    {
-                                        _selectedWHMap.WHSystemLinks.Remove(dbWHSysLink);
-                                    }
+            foreach (var dbWHSysLink in _selectedWHMap.WHSystemLinks)
+            {
+                var whFrom = await DbWHSystems.GetById(dbWHSysLink.IdWHSystemFrom);
+                var whTo = await DbWHSystems.GetById(dbWHSysLink.IdWHSystemTo);
 
-                                }
-                            }
-                            else
-                            {
-                                Logger.LogWarning("Bad Link,Auto remove");
-                                if(await DbWHSystemLinks.DeleteById(dbWHSysLink.Id))
-                                {
-                                    _selectedWHMap.WHSystemLinks.Remove(dbWHSysLink);
-                                }
-                            }
-                        }
-                        //});
-                        await InvokeAsync(() => {
-                            StateHasChanged();
-                        });
-                    }
+                if (whFrom != null && whTo != null)
+                {
+                    await AddLinkToDiagram(dbWHSysLink, whFrom, whTo);
+                }
+                else
+                {
+                    await RemoveInvalidLink(dbWHSysLink);
                 }
-                Logger.LogInformation("Restore Mapper Success");
-                
-                return true;
-                
             }
-            catch(Exception ex)
+
+            await InvokeAsync(StateHasChanged);
+        }
+
+        private async Task AddLinkToDiagram(WHSystemLink dbWHSysLink, WHSystem whFrom, WHSystem whTo)
+        {
+            var srcNode = GetNodeByTitle(whFrom.Name);
+            var targetNode = GetNodeByTitle(whTo.Name);
+
+            if (srcNode != null && targetNode != null)
             {
-                Logger.LogError(ex, "Mapper Restore");
-                return false;
+                _blazorDiagram.Links.Add(new EveSystemLinkModel(dbWHSysLink, srcNode, targetNode));
+            }
+            else
+            {
+                Logger.LogWarning("Bad Link, srcNode or Targetnode is null, Auto remove");
+                await RemoveInvalidLink(dbWHSysLink);
+            }
+        }
+
+        private EveSystemNodeModel? GetNodeByTitle(string title)
+        {
+            if (_blazorDiagram == null || _blazorDiagram.Nodes == null || _blazorDiagram.Nodes.Count == 0)
+            {
+                Logger.LogWarning("GetNodeByTitle, no node in diagram");
+                return null;
+            }
+            return _blazorDiagram.Nodes
+                .FirstOrDefault(x => string.Equals(x.Title, title, StringComparison.OrdinalIgnoreCase)) as EveSystemNodeModel
+                ?? null;
+        }
+
+        private async Task RemoveInvalidLink(WHSystemLink dbWHSysLink)
+        {
+            if (_selectedWHMap != null && await DbWHSystemLinks.DeleteById(dbWHSysLink.Id))
+            {
+                Logger.LogWarning("Bad Link, Auto remove");
+                _selectedWHMap.WHSystemLinks.Remove(dbWHSysLink);
             }
         }
         private async Task<bool> DeletedNodeOnMap(WHMap map, EveSystemNodeModel node)
@@ -1741,7 +1783,7 @@ private async Task<bool> OpenSearchAndAddDialog(ItemClickEventArgs e)
         {
             DialogOptions disableBackdropClick = new DialogOptions()
             {
-                DisableBackdropClick = true,
+                BackdropClick=false,
                 Position = DialogPosition.Center,
                 MaxWidth = MaxWidth.Medium,
                 FullWidth = true
@@ -1753,9 +1795,9 @@ private async Task<bool> OpenSearchAndAddDialog(ItemClickEventArgs e)
             parameters.Add("MouseY", e.MouseEvent.ClientY);
 
             var dialog = await DialogService.ShowAsync<Add>("Search and Add System Dialog", parameters, disableBackdropClick);
-            DialogResult result = await dialog.Result;
+            DialogResult? result = await dialog.Result;
 
-            if (!result.Canceled && result.Data != null)
+            if (result != null && !result.Canceled && result.Data != null)
             {
                 int whAddedId = (int)result.Data;
                 if (_selectedWHMap!=null && whAddedId > 0)
diff --git a/src/WHMapper/Pages/Mapper/Overview.razor b/src/WHMapper/Pages/Mapper/Overview.razor
index e4afac26..407d18ae 100644
--- a/src/WHMapper/Pages/Mapper/Overview.razor
+++ b/src/WHMapper/Pages/Mapper/Overview.razor
@@ -74,19 +74,22 @@
                 {
                     <MudTabs Elevation="4" ApplyEffectsToContainer="true" @bind-ActivePanelIndex="_selectedWHMapIndex" Rounded="true" Border="true" style="height: inherit; width: inherit;" Class="pa-5">
                         <ChildContent>
-                            @foreach (var item in WHMaps)
+                            @if(WHMaps!=null)
                             {
-                                <div style="width: inherit; height: inherit" Class="Rounded">
-                                    <MudTabPanel Text="@item.Name" Tag="@item.Id">
-                                        <CascadingValue Value="_blazorDiagram" IsFixed="true">
-                                            <DiagramCanvas>
-                                                <Widgets>
-                                                    <SelectionBoxWidget />
-                                                </Widgets>
-                                            </DiagramCanvas>
-                                        </CascadingValue>
-                                    </MudTabPanel>
-                                </div>
+                                foreach (var item in WHMaps)
+                                {
+                                    <div style="width: inherit; height: inherit" Class="Rounded">
+                                        <MudTabPanel Text="@item.Name" Tag="@item.Id">
+                                            <CascadingValue Value="_blazorDiagram" IsFixed="true">
+                                                <DiagramCanvas>
+                                                    <Widgets>
+                                                        <SelectionBoxWidget />
+                                                    </Widgets>
+                                                </DiagramCanvas>
+                                            </CascadingValue>
+                                        </MudTabPanel>
+                                    </div>
+                                }
                             }
                         </ChildContent>
                         <Header Context="tabs_context">
diff --git a/src/WHMapper/Pages/Mapper/RoutePlanner/Add.razor b/src/WHMapper/Pages/Mapper/RoutePlanner/Add.razor
index 21f1c3d7..b659d92b 100644
--- a/src/WHMapper/Pages/Mapper/RoutePlanner/Add.razor
+++ b/src/WHMapper/Pages/Mapper/RoutePlanner/Add.razor
@@ -3,7 +3,7 @@
     <DialogContent>
 
         <MudForm @bind-IsValid="@_formSuccessValidation" @ref="@_formRoutePlanner">
-            <MudAutocomplete T="SDESolarSystem" Label="System Name" @bind-Value="_searchResult" SearchFuncWithCancel="@EveMapperSearch.SearchSystem" 
+            <MudAutocomplete T="SDESolarSystem" Label="System Name" @bind-Value="_searchResult" SearchFunc="@EveMapperSearch.SearchSystem" 
                 Margin="Margin.Dense" Dense="true"
                 Required="true" ResetValueOnEmptyText="true" CoerceValue="true" CoerceText="true"
                 Validation="@(new Func<string, IEnumerable<string>>(EveMapperSearch.ValidateSearchType))"
diff --git a/src/WHMapper/Pages/Mapper/RoutePlanner/Delete.razor b/src/WHMapper/Pages/Mapper/RoutePlanner/Delete.razor
index 3fde26ca..798e93e3 100644
--- a/src/WHMapper/Pages/Mapper/RoutePlanner/Delete.razor
+++ b/src/WHMapper/Pages/Mapper/RoutePlanner/Delete.razor
@@ -2,7 +2,7 @@
     <DialogContent>
         @if (RouteId > 0)
         {
-            <MudText>@MSG_DELETE_ROUTE</MudText>
+            <MudText Class="pointer-events-none">@MSG_DELETE_ROUTE</MudText>
         }
     </DialogContent>
     <DialogActions>
diff --git a/src/WHMapper/Pages/Mapper/RoutePlanner/Overview.cs b/src/WHMapper/Pages/Mapper/RoutePlanner/Overview.cs
index cc7c1637..679a4bb0 100644
--- a/src/WHMapper/Pages/Mapper/RoutePlanner/Overview.cs
+++ b/src/WHMapper/Pages/Mapper/RoutePlanner/Overview.cs
@@ -148,7 +148,7 @@ private async Task AddRoute()
         {
             DialogOptions disableBackdropClick = new DialogOptions()
             {
-                DisableBackdropClick = true,
+                BackdropClick=false,
                 Position = DialogPosition.Center,
                 MaxWidth = MaxWidth.Medium,
                 FullWidth = true
@@ -156,9 +156,9 @@ private async Task AddRoute()
             var parameters = new DialogParameters();
 
             var dialog = await DialogService.ShowAsync<Add>("Add Route", parameters, disableBackdropClick);
-            DialogResult result = await dialog.Result;
+            DialogResult? result = await dialog.Result;
 
-            if (!result.Canceled)
+            if (result != null && !result.Canceled)
             {
                 await Restore();
             }
@@ -170,9 +170,9 @@ private async Task DelRoute(EveRoute route)
             var parameters = new DialogParameters();
             parameters.Add("RouteId", route.Id);
             var dialog = await DialogService.ShowAsync<Delete>("Delete Route", parameters);
-            DialogResult result = await dialog.Result;
+            DialogResult? result = await dialog.Result;
             
-            if (!result.Canceled)
+            if (result != null && !result.Canceled)
             {
                 await ShowRoute(route,false);
                 await Restore();
diff --git a/src/WHMapper/Pages/Mapper/RoutePlanner/Overview.razor b/src/WHMapper/Pages/Mapper/RoutePlanner/Overview.razor
index 7b2a43b0..29ceb007 100644
--- a/src/WHMapper/Pages/Mapper/RoutePlanner/Overview.razor
+++ b/src/WHMapper/Pages/Mapper/RoutePlanner/Overview.razor
@@ -1,8 +1,8 @@
 @using WHMapper.Models.DTO.EveAPI.Route.Enums;
 
 <MudPaper Class="d-flex flex-column pa-2" hidden="@(CurrentSystemNode == null)" Outlined="true" MinWidth="220px" >
-    <MudStack Class="flex-none d-flex" Width="100%" Height="25px" Row="true" Justify="Justify.FlexStart" Spacing="1" >
-        <MudText Typo="Typo.subtitle1">Routes :</MudText>
+    <MudStack Class="flex-none d-flex" Row="true" Justify="Justify.FlexStart" Spacing="1" >
+        <MudText Class="pointer-events-none" Typo="Typo.subtitle1">Routes :</MudText>
         <MudIconButton Icon="@Icons.Material.Filled.Add"  Color="Color.Info" Size="Size.Small" OnClick="@((e) => AddRoute())" Disabled="@(_isEditable || _loading)"/>
         <AuthorizeView Policy="Admin" Context="adminContext">
             <Authorized>
@@ -13,7 +13,7 @@
             </NotAuthorized>
         </AuthorizeView>
     </MudStack>
-    <MudRadioGroup Class="flex-none d-flex" Width="100%" Height="45px" @bind-Value="RType">
+    <MudRadioGroup Class="flex-none d-flex" @bind-Value="RType">
         <MudRadio Class="ma-0" T="RouteType" Value="RouteType.Secure" Color="Color.Success" Size="Size.Small">Safer</MudRadio>
         <MudRadio Class="ma-0" T="RouteType" Value="RouteType.Shortest"  Color="Color.Warning" Size="Size.Small">Shorter</MudRadio>
         <!--<MudRadio Class="ma-0" T="RouteType" Value="RouteType.Insecure"  Color="Color.Error" Size="Size.Small">Riskly</MudRadio>-->
@@ -33,8 +33,8 @@
             {
                 <MudStack Row="true" Justify="Justify.SpaceBetween" Spacing="1">
                     <MudStack Row="true" Spacing="1">
-                        <MudText Typo="Typo.body2">@route.DestinationName</MudText>
-                        <MudChip Class="mt-n1" Color="@(route.IsAvailable==true ? Color.Dark : Color.Error )" Size="Size.Small">@route.RouteLength</MudChip> 
+                        <MudText Class="pointer-events-none" Typo="Typo.body2">@route.DestinationName</MudText>
+                        <MudChip T="int" Class="mt-n1" Color="@(route.IsAvailable==true ? Color.Dark : Color.Error )" Size="Size.Small">@route.RouteLength</MudChip> 
                     </MudStack>
                     <MudIconButton Class="mt-n1" Icon="@(route.IsShowed ? Icons.Material.Filled.GpsOff : @Icons.Material.Filled.GpsFixed)" Color="@(route.IsShowed ? Color.Error : Color.Success)" Size="Size.Small" Disabled="@(route.IsAvailable==false)" OnClick="@((e)=>ToggleShowRoute(route))"/>
                     <AuthorizeView Policy="Admin" Context="adminContext">
@@ -54,7 +54,7 @@
                 <MudStack Row="true" Justify="Justify.SpaceBetween" Spacing="1">
                     <MudStack Row="true" Spacing="1">
                         <MudText Typo="Typo.body2">@route.DestinationName</MudText>
-                        <MudChip Class="mt-n1" Color="@(route.IsAvailable==true ? Color.Dark : Color.Error )" Size="Size.Small">@route.RouteLength</MudChip> 
+                        <MudChip T="int" Class="mt-n1" Color="@(route.IsAvailable==true ? Color.Dark : Color.Error )" Size="Size.Small">@route.RouteLength</MudChip> 
                     </MudStack>
                     <MudIconButton Class="mt-n1" Icon="@(route.IsShowed ? Icons.Material.Filled.GpsOff : @Icons.Material.Filled.GpsFixed)" Color="@(route.IsShowed ? Color.Error : Color.Success)" Size="Size.Small" Disabled="@(route.IsAvailable==false)" OnClick="@((e)=>ToggleShowRoute(route))"/>
                     @if(_isEditable)
diff --git a/src/WHMapper/Pages/Mapper/Signatures/Delete.razor b/src/WHMapper/Pages/Mapper/Signatures/Delete.razor
index 9b2f4f5b..bbe1917c 100644
--- a/src/WHMapper/Pages/Mapper/Signatures/Delete.razor
+++ b/src/WHMapper/Pages/Mapper/Signatures/Delete.razor
@@ -2,11 +2,11 @@
     <DialogContent>
         @if (SignatureId > 0)
         {
-            <MudText>@MSG_DELETE_SIGNATURE</MudText>
+            <MudText Class="pointer-events-none">@MSG_DELETE_SIGNATURE</MudText>
         }
         else
         {
-            <MudText>@MSG_DELETE_SIGNATURES</MudText>
+            <MudText Class="pointer-events-none">@MSG_DELETE_SIGNATURES</MudText>
         }
     </DialogContent>
     <DialogActions>
diff --git a/src/WHMapper/Pages/Mapper/Signatures/Import.cs b/src/WHMapper/Pages/Mapper/Signatures/Import.cs
index fab53fe5..cfe3648f 100644
--- a/src/WHMapper/Pages/Mapper/Signatures/Import.cs
+++ b/src/WHMapper/Pages/Mapper/Signatures/Import.cs
@@ -18,6 +18,11 @@
 using System.Diagnostics.Tracing;
 using System.Reflection.Emit;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components.Rendering;
+using WHMapper.Models.DTO.EveMapper.Enums;
+using WHMapper.Models.DTO.EveMapper;
+using WHMapper.Services.WHColor;
+using Blazor.Diagrams.Core.Events;
 
 namespace WHMapper.Pages.Mapper.Signatures
 {
@@ -34,24 +39,93 @@ public partial class Import : Microsoft.AspNetCore.Components.ComponentBase
         [Inject]
         private IWHSignatureHelper SignatureHelper { get; set; } = null!;
 
+        [Inject]
+        private IWHColorHelper ColorHelper { get; set; } = null!;
+
         [CascadingParameter]
         MudDialogInstance MudDialog { get; set; } = null!;
 
         [Parameter]
         public int CurrentSystemNodeId { get; set; }
 
+        private IEnumerable<WHSignature>? _currentSystemSigs = null!;
+        private string scanUser = String.Empty;
 
         private MudForm _form = null!;
         private bool _success = false;
-        private FluentValueValidator<string> _ccValidator = new FluentValueValidator<string>(x => x
-            .NotEmpty()
-            .NotNull()
-            .Matches(IWHSignatureHelper.SCAN_VALIDATION_REGEX));
+        private bool Success
+        {
+            get => _success;
+            set
+            {
+                _success = value;  
+                if(_success)
+                {
+                    Task.Run(()=>Analyze());  
+                } 
+                else
+                {
+                    AnalyzesSignatures = Enumerable.Empty<WHAnalizedSignature>();
+                } 
+            }
+        }
 
-        private string _scanResult = String.Empty;
-        private bool _lazyDeleted = false;
+        private IEnumerable<WHAnalizedSignature>? AnalyzesSignatures { get; set; } = null!;
+
+
+        private FluentSignatureValueValidator<string> _ccValidator =null!;
+
+
+        private string _scanResult = string.Empty;
         
+        private string ScanResult
+        { 
+            get
+            {
+                return _scanResult;
+            }
+            set
+            {
+                Success = false;
+                _scanResult = value;
+            }
+        }
+        private bool _lazyDeleted = false;
 
+        private bool LazyDeleted 
+        {
+            get => _lazyDeleted;
+            set
+            {
+                _lazyDeleted = value;
+                Task.Run(()=>Analyze());
+            }
+        }
+
+        protected override void OnInitialized()
+        {
+             _ccValidator  = new FluentSignatureValueValidator<string>(x => x
+                .NotEmpty()
+                .NotNull()
+                .MustAsync(async (context, value, cancellationToken) => await SignatureHelper.ValidateScanResult(value))
+            );
+        }
+
+        protected override Task OnParametersSetAsync()
+        {
+            Task.Run(() => Restore());
+            return base.OnParametersSetAsync();
+        }
+
+        private async Task Restore()
+        {
+
+            ScanResult = String.Empty;
+            _lazyDeleted = false;
+            Success = false;
+            _currentSystemSigs = await SignatureHelper.GetCurrentSystemSignatures(CurrentSystemNodeId);
+            scanUser = await UserService.GetUserName();
+        }
 
         private async Task Submit()
         {
@@ -61,9 +135,7 @@ private async Task Submit()
             {
                 try
                 {
-                    String scanUser = await UserService.GetUserName();
-
-                    if (await SignatureHelper.ImportScanResult(scanUser, CurrentSystemNodeId, _scanResult, _lazyDeleted))
+                    if (await SignatureHelper.ImportScanResult(scanUser, CurrentSystemNodeId, ScanResult, _lazyDeleted))
                     {
                         Snackbar.Add("Signatures successfully added/updated", Severity.Success);
                         MudDialog.Close(DialogResult.Ok(true));
@@ -93,6 +165,20 @@ private Task Cancel()
             return Task.CompletedTask;
         }
 
+        private async Task Analyze()
+        {
+            var sigs = await SignatureHelper.ParseScanResult(scanUser, CurrentSystemNodeId, ScanResult);
+            var res = await SignatureHelper.AnalyzedSignatures(sigs, _currentSystemSigs, _lazyDeleted);
+            AnalyzesSignatures = res?.OrderBy(x=>x.Name);
+            await InvokeAsync(() => {
+                StateHasChanged();
+            });
+        }
+
+        private string RowStyleFunc(WHAnalizedSignature item, int index)
+        {
+            return "background-color:"+ColorHelper.GetWHAnalyzedSignatureColor(item.Status);
+        }
     }
 
     /// <summary>
@@ -100,22 +186,22 @@ private Task Cancel()
     /// You can reuse this class for all your fields, like for the credit card rules above.
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    internal class FluentValueValidator<T> : AbstractValidator<T>
+    internal class FluentSignatureValueValidator<T> : AbstractValidator<T>
     {
-        public FluentValueValidator(Action<IRuleBuilderInitial<T, T>> rule)
+        public FluentSignatureValueValidator(Action<IRuleBuilderInitial<T, T>> rule)
         {
             rule(RuleFor(x => x));
         }
 
-        private IEnumerable<string> ValidateValue(T arg)
+        private async Task<IEnumerable<string>> ValidateValue(T arg)
         {
-            var result = Validate(arg);
+            var result = await ValidateAsync(arg);
             if (result.IsValid)
                 return new string[0];
             return result.Errors.Select(e => e.ErrorMessage);
         }
 
-        public Func<T, IEnumerable<string>> Validation => ValidateValue;
+        public Func<T, Task<IEnumerable<string>>> Validation => async item => await ValidateValue(item);
     }
 
 }
diff --git a/src/WHMapper/Pages/Mapper/Signatures/Import.razor b/src/WHMapper/Pages/Mapper/Signatures/Import.razor
index 697050b7..66fc0fb8 100644
--- a/src/WHMapper/Pages/Mapper/Signatures/Import.razor
+++ b/src/WHMapper/Pages/Mapper/Signatures/Import.razor
@@ -1,10 +1,34 @@
 <MudDialog>
     <DialogContent>
-        <MudForm @bind-IsValid="@_success" @ref="@_form">
-            <MudTextField T="string" Variant="Variant.Outlined" @bind-Value="@_scanResult"
-                          Label="Scan Result" Lines="10" Required="true"
-                          RequiredError="Required Scan Result!" Validation="@_ccValidator.Validation" Immediate="true" />
-            <MudCheckBox @bind-Checked="@_lazyDeleted" Label="Lazy Deleted" Color="Color.Secondary"></MudCheckBox>
+        <MudForm @bind-IsValid="Success" @ref="_form">
+            <MudStack Row="true">
+                <MudTextField T="string" Variant="Variant.Outlined" @bind-Value="ScanResult"
+                        Label="Scan Result" Lines="10" Required="true"
+                        RequiredError="Required Scan Result!" Validation="@_ccValidator.Validation" Immediate="true"/>
+            
+                <MudTable Items=@AnalyzesSignatures Outlined="true" Hover="false" Dense="true" Bordered=true Striped=true AllowUnsorted=false FixedHeader="true" ReadOnly="true"
+                    Virtualize="true" Loading="@(AnalyzesSignatures==null)" LoadingProgressColor="Color.Info" Height="230px" HorizontalScrollbar="false"  RowStyleFunc="RowStyleFunc">
+                    <ColGroup>
+                        <col style="width: 105px;"/>
+                        <col style="width: 150px;"/>
+                        <col style="width: 165px;"/>
+                        <col style="width: 170px;"/>
+                        <col />
+                    </ColGroup>
+                    <HeaderContent>
+                        <MudTh> Name</MudTh>
+                        <MudTh> Group</MudTh>
+                        <MudTh> Type</MudTh>
+                    </HeaderContent>
+                    <RowTemplate>
+                        <MudTd DataLabel="Id">@context.Name</MudTd>
+                        <MudTd DataLabel="Group">@context.Group</MudTd>
+                        <MudTd DataLabel="Type" Style="text-align:left">@context.Type</MudTd>
+                    </RowTemplate>
+                </MudTable>
+            </MudStack>
+
+            <MudCheckBox @bind-Value="LazyDeleted" Label="Lazy Deleted" Color="Color.Secondary"></MudCheckBox>
         </MudForm>
 </DialogContent>
     <DialogActions>
diff --git a/src/WHMapper/Pages/Mapper/Signatures/Overview.cs b/src/WHMapper/Pages/Mapper/Signatures/Overview.cs
index aa29216d..174b50f2 100644
--- a/src/WHMapper/Pages/Mapper/Signatures/Overview.cs
+++ b/src/WHMapper/Pages/Mapper/Signatures/Overview.cs
@@ -161,7 +161,7 @@ protected async Task  OpenImportDialog()
         {
             DialogOptions disableBackdropClick = new DialogOptions()
             {
-                DisableBackdropClick = true,
+                BackdropClick=false,
                 Position = DialogPosition.Center,
                 MaxWidth = MaxWidth.Medium,
                 FullWidth = true
@@ -170,9 +170,9 @@ protected async Task  OpenImportDialog()
             parameters.Add("CurrentSystemNodeId", CurrentSystemNodeId);
 
             var dialog = await DialogService.ShowAsync<Import>("Import Scan Dialog", parameters, disableBackdropClick);
-            DialogResult result = await dialog.Result;
+            DialogResult? result = await dialog.Result;
 
-            if (!result.Canceled && CurrentMapId!=null && CurrentSystemNodeId!=null)
+            if (result!=null && !result.Canceled && CurrentMapId.HasValue && CurrentSystemNodeId.HasValue)
             {
                 await NotifyWormholeSignaturesChanged(CurrentMapId.Value, CurrentSystemNodeId.Value);
                 await Restore();
@@ -202,7 +202,6 @@ public async Task Restore()
                 Signatures = new List<WHSignature>();
             }
         }
-
         protected async Task DeleteSignature(int id)
         {
             if(CurrentSystemNodeId!=null)
@@ -214,9 +213,9 @@ protected async Task DeleteSignature(int id)
                 var options = new DialogOptions() { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall };
 
                 var dialog = await DialogService.ShowAsync<Delete>("Delete", parameters, options);
-                DialogResult result = await dialog.Result;
+                DialogResult? result = await dialog.Result;
 
-                if (!result.Canceled && CurrentMapId!=null)
+                if (result != null && !result.Canceled && CurrentMapId!=null)
                 {
                     await NotifyWormholeSignaturesChanged(CurrentMapId.Value, CurrentSystemNodeId.Value);
                     await Restore();
@@ -229,7 +228,6 @@ protected async Task DeleteSignature(int id)
             }
         }
 
-
         protected async Task DeleteAllSignature()
         {
             var parameters = new DialogParameters();
@@ -245,9 +243,9 @@ protected async Task DeleteAllSignature()
             var options = new DialogOptions() { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall };
 
             var dialog = await DialogService.ShowAsync<Delete>("Delete", parameters, options);
-            DialogResult result = await dialog.Result;
+            DialogResult? result = await dialog.Result;
 
-            if (!result.Canceled && CurrentMapId != null && CurrentSystemNodeId != null)
+            if (result!=null && !result.Canceled && CurrentMapId != null && CurrentSystemNodeId != null)
             {
                 await NotifyWormholeSignaturesChanged(CurrentMapId.Value, CurrentSystemNodeId.Value);
                 await Restore();
diff --git a/src/WHMapper/Pages/Mapper/Signatures/Overview.razor b/src/WHMapper/Pages/Mapper/Signatures/Overview.razor
index d5812c66..6b588b3d 100644
--- a/src/WHMapper/Pages/Mapper/Signatures/Overview.razor
+++ b/src/WHMapper/Pages/Mapper/Signatures/Overview.razor
@@ -39,7 +39,30 @@
         @if (@context.Group == Models.Db.Enums.WHSignatureGroup.Wormhole && !String.IsNullOrEmpty(context.Type) && context.Type.Contains(" -> "))
         {
             var splitRes = @context.Type.Split(" -> ");
-            <MudTd DataLabel="Type" Style="@($"color:{WHColorHelper?.GetSystemTypeColor(Enum.Parse<EveSystemType>(splitRes[1]))}; text-align:left")">@context.Type</MudTd>
+            var wh_type = EveMapperHelperServices.WormholeTypes.FirstOrDefault(x => string.Equals(x.Name,splitRes[0],StringComparison.OrdinalIgnoreCase));
+            if(wh_type!=null && wh_type.Name!="K162")
+            {
+                <MudTd DataLabel="Type" Style="@($"color:{WHColorHelper?.GetSystemTypeColor(Enum.Parse<EveSystemType>(splitRes[1]))}; text-align:left")">
+                    <MudTooltip Text="Arrow Right" Arrow="true" Placement="Placement.Bottom">
+                        <ChildContent>
+                            @context.Type
+                        </ChildContent>
+                        <TooltipContent>
+                            <MudPaper Elevation="0">
+                                <MudStack Spacing="0">
+                                        <MudText Class="ml-1 mr-1 pointer-events-none" Typo="Typo.caption">Max Mass : @wh_type.MassMax.ToString("#,##0") kg</MudText>
+                                        <MudText Class="ml-1 mr-1 pointer-events-none" Typo="Typo.caption">Max Jump Mass: @wh_type.JumpMassMax.ToString("#,##0") kg</MudText>
+                                        <MudText Class="ml-1 mr-1 pointer-events-none" Typo="Typo.caption">Max Stable Time: @(wh_type.StableTime/60) h</MudText>
+                                </MudStack>
+                            </MudPaper>
+                        </TooltipContent>
+                    </MudTooltip>
+                </MudTd>
+            }
+            else
+            {
+                 <MudTd DataLabel="Type" Style="@($"color:{WHColorHelper?.GetSystemTypeColor(Enum.Parse<EveSystemType>(splitRes[1]))}; text-align:left")">@context.Type</MudTd>
+            }
         }
         else
         {
diff --git a/src/WHMapper/Pages/Mapper/SystemInfos/Overview.razor b/src/WHMapper/Pages/Mapper/SystemInfos/Overview.razor
index e52995e5..de7e0b1b 100644
--- a/src/WHMapper/Pages/Mapper/SystemInfos/Overview.razor
+++ b/src/WHMapper/Pages/Mapper/SystemInfos/Overview.razor
@@ -1,6 +1,6 @@
 
 <MudPaper Outlined="true" hidden="@(CurrentSystemNode == null)" class="d-flex flex-column justify-space-between">
-    <MudStack class="pa-2" Spacing="1">
+    <MudStack Class="pa-2" Spacing="1">
         <MudStack Row="true" Justify="Justify.SpaceAround">
             <MudLink Href="@_linkToDotlan" Target="_blank">
                 <MudStack Row="true" Spacing=1>
@@ -31,41 +31,43 @@
             }
         </MudStack>
         <MudStack Row="true" Justify="Justify.SpaceBetween">
-            <MudText Typo="Typo.body2">Region:</MudText>
-            <MudText Typo="Typo.body2" Style="font-weight:bold;">@(CurrentSystemNode != null && !String.IsNullOrWhiteSpace(CurrentSystemNode?.RegionName) ? CurrentSystemNode.RegionName : String.Empty)</MudText>
+            <MudText Class="pointer-events-none" Typo="Typo.body2">Region:</MudText>
+            <MudText Class="pointer-events-none" Typo="Typo.body2" Style="font-weight:bold;">@(CurrentSystemNode != null && !String.IsNullOrWhiteSpace(CurrentSystemNode?.RegionName) ? CurrentSystemNode.RegionName : String.Empty)</MudText>
         </MudStack>
         <MudStack Row="true" Justify="Justify.SpaceBetween">
-                <MudText Typo="Typo.body2">Constellation:</MudText>
-                <MudText Typo="Typo.body2" Style="font-weight:bold;">@(CurrentSystemNode != null && !String.IsNullOrWhiteSpace(CurrentSystemNode?.ConstellationName) ? CurrentSystemNode.ConstellationName : String.Empty)</MudText>
+                <MudText Class="pointer-events-none" Typo="Typo.body2">Constellation:</MudText>
+                <MudText Class="pointer-events-none" Typo="Typo.body2" Style="font-weight:bold;">@(CurrentSystemNode != null && !String.IsNullOrWhiteSpace(CurrentSystemNode?.ConstellationName) ? CurrentSystemNode.ConstellationName : String.Empty)</MudText>
         </MudStack>
         <MudStack Row="true" Justify="Justify.SpaceBetween">
-            <MudText Typo="Typo.body2">Name:</MudText>
-            <MudText Typo="Typo.body2" Style="font-weight:bold;">@(CurrentSystemNode != null && !String.IsNullOrWhiteSpace(CurrentSystemNode?.Name) ? CurrentSystemNode.Name : String.Empty)</MudText>
+            <MudText Class="pointer-events-none" Typo="Typo.body2">Name:</MudText>
+            <MudText Class="pointer-events-none" Typo="Typo.body2" Style="font-weight:bold;">@(CurrentSystemNode != null && !String.IsNullOrWhiteSpace(CurrentSystemNode?.Name) ? CurrentSystemNode.Name : String.Empty)</MudText>
         </MudStack>
         <MudStack Row="true" Justify="Justify.SpaceBetween">
-            <MudText Typo="Typo.body2">Security:</MudText>
-            <MudText Typo="Typo.body2" Style="@($"color:{_secColor};")">@(CurrentSystemNode != null  ? _secStatus : String.Empty)</MudText>       
+            <MudText Class="pointer-events-none" Typo="Typo.body2">Security:</MudText>
+            <MudText Class="pointer-events-none" Typo="Typo.body2" Style="@($"color:{_secColor};")">@(CurrentSystemNode != null  ? _secStatus : String.Empty)</MudText>       
         </MudStack>
         <MudStack Row="true" Justify="Justify.SpaceBetween">
-            <MudText Typo="Typo.body2">Class:</MudText>
-            <MudText Typo="Typo.body2" Style="@($"color:{_systemColor}; font-weight:bold;")">@_systemType</MudText>    
+            <MudText Class="pointer-events-none" Typo="Typo.body2">Class:</MudText>
+            <MudText Class="pointer-events-none" Typo="Typo.body2" Style="@($"color:{_systemColor}; font-weight:bold;")">@_systemType</MudText>    
         </MudStack>
       
         <MudStack Row="true" Justify="Justify.SpaceBetween" hidden="@(CurrentSystemNode == null || CurrentSystemNode.Effect==WHMapper.Models.DTO.EveMapper.Enums.WHEffect.None)">
-            <MudText Typo="Typo.body2">Effect:</MudText>
+            <MudText Class="pointer-events-none" Typo="Typo.body2">Effect:</MudText>
                 <MudTooltip Text="Arrow Right" Arrow="true" Placement="Placement.Bottom">
                     <ChildContent>
-                        <MudIcon Icon="@Icons.Material.Filled.Square" Class="d-inline-flex" Size="Size.Small" DisableElevation="true" Style="@($"color:{_whEffectColor};")" />
+                        <MudIcon Icon="@Icons.Material.Filled.Square" Class="d-inline-flex" Size="Size.Small" Style="@($"color:{_whEffectColor};")" />
                     </ChildContent>
                     <TooltipContent>
-                        <MudPaper Class="d-flex flex-column flex-grow-1 gap-0" Elevation="0">
+                        <MudPaper Elevation="0">
+                            <MudStack Spacing="0">
                             @if (CurrentSystemNode != null && CurrentSystemNode.EffectDetails != null)
                             {
                                 foreach (var effectInfo in CurrentSystemNode.EffectDetails)
                                 {
-                                    <MudText class="ml-1 mr-1" Typo="Typo.caption">@effectInfo.Name : @effectInfo.Value%</MudText>
+                                    <MudText Class="ml-1 mr-1 pointer-events-none" Typo="Typo.caption">@effectInfo.Name : @effectInfo.Value%</MudText>
                                 }
                             }
+                            </MudStack>
                         </MudPaper>
                     </TooltipContent>
                 </MudTooltip> 
@@ -78,9 +80,22 @@
             {
                 @foreach (var item in CurrentSystemNode.Statics)
                 {
-                    <MudStack Row="true" Justify="Justify.FlexEnd" Spacing="1">
-                        <MudText Typo="Typo.body2" Class="d-inline-flex ml-1">@item.WHName</MudText>
-                        <MudText Typo="Typo.body2" Class="d-inline-flex" Style="@($"color:{WHColorHelper.GetSystemTypeColor(@item.EveSystemDestinationType)}; font-weight:bold;")">@item.EveSystemDestinationType.ToString()</MudText>
+                    <MudStack Row="true" Justify="Justify.FlexEnd" Spacing="1" >
+                        <MudTooltip Text="Arrow Right" Arrow="true" Placement="Placement.Bottom">
+                            <ChildContent>
+                                <MudText Typo="Typo.body2" Class="d-inline-flex ml-1 pointer-events-none">@item.Name</MudText>
+                            </ChildContent>
+                            <TooltipContent>
+                                <MudPaper Elevation="0">
+                                    <MudStack Spacing="0">
+                                        <MudText Class="ml-1 mr-1 pointer-events-none" Typo="Typo.caption">Max Mass : @item.MassMax.ToString("#,##0") kg</MudText>
+                                        <MudText Class="ml-1 mr-1 pointer-events-none" Typo="Typo.caption">Max Jump Mass: @item.JumpMassMax.ToString("#,##0") kg</MudText>
+                                        <MudText Class="ml-1 mr-1 pointer-events-none" Typo="Typo.caption">Max Stable Time: @(item.StableTime/60) h</MudText>
+                                    </MudStack>
+                                </MudPaper>
+                            </TooltipContent>
+                        </MudTooltip>
+                        <MudText Typo="Typo.body2" Class="d-inline-flex" Style="@($"color:{WHColorHelper.GetSystemTypeColor(@item.Destination)}; font-weight:bold;")">@item.Destination.ToString()</MudText>
                     </MudStack>
                 }
             }
diff --git a/src/WHMapper/Pages/_Host.cshtml b/src/WHMapper/Pages/_Host.cshtml
index 62344fa8..9e62c74e 100644
--- a/src/WHMapper/Pages/_Host.cshtml
+++ b/src/WHMapper/Pages/_Host.cshtml
@@ -16,7 +16,6 @@
     {
         AccessToken = await HttpContext.GetTokenAsync(EVEOnlineAuthenticationDefaults.AuthenticationScheme, "access_token"),
         RefreshToken = await HttpContext.GetTokenAsync(EVEOnlineAuthenticationDefaults.AuthenticationScheme, "refresh_token"),
-        XsrfToken = Xsrf.GetAndStoreTokens(HttpContext).RequestToken
     };
 }
 
diff --git a/src/WHMapper/Program.cs b/src/WHMapper/Program.cs
index 1cb9a663..e058ca87 100644
--- a/src/WHMapper/Program.cs
+++ b/src/WHMapper/Program.cs
@@ -52,17 +52,16 @@ private static void Main(string[] args)
 
             ConnectionMultiplexer redis = ConnectionMultiplexer.Connect(builder.Configuration.GetConnectionString("RedisConnection"));
 
-            builder.Services.AddDataProtection()
-                .SetApplicationName("WHMapper")
-                .PersistKeysToStackExchangeRedis(redis);
-
-
             builder.Services.AddStackExchangeRedisCache(option =>
             {
                 option.Configuration = builder.Configuration.GetConnectionString("RedisConnection");
                 option.InstanceName = "WHMapper";
             });
 
+            builder.Services.AddDataProtection()
+                .SetApplicationName("WHMapper")
+                .PersistKeysToStackExchangeRedis(redis,"DataProtection-Keys");
+
             builder.Services.AddSignalR();
 
             builder.Services.AddRazorPages();
diff --git a/src/WHMapper/Services/EveMapper/EveMapperCacheService.cs b/src/WHMapper/Services/EveMapper/EveMapperCacheService.cs
index e53bf287..f068b090 100644
--- a/src/WHMapper/Services/EveMapper/EveMapperCacheService.cs
+++ b/src/WHMapper/Services/EveMapper/EveMapperCacheService.cs
@@ -36,7 +36,7 @@ public async Task<TEntity> GetAsync<TEntity>(int key)
         {
             string cacheKey = GetEntityCacheKey<TEntity>();
             var result = await _cacheService.Get<IEnumerable<TEntity>>(cacheKey);
-            return result?.Single(x => x.Id == key)!;
+            return result?.FirstOrDefault(x => x.Id == key)!;
         } 
         catch(InvalidOperationException e)
         {
diff --git a/src/WHMapper/Services/EveMapper/EveMapperHelper.cs b/src/WHMapper/Services/EveMapper/EveMapperHelper.cs
index 25cf839a..bf500d95 100644
--- a/src/WHMapper/Services/EveMapper/EveMapperHelper.cs
+++ b/src/WHMapper/Services/EveMapper/EveMapperHelper.cs
@@ -681,12 +681,12 @@ public async Task<EveSystemNodeModel> DefineEveSystemNodeModel(WHSystem wh)
                 EveSystemType whClass = await GetWHClass(system_region!.Name, system_constellation.Name, system.Name, system.SecurityStatus);
                 WHEffect whEffect = await GetSystemEffect(system.Name);
                 IList<EveSystemEffect>? effectDetails = GetWHEffectDetails(whEffect, whClass);
-                IList<WHStatic>? statics = null;
+                IList<WormholeType>? statics = null;
 
                 IEnumerable<KeyValuePair<string, string>>? whStatics = await _anoikServices!.GetSystemStatics(wh.Name);
-                if (whStatics != null)
+                if (whStatics!=null && whStatics.Any() && _whTypes != null && _whTypes.Any()) 
                 {
-                    statics = whStatics.Select(x => new WHStatic(x.Key, Enum.Parse<EveSystemType>(x.Value, true))).ToList<WHStatic>();
+                    statics = whStatics.Select(x => _whTypes.FirstOrDefault<WormholeType>(y => String.Equals(y.Name,x.Key,StringComparison.OrdinalIgnoreCase))).Where(y => y != null).ToList<WormholeType>();
                 }
 
                 res = new EveSystemNodeModel(wh, note, system_region.Name, system_constellation.Name, whClass, whEffect, effectDetails, statics);
@@ -721,15 +721,15 @@ await Parallel.ForEachAsync(whGroup!.Types, _options, async (whTypeId, token) =>
                         switch (whType.SystemTypeValue)
                         {
                             case 0://K162
-                                _whTypes.Add(new WormholeType("K162", EveSystemType.C1, null));
-                                _whTypes.Add(new WormholeType("K162", EveSystemType.C2, null));
-                                _whTypes.Add(new WormholeType("K162", EveSystemType.C3, null));
-                                _whTypes.Add(new WormholeType("K162", EveSystemType.C4, null));
-                                _whTypes.Add(new WormholeType("K162", EveSystemType.C5, null));
-                                _whTypes.Add(new WormholeType("K162", EveSystemType.C6, null));
-                                _whTypes.Add(new WormholeType("K162", EveSystemType.HS, null));
-                                _whTypes.Add(new WormholeType("K162", EveSystemType.LS, null));
-                                _whTypes.Add(new WormholeType("K162", EveSystemType.NS, null));
+                                _whTypes.Add(new WormholeType("K162", EveSystemType.C1));
+                                _whTypes.Add(new WormholeType("K162", EveSystemType.C2));
+                                _whTypes.Add(new WormholeType("K162", EveSystemType.C3));
+                                _whTypes.Add(new WormholeType("K162", EveSystemType.C4));
+                                _whTypes.Add(new WormholeType("K162", EveSystemType.C5));
+                                _whTypes.Add(new WormholeType("K162", EveSystemType.C6));
+                                _whTypes.Add(new WormholeType("K162", EveSystemType.HS));
+                                _whTypes.Add(new WormholeType("K162", EveSystemType.LS));
+                                _whTypes.Add(new WormholeType("K162", EveSystemType.NS));
                                 break;
                             case 10:
                             case 11:
@@ -740,7 +740,7 @@ await Parallel.ForEachAsync(whGroup!.Types, _options, async (whTypeId, token) =>
                                 int sys_type_value=(int)whType.SystemTypeValue;
                                 if (Enum.IsDefined(typeof(EveSystemType), sys_type_value))
                                 {
-                                    _whTypes.Add(new WormholeType(whType.Name, (EveSystemType)whType.SystemTypeValue, null));
+                                    _whTypes.Add(new WormholeType(whType));
                                 }
                                 else
                                 {
diff --git a/src/WHMapper/Services/EveMapper/EveMapperService.cs b/src/WHMapper/Services/EveMapper/EveMapperService.cs
index 8c0b38a2..d2aed12e 100644
--- a/src/WHMapper/Services/EveMapper/EveMapperService.cs
+++ b/src/WHMapper/Services/EveMapper/EveMapperService.cs
@@ -36,20 +36,24 @@ Func<TEveApiEntity, TEntity> entityMap
             var apiResult = await getEveApiEntityAction.Invoke(_eveApiService);
             if (EqualityComparer<TEveApiEntity>.Default.Equals(apiResult, default(TEveApiEntity)))
             {
-                _logger.LogWarning($"{nameof(TEntity)} with Id {key} not found");
+                _logger.LogWarning("{entityname} with Id {key} not found", typeof(TEntity).Name, key);
                 return null;
             }
-
-            // Add to cache (fire and forget) and return the entity
-            var entity = entityMap(apiResult);
-            await _cacheService.AddAsync(entity);
-            return entity;
+            else
+            {
+                // Add to cache (fire and forget) and return the entity
+                var entity = entityMap(apiResult);
+                if (entity != null)
+                {
+                    await _cacheService.AddAsync(entity);
+                    return entity;
+                }
+            }
         }
         catch (Exception e)
         {
-            _logger.LogError(e, $"Error while getting {nameof(TEntity)} with Id {key}");
+            _logger.LogError(e, "Error while getting {entityname} with Id {key}", typeof(TEntity).Name, key);
         }
-
         return null;
     }
 
diff --git a/src/WHMapper/Services/SDE/SDEServiceManager.cs b/src/WHMapper/Services/SDE/SDEServiceManager.cs
index 1025c502..bde2274c 100644
--- a/src/WHMapper/Services/SDE/SDEServiceManager.cs
+++ b/src/WHMapper/Services/SDE/SDEServiceManager.cs
@@ -73,6 +73,14 @@ private string GetCurrentChecksum()
                 var fileContent = _fileSystem.File.ReadLines(SDE_CHECKSUM_FILE);
                 return string.Join(";", fileContent);
             }
+            catch (FileNotFoundException)
+            {
+                _logger.LogInformation("No checksum file found");
+            }
+            catch(DirectoryNotFoundException)
+            {
+                _logger.LogInformation("No checksum file found");
+            }
             catch (Exception ex)
             {
                 _logger.LogWarning(ex.ToString());
diff --git a/src/WHMapper/Services/WHColor/IWHColorHelper.cs b/src/WHMapper/Services/WHColor/IWHColorHelper.cs
index 6b61f0a6..2f45b90c 100644
--- a/src/WHMapper/Services/WHColor/IWHColorHelper.cs
+++ b/src/WHMapper/Services/WHColor/IWHColorHelper.cs
@@ -14,5 +14,6 @@ public interface IWHColorHelper
         string GetLinkStatusColor(SystemLinkMassStatus status);
         string GetLinkSelectedColor();
         string GetNodeStatusColor(WHSystemStatus status);
+        string GetWHAnalyzedSignatureColor(WHAnalizedSignatureEnums status);
     }
 }
diff --git a/src/WHMapper/Services/WHColor/WHColorHelper.cs b/src/WHMapper/Services/WHColor/WHColorHelper.cs
index 3164fc81..85fd4de0 100644
--- a/src/WHMapper/Services/WHColor/WHColorHelper.cs
+++ b/src/WHMapper/Services/WHColor/WHColorHelper.cs
@@ -72,6 +72,11 @@ public class WHColorHelper : IWHColorHelper
         private const string NODE_STATUS_UNKNOWN_COLOR = IWHColorHelper.DEFAULT_COLOR;
 
 
+        private const string WH_ANALYZED_SIGNATURE_ADD = "#5cb85c";
+        private const string WH_ANALYZED_SIGNATURE_UPDATE = IWHColorHelper.DEFAULT_COLOR;
+        private const string WH_ANALYZED_SIGNATURE_DELETE = "#a52521";
+
+
         private bool FloatEquals(float a, float b)
         {
             return Math.Abs(a - b) < EPSILON;
@@ -222,6 +227,20 @@ public string GetLinkSelectedColor()
         }
         #endregion
 
+        public string GetWHAnalyzedSignatureColor(WHAnalizedSignatureEnums status)
+        {
+            switch (status)
+            {
+                case WHAnalizedSignatureEnums.toAdd:
+                    return WH_ANALYZED_SIGNATURE_ADD;
+                case WHAnalizedSignatureEnums.toUpdate:
+                    return WH_ANALYZED_SIGNATURE_UPDATE;
+                case WHAnalizedSignatureEnums.toDelete:
+                    return WH_ANALYZED_SIGNATURE_DELETE;
+                default:
+                    return IWHColorHelper.DEFAULT_COLOR;
+            }
+        }
 
     }
 }
diff --git a/src/WHMapper/Services/WHSignatures/IWHSignatureHelper.cs b/src/WHMapper/Services/WHSignatures/IWHSignatureHelper.cs
index 40093237..f60e0e29 100644
--- a/src/WHMapper/Services/WHSignatures/IWHSignatureHelper.cs
+++ b/src/WHMapper/Services/WHSignatures/IWHSignatureHelper.cs
@@ -1,4 +1,6 @@
-namespace WHMapper.Services.WHSignature
+using WHMapper.Models.DTO.EveMapper;
+
+namespace WHMapper.Services.WHSignature
 {
     public interface IWHSignatureHelper
     {
@@ -6,5 +8,7 @@ public interface IWHSignatureHelper
         Task<bool> ValidateScanResult(string? scanResult);
         Task<IEnumerable<WHMapper.Models.Db.WHSignature>?> ParseScanResult(string scanUser, int currentSystemScannedId, string? scanResult);
         Task<bool> ImportScanResult(string scanUser, int currentSystemScannedId, string? scanResult, bool lazyDeleted);
+        Task<IEnumerable<WHMapper.Models.Db.WHSignature>?> GetCurrentSystemSignatures(int whId);
+        Task<IEnumerable<WHAnalizedSignature>?> AnalyzedSignatures(IEnumerable<WHMapper.Models.Db.WHSignature>? parsedSigs,IEnumerable<WHMapper.Models.Db.WHSignature>? currentSystemSigs , bool lazyDeleted);
     }
 }
diff --git a/src/WHMapper/Services/WHSignatures/WHSignatureHelper.cs b/src/WHMapper/Services/WHSignatures/WHSignatureHelper.cs
index 77107177..16e64954 100644
--- a/src/WHMapper/Services/WHSignatures/WHSignatureHelper.cs
+++ b/src/WHMapper/Services/WHSignatures/WHSignatureHelper.cs
@@ -1,5 +1,7 @@
 using System.Text.RegularExpressions;
 using WHMapper.Models.Db.Enums;
+using WHMapper.Models.DTO.EveMapper;
+using WHMapper.Models.DTO.EveMapper.Enums;
 using WHMapper.Repositories.WHSignatures;
 using WHMapper.Services.WHSignature;
 
@@ -8,7 +10,7 @@ namespace WHMapper.Services.WHSignatures
 {
     public class WHSignatureHelper : IWHSignatureHelper
     {
-        private IWHSignatureRepository _dbWHSignatures;
+        private readonly IWHSignatureRepository _dbWHSignatures;
 
         public WHSignatureHelper(IWHSignatureRepository sigRepo)
         {
@@ -21,8 +23,11 @@ public Task<bool> ValidateScanResult(string? scanResult)
             {
                 if (!string.IsNullOrEmpty(scanResult))
                 {
-                    Match match = Regex.Match(scanResult, IWHSignatureHelper.SCAN_VALIDATION_REGEX, RegexOptions.IgnoreCase, TimeSpan.FromSeconds(2));
-                    return Task.FromResult<bool>(match.Success);
+                    var matches = Regex.Matches(scanResult, IWHSignatureHelper.SCAN_VALIDATION_REGEX, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Multiline | RegexOptions.ExplicitCapture, TimeSpan.FromSeconds(2));
+                    // Compter le nombre de lignes non vides dans scanResult
+                    int nonEmptyLinesCount = scanResult.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).Length;
+                    
+                    return Task.FromResult<bool>(matches.Count == nonEmptyLinesCount);
                 }
                 return Task.FromResult<bool>(false);
             }
@@ -33,63 +38,89 @@ public Task<bool> ValidateScanResult(string? scanResult)
 
         }
 
-        public Task<IEnumerable<WHMapper.Models.Db.WHSignature>?> ParseScanResult(string scanUser, int currentSystemScannedId, string? scanResult)
+    public Task<IEnumerable<WHMapper.Models.Db.WHSignature>?> ParseScanResult(string scanUser, int currentSystemScannedId, string? scanResult)
+    {
+
+        IList<WHMapper.Models.Db.WHSignature> sigResult = new List<WHMapper.Models.Db.WHSignature>();
+
+        if (string.IsNullOrEmpty(scanResult))
         {
-            string sigName = string.Empty;
-            WHSignatureGroup sigGroup = WHSignatureGroup.Unknow;
-            string sigType = string.Empty;
-            string[]? sigvalues = null;
-            string[]? splittedSig = null;
+            return Task.FromResult<IEnumerable<WHMapper.Models.Db.WHSignature>?>(sigResult);
+        }
 
-            IList<WHMapper.Models.Db.WHSignature> sigResult = new List<WHMapper.Models.Db.WHSignature>();
+        try
+        {
+            string[] sigValues = scanResult.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
 
-            if (!string.IsNullOrEmpty(scanResult))
+            foreach (string sigValue in sigValues)
             {
-                Regex lineRegex = new Regex("\n", RegexOptions.None, TimeSpan.FromSeconds(2));
-                Regex tabRegex = new Regex("\t", RegexOptions.None, TimeSpan.FromSeconds(2));
-                try
-                {
-                    sigvalues = lineRegex.Split(scanResult);
-                }
-                catch (RegexMatchTimeoutException)
+                string[] splittedSig = sigValue.Split('\t');
+                if (splittedSig.Length < 4) continue; // Assurez-vous qu'il y a suffisamment d'éléments pour éviter les erreurs d'index
+
+                string sigName = splittedSig[0];
+                WHSignatureGroup sigGroup = WHSignatureGroup.Unknow;
+                string sigType = string.Empty;
+
+                if (!string.IsNullOrWhiteSpace(splittedSig[2]))
                 {
-                    return Task.FromResult<IEnumerable<WHMapper.Models.Db.WHSignature>?>(null);
+                    string textGroup = splittedSig[2].Contains(' ') ? splittedSig[2].Split(' ').First() : splittedSig[2];
+                    Enum.TryParse(textGroup, out sigGroup);
+                    sigType = splittedSig[3];
                 }
 
-                foreach (string sigValue in sigvalues)
-                {
-                    sigGroup = WHSignatureGroup.Unknow;
-                    sigType = string.Empty;
+                sigResult.Add(new WHMapper.Models.Db.WHSignature(currentSystemScannedId, sigName, sigGroup, sigType, scanUser));
+            }
+        }
+        catch (Exception ex) when (ex is RegexMatchTimeoutException || ex is ArgumentException)
+        {
+            // Log l'exception si nécessaire
+            return Task.FromResult<IEnumerable<WHMapper.Models.Db.WHSignature>?>(null);
+        }
 
-                    try
-                    {
-                        splittedSig = tabRegex.Split(sigValue);
-                    }
-                    catch (RegexMatchTimeoutException)
-                    {
-                        return Task.FromResult<IEnumerable<WHMapper.Models.Db.WHSignature>?>(null);
-                    }
+        return Task.FromResult<IEnumerable<WHMapper.Models.Db.WHSignature>?>(sigResult);
+    }
 
-                    sigName = splittedSig[0];
+        public Task<IEnumerable<WHAnalizedSignature>?> AnalyzedSignatures(IEnumerable<WHMapper.Models.Db.WHSignature>? parsedSigs,IEnumerable<WHMapper.Models.Db.WHSignature>? currentSystemSigs , bool lazyDeleted)
+        {
+            IEnumerable<WHAnalizedSignature>? toAdd = new List<WHAnalizedSignature>();
+            IEnumerable<WHAnalizedSignature>? toUpdate = new List<WHAnalizedSignature>();
+            IEnumerable<WHAnalizedSignature>? toDelete = new List<WHAnalizedSignature>();
 
+            if (parsedSigs == null || !parsedSigs.Any()) return Task.FromResult<IEnumerable<WHAnalizedSignature>?>(null);
 
-                    if (!String.IsNullOrWhiteSpace(splittedSig[2]))
-                    {
-                        var textGroup = splittedSig[2];
-                        if (splittedSig[2].Contains(' '))
-                            textGroup = splittedSig[2].Split(' ').First();
+            if (currentSystemSigs == null || !currentSystemSigs.Any())
+            {
+                toAdd = parsedSigs.Select(x => new WHAnalizedSignature(x, WHAnalizedSignatureEnums.toAdd)).ToList();
+                return Task.FromResult<IEnumerable<WHAnalizedSignature>?>(toAdd);
+            }
 
-                        Enum.TryParse<WHSignatureGroup>(textGroup, out sigGroup);
+            var sigsToAdd = parsedSigs.ExceptBy(currentSystemSigs.Select(x => x.Name), y => y.Name);
+            if (sigsToAdd.Any()) 
+                toAdd=sigsToAdd.Select(x=>new WHAnalizedSignature(x,WHAnalizedSignatureEnums.toAdd)).ToList();
 
-                        sigType = splittedSig[3];
-                    }
+            var sigsToUpdate = currentSystemSigs.IntersectBy(parsedSigs.Where(x=> x.Group==WHSignatureGroup.Unknow).Select(x => x.Name), y => y.Name);
+            var sigsToUpdate2 = parsedSigs.Where(x=> x.Group!=WHSignatureGroup.Unknow).IntersectBy(currentSystemSigs.Select(x => x.Name), y => y.Name);
+            
+            sigsToUpdate = sigsToUpdate.Concat(sigsToUpdate2);
 
-                    sigResult.Add(new WHMapper.Models.Db.WHSignature(currentSystemScannedId, sigName, sigGroup, sigType, scanUser));
-                }
+            if (sigsToUpdate.Any())
+                toUpdate = sigsToUpdate.Select(x=>new WHAnalizedSignature(x,WHAnalizedSignatureEnums.toUpdate)).ToList();
+
+            if (lazyDeleted)
+            {
+                var sigsToDeleted = currentSystemSigs.ExceptBy(parsedSigs.Select(x => x.Name), y => y.Name);
+                if (sigsToDeleted.Any())
+                    toDelete = sigsToDeleted.Select(x=>new WHAnalizedSignature(x,WHAnalizedSignatureEnums.toDelete)).ToList();
             }
+           
 
-            return Task.FromResult<IEnumerable<WHMapper.Models.Db.WHSignature>?>(sigResult);
+            return Task.FromResult<IEnumerable<WHAnalizedSignature>?>(toAdd.Concat(toUpdate).Concat(toDelete));
+        }
 
+        public async Task<IEnumerable<WHMapper.Models.Db.WHSignature>?> GetCurrentSystemSignatures(int whId)
+        {
+            var signatures = await _dbWHSignatures.GetByWHId(whId);
+            return signatures;
         }
 
         public async Task<bool> ImportScanResult(string scanUser, int currentSystemScannedId, string? scanResult, bool lazyDeleted)
@@ -121,8 +152,6 @@ public async Task<bool> ImportScanResult(string scanUser, int currentSystemScann
             sigUpdated = await UpdateSignatures(currentSystemSigs, sigs);
             sigAdded = await AddNewSignatures(currentSystemSigs, sigs, currentSystemScannedId);
 
-
-            await Task.Delay(500); // Consider removing or justifying this delay.
             return sigUpdated || sigAdded;
         }
 
@@ -134,17 +163,20 @@ private async Task<bool> UpdateSignatures(IEnumerable<Models.Db.WHSignature> cur
             foreach (var sig in sigsToUpdate)
             {
                 var sigParse = sigs.FirstOrDefault(x => x.Name == sig.Name);
-                if (sigParse != null && sigParse.Group != WHSignatureGroup.Unknow)
+                if (sigParse != null)
                 {
-                    sig.Group = sigParse.Group;
-                    sig.Type = String.IsNullOrEmpty(sig.Type) ? sigParse.Type : sig.Type;
                     sig.Updated = sigParse.Updated;
                     sig.UpdatedBy = sigParse.UpdatedBy;
+                    if(sigParse.Group != WHSignatureGroup.Unknow)
+                    {
+                        sig.Group = sigParse.Group;
+                        sig.Type = String.IsNullOrEmpty(sig.Type) ? sigParse.Type : sig.Type;
+                    }
                 }
             }
 
             var resUpdate = await _dbWHSignatures.Update(sigsToUpdate);
-                return resUpdate != null && resUpdate.Count() == sigsToUpdate.Count();
+            return resUpdate != null && resUpdate.Count() == sigsToUpdate.Count();
         }
 
         private async Task<bool> AddNewSignatures(IEnumerable<Models.Db.WHSignature> currentSystemSigs, IEnumerable<Models.Db.WHSignature> sigs, int currentSystemScannedId)
@@ -164,5 +196,7 @@ private async Task DeleteSignatures(IEnumerable<Models.Db.WHSignature> currentSy
                 await _dbWHSignatures.DeleteById(sig.Id);
             }
         }
+
+
     }
 }
diff --git a/src/WHMapper/Shared/AccessControl.razor b/src/WHMapper/Shared/AccessControl.razor
index fd27dc04..d75758be 100644
--- a/src/WHMapper/Shared/AccessControl.razor
+++ b/src/WHMapper/Shared/AccessControl.razor
@@ -5,50 +5,25 @@
     <Authorized>
         <AuthorizeView Policy="Admin" Context="innerContext">
            <Authorized>
-                <MudMenu Dense="true" AnchorOrigin="Origin.BottomLeft" TransformOrigin="Origin.BottomLeft">
+                <MudMenu Dense="true" AnchorOrigin="Origin.BottomRight" TransformOrigin="Origin.TopRight">
                     <ActivatorContent>
-                        <MudChip Icon="@Icons.Material.Filled.Person">@_username</MudChip>
+                        <MudChip T="string" Icon="@Icons.Material.Filled.Person">@_username</MudChip>
                     </ActivatorContent>
                     <ChildContent>
-                        <form action="login?redirectUri=/" method="get" target="_blank">
-                            <input name="__RequestVerificationToken" type="hidden" value="@TokenProvider.XsrfToken">
-                            <MudButton StartIcon="@Icons.Material.Filled.PersonAdd" IconColor="Color.Default" ButtonType="ButtonType.Submit" FullWidth="true">
-                                <MudText>Add Account</MudText>
-                            </MudButton>
-                        </form>
-                        <form action="whmapperadmin" method="post">
-                            <input name="__RequestVerificationToken" type="hidden" value="@TokenProvider.XsrfToken">
-                            <MudButton StartIcon="@Icons.Material.Filled.SettingsAccessibility" IconColor="Color.Default" ButtonType="ButtonType.Submit" FullWidth="true">
-                                <MudText>Access List</MudText>
-                            </MudButton>
-                        </form>
-                        <form action="logout" method="get">
-                            <input name="__RequestVerificationToken" type="hidden" value="@TokenProvider.XsrfToken">
-                            <MudButton StartIcon="@Icons.Material.Filled.Logout" IconColor="Color.Default" ButtonType="ButtonType.Submit" FullWidth="true">
-                                <MudText>Logout</MudText>
-                            </MudButton>
-                        </form>
+                        <MudMenuItem Icon="@Icons.Material.Filled.PersonAdd" IconColor="Color.Default" Href="login?redirectUri=/" Target="_blank">Add Account</MudMenuItem>     
+                        <MudMenuItem Icon="@Icons.Material.Filled.SettingsAccessibility" IconColor="Color.Default" Href="whmapperadmin" Target="_blank">Access List</MudMenuItem>
+                        <MudMenuItem Icon="@Icons.Material.Filled.Logout" IconColor="Color.Default" Href="logout">Logout</MudMenuItem>
                     </ChildContent>
                 </MudMenu>
             </Authorized>
             <NotAuthorized>
-                <MudMenu Dense="true" AnchorOrigin="Origin.BottomLeft" TransformOrigin="Origin.BottomLeft">
+                <MudMenu Dense="true" AnchorOrigin="Origin.BottomRight" TransformOrigin="Origin.TopRight">
                     <ActivatorContent>
-                        <MudChip Icon="@Icons.Material.Filled.Person">@_username</MudChip>
+                        <MudChip T="string" Icon="@Icons.Material.Filled.Person">@_username</MudChip>
                     </ActivatorContent>
                     <ChildContent>
-                        <form action="login?redirectUri=/" method="get" target="_blank">
-                            <input name="__RequestVerificationToken" type="hidden" value="@TokenProvider.XsrfToken">
-                            <MudButton StartIcon="@Icons.Material.Filled.PersonAdd" IconColor="Color.Default" ButtonType="ButtonType.Submit" FullWidth="true">
-                                <MudText>Add Account</MudText>
-                            </MudButton>
-                        </form>
-                        <form action="logout" method="get">
-                            <input name="__RequestVerificationToken" type="hidden" value="@TokenProvider.XsrfToken">
-                            <MudButton StartIcon="@Icons.Material.Filled.Logout" IconColor="Color.Default" ButtonType="ButtonType.Submit" FullWidth="true">
-                                <MudText>Logout</MudText>
-                            </MudButton>
-                        </form>
+                        <MudMenuItem Icon="@Icons.Material.Filled.PersonAdd" IconColor="Color.Default" Href="login?redirectUri=/" Target="_blank">Add Account</MudMenuItem>
+                        <MudMenuItem Icon="@Icons.Material.Filled.Logout" IconColor="Color.Default" Href="logout">Logout</MudMenuItem>
                     </ChildContent>
                 </MudMenu>
             </NotAuthorized>
@@ -56,17 +31,12 @@
 
     </Authorized>
     <NotAuthorized>
-        <MudMenu Dense="true">
+        <MudMenu Dense="true" AnchorOrigin="Origin.BottomRight" TransformOrigin="Origin.TopRight">
             <ActivatorContent>
-                <MudChip Icon="@Icons.Material.Filled.Person">Account</MudChip>
+                <MudChip T="string" Icon="@Icons.Material.Filled.Person">Account</MudChip>
             </ActivatorContent>
             <ChildContent>
-                <form action="login?redirectUri=/" method="get">
-                    <input name="__RequestVerificationToken" type="hidden" value="@TokenProvider.XsrfToken">
-                    <MudButton StartIcon="@Icons.Material.Filled.Login" IconColor="Color.Default" ButtonType="ButtonType.Submit" FullWidth="true">
-                        <MudText>Login</MudText>
-                    </MudButton>
-                </form>
+                <MudMenuItem Icon=@Icons.Material.Filled.Login IconColor="Color.Default" Href="login?redirectUri=/">Login</MudMenuItem>
             </ChildContent>
         </MudMenu>
     </NotAuthorized>
@@ -81,13 +51,9 @@
     [Inject]
     private IEveUserInfosServices UserService { get; set; } = null!;
 
-    [Inject]
-    private Models.DTO.TokenProvider TokenProvider {get;set;} = null!;
-
     protected override async Task OnInitializedAsync()
     {
         _username = await UserService.GetUserName();
         StateHasChanged();
-
     }
 }
diff --git a/src/WHMapper/Shared/MainLayout.razor b/src/WHMapper/Shared/MainLayout.razor
index a1cfb7dd..129d3067 100644
--- a/src/WHMapper/Shared/MainLayout.razor
+++ b/src/WHMapper/Shared/MainLayout.razor
@@ -1,6 +1,7 @@
 @inherits LayoutComponentBase
 
-<MudThemeProvider Theme="_currentTheme" DefaultScrollbar="false"/>
+<MudThemeProvider Theme="_currentTheme" DefaultScrollbar="false" IsDarkMode="true"/>
+<MudPopoverProvider/>
 <MudDialogProvider />
 <MudSnackbarProvider />
 
@@ -59,11 +60,11 @@
     {
         _currentTheme = new MudTheme()
         {
-            Palette = new PaletteDark()
+            PaletteDark = new PaletteDark()
             {
                 Black = "#27272f",
                 Background = "#32333d",
-                BackgroundGrey = "#27272f",
+                BackgroundGray = "#27272f",
                 Surface = "#373740",
                 DrawerBackground = "#27272f",
                 DrawerText = "rgba(255,255,255, 0.50)",
diff --git a/src/WHMapper/WHMapper.csproj b/src/WHMapper/WHMapper.csproj
index 75b6b54f..02970b3b 100644
--- a/src/WHMapper/WHMapper.csproj
+++ b/src/WHMapper/WHMapper.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -96,7 +96,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.5" />
     <PackageReference Include="YamlDotNet" Version="15.1.4" />
-    <PackageReference Include="MudBlazor" Version="6.19.1" />
+    <PackageReference Include="MudBlazor" Version="7.3.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Data\" />