From ef6de6ad2aab0bc1ea591b802d24d8b171940549 Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Mon, 24 Jul 2023 14:26:35 +0200
Subject: [PATCH] UI Re-arrangements

---
 app/AutoUpdate/AutoUpdateControl.cs        |   3 +-
 app/Input/InputDispatcher.cs               |  13 ++-
 app/Properties/Resources.Designer.cs       |  20 ++++
 app/Properties/Resources.resx              |  70 ++++++------
 app/Resources/icons8-quit-32.png           | Bin 0 -> 576 bytes
 app/Resources/icons8-software-32-white.png | Bin 0 -> 500 bytes
 app/Settings.Designer.cs                   | 119 +++++++++++----------
 app/Settings.cs                            |   4 +-
 app/Updates.cs                             |   6 +-
 9 files changed, 140 insertions(+), 95 deletions(-)
 create mode 100644 app/Resources/icons8-quit-32.png
 create mode 100644 app/Resources/icons8-software-32-white.png

diff --git a/app/AutoUpdate/AutoUpdateControl.cs b/app/AutoUpdate/AutoUpdateControl.cs
index 8dba9d5d..dfd10d91 100644
--- a/app/AutoUpdate/AutoUpdateControl.cs
+++ b/app/AutoUpdate/AutoUpdateControl.cs
@@ -16,7 +16,8 @@ namespace GHelper.AutoUpdate
         public AutoUpdateControl(SettingsForm settingsForm)
         {
             settings = settingsForm;
-            settings.SetVersionLabel(Properties.Strings.VersionLabel + ": " + Assembly.GetExecutingAssembly().GetName().Version);
+            var appVersion = new Version(Assembly.GetExecutingAssembly().GetName().Version.ToString());
+            settings.SetVersionLabel(Properties.Strings.VersionLabel + $": {appVersion.Major}.{appVersion.Minor}.{appVersion.Build}");
         }
 
         public void CheckForUpdates()
diff --git a/app/Input/InputDispatcher.cs b/app/Input/InputDispatcher.cs
index c0879d49..64db2e0a 100644
--- a/app/Input/InputDispatcher.cs
+++ b/app/Input/InputDispatcher.cs
@@ -545,9 +545,16 @@ namespace GHelper.Input
 
             try
             {
-                string executable = command.Split(' ')[0];
-                string arguments = command.Substring(executable.Length).Trim();
-                Process proc = Process.Start(executable, arguments);
+
+                //string executable = command.Split(' ')[0];
+                //string arguments = command.Substring(executable.Length).Trim();
+
+                ProcessStartInfo startInfo = new ProcessStartInfo();
+                startInfo.UseShellExecute = true;
+                startInfo.WorkingDirectory = Environment.CurrentDirectory;
+                startInfo.FileName = command;
+                //startInfo.Arguments = arguments;
+                Process proc = Process.Start(startInfo);
             }
             catch
             {
diff --git a/app/Properties/Resources.Designer.cs b/app/Properties/Resources.Designer.cs
index db1ad45f..7b788858 100644
--- a/app/Properties/Resources.Designer.cs
+++ b/app/Properties/Resources.Designer.cs
@@ -360,6 +360,16 @@ namespace GHelper.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap icons8_quit_32 {
+            get {
+                object obj = ResourceManager.GetObject("icons8-quit-32", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -440,6 +450,16 @@ namespace GHelper.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap icons8_software_32_white {
+            get {
+                object obj = ResourceManager.GetObject("icons8-software-32-white", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/app/Properties/Resources.resx b/app/Properties/Resources.resx
index dae79172..ffee67b5 100644
--- a/app/Properties/Resources.resx
+++ b/app/Properties/Resources.resx
@@ -118,24 +118,30 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="icons8-gauge-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons8-gauge-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="brightness_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\brightness-up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icons8_temperature_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-temperature-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="backlight_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\backlight-down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icons8_mute_unmute_96" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-mute-unmute-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icons8-quit-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-quit-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icons8-fiat-500-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-fiat-500-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icons8_microphone_96" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-microphone-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icons8_voltage_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-voltage-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icons8-project-management-48 (1)" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-project-management-48 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -145,6 +151,9 @@
   <data name="icons8_touchpad_96" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-touchpad-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icons8-automation-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-automation-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icons8-help-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-help-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -154,8 +163,8 @@
   <data name="icons8-game-controller-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-game-controller-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icons8-matrix-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons8-matrix-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8_video_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-video-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icons8-refresh-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-refresh-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -181,6 +190,12 @@
   <data name="eco" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\eco.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icons8-video-card-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-video-card-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icons8-rocket-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-rocket-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icons8_edit_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-edit-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -208,8 +223,20 @@
   <data name="icons8_remove_64" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-remove-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icons8_video_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons8-video-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8-matrix-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-matrix-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icons8-keyboard-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-keyboard-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icons8_fan_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-fan-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icons8_software_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-software-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icons8-gauge-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-gauge-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icons8-leaf-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-leaf-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -217,43 +244,22 @@
   <data name="ultimate" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ultimate.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icons8-rocket-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons8-rocket-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="backlight" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\backlight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icons8-settings-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-settings-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icons8-keyboard-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons8-keyboard-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="icons8-automation-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons8-automation-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8_processor_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-processor-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icons8-laptop-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-laptop-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icons8-video-card-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons8-video-card-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="icons8_fan_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons8-fan-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="icons8_processor_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons8-processor-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="icons8_rocket_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-rocket-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icons8_software_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons8-software-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="icons8_temperature_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons8-temperature-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="icons8_voltage_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons8-voltage-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8-software-32-white" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons8-software-32-white.png;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/app/Resources/icons8-quit-32.png b/app/Resources/icons8-quit-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..3db87ccd2f30a0a5eefa741621c019544c637238
GIT binary patch
literal 576
zcmV-G0>Ax<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkP@<~KNRCt{2*UM@YK@<kyPc!-ePTUDzP;?YssvxK!Nfeig;ET8k
z=*kO<84)*L;>33l1(mEth~VuJ6tCbFO^ikw&Y~D5>F!C1g8tCZ(C7U1ch#v=fAJsv
zVI_9rAP!(Fntn6Z;WVD%C+2!Q4{;)5v;OTkek22Z#(mtxEj-4D<oh%(M((1p7jJ^}
z8?Iv)8a-l{V+b95kDM2=RDIznW`gJr*4M~w;a=o^#o@Yx55+VV1gEgHE&&EGmWbF<
zHE|HHBJqsHV=P&Yg1ZzqBB7YVB^d+^B+GH3EO>1c&~&`#LaQq8XegbiK)MO<(5^UB
zo!~xRrt~USRUq6L#Z{1Asvu%GVy9%pNDUE1pZFAAbVW`P!-<G1B_bY0+_qjHw{*4B
zexG9t2)G?F`{ygFw|`PVjwQHUvII{et~kE`&LZ55YZbR)tL8Qwsj>}6Yc!&wXy4;}
z#YQwyr4g-(mN}Ez)f6*3TeZb^Lg{3t!>AElbJ4a-(ZtJ0IF~^{JGh?LF|PX(LvprH
zL()hFFN$@0U4kQtCA*6aHP?JH8T^nwu?Mdcr(2kn-B>oyJ|B*1pG~H{_MdlSFb<j2
zmVd#6#FiHw?qioNZ|A<Otj0+^UEpFe75hA=o9c;XxZLz=mi3JH&)^qM`oZsRg=dKX
O0000<MNUMnLSTaJ=KeDP

literal 0
HcmV?d00001

diff --git a/app/Resources/icons8-software-32-white.png b/app/Resources/icons8-software-32-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ee2865df3f29c3a6b9710394d2ecb89cbcf7135
GIT binary patch
literal 500
zcmV<Q0So?#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkPrb$FWRCt{2lus)}VHC!H%ED~O8sSS&{$z`l%@~qG6ibN>DgTn4
zVmFMxtN9A}4txWYJsV@tT%CGu-KINtu9<t2x=)>Y-=1^MbKdj5=Y<6S5G}w2umhaQ
zY@Gp`;}q@!u7M)pR50T%fzGJK7l99nd;&MX1~4PD^{qJbDF6#mi61Cw2{-}T0({$n
zoO~^2KZ=t(z&kJwGy+S&JunpzH=!;#^>m_JZ7)f@6}a=<_j;B1NyQdweG^v_I?>5p
z@fTnWXb6$xTrn55j9O8Ts!eTo#XIDa0{UgP_JjF;sgu7N(ToJ`wHqF^x04%sfhW&(
zJOVuxa=D#L|E7Rl1=)BRrh#p>Jyj;|EuzUM*QR*;tU@EFpjjWT-y_-w40!g&m19oa
zX)OiJ`*1@ZK@%VJ?2RkOyg17l8hZ-b^5Lw_&puc1T;U3~#9Pj)SOLBR{`z{&axVuJ
zkdIN^wS1TY(nJr-nH1n8S3vRz2_C~kjml~aW4NZ=*&wH3IlZcgbVO$2Z^}JVt<vKd
qf5D@$?HX09@)21!%*hk*7x)3gA?<}<-Y53}0000<MNUMnLSTX;wb*t5

literal 0
HcmV?d00001

diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs
index 17a31b32..1153bbe2 100644
--- a/app/Settings.Designer.cs
+++ b/app/Settings.Designer.cs
@@ -46,6 +46,7 @@ namespace GHelper
             pictureBattery = new PictureBox();
             labelBatteryTitle = new Label();
             panelFooter = new Panel();
+            buttonKeyboard = new RButton();
             buttonUpdates = new RButton();
             buttonQuit = new RButton();
             checkStartup = new CheckBox();
@@ -85,7 +86,6 @@ namespace GHelper
             labelSreen = new Label();
             panelKeyboard = new Panel();
             tableLayoutKeyboard = new TableLayoutPanel();
-            buttonKeyboard = new RButton();
             panelColor = new Panel();
             pictureColor2 = new PictureBox();
             pictureColor = new PictureBox();
@@ -95,8 +95,8 @@ namespace GHelper
             pictureKeyboard = new PictureBox();
             labelKeyboard = new Label();
             labelVersion = new Label();
-            labelModel = new Label();
             panelVersion = new Panel();
+            tableLayoutPanel1 = new TableLayoutPanel();
             panelMatrix.SuspendLayout();
             tableLayoutMatrix.SuspendLayout();
             panelMatrixTitle.SuspendLayout();
@@ -125,6 +125,7 @@ namespace GHelper
             panelKeyboardTitle.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureKeyboard).BeginInit();
             panelVersion.SuspendLayout();
+            tableLayoutPanel1.SuspendLayout();
             SuspendLayout();
             // 
             // panelMatrix
@@ -335,33 +336,56 @@ namespace GHelper
             // 
             panelFooter.AutoSize = true;
             panelFooter.AutoSizeMode = AutoSizeMode.GrowAndShrink;
-            panelFooter.Controls.Add(buttonUpdates);
-            panelFooter.Controls.Add(buttonQuit);
-            panelFooter.Controls.Add(checkStartup);
+            panelFooter.Controls.Add(tableLayoutPanel1);
             panelFooter.Dock = DockStyle.Top;
             panelFooter.Location = new Point(11, 1236);
             panelFooter.Margin = new Padding(0);
             panelFooter.Name = "panelFooter";
             panelFooter.Padding = new Padding(20);
-            panelFooter.Size = new Size(811, 92);
+            panelFooter.Size = new Size(811, 96);
             panelFooter.TabIndex = 7;
             // 
+            // buttonKeyboard
+            // 
+            buttonKeyboard.AccessibleName = "Extra Settings";
+            buttonKeyboard.Activated = false;
+            buttonKeyboard.BackColor = SystemColors.ControlLight;
+            buttonKeyboard.BorderColor = Color.Transparent;
+            buttonKeyboard.BorderRadius = 2;
+            buttonKeyboard.Dock = DockStyle.Top;
+            buttonKeyboard.FlatAppearance.BorderSize = 0;
+            buttonKeyboard.FlatStyle = FlatStyle.Flat;
+            buttonKeyboard.Image = Properties.Resources.icons8_settings_32;
+            buttonKeyboard.ImageAlign = ContentAlignment.MiddleRight;
+            buttonKeyboard.Location = new Point(4, 4);
+            buttonKeyboard.Margin = new Padding(4);
+            buttonKeyboard.Name = "buttonKeyboard";
+            buttonKeyboard.Secondary = true;
+            buttonKeyboard.Size = new Size(248, 48);
+            buttonKeyboard.TabIndex = 24;
+            buttonKeyboard.Text = Properties.Strings.Extra;
+            buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText;
+            buttonKeyboard.UseVisualStyleBackColor = false;
+            // 
             // buttonUpdates
             // 
             buttonUpdates.AccessibleName = "BIOS and Driver Updates";
             buttonUpdates.Activated = false;
-            buttonUpdates.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             buttonUpdates.BackColor = SystemColors.ControlLight;
             buttonUpdates.BorderColor = Color.Transparent;
             buttonUpdates.BorderRadius = 2;
+            buttonUpdates.Dock = DockStyle.Top;
             buttonUpdates.FlatStyle = FlatStyle.Flat;
-            buttonUpdates.Location = new Point(412, 24);
-            buttonUpdates.Margin = new Padding(8, 4, 8, 4);
+            buttonUpdates.Image = Properties.Resources.icons8_software_32_white;
+            buttonUpdates.ImageAlign = ContentAlignment.MiddleRight;
+            buttonUpdates.Location = new Point(260, 4);
+            buttonUpdates.Margin = new Padding(4);
             buttonUpdates.Name = "buttonUpdates";
             buttonUpdates.Secondary = true;
-            buttonUpdates.Size = new Size(180, 44);
+            buttonUpdates.Size = new Size(248, 48);
             buttonUpdates.TabIndex = 22;
             buttonUpdates.Text = "Updates";
+            buttonUpdates.TextImageRelation = TextImageRelation.ImageBeforeText;
             buttonUpdates.UseVisualStyleBackColor = false;
             // 
             // buttonQuit
@@ -373,19 +397,19 @@ namespace GHelper
             buttonQuit.BorderColor = Color.Transparent;
             buttonQuit.BorderRadius = 2;
             buttonQuit.FlatStyle = FlatStyle.Flat;
-            buttonQuit.Location = new Point(606, 24);
-            buttonQuit.Margin = new Padding(8, 4, 8, 4);
+            buttonQuit.Image = Properties.Resources.icons8_quit_32;
+            buttonQuit.Location = new Point(703, 4);
+            buttonQuit.Margin = new Padding(4);
             buttonQuit.Name = "buttonQuit";
             buttonQuit.Secondary = true;
-            buttonQuit.Size = new Size(180, 44);
+            buttonQuit.Size = new Size(64, 46);
             buttonQuit.TabIndex = 23;
-            buttonQuit.Text = Properties.Strings.Quit;
             buttonQuit.UseVisualStyleBackColor = false;
             // 
             // checkStartup
             // 
             checkStartup.AutoSize = true;
-            checkStartup.Location = new Point(27, 28);
+            checkStartup.Location = new Point(27, 12);
             checkStartup.Margin = new Padding(8, 4, 8, 4);
             checkStartup.Name = "checkStartup";
             checkStartup.Size = new Size(206, 36);
@@ -997,7 +1021,6 @@ namespace GHelper
             tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F));
             tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F));
             tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F));
-            tableLayoutKeyboard.Controls.Add(buttonKeyboard, 0, 0);
             tableLayoutKeyboard.Controls.Add(panelColor, 0, 0);
             tableLayoutKeyboard.Controls.Add(comboKeyboard, 0, 0);
             tableLayoutKeyboard.Dock = DockStyle.Top;
@@ -1009,28 +1032,6 @@ namespace GHelper
             tableLayoutKeyboard.Size = new Size(771, 60);
             tableLayoutKeyboard.TabIndex = 39;
             // 
-            // buttonKeyboard
-            // 
-            buttonKeyboard.AccessibleName = "Extra Settings";
-            buttonKeyboard.Activated = false;
-            buttonKeyboard.BackColor = SystemColors.ControlLight;
-            buttonKeyboard.BorderColor = Color.Transparent;
-            buttonKeyboard.BorderRadius = 2;
-            buttonKeyboard.Dock = DockStyle.Top;
-            buttonKeyboard.FlatAppearance.BorderSize = 0;
-            buttonKeyboard.FlatStyle = FlatStyle.Flat;
-            buttonKeyboard.Image = Properties.Resources.icons8_settings_32;
-            buttonKeyboard.ImageAlign = ContentAlignment.MiddleRight;
-            buttonKeyboard.Location = new Point(518, 8);
-            buttonKeyboard.Margin = new Padding(4, 8, 4, 8);
-            buttonKeyboard.Name = "buttonKeyboard";
-            buttonKeyboard.Secondary = true;
-            buttonKeyboard.Size = new Size(249, 44);
-            buttonKeyboard.TabIndex = 15;
-            buttonKeyboard.Text = Properties.Strings.Extra;
-            buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText;
-            buttonKeyboard.UseVisualStyleBackColor = false;
-            // 
             // panelColor
             // 
             panelColor.AutoSize = true;
@@ -1135,32 +1136,22 @@ namespace GHelper
             // 
             // labelVersion
             // 
+            labelVersion.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             labelVersion.Cursor = Cursors.Hand;
             labelVersion.Font = new Font("Segoe UI", 9F, FontStyle.Underline, GraphicsUnit.Point);
             labelVersion.ForeColor = SystemColors.ControlDark;
-            labelVersion.Location = new Point(28, 12);
+            labelVersion.Location = new Point(487, 12);
             labelVersion.Margin = new Padding(8, 0, 8, 0);
             labelVersion.Name = "labelVersion";
             labelVersion.Size = new Size(300, 32);
             labelVersion.TabIndex = 37;
             labelVersion.Text = "v.0";
-            // 
-            // labelModel
-            // 
-            labelModel.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            labelModel.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
-            labelModel.ForeColor = SystemColors.ControlDark;
-            labelModel.Location = new Point(380, 12);
-            labelModel.Margin = new Padding(8, 0, 8, 0);
-            labelModel.Name = "labelModel";
-            labelModel.Size = new Size(400, 32);
-            labelModel.TabIndex = 38;
-            labelModel.TextAlign = ContentAlignment.TopRight;
+            labelVersion.TextAlign = ContentAlignment.TopRight;
             // 
             // panelVersion
             // 
             panelVersion.Controls.Add(labelVersion);
-            panelVersion.Controls.Add(labelModel);
+            panelVersion.Controls.Add(checkStartup);
             panelVersion.Dock = DockStyle.Top;
             panelVersion.Location = new Point(11, 1180);
             panelVersion.Margin = new Padding(4);
@@ -1168,6 +1159,24 @@ namespace GHelper
             panelVersion.Size = new Size(811, 56);
             panelVersion.TabIndex = 6;
             // 
+            // tableLayoutPanel1
+            // 
+            tableLayoutPanel1.AutoSize = true;
+            tableLayoutPanel1.ColumnCount = 3;
+            tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
+            tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
+            tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
+            tableLayoutPanel1.Controls.Add(buttonKeyboard, 0, 0);
+            tableLayoutPanel1.Controls.Add(buttonQuit, 2, 0);
+            tableLayoutPanel1.Controls.Add(buttonUpdates, 1, 0);
+            tableLayoutPanel1.Dock = DockStyle.Top;
+            tableLayoutPanel1.Location = new Point(20, 20);
+            tableLayoutPanel1.Name = "tableLayoutPanel1";
+            tableLayoutPanel1.RowCount = 1;
+            tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
+            tableLayoutPanel1.Size = new Size(771, 56);
+            tableLayoutPanel1.TabIndex = 25;
+            // 
             // SettingsForm
             // 
             AutoScaleDimensions = new SizeF(192F, 192F);
@@ -1233,6 +1242,8 @@ namespace GHelper
             panelKeyboardTitle.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureKeyboard).EndInit();
             panelVersion.ResumeLayout(false);
+            panelVersion.PerformLayout();
+            tableLayoutPanel1.ResumeLayout(false);
             ResumeLayout(false);
             PerformLayout();
         }
@@ -1274,7 +1285,6 @@ namespace GHelper
         private Label labelTipScreen;
         private RButton buttonMiniled;
         private RButton buttonMatrix;
-        private RButton buttonKeyboard;
         private RButton buttonKeyboardColor;
         private RButton buttonFans;
         private Slider sliderBattery;
@@ -1303,7 +1313,8 @@ namespace GHelper
         private Label labelBatteryTitle;
         private Panel panelVersion;
         private Label labelVersion;
-        private Label labelModel;
         private RButton buttonStopGPU;
+        private RButton buttonKeyboard;
+        private TableLayoutPanel tableLayoutPanel1;
     }
 }
\ No newline at end of file
diff --git a/app/Settings.cs b/app/Settings.cs
index dc41231b..1773b8fa 100644
--- a/app/Settings.cs
+++ b/app/Settings.cs
@@ -75,7 +75,7 @@ namespace GHelper
             checkStartup.Text = Properties.Strings.RunOnStartup;
 
             buttonMatrix.Text = Properties.Strings.PictureGif;
-            buttonQuit.Text = Properties.Strings.Quit;
+            //buttonQuit.Text = Properties.Strings.Quit;
             buttonUpdates.Text = Properties.Strings.Updates;
 
             FormClosing += SettingsForm_FormClosing;
@@ -181,7 +181,7 @@ namespace GHelper
             labelBattery.MouseLeave += PanelBattery_MouseLeave;
             labelBatteryTitle.MouseLeave += PanelBattery_MouseLeave;
 
-            labelModel.Text = AppConfig.GetModelShort() + (ProcessHelper.IsUserAdministrator() ? "." : "");
+            Text = "G-Helper - " + AppConfig.GetModelShort() + (ProcessHelper.IsUserAdministrator() ? "." : "");
             TopMost = AppConfig.Is("topmost");
 
             SetContextMenu();
diff --git a/app/Updates.cs b/app/Updates.cs
index 0c4499a7..b59a1d0d 100644
--- a/app/Updates.cs
+++ b/app/Updates.cs
@@ -25,10 +25,10 @@ namespace GHelper
         static int updatesCount = 0;
         private static long lastUpdate;
 
-        private void LoadUpdates()
+        private void LoadUpdates(bool force = false)
         {
 
-            if (Math.Abs(DateTimeOffset.Now.ToUnixTimeMilliseconds() - lastUpdate) < 5000) return;
+            if (!force && (Math.Abs(DateTimeOffset.Now.ToUnixTimeMilliseconds() - lastUpdate) < 5000)) return;
             lastUpdate = DateTimeOffset.Now.ToUnixTimeMilliseconds();
 
             InitBiosAndModel();
@@ -77,7 +77,7 @@ namespace GHelper
             InitTheme(true);
 
 
-            LoadUpdates();
+            LoadUpdates(true);
 
             //buttonRefresh.Visible = false;
             buttonRefresh.Click += ButtonRefresh_Click;