diff --git a/Core/Other/Settings/TabSettingsAdvanced.Designer.cs b/Core/Other/Settings/TabSettingsAdvanced.Designer.cs
index 96b5b804..aeebdcf6 100644
--- a/Core/Other/Settings/TabSettingsAdvanced.Designer.cs
+++ b/Core/Other/Settings/TabSettingsAdvanced.Designer.cs
@@ -36,17 +36,20 @@ private void InitializeComponent() {
             this.btnReset = new System.Windows.Forms.Button();
             this.btnImport = new System.Windows.Forms.Button();
             this.btnExport = new System.Windows.Forms.Button();
-            this.groupPerformance = new System.Windows.Forms.GroupBox();
-            this.groupConfiguration = new System.Windows.Forms.GroupBox();
-            this.groupApp = new System.Windows.Forms.GroupBox();
-            this.groupPerformance.SuspendLayout();
-            this.groupConfiguration.SuspendLayout();
-            this.groupApp.SuspendLayout();
+            this.labelApp = new System.Windows.Forms.Label();
+            this.panelApp = new System.Windows.Forms.Panel();
+            this.labelPerformance = new System.Windows.Forms.Label();
+            this.panelPerformance = new System.Windows.Forms.Panel();
+            this.panelConfiguration = new System.Windows.Forms.Panel();
+            this.labelConfiguration = new System.Windows.Forms.Label();
+            this.panelApp.SuspendLayout();
+            this.panelPerformance.SuspendLayout();
+            this.panelConfiguration.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnClearCache
             // 
-            this.btnClearCache.Location = new System.Drawing.Point(6, 44);
+            this.btnClearCache.Location = new System.Drawing.Point(3, 28);
             this.btnClearCache.Name = "btnClearCache";
             this.btnClearCache.Size = new System.Drawing.Size(171, 23);
             this.btnClearCache.TabIndex = 1;
@@ -58,7 +61,7 @@ private void InitializeComponent() {
             // checkHardwareAcceleration
             // 
             this.checkHardwareAcceleration.AutoSize = true;
-            this.checkHardwareAcceleration.Location = new System.Drawing.Point(9, 21);
+            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 5);
             this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkHardwareAcceleration.Name = "checkHardwareAcceleration";
             this.checkHardwareAcceleration.Size = new System.Drawing.Size(134, 17);
@@ -70,7 +73,7 @@ private void InitializeComponent() {
             // 
             // btnEditCefArgs
             // 
-            this.btnEditCefArgs.Location = new System.Drawing.Point(6, 19);
+            this.btnEditCefArgs.Location = new System.Drawing.Point(3, 3);
             this.btnEditCefArgs.Name = "btnEditCefArgs";
             this.btnEditCefArgs.Size = new System.Drawing.Size(171, 23);
             this.btnEditCefArgs.TabIndex = 0;
@@ -80,7 +83,7 @@ private void InitializeComponent() {
             // 
             // btnEditCSS
             // 
-            this.btnEditCSS.Location = new System.Drawing.Point(6, 48);
+            this.btnEditCSS.Location = new System.Drawing.Point(3, 32);
             this.btnEditCSS.Name = "btnEditCSS";
             this.btnEditCSS.Size = new System.Drawing.Size(171, 23);
             this.btnEditCSS.TabIndex = 1;
@@ -90,7 +93,7 @@ private void InitializeComponent() {
             // 
             // btnRestartArgs
             // 
-            this.btnRestartArgs.Location = new System.Drawing.Point(6, 106);
+            this.btnRestartArgs.Location = new System.Drawing.Point(3, 90);
             this.btnRestartArgs.Name = "btnRestartArgs";
             this.btnRestartArgs.Size = new System.Drawing.Size(171, 23);
             this.btnRestartArgs.TabIndex = 3;
@@ -100,7 +103,7 @@ private void InitializeComponent() {
             // 
             // btnRestart
             // 
-            this.btnRestart.Location = new System.Drawing.Point(6, 77);
+            this.btnRestart.Location = new System.Drawing.Point(3, 61);
             this.btnRestart.Name = "btnRestart";
             this.btnRestart.Size = new System.Drawing.Size(171, 23);
             this.btnRestart.TabIndex = 2;
@@ -111,7 +114,7 @@ private void InitializeComponent() {
             // 
             // btnOpenAppFolder
             // 
-            this.btnOpenAppFolder.Location = new System.Drawing.Point(6, 19);
+            this.btnOpenAppFolder.Location = new System.Drawing.Point(3, 3);
             this.btnOpenAppFolder.Name = "btnOpenAppFolder";
             this.btnOpenAppFolder.Size = new System.Drawing.Size(171, 23);
             this.btnOpenAppFolder.TabIndex = 0;
@@ -121,7 +124,7 @@ private void InitializeComponent() {
             // 
             // btnOpenDataFolder
             // 
-            this.btnOpenDataFolder.Location = new System.Drawing.Point(6, 48);
+            this.btnOpenDataFolder.Location = new System.Drawing.Point(3, 32);
             this.btnOpenDataFolder.Name = "btnOpenDataFolder";
             this.btnOpenDataFolder.Size = new System.Drawing.Size(171, 23);
             this.btnOpenDataFolder.TabIndex = 1;
@@ -133,11 +136,11 @@ private void InitializeComponent() {
             // 
             this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnReset.AutoSize = true;
-            this.btnReset.Location = new System.Drawing.Point(190, 268);
+            this.btnReset.Location = new System.Drawing.Point(190, 388);
             this.btnReset.Name = "btnReset";
             this.btnReset.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnReset.Size = new System.Drawing.Size(102, 23);
-            this.btnReset.TabIndex = 5;
+            this.btnReset.TabIndex = 8;
             this.btnReset.Text = "Restore Defaults";
             this.btnReset.UseVisualStyleBackColor = true;
             // 
@@ -145,11 +148,11 @@ private void InitializeComponent() {
             // 
             this.btnImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnImport.AutoSize = true;
-            this.btnImport.Location = new System.Drawing.Point(100, 268);
+            this.btnImport.Location = new System.Drawing.Point(100, 388);
             this.btnImport.Name = "btnImport";
             this.btnImport.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnImport.Size = new System.Drawing.Size(84, 23);
-            this.btnImport.TabIndex = 4;
+            this.btnImport.TabIndex = 7;
             this.btnImport.Text = "Import Profile";
             this.btnImport.UseVisualStyleBackColor = true;
             // 
@@ -158,65 +161,101 @@ private void InitializeComponent() {
             this.btnExport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnExport.AutoSize = true;
             this.btnExport.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnExport.Location = new System.Drawing.Point(9, 268);
+            this.btnExport.Location = new System.Drawing.Point(9, 388);
             this.btnExport.Name = "btnExport";
             this.btnExport.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnExport.Size = new System.Drawing.Size(85, 23);
-            this.btnExport.TabIndex = 3;
+            this.btnExport.TabIndex = 6;
             this.btnExport.Text = "Export Profile";
             this.btnExport.UseVisualStyleBackColor = true;
             // 
-            // groupPerformance
+            // labelApp
             // 
-            this.groupPerformance.Controls.Add(this.checkHardwareAcceleration);
-            this.groupPerformance.Controls.Add(this.btnClearCache);
-            this.groupPerformance.Location = new System.Drawing.Point(9, 9);
-            this.groupPerformance.Name = "groupPerformance";
-            this.groupPerformance.Size = new System.Drawing.Size(183, 74);
-            this.groupPerformance.TabIndex = 0;
-            this.groupPerformance.TabStop = false;
-            this.groupPerformance.Text = "Performance";
+            this.labelApp.AutoSize = true;
+            this.labelApp.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelApp.Location = new System.Drawing.Point(6, 8);
+            this.labelApp.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.labelApp.Name = "labelApp";
+            this.labelApp.Size = new System.Drawing.Size(38, 20);
+            this.labelApp.TabIndex = 0;
+            this.labelApp.Text = "App";
             // 
-            // groupConfiguration
+            // panelApp
             // 
-            this.groupConfiguration.Controls.Add(this.btnEditCSS);
-            this.groupConfiguration.Controls.Add(this.btnEditCefArgs);
-            this.groupConfiguration.Location = new System.Drawing.Point(9, 89);
-            this.groupConfiguration.Name = "groupConfiguration";
-            this.groupConfiguration.Size = new System.Drawing.Size(183, 77);
-            this.groupConfiguration.TabIndex = 1;
-            this.groupConfiguration.TabStop = false;
-            this.groupConfiguration.Text = "Configuration";
+            this.panelApp.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelApp.Controls.Add(this.btnOpenDataFolder);
+            this.panelApp.Controls.Add(this.btnOpenAppFolder);
+            this.panelApp.Controls.Add(this.btnRestart);
+            this.panelApp.Controls.Add(this.btnRestartArgs);
+            this.panelApp.Location = new System.Drawing.Point(9, 31);
+            this.panelApp.Name = "panelApp";
+            this.panelApp.Size = new System.Drawing.Size(322, 117);
+            this.panelApp.TabIndex = 1;
             // 
-            // groupApp
+            // labelPerformance
             // 
-            this.groupApp.Controls.Add(this.btnOpenDataFolder);
-            this.groupApp.Controls.Add(this.btnOpenAppFolder);
-            this.groupApp.Controls.Add(this.btnRestartArgs);
-            this.groupApp.Controls.Add(this.btnRestart);
-            this.groupApp.Location = new System.Drawing.Point(198, 9);
-            this.groupApp.Name = "groupApp";
-            this.groupApp.Size = new System.Drawing.Size(183, 135);
-            this.groupApp.TabIndex = 2;
-            this.groupApp.TabStop = false;
-            this.groupApp.Text = "App";
+            this.labelPerformance.AutoSize = true;
+            this.labelPerformance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelPerformance.Location = new System.Drawing.Point(6, 172);
+            this.labelPerformance.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelPerformance.Name = "labelPerformance";
+            this.labelPerformance.Size = new System.Drawing.Size(100, 20);
+            this.labelPerformance.TabIndex = 2;
+            this.labelPerformance.Text = "Performance";
+            // 
+            // panelPerformance
+            // 
+            this.panelPerformance.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelPerformance.Controls.Add(this.checkHardwareAcceleration);
+            this.panelPerformance.Controls.Add(this.btnClearCache);
+            this.panelPerformance.Location = new System.Drawing.Point(9, 195);
+            this.panelPerformance.Name = "panelPerformance";
+            this.panelPerformance.Size = new System.Drawing.Size(322, 54);
+            this.panelPerformance.TabIndex = 3;
+            // 
+            // panelConfiguration
+            // 
+            this.panelConfiguration.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelConfiguration.Controls.Add(this.btnEditCSS);
+            this.panelConfiguration.Controls.Add(this.btnEditCefArgs);
+            this.panelConfiguration.Location = new System.Drawing.Point(9, 296);
+            this.panelConfiguration.Name = "panelConfiguration";
+            this.panelConfiguration.Size = new System.Drawing.Size(322, 58);
+            this.panelConfiguration.TabIndex = 5;
+            // 
+            // labelConfiguration
+            // 
+            this.labelConfiguration.AutoSize = true;
+            this.labelConfiguration.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelConfiguration.Location = new System.Drawing.Point(6, 273);
+            this.labelConfiguration.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelConfiguration.Name = "labelConfiguration";
+            this.labelConfiguration.Size = new System.Drawing.Size(104, 20);
+            this.labelConfiguration.TabIndex = 4;
+            this.labelConfiguration.Text = "Configuration";
             // 
             // TabSettingsAdvanced
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupApp);
-            this.Controls.Add(this.groupConfiguration);
-            this.Controls.Add(this.groupPerformance);
+            this.Controls.Add(this.labelConfiguration);
+            this.Controls.Add(this.panelConfiguration);
+            this.Controls.Add(this.panelPerformance);
+            this.Controls.Add(this.labelPerformance);
+            this.Controls.Add(this.panelApp);
+            this.Controls.Add(this.labelApp);
             this.Controls.Add(this.btnReset);
             this.Controls.Add(this.btnImport);
             this.Controls.Add(this.btnExport);
             this.Name = "TabSettingsAdvanced";
-            this.Size = new System.Drawing.Size(478, 300);
-            this.groupPerformance.ResumeLayout(false);
-            this.groupPerformance.PerformLayout();
-            this.groupConfiguration.ResumeLayout(false);
-            this.groupApp.ResumeLayout(false);
+            this.Size = new System.Drawing.Size(340, 420);
+            this.panelApp.ResumeLayout(false);
+            this.panelPerformance.ResumeLayout(false);
+            this.panelPerformance.PerformLayout();
+            this.panelConfiguration.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -230,14 +269,17 @@ private void InitializeComponent() {
         private System.Windows.Forms.Button btnReset;
         private System.Windows.Forms.Button btnImport;
         private System.Windows.Forms.Button btnExport;
-        private System.Windows.Forms.GroupBox groupPerformance;
-        private System.Windows.Forms.GroupBox groupConfiguration;
         private System.Windows.Forms.Button btnEditCefArgs;
         private System.Windows.Forms.Button btnEditCSS;
-        private System.Windows.Forms.GroupBox groupApp;
         private System.Windows.Forms.Button btnRestartArgs;
         private System.Windows.Forms.Button btnRestart;
         private System.Windows.Forms.Button btnOpenAppFolder;
         private System.Windows.Forms.Button btnOpenDataFolder;
+        private System.Windows.Forms.Label labelApp;
+        private System.Windows.Forms.Panel panelApp;
+        private System.Windows.Forms.Label labelPerformance;
+        private System.Windows.Forms.Panel panelPerformance;
+        private System.Windows.Forms.Panel panelConfiguration;
+        private System.Windows.Forms.Label labelConfiguration;
     }
 }
diff --git a/Core/Other/Settings/TabSettingsGeneral.Designer.cs b/Core/Other/Settings/TabSettingsGeneral.Designer.cs
index 08f63368..08b88c56 100644
--- a/Core/Other/Settings/TabSettingsGeneral.Designer.cs
+++ b/Core/Other/Settings/TabSettingsGeneral.Designer.cs
@@ -33,23 +33,26 @@ private void InitializeComponent() {
             this.btnCheckUpdates = new System.Windows.Forms.Button();
             this.labelZoomValue = new System.Windows.Forms.Label();
             this.checkSwitchAccountSelectors = new System.Windows.Forms.CheckBox();
-            this.groupTray = new System.Windows.Forms.GroupBox();
             this.labelTrayIcon = new System.Windows.Forms.Label();
-            this.groupInterface = new System.Windows.Forms.GroupBox();
             this.trackBarZoom = new System.Windows.Forms.TrackBar();
             this.labelZoom = new System.Windows.Forms.Label();
-            this.groupUpdates = new System.Windows.Forms.GroupBox();
             this.zoomUpdateTimer = new System.Windows.Forms.Timer(this.components);
-            this.groupTray.SuspendLayout();
-            this.groupInterface.SuspendLayout();
+            this.labelUI = new System.Windows.Forms.Label();
+            this.panelUI = new System.Windows.Forms.Panel();
+            this.labelTray = new System.Windows.Forms.Label();
+            this.panelUpdates = new System.Windows.Forms.Panel();
+            this.panelTray = new System.Windows.Forms.Panel();
+            this.labelUpdates = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).BeginInit();
-            this.groupUpdates.SuspendLayout();
+            this.panelUI.SuspendLayout();
+            this.panelUpdates.SuspendLayout();
+            this.panelTray.SuspendLayout();
             this.SuspendLayout();
             // 
             // checkExpandLinks
             // 
             this.checkExpandLinks.AutoSize = true;
-            this.checkExpandLinks.Location = new System.Drawing.Point(9, 21);
+            this.checkExpandLinks.Location = new System.Drawing.Point(6, 5);
             this.checkExpandLinks.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkExpandLinks.Name = "checkExpandLinks";
             this.checkExpandLinks.Size = new System.Drawing.Size(166, 17);
@@ -63,7 +66,8 @@ private void InitializeComponent() {
             // 
             this.comboBoxTrayType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxTrayType.FormattingEnabled = true;
-            this.comboBoxTrayType.Location = new System.Drawing.Point(6, 19);
+            this.comboBoxTrayType.Location = new System.Drawing.Point(3, 5);
+            this.comboBoxTrayType.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
             this.comboBoxTrayType.Name = "comboBoxTrayType";
             this.comboBoxTrayType.Size = new System.Drawing.Size(171, 21);
             this.comboBoxTrayType.TabIndex = 0;
@@ -72,7 +76,7 @@ private void InitializeComponent() {
             // checkTrayHighlight
             // 
             this.checkTrayHighlight.AutoSize = true;
-            this.checkTrayHighlight.Location = new System.Drawing.Point(9, 70);
+            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 56);
             this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkTrayHighlight.Name = "checkTrayHighlight";
             this.checkTrayHighlight.Size = new System.Drawing.Size(103, 17);
@@ -85,7 +89,7 @@ private void InitializeComponent() {
             // checkSpellCheck
             // 
             this.checkSpellCheck.AutoSize = true;
-            this.checkSpellCheck.Location = new System.Drawing.Point(9, 67);
+            this.checkSpellCheck.Location = new System.Drawing.Point(6, 51);
             this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkSpellCheck.Name = "checkSpellCheck";
             this.checkSpellCheck.Size = new System.Drawing.Size(119, 17);
@@ -97,7 +101,7 @@ private void InitializeComponent() {
             // checkUpdateNotifications
             // 
             this.checkUpdateNotifications.AutoSize = true;
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(9, 21);
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 5);
             this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkUpdateNotifications.Name = "checkUpdateNotifications";
             this.checkUpdateNotifications.Size = new System.Drawing.Size(165, 17);
@@ -109,7 +113,7 @@ private void InitializeComponent() {
             // 
             // btnCheckUpdates
             // 
-            this.btnCheckUpdates.Location = new System.Drawing.Point(6, 44);
+            this.btnCheckUpdates.Location = new System.Drawing.Point(3, 28);
             this.btnCheckUpdates.Name = "btnCheckUpdates";
             this.btnCheckUpdates.Size = new System.Drawing.Size(171, 23);
             this.btnCheckUpdates.TabIndex = 1;
@@ -119,9 +123,8 @@ private void InitializeComponent() {
             // 
             // labelZoomValue
             // 
-            this.labelZoomValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.labelZoomValue.BackColor = System.Drawing.Color.Transparent;
-            this.labelZoomValue.Location = new System.Drawing.Point(139, 116);
+            this.labelZoomValue.Location = new System.Drawing.Point(136, 100);
             this.labelZoomValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelZoomValue.Name = "labelZoomValue";
             this.labelZoomValue.Size = new System.Drawing.Size(38, 13);
@@ -133,7 +136,7 @@ private void InitializeComponent() {
             // checkSwitchAccountSelectors
             // 
             this.checkSwitchAccountSelectors.AutoSize = true;
-            this.checkSwitchAccountSelectors.Location = new System.Drawing.Point(9, 44);
+            this.checkSwitchAccountSelectors.Location = new System.Drawing.Point(6, 28);
             this.checkSwitchAccountSelectors.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkSwitchAccountSelectors.Name = "checkSwitchAccountSelectors";
             this.checkSwitchAccountSelectors.Size = new System.Drawing.Size(172, 17);
@@ -143,50 +146,22 @@ private void InitializeComponent() {
         "iple accounts, instead of TweetDeck\'s default behavior.");
             this.checkSwitchAccountSelectors.UseVisualStyleBackColor = true;
             // 
-            // groupTray
-            // 
-            this.groupTray.Controls.Add(this.checkTrayHighlight);
-            this.groupTray.Controls.Add(this.labelTrayIcon);
-            this.groupTray.Controls.Add(this.comboBoxTrayType);
-            this.groupTray.Location = new System.Drawing.Point(9, 168);
-            this.groupTray.Name = "groupTray";
-            this.groupTray.Size = new System.Drawing.Size(183, 93);
-            this.groupTray.TabIndex = 1;
-            this.groupTray.TabStop = false;
-            this.groupTray.Text = "System Tray";
-            // 
             // labelTrayIcon
             // 
             this.labelTrayIcon.AutoSize = true;
-            this.labelTrayIcon.Location = new System.Drawing.Point(6, 52);
+            this.labelTrayIcon.Location = new System.Drawing.Point(3, 38);
             this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
             this.labelTrayIcon.Name = "labelTrayIcon";
             this.labelTrayIcon.Size = new System.Drawing.Size(52, 13);
             this.labelTrayIcon.TabIndex = 1;
             this.labelTrayIcon.Text = "Tray Icon";
             // 
-            // groupInterface
-            // 
-            this.groupInterface.Controls.Add(this.checkSwitchAccountSelectors);
-            this.groupInterface.Controls.Add(this.labelZoomValue);
-            this.groupInterface.Controls.Add(this.trackBarZoom);
-            this.groupInterface.Controls.Add(this.labelZoom);
-            this.groupInterface.Controls.Add(this.checkSpellCheck);
-            this.groupInterface.Controls.Add(this.checkExpandLinks);
-            this.groupInterface.Location = new System.Drawing.Point(9, 9);
-            this.groupInterface.Name = "groupInterface";
-            this.groupInterface.Size = new System.Drawing.Size(183, 153);
-            this.groupInterface.TabIndex = 0;
-            this.groupInterface.TabStop = false;
-            this.groupInterface.Text = "User Interface";
-            // 
             // trackBarZoom
             // 
-            this.trackBarZoom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.trackBarZoom.AutoSize = false;
+            this.trackBarZoom.BackColor = System.Drawing.SystemColors.Control;
             this.trackBarZoom.LargeChange = 25;
-            this.trackBarZoom.Location = new System.Drawing.Point(6, 115);
+            this.trackBarZoom.Location = new System.Drawing.Point(3, 99);
             this.trackBarZoom.Maximum = 200;
             this.trackBarZoom.Minimum = 50;
             this.trackBarZoom.Name = "trackBarZoom";
@@ -198,49 +173,111 @@ private void InitializeComponent() {
             // 
             // labelZoom
             // 
-            this.labelZoom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.labelZoom.AutoSize = true;
-            this.labelZoom.Location = new System.Drawing.Point(5, 99);
+            this.labelZoom.Location = new System.Drawing.Point(3, 83);
             this.labelZoom.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelZoom.Name = "labelZoom";
             this.labelZoom.Size = new System.Drawing.Size(34, 13);
             this.labelZoom.TabIndex = 3;
             this.labelZoom.Text = "Zoom";
             // 
-            // groupUpdates
-            // 
-            this.groupUpdates.Controls.Add(this.checkUpdateNotifications);
-            this.groupUpdates.Controls.Add(this.btnCheckUpdates);
-            this.groupUpdates.Location = new System.Drawing.Point(198, 9);
-            this.groupUpdates.Name = "groupUpdates";
-            this.groupUpdates.Size = new System.Drawing.Size(183, 75);
-            this.groupUpdates.TabIndex = 2;
-            this.groupUpdates.TabStop = false;
-            this.groupUpdates.Text = "Updates";
-            // 
             // zoomUpdateTimer
             // 
             this.zoomUpdateTimer.Interval = 250;
             this.zoomUpdateTimer.Tick += new System.EventHandler(this.zoomUpdateTimer_Tick);
             // 
+            // labelUI
+            // 
+            this.labelUI.AutoSize = true;
+            this.labelUI.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelUI.Location = new System.Drawing.Point(6, 8);
+            this.labelUI.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.labelUI.Name = "labelUI";
+            this.labelUI.Size = new System.Drawing.Size(111, 20);
+            this.labelUI.TabIndex = 0;
+            this.labelUI.Text = "User Interface";
+            // 
+            // panelUI
+            // 
+            this.panelUI.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelUI.Controls.Add(this.checkExpandLinks);
+            this.panelUI.Controls.Add(this.checkSwitchAccountSelectors);
+            this.panelUI.Controls.Add(this.checkSpellCheck);
+            this.panelUI.Controls.Add(this.labelZoom);
+            this.panelUI.Controls.Add(this.labelZoomValue);
+            this.panelUI.Controls.Add(this.trackBarZoom);
+            this.panelUI.Location = new System.Drawing.Point(9, 31);
+            this.panelUI.Name = "panelUI";
+            this.panelUI.Size = new System.Drawing.Size(322, 134);
+            this.panelUI.TabIndex = 1;
+            // 
+            // labelTray
+            // 
+            this.labelTray.AutoSize = true;
+            this.labelTray.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTray.Location = new System.Drawing.Point(5, 189);
+            this.labelTray.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelTray.Name = "labelTray";
+            this.labelTray.Size = new System.Drawing.Size(96, 20);
+            this.labelTray.TabIndex = 2;
+            this.labelTray.Text = "System Tray";
+            // 
+            // panelUpdates
+            // 
+            this.panelUpdates.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelUpdates.Controls.Add(this.checkUpdateNotifications);
+            this.panelUpdates.Controls.Add(this.btnCheckUpdates);
+            this.panelUpdates.Location = new System.Drawing.Point(9, 335);
+            this.panelUpdates.Name = "panelUpdates";
+            this.panelUpdates.Size = new System.Drawing.Size(322, 55);
+            this.panelUpdates.TabIndex = 5;
+            // 
+            // panelTray
+            // 
+            this.panelTray.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelTray.Controls.Add(this.checkTrayHighlight);
+            this.panelTray.Controls.Add(this.comboBoxTrayType);
+            this.panelTray.Controls.Add(this.labelTrayIcon);
+            this.panelTray.Location = new System.Drawing.Point(9, 212);
+            this.panelTray.Name = "panelTray";
+            this.panelTray.Size = new System.Drawing.Size(322, 76);
+            this.panelTray.TabIndex = 3;
+            // 
+            // labelUpdates
+            // 
+            this.labelUpdates.AutoSize = true;
+            this.labelUpdates.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelUpdates.Location = new System.Drawing.Point(6, 312);
+            this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelUpdates.Name = "labelUpdates";
+            this.labelUpdates.Size = new System.Drawing.Size(70, 20);
+            this.labelUpdates.TabIndex = 4;
+            this.labelUpdates.Text = "Updates";
+            // 
             // TabSettingsGeneral
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupUpdates);
-            this.Controls.Add(this.groupInterface);
-            this.Controls.Add(this.groupTray);
+            this.Controls.Add(this.labelUpdates);
+            this.Controls.Add(this.panelTray);
+            this.Controls.Add(this.panelUpdates);
+            this.Controls.Add(this.labelTray);
+            this.Controls.Add(this.panelUI);
+            this.Controls.Add(this.labelUI);
             this.Name = "TabSettingsGeneral";
-            this.Size = new System.Drawing.Size(478, 300);
-            this.groupTray.ResumeLayout(false);
-            this.groupTray.PerformLayout();
-            this.groupInterface.ResumeLayout(false);
-            this.groupInterface.PerformLayout();
+            this.Size = new System.Drawing.Size(340, 400);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
-            this.groupUpdates.ResumeLayout(false);
-            this.groupUpdates.PerformLayout();
+            this.panelUI.ResumeLayout(false);
+            this.panelUI.PerformLayout();
+            this.panelUpdates.ResumeLayout(false);
+            this.panelUpdates.PerformLayout();
+            this.panelTray.ResumeLayout(false);
+            this.panelTray.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
@@ -249,12 +286,9 @@ private void InitializeComponent() {
         private System.Windows.Forms.CheckBox checkExpandLinks;
         private System.Windows.Forms.ComboBox comboBoxTrayType;
         private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.GroupBox groupTray;
-        private System.Windows.Forms.GroupBox groupInterface;
         private System.Windows.Forms.Label labelTrayIcon;
         private System.Windows.Forms.CheckBox checkTrayHighlight;
         private System.Windows.Forms.CheckBox checkSpellCheck;
-        private System.Windows.Forms.GroupBox groupUpdates;
         private System.Windows.Forms.CheckBox checkUpdateNotifications;
         private System.Windows.Forms.Button btnCheckUpdates;
         private System.Windows.Forms.Label labelZoom;
@@ -262,5 +296,11 @@ private void InitializeComponent() {
         private System.Windows.Forms.TrackBar trackBarZoom;
         private System.Windows.Forms.Timer zoomUpdateTimer;
         private System.Windows.Forms.CheckBox checkSwitchAccountSelectors;
+        private System.Windows.Forms.Label labelUI;
+        private System.Windows.Forms.Panel panelUI;
+        private System.Windows.Forms.Label labelTray;
+        private System.Windows.Forms.Panel panelUpdates;
+        private System.Windows.Forms.Panel panelTray;
+        private System.Windows.Forms.Label labelUpdates;
     }
 }
diff --git a/Core/Other/Settings/TabSettingsNotifications.Designer.cs b/Core/Other/Settings/TabSettingsNotifications.Designer.cs
index 4c9958a1..7cd951cc 100644
--- a/Core/Other/Settings/TabSettingsNotifications.Designer.cs
+++ b/Core/Other/Settings/TabSettingsNotifications.Designer.cs
@@ -24,7 +24,6 @@ protected override void Dispose(bool disposing) {
         /// </summary>
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
-            this.groupNotificationLocation = new System.Windows.Forms.GroupBox();
             this.labelEdgeDistanceValue = new System.Windows.Forms.Label();
             this.labelDisplay = new System.Windows.Forms.Label();
             this.comboBoxDisplay = new System.Windows.Forms.ComboBox();
@@ -35,14 +34,12 @@ private void InitializeComponent() {
             this.radioLocTR = new System.Windows.Forms.RadioButton();
             this.radioLocTL = new System.Windows.Forms.RadioButton();
             this.trackBarEdgeDistance = new System.Windows.Forms.TrackBar();
-            this.groupNotificationDuration = new System.Windows.Forms.GroupBox();
             this.tableLayoutDurationButtons = new System.Windows.Forms.TableLayoutPanel();
             this.btnDurationMedium = new TweetDuck.Core.Controls.FlatButton();
             this.btnDurationLong = new TweetDuck.Core.Controls.FlatButton();
             this.btnDurationShort = new TweetDuck.Core.Controls.FlatButton();
             this.labelDurationValue = new System.Windows.Forms.Label();
             this.trackBarDuration = new System.Windows.Forms.TrackBar();
-            this.groupUserInterface = new System.Windows.Forms.GroupBox();
             this.checkSkipOnLinkClick = new System.Windows.Forms.CheckBox();
             this.checkColumnName = new System.Windows.Forms.CheckBox();
             this.labelIdlePause = new System.Windows.Forms.Label();
@@ -51,37 +48,24 @@ private void InitializeComponent() {
             this.checkTimerCountDown = new System.Windows.Forms.CheckBox();
             this.checkNotificationTimer = new System.Windows.Forms.CheckBox();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.groupNotificationLocation.SuspendLayout();
+            this.labelGeneral = new System.Windows.Forms.Label();
+            this.panelGeneral = new System.Windows.Forms.Panel();
+            this.labelLocation = new System.Windows.Forms.Label();
+            this.panelLocation = new System.Windows.Forms.Panel();
+            this.panelDuration = new System.Windows.Forms.Panel();
+            this.labelDuration = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).BeginInit();
-            this.groupNotificationDuration.SuspendLayout();
             this.tableLayoutDurationButtons.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarDuration)).BeginInit();
-            this.groupUserInterface.SuspendLayout();
+            this.panelGeneral.SuspendLayout();
+            this.panelLocation.SuspendLayout();
+            this.panelDuration.SuspendLayout();
             this.SuspendLayout();
             // 
-            // groupNotificationLocation
-            // 
-            this.groupNotificationLocation.Controls.Add(this.labelEdgeDistanceValue);
-            this.groupNotificationLocation.Controls.Add(this.labelDisplay);
-            this.groupNotificationLocation.Controls.Add(this.comboBoxDisplay);
-            this.groupNotificationLocation.Controls.Add(this.labelEdgeDistance);
-            this.groupNotificationLocation.Controls.Add(this.radioLocCustom);
-            this.groupNotificationLocation.Controls.Add(this.radioLocBR);
-            this.groupNotificationLocation.Controls.Add(this.radioLocBL);
-            this.groupNotificationLocation.Controls.Add(this.radioLocTR);
-            this.groupNotificationLocation.Controls.Add(this.radioLocTL);
-            this.groupNotificationLocation.Controls.Add(this.trackBarEdgeDistance);
-            this.groupNotificationLocation.Location = new System.Drawing.Point(198, 9);
-            this.groupNotificationLocation.Name = "groupNotificationLocation";
-            this.groupNotificationLocation.Size = new System.Drawing.Size(183, 282);
-            this.groupNotificationLocation.TabIndex = 2;
-            this.groupNotificationLocation.TabStop = false;
-            this.groupNotificationLocation.Text = "Location";
-            // 
             // labelEdgeDistanceValue
             // 
             this.labelEdgeDistanceValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.labelEdgeDistanceValue.Location = new System.Drawing.Point(143, 217);
+            this.labelEdgeDistanceValue.Location = new System.Drawing.Point(120, 201);
             this.labelEdgeDistanceValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelEdgeDistanceValue.Name = "labelEdgeDistanceValue";
             this.labelEdgeDistanceValue.Size = new System.Drawing.Size(34, 13);
@@ -92,7 +76,7 @@ private void InitializeComponent() {
             // labelDisplay
             // 
             this.labelDisplay.AutoSize = true;
-            this.labelDisplay.Location = new System.Drawing.Point(5, 144);
+            this.labelDisplay.Location = new System.Drawing.Point(3, 128);
             this.labelDisplay.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDisplay.Name = "labelDisplay";
             this.labelDisplay.Size = new System.Drawing.Size(41, 13);
@@ -105,15 +89,15 @@ private void InitializeComponent() {
             | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBoxDisplay.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxDisplay.FormattingEnabled = true;
-            this.comboBoxDisplay.Location = new System.Drawing.Point(6, 160);
+            this.comboBoxDisplay.Location = new System.Drawing.Point(3, 144);
             this.comboBoxDisplay.Name = "comboBoxDisplay";
-            this.comboBoxDisplay.Size = new System.Drawing.Size(171, 21);
+            this.comboBoxDisplay.Size = new System.Drawing.Size(151, 21);
             this.comboBoxDisplay.TabIndex = 6;
             // 
             // labelEdgeDistance
             // 
             this.labelEdgeDistance.AutoSize = true;
-            this.labelEdgeDistance.Location = new System.Drawing.Point(5, 196);
+            this.labelEdgeDistance.Location = new System.Drawing.Point(3, 180);
             this.labelEdgeDistance.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelEdgeDistance.Name = "labelEdgeDistance";
             this.labelEdgeDistance.Size = new System.Drawing.Size(103, 13);
@@ -123,7 +107,7 @@ private void InitializeComponent() {
             // radioLocCustom
             // 
             this.radioLocCustom.AutoSize = true;
-            this.radioLocCustom.Location = new System.Drawing.Point(8, 112);
+            this.radioLocCustom.Location = new System.Drawing.Point(5, 96);
             this.radioLocCustom.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.radioLocCustom.Name = "radioLocCustom";
             this.radioLocCustom.Size = new System.Drawing.Size(60, 17);
@@ -136,7 +120,7 @@ private void InitializeComponent() {
             // radioLocBR
             // 
             this.radioLocBR.AutoSize = true;
-            this.radioLocBR.Location = new System.Drawing.Point(8, 89);
+            this.radioLocBR.Location = new System.Drawing.Point(5, 73);
             this.radioLocBR.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.radioLocBR.Name = "radioLocBR";
             this.radioLocBR.Size = new System.Drawing.Size(86, 17);
@@ -148,7 +132,7 @@ private void InitializeComponent() {
             // radioLocBL
             // 
             this.radioLocBL.AutoSize = true;
-            this.radioLocBL.Location = new System.Drawing.Point(8, 66);
+            this.radioLocBL.Location = new System.Drawing.Point(5, 50);
             this.radioLocBL.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.radioLocBL.Name = "radioLocBL";
             this.radioLocBL.Size = new System.Drawing.Size(79, 17);
@@ -160,7 +144,7 @@ private void InitializeComponent() {
             // radioLocTR
             // 
             this.radioLocTR.AutoSize = true;
-            this.radioLocTR.Location = new System.Drawing.Point(8, 43);
+            this.radioLocTR.Location = new System.Drawing.Point(5, 27);
             this.radioLocTR.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.radioLocTR.Name = "radioLocTR";
             this.radioLocTR.Size = new System.Drawing.Size(72, 17);
@@ -172,7 +156,7 @@ private void InitializeComponent() {
             // radioLocTL
             // 
             this.radioLocTL.AutoSize = true;
-            this.radioLocTL.Location = new System.Drawing.Point(8, 20);
+            this.radioLocTL.Location = new System.Drawing.Point(5, 4);
             this.radioLocTL.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocTL.Name = "radioLocTL";
             this.radioLocTL.Size = new System.Drawing.Size(65, 17);
@@ -187,32 +171,18 @@ private void InitializeComponent() {
             | System.Windows.Forms.AnchorStyles.Right)));
             this.trackBarEdgeDistance.AutoSize = false;
             this.trackBarEdgeDistance.LargeChange = 8;
-            this.trackBarEdgeDistance.Location = new System.Drawing.Point(8, 212);
+            this.trackBarEdgeDistance.Location = new System.Drawing.Point(5, 196);
             this.trackBarEdgeDistance.Maximum = 40;
             this.trackBarEdgeDistance.Minimum = 8;
             this.trackBarEdgeDistance.Name = "trackBarEdgeDistance";
-            this.trackBarEdgeDistance.Size = new System.Drawing.Size(141, 30);
+            this.trackBarEdgeDistance.Size = new System.Drawing.Size(121, 30);
             this.trackBarEdgeDistance.SmallChange = 2;
             this.trackBarEdgeDistance.TabIndex = 8;
             this.trackBarEdgeDistance.TickFrequency = 4;
             this.trackBarEdgeDistance.Value = 8;
             // 
-            // groupNotificationDuration
-            // 
-            this.groupNotificationDuration.Controls.Add(this.tableLayoutDurationButtons);
-            this.groupNotificationDuration.Controls.Add(this.labelDurationValue);
-            this.groupNotificationDuration.Controls.Add(this.trackBarDuration);
-            this.groupNotificationDuration.Location = new System.Drawing.Point(9, 202);
-            this.groupNotificationDuration.Name = "groupNotificationDuration";
-            this.groupNotificationDuration.Size = new System.Drawing.Size(183, 89);
-            this.groupNotificationDuration.TabIndex = 1;
-            this.groupNotificationDuration.TabStop = false;
-            this.groupNotificationDuration.Text = "Duration";
-            // 
             // tableLayoutDurationButtons
             // 
-            this.tableLayoutDurationButtons.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.tableLayoutDurationButtons.ColumnCount = 3;
             this.tableLayoutDurationButtons.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32F));
             this.tableLayoutDurationButtons.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 36F));
@@ -220,7 +190,7 @@ private void InitializeComponent() {
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationMedium, 0, 0);
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationLong, 1, 0);
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationShort, 0, 0);
-            this.tableLayoutDurationButtons.Location = new System.Drawing.Point(6, 56);
+            this.tableLayoutDurationButtons.Location = new System.Drawing.Point(3, 43);
             this.tableLayoutDurationButtons.Name = "tableLayoutDurationButtons";
             this.tableLayoutDurationButtons.RowCount = 1;
             this.tableLayoutDurationButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
@@ -276,7 +246,7 @@ private void InitializeComponent() {
             // 
             this.labelDurationValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.labelDurationValue.BackColor = System.Drawing.Color.Transparent;
-            this.labelDurationValue.Location = new System.Drawing.Point(129, 20);
+            this.labelDurationValue.Location = new System.Drawing.Point(106, 7);
             this.labelDurationValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelDurationValue.Name = "labelDurationValue";
             this.labelDurationValue.Size = new System.Drawing.Size(48, 13);
@@ -290,35 +260,19 @@ private void InitializeComponent() {
             this.trackBarDuration.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.trackBarDuration.AutoSize = false;
-            this.trackBarDuration.Location = new System.Drawing.Point(6, 19);
+            this.trackBarDuration.Location = new System.Drawing.Point(3, 6);
             this.trackBarDuration.Maximum = 60;
             this.trackBarDuration.Minimum = 10;
             this.trackBarDuration.Name = "trackBarDuration";
-            this.trackBarDuration.Size = new System.Drawing.Size(128, 30);
+            this.trackBarDuration.Size = new System.Drawing.Size(108, 30);
             this.trackBarDuration.TabIndex = 0;
             this.trackBarDuration.TickFrequency = 5;
             this.trackBarDuration.Value = 25;
             // 
-            // groupUserInterface
-            // 
-            this.groupUserInterface.Controls.Add(this.checkSkipOnLinkClick);
-            this.groupUserInterface.Controls.Add(this.checkColumnName);
-            this.groupUserInterface.Controls.Add(this.labelIdlePause);
-            this.groupUserInterface.Controls.Add(this.comboBoxIdlePause);
-            this.groupUserInterface.Controls.Add(this.checkNonIntrusive);
-            this.groupUserInterface.Controls.Add(this.checkTimerCountDown);
-            this.groupUserInterface.Controls.Add(this.checkNotificationTimer);
-            this.groupUserInterface.Location = new System.Drawing.Point(9, 9);
-            this.groupUserInterface.Name = "groupUserInterface";
-            this.groupUserInterface.Size = new System.Drawing.Size(183, 187);
-            this.groupUserInterface.TabIndex = 0;
-            this.groupUserInterface.TabStop = false;
-            this.groupUserInterface.Text = "General";
-            // 
             // checkSkipOnLinkClick
             // 
             this.checkSkipOnLinkClick.AutoSize = true;
-            this.checkSkipOnLinkClick.Location = new System.Drawing.Point(9, 90);
+            this.checkSkipOnLinkClick.Location = new System.Drawing.Point(6, 74);
             this.checkSkipOnLinkClick.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkSkipOnLinkClick.Name = "checkSkipOnLinkClick";
             this.checkSkipOnLinkClick.Size = new System.Drawing.Size(113, 17);
@@ -330,7 +284,7 @@ private void InitializeComponent() {
             // checkColumnName
             // 
             this.checkColumnName.AutoSize = true;
-            this.checkColumnName.Location = new System.Drawing.Point(9, 21);
+            this.checkColumnName.Location = new System.Drawing.Point(6, 5);
             this.checkColumnName.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkColumnName.Name = "checkColumnName";
             this.checkColumnName.Size = new System.Drawing.Size(129, 17);
@@ -342,9 +296,8 @@ private void InitializeComponent() {
             // 
             // labelIdlePause
             // 
-            this.labelIdlePause.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.labelIdlePause.AutoSize = true;
-            this.labelIdlePause.Location = new System.Drawing.Point(5, 141);
+            this.labelIdlePause.Location = new System.Drawing.Point(3, 125);
             this.labelIdlePause.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelIdlePause.Name = "labelIdlePause";
             this.labelIdlePause.Size = new System.Drawing.Size(89, 13);
@@ -353,11 +306,9 @@ private void InitializeComponent() {
             // 
             // comboBoxIdlePause
             // 
-            this.comboBoxIdlePause.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBoxIdlePause.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxIdlePause.FormattingEnabled = true;
-            this.comboBoxIdlePause.Location = new System.Drawing.Point(6, 157);
+            this.comboBoxIdlePause.Location = new System.Drawing.Point(3, 141);
             this.comboBoxIdlePause.Name = "comboBoxIdlePause";
             this.comboBoxIdlePause.Size = new System.Drawing.Size(171, 21);
             this.comboBoxIdlePause.TabIndex = 4;
@@ -366,7 +317,7 @@ private void InitializeComponent() {
             // checkNonIntrusive
             // 
             this.checkNonIntrusive.AutoSize = true;
-            this.checkNonIntrusive.Location = new System.Drawing.Point(9, 113);
+            this.checkNonIntrusive.Location = new System.Drawing.Point(6, 97);
             this.checkNonIntrusive.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkNonIntrusive.Name = "checkNonIntrusive";
             this.checkNonIntrusive.Size = new System.Drawing.Size(128, 17);
@@ -379,7 +330,7 @@ private void InitializeComponent() {
             // checkTimerCountDown
             // 
             this.checkTimerCountDown.AutoSize = true;
-            this.checkTimerCountDown.Location = new System.Drawing.Point(9, 67);
+            this.checkTimerCountDown.Location = new System.Drawing.Point(6, 51);
             this.checkTimerCountDown.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkTimerCountDown.Name = "checkTimerCountDown";
             this.checkTimerCountDown.Size = new System.Drawing.Size(119, 17);
@@ -391,7 +342,7 @@ private void InitializeComponent() {
             // checkNotificationTimer
             // 
             this.checkNotificationTimer.AutoSize = true;
-            this.checkNotificationTimer.Location = new System.Drawing.Point(9, 44);
+            this.checkNotificationTimer.Location = new System.Drawing.Point(6, 28);
             this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkNotificationTimer.Name = "checkNotificationTimer";
             this.checkNotificationTimer.Size = new System.Drawing.Size(145, 17);
@@ -399,31 +350,113 @@ private void InitializeComponent() {
             this.checkNotificationTimer.Text = "Display Notification Timer";
             this.checkNotificationTimer.UseVisualStyleBackColor = true;
             // 
+            // labelGeneral
+            // 
+            this.labelGeneral.AutoSize = true;
+            this.labelGeneral.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelGeneral.Location = new System.Drawing.Point(6, 8);
+            this.labelGeneral.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.labelGeneral.Name = "labelGeneral";
+            this.labelGeneral.Size = new System.Drawing.Size(66, 20);
+            this.labelGeneral.TabIndex = 0;
+            this.labelGeneral.Text = "General";
+            // 
+            // panelGeneral
+            // 
+            this.panelGeneral.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelGeneral.Controls.Add(this.checkSkipOnLinkClick);
+            this.panelGeneral.Controls.Add(this.checkColumnName);
+            this.panelGeneral.Controls.Add(this.checkNotificationTimer);
+            this.panelGeneral.Controls.Add(this.labelIdlePause);
+            this.panelGeneral.Controls.Add(this.checkTimerCountDown);
+            this.panelGeneral.Controls.Add(this.comboBoxIdlePause);
+            this.panelGeneral.Controls.Add(this.checkNonIntrusive);
+            this.panelGeneral.Location = new System.Drawing.Point(9, 31);
+            this.panelGeneral.Name = "panelGeneral";
+            this.panelGeneral.Size = new System.Drawing.Size(322, 166);
+            this.panelGeneral.TabIndex = 1;
+            // 
+            // labelLocation
+            // 
+            this.labelLocation.AutoSize = true;
+            this.labelLocation.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelLocation.Location = new System.Drawing.Point(6, 221);
+            this.labelLocation.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelLocation.Name = "labelLocation";
+            this.labelLocation.Size = new System.Drawing.Size(70, 20);
+            this.labelLocation.TabIndex = 2;
+            this.labelLocation.Text = "Location";
+            // 
+            // panelLocation
+            // 
+            this.panelLocation.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelLocation.Controls.Add(this.labelEdgeDistanceValue);
+            this.panelLocation.Controls.Add(this.radioLocTL);
+            this.panelLocation.Controls.Add(this.labelDisplay);
+            this.panelLocation.Controls.Add(this.trackBarEdgeDistance);
+            this.panelLocation.Controls.Add(this.comboBoxDisplay);
+            this.panelLocation.Controls.Add(this.radioLocTR);
+            this.panelLocation.Controls.Add(this.labelEdgeDistance);
+            this.panelLocation.Controls.Add(this.radioLocBL);
+            this.panelLocation.Controls.Add(this.radioLocCustom);
+            this.panelLocation.Controls.Add(this.radioLocBR);
+            this.panelLocation.Location = new System.Drawing.Point(9, 244);
+            this.panelLocation.Name = "panelLocation";
+            this.panelLocation.Size = new System.Drawing.Size(322, 231);
+            this.panelLocation.TabIndex = 3;
+            // 
+            // panelDuration
+            // 
+            this.panelDuration.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelDuration.Controls.Add(this.tableLayoutDurationButtons);
+            this.panelDuration.Controls.Add(this.labelDurationValue);
+            this.panelDuration.Controls.Add(this.trackBarDuration);
+            this.panelDuration.Location = new System.Drawing.Point(9, 522);
+            this.panelDuration.Name = "panelDuration";
+            this.panelDuration.Size = new System.Drawing.Size(322, 73);
+            this.panelDuration.TabIndex = 5;
+            // 
+            // labelDuration
+            // 
+            this.labelDuration.AutoSize = true;
+            this.labelDuration.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDuration.Location = new System.Drawing.Point(6, 499);
+            this.labelDuration.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelDuration.Name = "labelDuration";
+            this.labelDuration.Size = new System.Drawing.Size(70, 20);
+            this.labelDuration.TabIndex = 4;
+            this.labelDuration.Text = "Duration";
+            // 
             // TabSettingsNotifications
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupUserInterface);
-            this.Controls.Add(this.groupNotificationDuration);
-            this.Controls.Add(this.groupNotificationLocation);
+            this.Controls.Add(this.labelDuration);
+            this.Controls.Add(this.panelLocation);
+            this.Controls.Add(this.labelLocation);
+            this.Controls.Add(this.panelGeneral);
+            this.Controls.Add(this.labelGeneral);
+            this.Controls.Add(this.panelDuration);
             this.Name = "TabSettingsNotifications";
-            this.Size = new System.Drawing.Size(478, 300);
+            this.Size = new System.Drawing.Size(340, 605);
             this.ParentChanged += new System.EventHandler(this.TabSettingsNotifications_ParentChanged);
-            this.groupNotificationLocation.ResumeLayout(false);
-            this.groupNotificationLocation.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).EndInit();
-            this.groupNotificationDuration.ResumeLayout(false);
             this.tableLayoutDurationButtons.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarDuration)).EndInit();
-            this.groupUserInterface.ResumeLayout(false);
-            this.groupUserInterface.PerformLayout();
+            this.panelGeneral.ResumeLayout(false);
+            this.panelGeneral.PerformLayout();
+            this.panelLocation.ResumeLayout(false);
+            this.panelLocation.PerformLayout();
+            this.panelDuration.ResumeLayout(false);
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
         #endregion
-
-        private System.Windows.Forms.GroupBox groupNotificationLocation;
         private System.Windows.Forms.Label labelDisplay;
         private System.Windows.Forms.ComboBox comboBoxDisplay;
         private System.Windows.Forms.Label labelEdgeDistance;
@@ -433,8 +466,6 @@ private void InitializeComponent() {
         private System.Windows.Forms.RadioButton radioLocBL;
         private System.Windows.Forms.RadioButton radioLocTR;
         private System.Windows.Forms.RadioButton radioLocTL;
-        private System.Windows.Forms.GroupBox groupNotificationDuration;
-        private System.Windows.Forms.GroupBox groupUserInterface;
         private System.Windows.Forms.ToolTip toolTip;
         private System.Windows.Forms.Label labelEdgeDistanceValue;
         private System.Windows.Forms.Label labelDurationValue;
@@ -450,5 +481,11 @@ private void InitializeComponent() {
         private System.Windows.Forms.CheckBox checkSkipOnLinkClick;
         private System.Windows.Forms.CheckBox checkTimerCountDown;
         private System.Windows.Forms.CheckBox checkNotificationTimer;
+        private System.Windows.Forms.Label labelGeneral;
+        private System.Windows.Forms.Panel panelGeneral;
+        private System.Windows.Forms.Label labelLocation;
+        private System.Windows.Forms.Panel panelLocation;
+        private System.Windows.Forms.Panel panelDuration;
+        private System.Windows.Forms.Label labelDuration;
     }
 }
diff --git a/Core/Other/Settings/TabSettingsSounds.Designer.cs b/Core/Other/Settings/TabSettingsSounds.Designer.cs
index 03fb43ff..f75e43a0 100644
--- a/Core/Other/Settings/TabSettingsSounds.Designer.cs
+++ b/Core/Other/Settings/TabSettingsSounds.Designer.cs
@@ -25,31 +25,20 @@ protected override void Dispose(bool disposing) {
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.groupCustomSound = new System.Windows.Forms.GroupBox();
             this.btnPlaySound = new System.Windows.Forms.Button();
             this.btnResetSound = new System.Windows.Forms.Button();
             this.btnBrowseSound = new System.Windows.Forms.Button();
             this.tbCustomSound = new System.Windows.Forms.TextBox();
-            this.groupCustomSound.SuspendLayout();
+            this.labelSoundNotification = new System.Windows.Forms.Label();
+            this.panelSoundNotification = new System.Windows.Forms.Panel();
+            this.panelSoundNotification.SuspendLayout();
             this.SuspendLayout();
             // 
-            // groupCustomSound
-            // 
-            this.groupCustomSound.Controls.Add(this.btnPlaySound);
-            this.groupCustomSound.Controls.Add(this.btnResetSound);
-            this.groupCustomSound.Controls.Add(this.btnBrowseSound);
-            this.groupCustomSound.Controls.Add(this.tbCustomSound);
-            this.groupCustomSound.Location = new System.Drawing.Point(9, 9);
-            this.groupCustomSound.Name = "groupCustomSound";
-            this.groupCustomSound.Size = new System.Drawing.Size(372, 75);
-            this.groupCustomSound.TabIndex = 0;
-            this.groupCustomSound.TabStop = false;
-            this.groupCustomSound.Text = "Custom Sound Notification";
-            // 
             // btnPlaySound
             // 
+            this.btnPlaySound.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnPlaySound.AutoSize = true;
-            this.btnPlaySound.Location = new System.Drawing.Point(250, 45);
+            this.btnPlaySound.Location = new System.Drawing.Point(203, 29);
             this.btnPlaySound.Name = "btnPlaySound";
             this.btnPlaySound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnPlaySound.Size = new System.Drawing.Size(43, 23);
@@ -60,7 +49,7 @@ private void InitializeComponent() {
             // btnResetSound
             // 
             this.btnResetSound.AutoSize = true;
-            this.btnResetSound.Location = new System.Drawing.Point(6, 45);
+            this.btnResetSound.Location = new System.Drawing.Point(3, 29);
             this.btnResetSound.Name = "btnResetSound";
             this.btnResetSound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnResetSound.Size = new System.Drawing.Size(51, 23);
@@ -70,8 +59,9 @@ private void InitializeComponent() {
             // 
             // btnBrowseSound
             // 
+            this.btnBrowseSound.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnBrowseSound.AutoSize = true;
-            this.btnBrowseSound.Location = new System.Drawing.Point(299, 45);
+            this.btnBrowseSound.Location = new System.Drawing.Point(252, 29);
             this.btnBrowseSound.Name = "btnBrowseSound";
             this.btnBrowseSound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnBrowseSound.Size = new System.Drawing.Size(67, 23);
@@ -81,31 +71,60 @@ private void InitializeComponent() {
             // 
             // tbCustomSound
             // 
-            this.tbCustomSound.Location = new System.Drawing.Point(6, 19);
+            this.tbCustomSound.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.tbCustomSound.Location = new System.Drawing.Point(3, 3);
             this.tbCustomSound.Name = "tbCustomSound";
-            this.tbCustomSound.Size = new System.Drawing.Size(360, 20);
+            this.tbCustomSound.Size = new System.Drawing.Size(316, 20);
             this.tbCustomSound.TabIndex = 0;
             // 
+            // labelSoundNotification
+            // 
+            this.labelSoundNotification.AutoSize = true;
+            this.labelSoundNotification.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSoundNotification.Location = new System.Drawing.Point(6, 8);
+            this.labelSoundNotification.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.labelSoundNotification.Name = "labelSoundNotification";
+            this.labelSoundNotification.Size = new System.Drawing.Size(198, 20);
+            this.labelSoundNotification.TabIndex = 1;
+            this.labelSoundNotification.Text = "Custom Sound Notification";
+            // 
+            // panelSoundNotification
+            // 
+            this.panelSoundNotification.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelSoundNotification.Controls.Add(this.btnPlaySound);
+            this.panelSoundNotification.Controls.Add(this.tbCustomSound);
+            this.panelSoundNotification.Controls.Add(this.btnResetSound);
+            this.panelSoundNotification.Controls.Add(this.btnBrowseSound);
+            this.panelSoundNotification.Location = new System.Drawing.Point(9, 31);
+            this.panelSoundNotification.Name = "panelSoundNotification";
+            this.panelSoundNotification.Size = new System.Drawing.Size(322, 56);
+            this.panelSoundNotification.TabIndex = 2;
+            // 
             // TabSettingsSounds
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupCustomSound);
+            this.Controls.Add(this.panelSoundNotification);
+            this.Controls.Add(this.labelSoundNotification);
             this.Name = "TabSettingsSounds";
-            this.Size = new System.Drawing.Size(478, 300);
-            this.groupCustomSound.ResumeLayout(false);
-            this.groupCustomSound.PerformLayout();
+            this.Size = new System.Drawing.Size(340, 97);
+            this.panelSoundNotification.ResumeLayout(false);
+            this.panelSoundNotification.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
         #endregion
 
         private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.GroupBox groupCustomSound;
         private System.Windows.Forms.Button btnResetSound;
         private System.Windows.Forms.Button btnBrowseSound;
         private System.Windows.Forms.TextBox tbCustomSound;
         private System.Windows.Forms.Button btnPlaySound;
+        private System.Windows.Forms.Label labelSoundNotification;
+        private System.Windows.Forms.Panel panelSoundNotification;
     }
 }