diff --git a/LittleWarGameClient/font/LcdSolid-VPzB.ttf b/LittleWarGameClient/Assets/LcdSolid-VPzB.ttf
similarity index 100%
rename from LittleWarGameClient/font/LcdSolid-VPzB.ttf
rename to LittleWarGameClient/Assets/LcdSolid-VPzB.ttf
diff --git a/LittleWarGameClient/font/info.txt b/LittleWarGameClient/Assets/info.txt
similarity index 100%
rename from LittleWarGameClient/font/info.txt
rename to LittleWarGameClient/Assets/info.txt
diff --git a/LittleWarGameClient/logo.ico b/LittleWarGameClient/Assets/logo.ico
similarity index 100%
rename from LittleWarGameClient/logo.ico
rename to LittleWarGameClient/Assets/logo.ico
diff --git a/LittleWarGameClient/soldier.png b/LittleWarGameClient/Assets/soldier.png
similarity index 100%
rename from LittleWarGameClient/soldier.png
rename to LittleWarGameClient/Assets/soldier.png
diff --git a/LittleWarGameClient/wolfRunning.gif b/LittleWarGameClient/Assets/wolfRunning.gif
similarity index 100%
rename from LittleWarGameClient/wolfRunning.gif
rename to LittleWarGameClient/Assets/wolfRunning.gif
diff --git a/LittleWarGameClient/GameForm.Designer.cs b/LittleWarGameClient/GameForm.Designer.cs
index 697c54a..54c06a6 100644
--- a/LittleWarGameClient/GameForm.Designer.cs
+++ b/LittleWarGameClient/GameForm.Designer.cs
@@ -112,6 +112,7 @@ private void InitializeComponent()
             webBrowser.Name = "webBrowser";
             webBrowser.Size = new Size(1264, 681);
             webBrowser.TabIndex = 3;
+            webBrowser.LoadError += webView_LoadError;
             webBrowser.LoadingStateChanged += webView_LoadingStateChanged;
             // 
             // GameForm
diff --git a/LittleWarGameClient/GameForm.cs b/LittleWarGameClient/GameForm.cs
index d09aa0f..ae2225f 100644
--- a/LittleWarGameClient/GameForm.cs
+++ b/LittleWarGameClient/GameForm.cs
@@ -1,19 +1,8 @@
-using System.Runtime.CompilerServices;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection.Metadata;
-using System.Reflection;
-using System.Data;
-using System.Diagnostics;
-using NAudio.CoreAudioApi;
-using nud2dlib.Windows.Forms;
-using nud2dlib;
 using CefSharp;
-using CefSharp.Handler;
 using CefSharp.WinForms;
-using CefSharp.DevTools.Debugger;
+using LittleWarGameClient.Handlers;
+using LittleWarGameClient.Helpers;
+using LittleWarGameClient.Interceptors;
 
 namespace LittleWarGameClient
 {
@@ -31,12 +20,14 @@ internal static GameForm Instance
         }
 
         internal const string baseUrl = @"https://littlewargame.com/play";
-        private readonly Settings settings;
+        private readonly SettingsHandler settings;
         private readonly KeyboardHandler kbHandler;
         private readonly VersionHandler vHandler;
-        private readonly AudioManager audioMngr;
+        private readonly AudioHandler audioMngr;
         private FormWindowState PreviousWindowState;
 
+        internal int requestCallCounter = 0;
+        private int requestCallWhereLoadingFinished = -1;
         private bool wasSmallWindow = false;
         private bool gameHasLoaded = false;
         private bool mouseLocked;
@@ -45,9 +36,9 @@ internal GameForm()
         {
             PreInitWeb();
             InitializeComponent();
-            loadingText.Font = new Font(FontManager.lwgFont, 48F, FontStyle.Regular, GraphicsUnit.Point);
-            settings = new Settings();
-            audioMngr = new AudioManager(Text);
+            loadingText.Font = new Font(FontHandler.lwgFont, 48F, FontStyle.Regular, GraphicsUnit.Point);
+            settings = new SettingsHandler();
+            audioMngr = new AudioHandler(Text);
             kbHandler = new KeyboardHandler(settings);
             vHandler = new VersionHandler(settings);
             InitScreen();
@@ -195,26 +186,6 @@ private void GameForm_Load(object sender, EventArgs e)
             Activate();
         }
 
-        private void webView_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e)
-        {
-            if (e.IsLoading)
-            {
-                InvokeUI(() =>
-                {
-                    loadingPanel.Visible = true;
-                    loadingTimer.Enabled = true;
-                    gameHasLoaded = false;
-                });
-            }
-            else // has loaded
-            {
-                var addonJS = System.IO.File.ReadAllText("js/addons.js");
-                webBrowser.ExecuteScriptAsync(addonJS);
-                ElementMessage.CallJSFunc(webBrowser, "init.function", $"\"{vHandler.CurrentVersion}\", {settings.GetMouseLock().ToString().ToLower()}, {settings.GetVolume()}");
-                kbHandler.InitHotkeyNames((ChromiumWebBrowser)sender, settings);
-            }
-        }
-
         internal void InvokeUI(Action a)
         {
             if (formInstance != null && formInstance.InvokeRequired)
@@ -289,7 +260,6 @@ internal void AddonsLoadedPostLogic()
             ForceResizeGameWindows();
             loadingPanel.Visible = false;
             loadingTimer.Enabled = false;
-            loadingText.Text = "Reconnecting";
         }
 
         internal void ChangeVolume(float value)
@@ -303,5 +273,46 @@ internal async void VolumeChangePostLogic(float value)
             settings.SetVolume(value);
             await settings.SaveAsync();
         }
+
+        private void webView_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e)
+        {
+            if (e.IsLoading)
+            {
+                InvokeUI(() =>
+                {
+                    loaderImage.Visible = true;
+                    loadingPanel.Visible = true;
+                    loadingText.Text = "Loading";
+                    loadingText.Enabled = true;
+                    loadingTimer.Enabled = true;
+                    gameHasLoaded = false;
+                });
+            }
+            else // has loaded
+            {
+                if (requestCallWhereLoadingFinished < requestCallCounter)
+                {
+                    requestCallWhereLoadingFinished = requestCallCounter;
+                    var addonJS = System.IO.File.ReadAllText("js/addons.js");
+                    webBrowser.ExecuteScriptAsync(addonJS);
+                    ElementMessage.CallJSFunc(webBrowser, "init.function", $"\"{vHandler.CurrentVersion}\", {settings.GetMouseLock().ToString().ToLower()}, {settings.GetVolume()}");
+                    kbHandler.InitHotkeyNames((ChromiumWebBrowser)sender, settings);
+                }
+            }
+        }
+
+        private void webView_LoadError(object sender, LoadErrorEventArgs e)
+        {
+            InvokeUI(() =>
+            {
+                loaderImage.Visible = false;
+                loadingText.Text = "ERROR";
+                loadingText.Enabled = false;
+                loadingText.Visible = true;
+                loadingTimer.Enabled = false;
+                gameHasLoaded = false;
+            });
+            OverlayForm.Instance.AddOverlayMessage("loadError", new Notification("Error: Website could not be loaded"));
+        }
     }
 }
diff --git a/LittleWarGameClient/GameForm.resx b/LittleWarGameClient/GameForm.resx
index 4d514b2..fc888dc 100644
--- a/LittleWarGameClient/GameForm.resx
+++ b/LittleWarGameClient/GameForm.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/LittleWarGameClient/AudioManager.cs b/LittleWarGameClient/Handlers/AudioHandler.cs
similarity index 96%
rename from LittleWarGameClient/AudioManager.cs
rename to LittleWarGameClient/Handlers/AudioHandler.cs
index 8b97186..b5dd75d 100644
--- a/LittleWarGameClient/AudioManager.cs
+++ b/LittleWarGameClient/Handlers/AudioHandler.cs
@@ -8,15 +8,15 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace LittleWarGameClient
+namespace LittleWarGameClient.Handlers
 {
-    internal class AudioManager : IAudioSessionEventsHandler
+    internal class AudioHandler : IAudioSessionEventsHandler
     {
         private MMDevice? mainDevice;
         private AudioSessionControl? currentSession;
         private readonly string formTitle;
 
-        public AudioManager(string formTitle)
+        public AudioHandler(string formTitle)
         {
             this.formTitle = formTitle;
             var etor = new MMDeviceEnumerator();
@@ -59,7 +59,7 @@ private void UnregisterFromSession(AudioSessionControl? session)
             }
         }
 
-		private void ChangeTextAndIcon(AudioSessionControl session)
+        private void ChangeTextAndIcon(AudioSessionControl session)
         {
             if (session.IsSystemSoundsSession)
                 return;
diff --git a/LittleWarGameClient/FontManager.cs b/LittleWarGameClient/Handlers/FontHandler.cs
similarity index 92%
rename from LittleWarGameClient/FontManager.cs
rename to LittleWarGameClient/Handlers/FontHandler.cs
index dc0f83c..95be50a 100644
--- a/LittleWarGameClient/FontManager.cs
+++ b/LittleWarGameClient/Handlers/FontHandler.cs
@@ -7,9 +7,9 @@
 using System.Threading.Tasks;
 using static nud2dlib.Windows.Forms.Win32;
 
-namespace LittleWarGameClient
+namespace LittleWarGameClient.Handlers
 {
-    internal class FontManager
+    internal class FontHandler
     {
         private static FontFamily? gameFont;
         internal static FontFamily lwgFont
diff --git a/LittleWarGameClient/KeyboardHandler.cs b/LittleWarGameClient/Handlers/KeyboardHandler.cs
similarity index 87%
rename from LittleWarGameClient/KeyboardHandler.cs
rename to LittleWarGameClient/Handlers/KeyboardHandler.cs
index 7a1f208..a9cd9ba 100644
--- a/LittleWarGameClient/KeyboardHandler.cs
+++ b/LittleWarGameClient/Handlers/KeyboardHandler.cs
@@ -3,22 +3,23 @@
 using System.Reflection;
 using CefSharp.WinForms;
 using CefSharp;
+using LittleWarGameClient.Helpers;
 
-namespace LittleWarGameClient
+namespace LittleWarGameClient.Handlers
 {
     internal class KeyboardHandler : IKeyboardHandler
     {
         private readonly Dictionary<Keys, MethodInfo?> hotKeys = new Dictionary<Keys, MethodInfo?>();
         internal bool hasHangingAltKey = false;
 
-        internal KeyboardHandler(Settings settings)
+        internal KeyboardHandler(SettingsHandler settings)
         {
             InitHotkeys(settings);
         }
 
-        private void InitHotkeys(Settings settings)
+        private void InitHotkeys(SettingsHandler settings)
         {
-            Type type = typeof(Settings);
+            Type type = typeof(SettingsHandler);
             foreach (var methodInfo in type.GetMethods().Where(p => Attribute.IsDefined(p, typeof(Hotkey))))
             {
                 object[] attribute = methodInfo.GetCustomAttributes(typeof(Hotkey), true);
@@ -28,7 +29,7 @@ private void InitHotkeys(Settings settings)
                     Hotkey hotkey = (Hotkey)attribute[0];
                     if (hotkey.FuncToCall != null)
                     {
-                        Type thisType = this.GetType();
+                        Type thisType = GetType();
                         funcToCall = thisType.GetMethod(hotkey.FuncToCall, BindingFlags.NonPublic | BindingFlags.Instance);
                     }
                 }
@@ -38,9 +39,9 @@ private void InitHotkeys(Settings settings)
             }
         }
 
-        internal void InitHotkeyNames(ChromiumWebBrowser sender, Settings settings)
+        internal void InitHotkeyNames(ChromiumWebBrowser sender, SettingsHandler settings)
         {
-            Type type = typeof(Settings);
+            Type type = typeof(SettingsHandler);
             foreach (var methodInfo in type.GetMethods().Where(p => Attribute.IsDefined(p, typeof(Hotkey))))
             {
                 object[] attribute = methodInfo.GetCustomAttributes(typeof(Hotkey), true);
@@ -71,12 +72,12 @@ private void OptionsMenuHotkeyFunc(ChromiumWebBrowser sender)
 
         private void ChatHistoryHotkeyFunc(ChromiumWebBrowser sender)
         {
-            ElementMessage.CallJSFunc((ChromiumWebBrowser)sender, "toggleChat");
+            ElementMessage.CallJSFunc(sender, "toggleChat");
         }
 
         private void FriendsHotkeyFunc(ChromiumWebBrowser sender)
         {
-            ElementMessage.CallJSFunc((ChromiumWebBrowser)sender, "toggleFriends");
+            ElementMessage.CallJSFunc(sender, "toggleFriends");
         }
 
         public bool OnPreKeyEvent(IWebBrowser webView, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut)
@@ -117,6 +118,7 @@ public bool OnKeyEvent(IWebBrowser webView, IBrowser browser, KeyType type, int
         {
             if (isSystemKey && type == KeyType.Char)
                 return true;
+            //Matches Alt+F16 key press related to Alt-Tab fix for game
             if (windowsKeyCode == 0x7F && modifiers == CefEventFlags.AltDown)
                 hasHangingAltKey = false;
             return false;
diff --git a/LittleWarGameClient/Settings.cs b/LittleWarGameClient/Handlers/SettingsHandler.cs
similarity index 98%
rename from LittleWarGameClient/Settings.cs
rename to LittleWarGameClient/Handlers/SettingsHandler.cs
index 62ba8e5..d23671f 100644
--- a/LittleWarGameClient/Settings.cs
+++ b/LittleWarGameClient/Handlers/SettingsHandler.cs
@@ -1,4 +1,5 @@
 using IniFile;
+using LittleWarGameClient.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -6,9 +7,9 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace LittleWarGameClient
+namespace LittleWarGameClient.Handlers
 {
-    internal class Settings
+    internal class SettingsHandler
     {
         private const string fileName = "Settings.ini";
         private const int defaultWidth = 1280;
@@ -25,7 +26,7 @@ internal class Settings
         private readonly Ini settings;
         private readonly SettingsHelper helper;
 
-        public Settings()
+        public SettingsHandler()
         {
             if (!File.Exists(fileName))
                 settings = CreateDefaultIniFile();
diff --git a/LittleWarGameClient/VersionHandler.cs b/LittleWarGameClient/Handlers/VersionHandler.cs
similarity index 92%
rename from LittleWarGameClient/VersionHandler.cs
rename to LittleWarGameClient/Handlers/VersionHandler.cs
index 04a54d1..6a11352 100644
--- a/LittleWarGameClient/VersionHandler.cs
+++ b/LittleWarGameClient/Handlers/VersionHandler.cs
@@ -11,11 +11,11 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace LittleWarGameClient
+namespace LittleWarGameClient.Handlers
 {
     internal class VersionHandler
     {
-        readonly Settings settings;
+        readonly SettingsHandler settings;
         internal Version CurrentVersion { get; private set; }
         private Version? latestVersion;
         internal Version? LatestVersion
@@ -32,19 +32,19 @@ internal Version? LatestVersion
         }
         public event EventHandler LatestVersionObtained;
 
-        public VersionHandler(Settings s)
+        public VersionHandler(SettingsHandler s)
         {
             settings = s;
             var productVersion = System.Windows.Forms.Application.ProductVersion.Split('+').First();
             CurrentVersion = new Version(productVersion);
 #if DEBUG
-            CurrentVersion = new Version(0,0,0);
+            CurrentVersion = new Version(0, 0, 0);
 #endif
             LatestVersionObtained += CheckForUpdate;
-            (new Thread(() =>
+            new Thread(() =>
             {
                 PerformCheck();
-            })).Start();
+            }).Start();
         }
 
         private async void PerformCheck()
@@ -90,7 +90,7 @@ private bool CanCheckForUpdate()
                 return false;
             return true;
         }
-        private async Task<Version?> GetLatestGitHubVersion(int retries=3)
+        private async Task<Version?> GetLatestGitHubVersion(int retries = 3)
         {
             if (retries < 1)
             {
@@ -106,7 +106,7 @@ private bool CanCheckForUpdate()
             catch (Exception)
             {
                 Thread.Sleep(2000);
-                return await GetLatestGitHubVersion(retries-1);
+                return await GetLatestGitHubVersion(retries - 1);
             }
         }
     }
diff --git a/LittleWarGameClient/Extensions.cs b/LittleWarGameClient/Helpers/PanelHelper.cs
similarity index 86%
rename from LittleWarGameClient/Extensions.cs
rename to LittleWarGameClient/Helpers/PanelHelper.cs
index 30b8c91..264f13d 100644
--- a/LittleWarGameClient/Extensions.cs
+++ b/LittleWarGameClient/Helpers/PanelHelper.cs
@@ -5,9 +5,9 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace LittleWarGameClient
+namespace LittleWarGameClient.Helpers
 {
-    public static class Extensions
+    public static class PanelHelper
     {
         public static void SetDoubleBuffered(this Panel panel)
         {
diff --git a/LittleWarGameClient/SettingsHelper.cs b/LittleWarGameClient/Helpers/SettingsHelper.cs
similarity index 99%
rename from LittleWarGameClient/SettingsHelper.cs
rename to LittleWarGameClient/Helpers/SettingsHelper.cs
index e68a291..6621fac 100644
--- a/LittleWarGameClient/SettingsHelper.cs
+++ b/LittleWarGameClient/Helpers/SettingsHelper.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace LittleWarGameClient
+namespace LittleWarGameClient.Helpers
 {
     internal class SettingsHelper
     {
diff --git a/LittleWarGameClient/WebMessage.cs b/LittleWarGameClient/Helpers/WebInteropHelper.cs
similarity index 98%
rename from LittleWarGameClient/WebMessage.cs
rename to LittleWarGameClient/Helpers/WebInteropHelper.cs
index 404b18d..808357c 100644
--- a/LittleWarGameClient/WebMessage.cs
+++ b/LittleWarGameClient/Helpers/WebInteropHelper.cs
@@ -4,7 +4,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace LittleWarGameClient
+namespace LittleWarGameClient.Helpers
 {
     internal class ElementMessage
     {
diff --git a/LittleWarGameClient/ContextMenuInterceptor.cs b/LittleWarGameClient/Interceptors/ContextMenuInterceptor.cs
similarity index 69%
rename from LittleWarGameClient/ContextMenuInterceptor.cs
rename to LittleWarGameClient/Interceptors/ContextMenuInterceptor.cs
index fb3945e..743dad6 100644
--- a/LittleWarGameClient/ContextMenuInterceptor.cs
+++ b/LittleWarGameClient/Interceptors/ContextMenuInterceptor.cs
@@ -1,12 +1,7 @@
 using CefSharp;
 using CefSharp.Handler;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace LittleWarGameClient
+namespace LittleWarGameClient.Interceptors
 {
     internal class ContextMenuInterceptor : ContextMenuHandler
     {
diff --git a/LittleWarGameClient/DownloadInterceptor.cs b/LittleWarGameClient/Interceptors/DownloadInterceptor.cs
similarity index 87%
rename from LittleWarGameClient/DownloadInterceptor.cs
rename to LittleWarGameClient/Interceptors/DownloadInterceptor.cs
index 2c0cb4c..c113fc8 100644
--- a/LittleWarGameClient/DownloadInterceptor.cs
+++ b/LittleWarGameClient/Interceptors/DownloadInterceptor.cs
@@ -1,12 +1,7 @@
 using CefSharp;
 using CefSharp.Handler;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace LittleWarGameClient
+namespace LittleWarGameClient.Interceptors
 {
     internal class DownloadInterceptor : DownloadHandler
     {
@@ -14,7 +9,7 @@ protected override bool OnBeforeDownload(IWebBrowser chromiumWebBrowser, IBrowse
         {
             if (!callback.IsDisposed)
             {
-                var path = Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath);
+                var path = Path.GetDirectoryName(Application.ExecutablePath);
                 using (callback)
                 {
                     var downloadsDirPath = Path.Join(path, "downloads");
diff --git a/LittleWarGameClient/RequestInterceptor.cs b/LittleWarGameClient/Interceptors/RequestInterceptor.cs
similarity index 72%
rename from LittleWarGameClient/RequestInterceptor.cs
rename to LittleWarGameClient/Interceptors/RequestInterceptor.cs
index c308d05..9769a63 100644
--- a/LittleWarGameClient/RequestInterceptor.cs
+++ b/LittleWarGameClient/Interceptors/RequestInterceptor.cs
@@ -1,12 +1,7 @@
 using CefSharp;
 using CefSharp.Handler;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace LittleWarGameClient
+namespace LittleWarGameClient.Interceptors
 {
     internal class RequestInterceptor : RequestHandler
     {
@@ -19,6 +14,12 @@ internal class RequestInterceptor : RequestHandler
             //Default behaviour, url will be loaded normally.
             return null;
         }
+
+        protected override bool OnBeforeBrowse(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool userGesture, bool isRedirect)
+        {
+            GameForm.Instance.requestCallCounter++;
+            return base.OnBeforeBrowse(chromiumWebBrowser, browser, frame, request, userGesture, isRedirect);
+        }
     }
 
     internal class OverrideJavascript : ResourceRequestHandler
diff --git a/LittleWarGameClient/LittleWarGameClient.csproj b/LittleWarGameClient/LittleWarGameClient.csproj
index a3aa4b2..b351773 100644
--- a/LittleWarGameClient/LittleWarGameClient.csproj
+++ b/LittleWarGameClient/LittleWarGameClient.csproj
@@ -8,7 +8,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <SignAssembly>False</SignAssembly>
     <DelaySign>True</DelaySign>
-    <ApplicationIcon>logo.ico</ApplicationIcon>
+    <ApplicationIcon>Assets\logo.ico</ApplicationIcon>
     <Platforms>x64;x86</Platforms>
   </PropertyGroup>
 
@@ -43,7 +43,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="logo.ico" />
+    <Content Include="Assets\logo.ico" />
 	<ContentWithTargetPath Include="steam\steam_api.dll" Condition=" '$(Platform)' == 'x86' ">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		<TargetPath>steam_api.dll</TargetPath>
diff --git a/LittleWarGameClient/OverlayForm.cs b/LittleWarGameClient/OverlayForm.cs
index 63fafe3..38fd8b8 100644
--- a/LittleWarGameClient/OverlayForm.cs
+++ b/LittleWarGameClient/OverlayForm.cs
@@ -1,4 +1,5 @@
-using Loyc.Collections;
+using LittleWarGameClient.Handlers;
+using Loyc.Collections;
 using nud2dlib;
 using nud2dlib.Windows.Forms;
 using Steamworks;
@@ -44,7 +45,7 @@ internal OverlayForm()
             overlayMessages = new BDictionary<string, Notification>();
             IsActivated = false;
             InitializeComponent();
-            Font = new Font(FontManager.lwgFont, 21.75F, FontStyle.Regular, GraphicsUnit.Point);
+            Font = new Font(FontHandler.lwgFont, 21.75F, FontStyle.Regular, GraphicsUnit.Point);
 
             try
             {
@@ -60,12 +61,12 @@ protected override void OnRender(D2DGraphics g)
         {
             for (int i = 0; i < overlayMessages.Count; i++)
             {
-                try
+                var overlayMessageValue = overlayMessages.TryGet(i);
+                if (overlayMessageValue.HasValue)
                 {
-                    var notification = overlayMessages[i].Value.message;
+                    var notification = overlayMessageValue.Value.Value.message;
                     g.DrawText($" >{notification}", D2DColor.Yellow, Font, 0, (i + 1) * 30);
                 }
-                catch { break; }
             }
         }
 
diff --git a/LittleWarGameClient/Properties/Resources.Designer.cs b/LittleWarGameClient/Properties/Resources.Designer.cs
index 6de68e0..e23eea8 100644
--- a/LittleWarGameClient/Properties/Resources.Designer.cs
+++ b/LittleWarGameClient/Properties/Resources.Designer.cs
@@ -59,17 +59,19 @@ internal Resources() {
                 resourceCulture = value;
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
-        internal static byte[] LcdSolidFont {
-            get {
+        internal static byte[] LcdSolidFont
+        {
+            get
+            {
                 object obj = ResourceManager.GetObject("LcdSolidFont", resourceCulture);
                 return ((byte[])(obj));
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/LittleWarGameClient/Properties/Resources.resx b/LittleWarGameClient/Properties/Resources.resx
index 0874e32..f227103 100644
--- a/LittleWarGameClient/Properties/Resources.resx
+++ b/LittleWarGameClient/Properties/Resources.resx
@@ -119,12 +119,12 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="LcdSolidFont" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\font\LcdSolid-VPzB.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\LcdSolid-VPzB.ttf;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="soldier" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\soldier.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\soldier.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="wolfRunning" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\wolfRunning.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\wolfRunning.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/LittleWarGameClient/Resources/LcdSolid-VPzB.ttf b/LittleWarGameClient/Resources/LcdSolid-VPzB.ttf
new file mode 100644
index 0000000..808f3ee
Binary files /dev/null and b/LittleWarGameClient/Resources/LcdSolid-VPzB.ttf differ
diff --git a/LittleWarGameClient/Resources/soldier.png b/LittleWarGameClient/Resources/soldier.png
new file mode 100644
index 0000000..a0f16d8
Binary files /dev/null and b/LittleWarGameClient/Resources/soldier.png differ
diff --git a/LittleWarGameClient/Resources/wolfRunning.gif b/LittleWarGameClient/Resources/wolfRunning.gif
new file mode 100644
index 0000000..b9e5377
Binary files /dev/null and b/LittleWarGameClient/Resources/wolfRunning.gif differ
diff --git a/LittleWarGameClient/SplashScreen.cs b/LittleWarGameClient/SplashScreen.cs
index 6d614c3..b97cd48 100644
--- a/LittleWarGameClient/SplashScreen.cs
+++ b/LittleWarGameClient/SplashScreen.cs
@@ -7,6 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using LittleWarGameClient.Handlers;
 
 namespace LittleWarGameClient
 {
@@ -26,7 +27,7 @@ internal static SplashScreen Instance
         public SplashScreen()
         {
             InitializeComponent();
-            splashText.Font = new Font(FontManager.lwgFont, 24F, FontStyle.Regular, GraphicsUnit.Point);
+            splashText.Font = new Font(FontHandler.lwgFont, 24F, FontStyle.Regular, GraphicsUnit.Point);
         }
 
         internal void InvokeUI(Action a)
diff --git a/LittleWarGameClient/js/lwg-5.0.0.js b/LittleWarGameClient/js/lwg-5.0.0.js
index aa81bd2..c2971ca 100644
--- a/LittleWarGameClient/js/lwg-5.0.0.js
+++ b/LittleWarGameClient/js/lwg-5.0.0.js
@@ -1481,7 +1481,7 @@ var globalLWGDebug = false;
             return new HTMLBuilder()
               .add(`
                 <p class='hotkeyEntry' id='${textID}'>${this.name}
-                    <input type='text' id='${inputID}' class='hotkeyInput' readonly></input>
+                    <input type='text' id='${inputID}' class='hotkeyInput' style='width: 80px;' readonly></input>
                 </p>`)
               .addHook(() => this.text = $(`#${textID}`))
               .addHook(() => this.input = $(`#${inputID}`))