diff --git a/AddBatchPageForm.cs b/AddBatchPageForm.cs
index 84d7ac9..5df9a1e 100644
--- a/AddBatchPageForm.cs
+++ b/AddBatchPageForm.cs
@@ -50,9 +50,9 @@ namespace FizzyLauncher
             dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter();
             memoBox1 = new ThToolbarMemoBox();
             SuspendLayout();
-            //
+            // 
             // label1
-            //
+            // 
             label1.AutoSize = true;
             label1.BackColor = System.Drawing.Color.Transparent;
             label1.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -64,14 +64,14 @@ namespace FizzyLauncher
             label1.TabIndex = 153;
             label1.Text = "Add pages (one URL on each line)";
             label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // tHorizontalSeparator3
-            //
+            // 
             tHorizontalSeparator3.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             tHorizontalSeparator3.AutoScrollMargin = new System.Drawing.Size(0, 0);
             tHorizontalSeparator3.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             tHorizontalSeparator3.BackColor = System.Drawing.Color.Transparent;
-            tHorizontalSeparator3.Location = new System.Drawing.Point(10, 321);
+            tHorizontalSeparator3.Location = new System.Drawing.Point(10, 361);
             tHorizontalSeparator3.Margin = new Padding(0, 10, 0, 0);
             tHorizontalSeparator3.MaximumSize = new System.Drawing.Size(4920, 2);
             tHorizontalSeparator3.MinimumSize = new System.Drawing.Size(0, 22);
@@ -79,9 +79,9 @@ namespace FizzyLauncher
             tHorizontalSeparator3.Size = new System.Drawing.Size(424, 22);
             tHorizontalSeparator3.TabIndex = 207;
             tHorizontalSeparator3.TabStop = false;
-            //
+            // 
             // button3
-            //
+            // 
             button3.ActiveImage = null;
             button3.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             button3.BackColor = System.Drawing.Color.Transparent;
@@ -90,45 +90,47 @@ namespace FizzyLauncher
             button3.HoverImage = null;
             button3.IdleImage = null;
             button3.LabelText = "&Add Pages";
-            button3.Location = new System.Drawing.Point(306, 393);
+            button3.Location = new System.Drawing.Point(306, 433);
             button3.Name = "button3";
+            button3.Padding = new Padding(4, 4, 3, 3);
             button3.Size = new System.Drawing.Size(128, 32);
             button3.TabIndex = 209;
             button3.TabStop = false;
             button3.MouseClick += button3_MouseClick;
-            //
+            // 
             // progressBar2
-            //
+            // 
             progressBar2.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             progressBar2.BackColor = System.Drawing.Color.Transparent;
             progressBar2.BarColour = System.Drawing.Color.FromArgb(79, 193, 203);
             progressBar2.BarTextColour = System.Drawing.Color.Black;
             progressBar2.EnableReactiveVisual = false;
             progressBar2.Font = new System.Drawing.Font("Segoe UI", 9F);
-            progressBar2.Location = new System.Drawing.Point(10, 353);
+            progressBar2.Location = new System.Drawing.Point(10, 393);
             progressBar2.Maximum = 100;
             progressBar2.Minimum = 0;
             progressBar2.Name = "progressBar2";
+            progressBar2.Padding = new Padding(4, 4, 3, 3);
             progressBar2.ProgressText = "50/100";
             progressBar2.ShowProgressText = true;
             progressBar2.Size = new System.Drawing.Size(424, 20);
             progressBar2.TabIndex = 210;
             progressBar2.TabStop = false;
             progressBar2.Value = 50;
-            //
+            // 
             // dialogFooter1
-            //
+            // 
             dialogFooter1.BackColor = System.Drawing.Color.FromArgb(240, 240, 240);
             dialogFooter1.Button1Text = "&Close";
             dialogFooter1.Dialog = this;
             dialogFooter1.Dock = DockStyle.Bottom;
             dialogFooter1.IsBusy = false;
-            dialogFooter1.Location = new System.Drawing.Point(0, 437);
+            dialogFooter1.Location = new System.Drawing.Point(0, 477);
             dialogFooter1.Name = "dialogFooter1";
             dialogFooter1.Size = new System.Drawing.Size(444, 84);
-            //
+            // 
             // memoBox1
-            //
+            // 
             memoBox1.AllowDrop = true;
             memoBox1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             memoBox1.BackColor = System.Drawing.Color.Transparent;
@@ -137,19 +139,20 @@ namespace FizzyLauncher
             memoBox1.Font = new System.Drawing.Font("Segoe UI", 9F);
             memoBox1.Location = new System.Drawing.Point(10, 53);
             memoBox1.Name = "memoBox1";
+            memoBox1.Padding = new Padding(4, 4, 3, 3);
             memoBox1.ReadOnly = false;
             memoBox1.ScrollBars = ScrollBars.Vertical;
-            memoBox1.Size = new System.Drawing.Size(424, 258);
+            memoBox1.Size = new System.Drawing.Size(424, 298);
             memoBox1.TabIndex = 211;
             memoBox1.TabStop = false;
             memoBox1.WordWrap = false;
-            //
+            // 
             // AddBatchPageForm
-            //
+            // 
             AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             BackColor = System.Drawing.Color.White;
-            ClientSize = new System.Drawing.Size(444, 521);
+            ClientSize = new System.Drawing.Size(444, 561);
             Controls.Add(memoBox1);
             Controls.Add(dialogFooter1);
             Controls.Add(progressBar2);
@@ -157,7 +160,7 @@ namespace FizzyLauncher
             Controls.Add(tHorizontalSeparator3);
             Controls.Add(label1);
             KeyPreview = true;
-            MinimumSize = new System.Drawing.Size(460, 560);
+            MinimumSize = new System.Drawing.Size(460, 600);
             Name = "AddBatchPageForm";
             Text = "Add Pages (Batch)";
             ResumeLayout(false);
diff --git a/BookmarkManager.csproj b/BookmarkManager.csproj
index ec5f688..51065c0 100644
--- a/BookmarkManager.csproj
+++ b/BookmarkManager.csproj
@@ -14,7 +14,7 @@
     <Copyright>Ray Lam</Copyright>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <FileVersion>1.0.0.0</FileVersion>
-    <Version>0.6.4.140</Version>
+    <Version>0.6.5.144</Version>
     <PackageId>bukkubuddy</PackageId>
     <RunAnalyzersDuringLiveAnalysis>True</RunAnalyzersDuringLiveAnalysis>
     <SupportedOSPlatformVersion>8.0</SupportedOSPlatformVersion>
@@ -123,8 +123,8 @@
 
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
-    <PackageReference Include="RyzStudio" Version="8.1.2.366" />
-    <PackageReference Include="RyzStudio.Windows.Forms" Version="8.1.3.689" />
+    <PackageReference Include="RyzStudio" Version="8.1.5.141" />
+    <PackageReference Include="RyzStudio.Windows.Forms" Version="8.1.5.141" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/EditBookmarkForm.cs b/EditBookmarkForm.cs
index 9cc8365..69f8310 100644
--- a/EditBookmarkForm.cs
+++ b/EditBookmarkForm.cs
@@ -26,12 +26,12 @@ namespace FizzyLauncher
         private System.ComponentModel.IContainer components;
         private ThClearableTextBox textBox3;
         private ThUserControl thUserControl1;
-        private Label label5;
 
 
         private readonly WebProvider _webProvider;
         private BookmarkModel result = null;
         private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1;
+        private THorizontalSeparator tHorizontalSeparator1;
         private bool _isBusy = false;
 
 
@@ -88,18 +88,17 @@ namespace FizzyLauncher
             pictureBox1 = new PictureBox();
             toolTip1 = new ToolTip(components);
             textBox3 = new ThClearableTextBox();
-            thUserControl1 = new ThUserControl();
-            label5 = new Label();
             dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter();
+            tHorizontalSeparator1 = new THorizontalSeparator();
             ((ISupportInitialize)pictureBox1).BeginInit();
             SuspendLayout();
-            //
+            // 
             // label1
-            //
+            // 
             label1.AutoSize = true;
             label1.BackColor = Color.Transparent;
             label1.ForeColor = SystemColors.ControlText;
-            label1.Location = new Point(10, 21);
+            label1.Location = new Point(9, 21);
             label1.Margin = new Padding(0);
             label1.Name = "label1";
             label1.Padding = new Padding(0, 8, 0, 0);
@@ -107,9 +106,9 @@ namespace FizzyLauncher
             label1.TabIndex = 153;
             label1.Text = "Title";
             label1.TextAlign = ContentAlignment.MiddleLeft;
-            //
+            // 
             // textBox1
-            //
+            // 
             textBox1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             textBox1.BackColor = Color.Transparent;
             textBox1.ClearedValue = "";
@@ -117,19 +116,20 @@ namespace FizzyLauncher
             textBox1.Font = new Font("Segoe UI", 9F);
             textBox1.Icon = "O";
             textBox1.IconSize = 13F;
-            textBox1.Location = new Point(109, 20);
+            textBox1.Location = new Point(115, 20);
             textBox1.Name = "textBox1";
-            textBox1.Size = new Size(260, 32);
+            textBox1.Padding = new Padding(4, 4, 3, 3);
+            textBox1.Size = new Size(314, 32);
             textBox1.TabIndex = 0;
             textBox1.TabStop = false;
             textBox1.UseSystemPasswordChar = false;
-            //
+            // 
             // label2
-            //
+            // 
             label2.AutoSize = true;
             label2.BackColor = Color.Transparent;
             label2.ForeColor = SystemColors.ControlText;
-            label2.Location = new Point(10, 61);
+            label2.Location = new Point(9, 61);
             label2.Margin = new Padding(0);
             label2.Name = "label2";
             label2.Padding = new Padding(0, 8, 0, 0);
@@ -137,13 +137,13 @@ namespace FizzyLauncher
             label2.TabIndex = 193;
             label2.Text = "Address";
             label2.TextAlign = ContentAlignment.MiddleLeft;
-            //
+            // 
             // label3
-            //
+            // 
             label3.AutoSize = true;
             label3.BackColor = Color.Transparent;
             label3.ForeColor = SystemColors.ControlText;
-            label3.Location = new Point(10, 104);
+            label3.Location = new Point(9, 104);
             label3.Margin = new Padding(0);
             label3.Name = "label3";
             label3.Padding = new Padding(0, 8, 0, 0);
@@ -151,30 +151,31 @@ namespace FizzyLauncher
             label3.TabIndex = 195;
             label3.Text = "Description";
             label3.TextAlign = ContentAlignment.MiddleLeft;
-            //
+            // 
             // memoBox1
-            //
+            // 
             memoBox1.AllowDrop = true;
             memoBox1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             memoBox1.BackColor = Color.Transparent;
             memoBox1.ClearedValue = "";
             memoBox1.EnableReactiveVisual = true;
             memoBox1.Font = new Font("Segoe UI", 9F);
-            memoBox1.Location = new Point(110, 196);
+            memoBox1.Location = new Point(87, 166);
             memoBox1.Name = "memoBox1";
+            memoBox1.Padding = new Padding(4, 4, 3, 3);
             memoBox1.ReadOnly = false;
             memoBox1.ScrollBars = ScrollBars.Vertical;
-            memoBox1.Size = new Size(259, 232);
+            memoBox1.Size = new Size(342, 302);
             memoBox1.TabIndex = 3;
             memoBox1.TabStop = false;
             memoBox1.WordWrap = false;
-            //
+            // 
             // label4
-            //
+            // 
             label4.AutoSize = true;
             label4.BackColor = Color.Transparent;
             label4.ForeColor = SystemColors.ControlText;
-            label4.Location = new Point(10, 196);
+            label4.Location = new Point(9, 166);
             label4.Margin = new Padding(0);
             label4.Name = "label4";
             label4.Padding = new Padding(0, 8, 0, 0);
@@ -182,29 +183,30 @@ namespace FizzyLauncher
             label4.TabIndex = 198;
             label4.Text = "Notes";
             label4.TextAlign = ContentAlignment.MiddleLeft;
-            //
+            // 
             // textBox2
-            //
+            // 
             textBox2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             textBox2.BackColor = Color.Transparent;
             textBox2.EnableReactiveVisual = true;
             textBox2.Font = new Font("Segoe UI", 9F);
             textBox2.Icon = "M";
             textBox2.IconSize = 13F;
-            textBox2.Location = new Point(110, 62);
+            textBox2.Location = new Point(98, 62);
             textBox2.Name = "textBox2";
-            textBox2.Size = new Size(259, 32);
+            textBox2.Padding = new Padding(4, 4, 3, 3);
+            textBox2.Size = new Size(331, 32);
             textBox2.TabIndex = 1;
             textBox2.TabStop = false;
             textBox2.UseSystemPasswordChar = false;
             textBox2.OnButtonClick += textBox2_OnButtonClick;
-            //
+            // 
             // pictureBox1
-            //
+            // 
             pictureBox1.BackColor = Color.White;
             pictureBox1.ErrorImage = null;
             pictureBox1.InitialImage = null;
-            pictureBox1.Location = new Point(113, 150);
+            pictureBox1.Location = new Point(78, 20);
             pictureBox1.Name = "pictureBox1";
             pictureBox1.Size = new Size(32, 32);
             pictureBox1.SizeMode = PictureBoxSizeMode.CenterImage;
@@ -212,9 +214,9 @@ namespace FizzyLauncher
             pictureBox1.TabStop = false;
             pictureBox1.MouseClick += pictureBox1_MouseClick;
             pictureBox1.MouseDoubleClick += pictureBox1_MouseDoubleClick;
-            //
+            // 
             // textBox3
-            //
+            // 
             textBox3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             textBox3.BackColor = Color.Transparent;
             textBox3.ClearedValue = "";
@@ -222,68 +224,57 @@ namespace FizzyLauncher
             textBox3.Font = new Font("Segoe UI", 9F);
             textBox3.Icon = "O";
             textBox3.IconSize = 13F;
-            textBox3.Location = new Point(109, 104);
+            textBox3.Location = new Point(116, 104);
             textBox3.Name = "textBox3";
-            textBox3.Size = new Size(260, 32);
+            textBox3.Padding = new Padding(4, 4, 3, 3);
+            textBox3.Size = new Size(313, 32);
             textBox3.TabIndex = 203;
             textBox3.TabStop = false;
             textBox3.UseSystemPasswordChar = false;
-            //
-            // thUserControl1
-            //
-            thUserControl1.BackColor = Color.Transparent;
-            thUserControl1.EnableReactiveVisual = true;
-            thUserControl1.Location = new Point(109, 146);
-            thUserControl1.Name = "thUserControl1";
-            thUserControl1.Size = new Size(40, 40);
-            thUserControl1.TabIndex = 204;
-            thUserControl1.TabStop = false;
-            //
-            // label5
-            //
-            label5.AutoSize = true;
-            label5.BackColor = Color.Transparent;
-            label5.ForeColor = SystemColors.ControlText;
-            label5.Location = new Point(10, 146);
-            label5.Margin = new Padding(0);
-            label5.Name = "label5";
-            label5.Padding = new Padding(0, 8, 0, 0);
-            label5.Size = new Size(30, 23);
-            label5.TabIndex = 195;
-            label5.Text = "Icon";
-            label5.TextAlign = ContentAlignment.MiddleLeft;
-            //
+            // 
             // dialogFooter1
-            //
+            // 
             dialogFooter1.BackColor = Color.FromArgb(240, 240, 240);
             dialogFooter1.Button1Text = "&OK";
             dialogFooter1.Dialog = this;
             dialogFooter1.Dock = DockStyle.Bottom;
             dialogFooter1.IsBusy = false;
-            dialogFooter1.Location = new Point(0, 437);
+            dialogFooter1.Location = new Point(0, 477);
             dialogFooter1.Name = "dialogFooter1";
-            dialogFooter1.Size = new Size(384, 84);
-            //
+            dialogFooter1.Size = new Size(444, 84);
+            // 
+            // tHorizontalSeparator1
+            // 
+            tHorizontalSeparator1.AutoScrollMargin = new Size(0, 0);
+            tHorizontalSeparator1.AutoScrollMinSize = new Size(0, 0);
+            tHorizontalSeparator1.BackColor = Color.Transparent;
+            tHorizontalSeparator1.Location = new Point(9, 139);
+            tHorizontalSeparator1.MaximumSize = new Size(3840, 22);
+            tHorizontalSeparator1.MinimumSize = new Size(0, 22);
+            tHorizontalSeparator1.Name = "tHorizontalSeparator1";
+            tHorizontalSeparator1.Size = new Size(423, 22);
+            tHorizontalSeparator1.TabIndex = 209;
+            tHorizontalSeparator1.TabStop = false;
+            // 
             // EditBookmarkForm
-            //
+            // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             BackColor = Color.White;
-            ClientSize = new Size(384, 521);
+            ClientSize = new Size(444, 561);
+            Controls.Add(tHorizontalSeparator1);
+            Controls.Add(pictureBox1);
             Controls.Add(dialogFooter1);
             Controls.Add(textBox3);
-            Controls.Add(pictureBox1);
             Controls.Add(textBox2);
             Controls.Add(memoBox1);
             Controls.Add(label4);
-            Controls.Add(label5);
             Controls.Add(label3);
             Controls.Add(label2);
             Controls.Add(textBox1);
             Controls.Add(label1);
-            Controls.Add(thUserControl1);
             KeyPreview = true;
-            MinimumSize = new Size(400, 560);
+            MinimumSize = new Size(460, 600);
             Name = "EditBookmarkForm";
             Text = "Edit Bookmark";
             ((ISupportInitialize)pictureBox1).EndInit();
diff --git a/EditBookmarkForm.resx b/EditBookmarkForm.resx
index 2704a16..dcfd08d 100644
--- a/EditBookmarkForm.resx
+++ b/EditBookmarkForm.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/OptionsForm.cs b/OptionsForm.cs
index cbbeef2..788c0c8 100644
--- a/OptionsForm.cs
+++ b/OptionsForm.cs
@@ -1,27 +1,24 @@
-using System;
-using System.Linq;
-using System.Windows.Forms;
+using System.Windows.Forms;
 using FizzyLauncher.Models;
 using RyzStudio.Windows.Forms;
-using RyzStudio.Windows.ThemedForms;
 using RyzStudio.Windows.ThemedForms.PickerBox;
 
 namespace FizzyLauncher
 {
     public class OptionsForm : Form
     {
-        private FlowLayoutPanel flowLayoutPanel1;
-        private TTogglePanel panel1;
-        private TTogglePanel panel3;
+        private TTogglePanelC panel1;
+        private TTogglePanelC panel3;
         private ThYesNoPickerBox yesNoPickerBox1;
         private Label label2;
-        private TTogglePanel panel2;
-        private ThYesNoPickerBox thYesNoPickerBox1;
+        private TTogglePanelC panel2;
         private Label label1;
         private ThYesNoPickerBox yesNoPickerBox2;
         private Label label3;
         private RyzStudio.Windows.ThemedForms.ButtonTextBox.ThClearableTextBox textBox1;
         private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1;
+        private TFlowLayoutContainer flowLayoutContainer1;
+
         private AppOptions _appSession = null;
 
 
@@ -36,89 +33,70 @@ namespace FizzyLauncher
             if (_appSession != null)
             {
                 yesNoPickerBox1.Value = _appSession.RestorePosition;
-
                 yesNoPickerBox2.Value = _appSession.AlwaysOnTop;
-
                 textBox1.Text = _appSession.RunCommand ?? string.Empty;
             }
         }
 
         private void InitializeComponent()
         {
-            flowLayoutPanel1 = new FlowLayoutPanel();
-            panel1 = new TTogglePanel();
+            panel1 = new TTogglePanelC();
             yesNoPickerBox1 = new ThYesNoPickerBox();
             label2 = new Label();
-            panel2 = new TTogglePanel();
+            panel2 = new TTogglePanelC();
             yesNoPickerBox2 = new ThYesNoPickerBox();
-            thYesNoPickerBox1 = new ThYesNoPickerBox();
             label1 = new Label();
-            panel3 = new TTogglePanel();
+            panel3 = new TTogglePanelC();
             textBox1 = new RyzStudio.Windows.ThemedForms.ButtonTextBox.ThClearableTextBox();
             label3 = new Label();
             dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter();
-            flowLayoutPanel1.SuspendLayout();
+            flowLayoutContainer1 = new TFlowLayoutContainer();
             panel1.SuspendLayout();
             panel2.SuspendLayout();
             panel3.SuspendLayout();
+            flowLayoutContainer1.SuspendLayout();
             SuspendLayout();
-            // 
-            // flowLayoutPanel1
-            // 
-            flowLayoutPanel1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
-            flowLayoutPanel1.AutoScroll = true;
-            flowLayoutPanel1.BackColor = System.Drawing.Color.Transparent;
-            flowLayoutPanel1.Controls.Add(panel1);
-            flowLayoutPanel1.Controls.Add(panel2);
-            flowLayoutPanel1.Controls.Add(panel3);
-            flowLayoutPanel1.FlowDirection = FlowDirection.TopDown;
-            flowLayoutPanel1.Location = new System.Drawing.Point(8, 12);
-            flowLayoutPanel1.Name = "flowLayoutPanel1";
-            flowLayoutPanel1.Size = new System.Drawing.Size(436, 412);
-            flowLayoutPanel1.TabIndex = 194;
-            flowLayoutPanel1.WrapContents = false;
-            flowLayoutPanel1.Resize += flowLayoutPanel1_Resize;
-            // 
+            //
             // panel1
-            // 
+            //
             panel1.AutoScrollMargin = new System.Drawing.Size(0, 0);
             panel1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             panel1.Controls.Add(yesNoPickerBox1);
             panel1.Controls.Add(label2);
-            panel1.ExpandedHeight = 100;
-            panel1.ForeColor = System.Drawing.Color.FromArgb(99, 105, 119);
+            panel1.ExpandedHeight = 86;
+            panel1.ForeColor = System.Drawing.Color.FromArgb(31, 31, 31);
             panel1.IsOpen = true;
-            panel1.Location = new System.Drawing.Point(0, 0);
-            panel1.Margin = new Padding(0);
+            panel1.Location = new System.Drawing.Point(10, 10);
+            panel1.Margin = new Padding(0, 0, 0, 5);
             panel1.Name = "panel1";
-            panel1.PaddingBottom = 0;
-            panel1.PaddingLeft = 4;
-            panel1.Size = new System.Drawing.Size(401, 77);
+            panel1.Padding = new Padding(4, 32, 3, 3);
+            panel1.Size = new System.Drawing.Size(427, 86);
             panel1.TabIndex = 0;
             panel1.Title = "On Start-Up";
             panel1.TitleContextMenuStrip = null;
             panel1.TitleCursor = Cursors.Default;
-            // 
+            //
             // yesNoPickerBox1
-            // 
+            //
             yesNoPickerBox1.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             yesNoPickerBox1.BackColor = System.Drawing.Color.Transparent;
             yesNoPickerBox1.EnableReactiveVisual = true;
             yesNoPickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F);
-            yesNoPickerBox1.Location = new System.Drawing.Point(307, 22);
+            yesNoPickerBox1.Location = new System.Drawing.Point(330, 42);
             yesNoPickerBox1.Name = "yesNoPickerBox1";
+            yesNoPickerBox1.Padding = new Padding(4, 4, 3, 3);
             yesNoPickerBox1.SelectedIndex = 1;
             yesNoPickerBox1.Size = new System.Drawing.Size(84, 34);
             yesNoPickerBox1.TabIndex = 197;
             yesNoPickerBox1.TabStop = false;
             yesNoPickerBox1.Value = true;
-            // 
+            //
             // label2
-            // 
+            //
             label2.AutoSize = true;
             label2.BackColor = System.Drawing.Color.Transparent;
             label2.ForeColor = System.Drawing.SystemColors.ControlText;
-            label2.Location = new System.Drawing.Point(1, 22);
+            label2.Location = new System.Drawing.Point(9, 42);
             label2.Margin = new Padding(0);
             label2.Name = "label2";
             label2.Padding = new Padding(0, 8, 0, 0);
@@ -126,62 +104,47 @@ namespace FizzyLauncher
             label2.TabIndex = 196;
             label2.Text = "Restore Position";
             label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
+            //
             // panel2
-            // 
+            //
             panel2.AutoScrollMargin = new System.Drawing.Size(0, 0);
             panel2.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             panel2.Controls.Add(yesNoPickerBox2);
-            panel2.Controls.Add(thYesNoPickerBox1);
             panel2.Controls.Add(label1);
-            panel2.ExpandedHeight = 100;
-            panel2.ForeColor = System.Drawing.Color.FromArgb(99, 105, 119);
+            panel2.ExpandedHeight = 86;
+            panel2.ForeColor = System.Drawing.Color.FromArgb(31, 31, 31);
             panel2.IsOpen = true;
-            panel2.Location = new System.Drawing.Point(0, 77);
-            panel2.Margin = new Padding(0);
+            panel2.Location = new System.Drawing.Point(10, 101);
+            panel2.Margin = new Padding(0, 0, 0, 5);
             panel2.Name = "panel2";
-            panel2.PaddingBottom = 0;
-            panel2.PaddingLeft = 4;
-            panel2.Size = new System.Drawing.Size(401, 77);
+            panel2.Padding = new Padding(4, 32, 3, 3);
+            panel2.Size = new System.Drawing.Size(427, 86);
             panel2.TabIndex = 2;
             panel2.Title = "Appearance";
             panel2.TitleContextMenuStrip = null;
             panel2.TitleCursor = Cursors.Default;
-            // 
+            //
             // yesNoPickerBox2
-            // 
+            //
             yesNoPickerBox2.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             yesNoPickerBox2.BackColor = System.Drawing.Color.Transparent;
             yesNoPickerBox2.EnableReactiveVisual = true;
             yesNoPickerBox2.Font = new System.Drawing.Font("Segoe UI", 9F);
-            yesNoPickerBox2.Location = new System.Drawing.Point(307, 22);
+            yesNoPickerBox2.Location = new System.Drawing.Point(330, 42);
             yesNoPickerBox2.Name = "yesNoPickerBox2";
+            yesNoPickerBox2.Padding = new Padding(4, 4, 3, 3);
             yesNoPickerBox2.SelectedIndex = 1;
             yesNoPickerBox2.Size = new System.Drawing.Size(84, 34);
             yesNoPickerBox2.TabIndex = 198;
             yesNoPickerBox2.TabStop = false;
             yesNoPickerBox2.Value = true;
-            // 
-            // thYesNoPickerBox1
-            // 
-            thYesNoPickerBox1.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            thYesNoPickerBox1.BackColor = System.Drawing.Color.Transparent;
-            thYesNoPickerBox1.EnableReactiveVisual = true;
-            thYesNoPickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F);
-            thYesNoPickerBox1.Location = new System.Drawing.Point(508, 22);
-            thYesNoPickerBox1.Name = "thYesNoPickerBox1";
-            thYesNoPickerBox1.SelectedIndex = 1;
-            thYesNoPickerBox1.Size = new System.Drawing.Size(84, 34);
-            thYesNoPickerBox1.TabIndex = 197;
-            thYesNoPickerBox1.TabStop = false;
-            thYesNoPickerBox1.Value = true;
-            // 
+            //
             // label1
-            // 
+            //
             label1.AutoSize = true;
             label1.BackColor = System.Drawing.Color.Transparent;
             label1.ForeColor = System.Drawing.SystemColors.ControlText;
-            label1.Location = new System.Drawing.Point(1, 22);
+            label1.Location = new System.Drawing.Point(9, 42);
             label1.Margin = new Padding(0);
             label1.Name = "label1";
             label1.Padding = new Padding(0, 8, 0, 0);
@@ -189,29 +152,28 @@ namespace FizzyLauncher
             label1.TabIndex = 196;
             label1.Text = "Always On Top";
             label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
+            //
             // panel3
-            // 
+            //
             panel3.AutoScrollMargin = new System.Drawing.Size(0, 0);
             panel3.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             panel3.Controls.Add(textBox1);
             panel3.Controls.Add(label3);
-            panel3.ExpandedHeight = 100;
-            panel3.ForeColor = System.Drawing.Color.FromArgb(99, 105, 119);
+            panel3.ExpandedHeight = 86;
+            panel3.ForeColor = System.Drawing.Color.FromArgb(31, 31, 31);
             panel3.IsOpen = true;
-            panel3.Location = new System.Drawing.Point(0, 154);
-            panel3.Margin = new Padding(0);
+            panel3.Location = new System.Drawing.Point(10, 192);
+            panel3.Margin = new Padding(0, 0, 0, 5);
             panel3.Name = "panel3";
-            panel3.PaddingBottom = 0;
-            panel3.PaddingLeft = 4;
-            panel3.Size = new System.Drawing.Size(401, 77);
+            panel3.Padding = new Padding(4, 32, 3, 3);
+            panel3.Size = new System.Drawing.Size(427, 86);
             panel3.TabIndex = 1;
             panel3.Title = "Behaviour";
             panel3.TitleContextMenuStrip = null;
             panel3.TitleCursor = Cursors.Default;
-            // 
+            //
             // textBox1
-            // 
+            //
             textBox1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             textBox1.BackColor = System.Drawing.Color.Transparent;
             textBox1.ClearedValue = "{0}";
@@ -219,19 +181,20 @@ namespace FizzyLauncher
             textBox1.Font = new System.Drawing.Font("Segoe UI", 9F);
             textBox1.Icon = "O";
             textBox1.IconSize = 13F;
-            textBox1.Location = new System.Drawing.Point(161, 21);
+            textBox1.Location = new System.Drawing.Point(165, 42);
             textBox1.Name = "textBox1";
-            textBox1.Size = new System.Drawing.Size(230, 32);
+            textBox1.Padding = new Padding(4, 4, 3, 3);
+            textBox1.Size = new System.Drawing.Size(249, 32);
             textBox1.TabIndex = 203;
             textBox1.TabStop = false;
             textBox1.UseSystemPasswordChar = false;
-            // 
+            //
             // label3
-            // 
+            //
             label3.AutoSize = true;
             label3.BackColor = System.Drawing.Color.Transparent;
             label3.ForeColor = System.Drawing.SystemColors.ControlText;
-            label3.Location = new System.Drawing.Point(1, 21);
+            label3.Location = new System.Drawing.Point(9, 42);
             label3.Margin = new Padding(0);
             label3.Name = "label3";
             label3.Padding = new Padding(0, 8, 0, 0);
@@ -239,55 +202,52 @@ namespace FizzyLauncher
             label3.TabIndex = 199;
             label3.Text = "Run Command";
             label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
+            //
             // dialogFooter1
-            // 
+            //
             dialogFooter1.BackColor = System.Drawing.Color.FromArgb(240, 240, 240);
             dialogFooter1.Button1Text = "&Save";
             dialogFooter1.Dialog = this;
             dialogFooter1.Dock = DockStyle.Bottom;
-            dialogFooter1.Location = new System.Drawing.Point(0, 437);
+            dialogFooter1.IsBusy = false;
+            dialogFooter1.Location = new System.Drawing.Point(0, 477);
             dialogFooter1.Name = "dialogFooter1";
             dialogFooter1.Size = new System.Drawing.Size(444, 84);
-            // 
+            //
+            // flowLayoutContainer1
+            //
+            flowLayoutContainer1.AutoScroll = true;
+            flowLayoutContainer1.Controls.Add(panel1);
+            flowLayoutContainer1.Controls.Add(panel2);
+            flowLayoutContainer1.Controls.Add(panel3);
+            flowLayoutContainer1.Dock = DockStyle.Fill;
+            flowLayoutContainer1.Location = new System.Drawing.Point(0, 0);
+            flowLayoutContainer1.Name = "flowLayoutContainer1";
+            flowLayoutContainer1.Padding = new Padding(10, 10, 10, 30);
+            flowLayoutContainer1.Size = new System.Drawing.Size(444, 477);
+            flowLayoutContainer1.TabIndex = 195;
+            //
             // OptionsForm
-            // 
+            //
             AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             BackColor = System.Drawing.Color.White;
-            ClientSize = new System.Drawing.Size(444, 521);
+            ClientSize = new System.Drawing.Size(444, 561);
+            Controls.Add(flowLayoutContainer1);
             Controls.Add(dialogFooter1);
-            Controls.Add(flowLayoutPanel1);
-            MinimumSize = new System.Drawing.Size(460, 560);
+            MinimumSize = new System.Drawing.Size(460, 600);
             Name = "OptionsForm";
             Text = "Options";
-            flowLayoutPanel1.ResumeLayout(false);
             panel1.ResumeLayout(false);
             panel1.PerformLayout();
             panel2.ResumeLayout(false);
             panel2.PerformLayout();
             panel3.ResumeLayout(false);
             panel3.PerformLayout();
+            flowLayoutContainer1.ResumeLayout(false);
             ResumeLayout(false);
         }
 
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-
-            flowLayoutPanel1_Resize(null, e);
-        }
-
-        private void flowLayoutPanel1_Resize(object sender, EventArgs e)
-        {
-            var width = flowLayoutPanel1.ClientRectangle.Width - SystemInformation.VerticalScrollBarWidth;
-
-            foreach (var item in flowLayoutPanel1.Controls.OfType<Control>())
-            {
-                item.Width = width;
-            }
-        }
-
         public AppOptions Result
         {
             get
@@ -298,9 +258,7 @@ namespace FizzyLauncher
                 }
 
                 _appSession.RestorePosition = yesNoPickerBox1.Value;
-
                 _appSession.AlwaysOnTop = yesNoPickerBox2.Value;
-
                 _appSession.RunCommand = textBox1.Text ?? string.Empty;
 
                 return _appSession;
diff --git a/OptionsForm.resx b/OptionsForm.resx
index af32865..8b2ff64 100644
--- a/OptionsForm.resx
+++ b/OptionsForm.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/UpdateIconsForm.cs b/UpdateIconsForm.cs
index db85498..4987173 100644
--- a/UpdateIconsForm.cs
+++ b/UpdateIconsForm.cs
@@ -59,9 +59,9 @@ namespace FizzyLauncher
             progressBar2 = new ThProgressBar();
             dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter();
             SuspendLayout();
-            //
+            // 
             // label1
-            //
+            // 
             label1.AutoSize = true;
             label1.BackColor = System.Drawing.Color.Transparent;
             label1.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -73,9 +73,9 @@ namespace FizzyLauncher
             label1.TabIndex = 153;
             label1.Text = "Update Missing Icons (Only)";
             label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // tHorizontalSeparator2
-            //
+            // 
             tHorizontalSeparator2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             tHorizontalSeparator2.AutoScrollMargin = new System.Drawing.Size(0, 0);
             tHorizontalSeparator2.AutoScrollMinSize = new System.Drawing.Size(0, 0);
@@ -88,9 +88,9 @@ namespace FizzyLauncher
             tHorizontalSeparator2.Size = new System.Drawing.Size(424, 22);
             tHorizontalSeparator2.TabIndex = 190;
             tHorizontalSeparator2.TabStop = false;
-            //
+            // 
             // label2
-            //
+            // 
             label2.AutoSize = true;
             label2.BackColor = System.Drawing.Color.Transparent;
             label2.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -102,23 +102,24 @@ namespace FizzyLauncher
             label2.TabIndex = 195;
             label2.Text = "Retrieve supported icons from bookmarks.";
             label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // pickerBox1
-            //
+            // 
             pickerBox1.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             pickerBox1.BackColor = System.Drawing.Color.Transparent;
             pickerBox1.EnableReactiveVisual = true;
             pickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F);
             pickerBox1.Location = new System.Drawing.Point(350, 20);
             pickerBox1.Name = "pickerBox1";
+            pickerBox1.Padding = new Padding(4, 4, 3, 3);
             pickerBox1.SelectedIndex = 1;
             pickerBox1.Size = new System.Drawing.Size(84, 35);
             pickerBox1.TabIndex = 0;
             pickerBox1.TabStop = false;
             pickerBox1.Value = true;
-            //
+            // 
             // button2
-            //
+            // 
             button2.ActiveImage = null;
             button2.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             button2.BackColor = System.Drawing.Color.Transparent;
@@ -129,13 +130,14 @@ namespace FizzyLauncher
             button2.LabelText = "&Run";
             button2.Location = new System.Drawing.Point(306, 136);
             button2.Name = "button2";
+            button2.Padding = new Padding(4, 4, 3, 3);
             button2.Size = new System.Drawing.Size(128, 32);
             button2.TabIndex = 1;
             button2.TabStop = false;
             button2.MouseClick += button2_MouseClick;
-            //
+            // 
             // progressBar1
-            //
+            // 
             progressBar1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             progressBar1.BackColor = System.Drawing.Color.Transparent;
             progressBar1.BarColour = System.Drawing.Color.FromArgb(79, 202, 130);
@@ -146,15 +148,16 @@ namespace FizzyLauncher
             progressBar1.Maximum = 100;
             progressBar1.Minimum = 0;
             progressBar1.Name = "progressBar1";
+            progressBar1.Padding = new Padding(4, 4, 3, 3);
             progressBar1.ProgressText = "50/100";
             progressBar1.ShowProgressText = true;
             progressBar1.Size = new System.Drawing.Size(424, 20);
             progressBar1.TabIndex = 206;
             progressBar1.TabStop = false;
             progressBar1.Value = 50;
-            //
+            // 
             // label4
-            //
+            // 
             label4.AutoSize = true;
             label4.BackColor = System.Drawing.Color.Transparent;
             label4.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -166,9 +169,9 @@ namespace FizzyLauncher
             label4.TabIndex = 208;
             label4.Text = "Clear all icons.";
             label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // tHorizontalSeparator3
-            //
+            // 
             tHorizontalSeparator3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             tHorizontalSeparator3.AutoScrollMargin = new System.Drawing.Size(0, 0);
             tHorizontalSeparator3.AutoScrollMinSize = new System.Drawing.Size(0, 0);
@@ -181,9 +184,9 @@ namespace FizzyLauncher
             tHorizontalSeparator3.Size = new System.Drawing.Size(424, 22);
             tHorizontalSeparator3.TabIndex = 207;
             tHorizontalSeparator3.TabStop = false;
-            //
+            // 
             // button3
-            //
+            // 
             button3.ActiveImage = null;
             button3.BackColor = System.Drawing.Color.Transparent;
             button3.EnableMenuOnClick = false;
@@ -193,13 +196,14 @@ namespace FizzyLauncher
             button3.LabelText = "Clear &All";
             button3.Location = new System.Drawing.Point(306, 250);
             button3.Name = "button3";
+            button3.Padding = new Padding(4, 4, 3, 3);
             button3.Size = new System.Drawing.Size(128, 32);
             button3.TabIndex = 209;
             button3.TabStop = false;
             button3.MouseClick += button3_MouseClick;
-            //
+            // 
             // progressBar2
-            //
+            // 
             progressBar2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             progressBar2.BackColor = System.Drawing.Color.Transparent;
             progressBar2.BarColour = System.Drawing.Color.FromArgb(79, 193, 203);
@@ -210,30 +214,31 @@ namespace FizzyLauncher
             progressBar2.Maximum = 100;
             progressBar2.Minimum = 0;
             progressBar2.Name = "progressBar2";
+            progressBar2.Padding = new Padding(4, 4, 3, 3);
             progressBar2.ProgressText = "50/100";
             progressBar2.ShowProgressText = true;
             progressBar2.Size = new System.Drawing.Size(424, 20);
             progressBar2.TabIndex = 210;
             progressBar2.TabStop = false;
             progressBar2.Value = 50;
-            //
+            // 
             // dialogFooter1
-            //
+            // 
             dialogFooter1.BackColor = System.Drawing.Color.FromArgb(240, 240, 240);
             dialogFooter1.Button1Text = "&Close";
             dialogFooter1.Dialog = this;
             dialogFooter1.Dock = DockStyle.Bottom;
             dialogFooter1.IsBusy = false;
-            dialogFooter1.Location = new System.Drawing.Point(0, 437);
+            dialogFooter1.Location = new System.Drawing.Point(0, 477);
             dialogFooter1.Name = "dialogFooter1";
             dialogFooter1.Size = new System.Drawing.Size(444, 84);
-            //
+            // 
             // UpdateIconsForm
-            //
+            // 
             AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             BackColor = System.Drawing.Color.White;
-            ClientSize = new System.Drawing.Size(444, 521);
+            ClientSize = new System.Drawing.Size(444, 561);
             Controls.Add(dialogFooter1);
             Controls.Add(progressBar2);
             Controls.Add(button3);
@@ -246,7 +251,7 @@ namespace FizzyLauncher
             Controls.Add(tHorizontalSeparator2);
             Controls.Add(label1);
             KeyPreview = true;
-            MinimumSize = new System.Drawing.Size(460, 560);
+            MinimumSize = new System.Drawing.Size(460, 600);
             Name = "UpdateIconsForm";
             Text = "Update Icons";
             ResumeLayout(false);
diff --git a/UpdateIconsForm.resx b/UpdateIconsForm.resx
index af32865..8b2ff64 100644
--- a/UpdateIconsForm.resx
+++ b/UpdateIconsForm.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter