diff --git a/Wardrobe/GUI/Main_Menu.Designer.vb b/Wardrobe/GUI/Main_Menu.Designer.vb
index 99bbbc7..422b60f 100644
--- a/Wardrobe/GUI/Main_Menu.Designer.vb
+++ b/Wardrobe/GUI/Main_Menu.Designer.vb
@@ -27,17 +27,25 @@ Partial Class Main_Menu
         Me.Button_Individual = New System.Windows.Forms.Button()
         Me.Button_Order = New System.Windows.Forms.Button()
         Me.Label_SettingsError = New System.Windows.Forms.Label()
+        Me.Button_Order2 = New System.Windows.Forms.Button()
+        Me.Button_Settings2 = New System.Windows.Forms.Button()
         Me.SuspendLayout()
         '
         'Button_Settings
         '
-        Me.Button_Settings.Location = New System.Drawing.Point(49, 47)
+        Me.Button_Settings.BackColor = System.Drawing.Color.Transparent
+        Me.Button_Settings.FlatAppearance.BorderSize = 0
+        Me.Button_Settings.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button_Settings.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button_Settings.ForeColor = System.Drawing.SystemColors.ControlLightLight
+        Me.Button_Settings.Location = New System.Drawing.Point(11, 47)
         Me.Button_Settings.Margin = New System.Windows.Forms.Padding(2)
         Me.Button_Settings.Name = "Button_Settings"
-        Me.Button_Settings.Size = New System.Drawing.Size(127, 41)
+        Me.Button_Settings.Size = New System.Drawing.Size(115, 41)
         Me.Button_Settings.TabIndex = 5
         Me.Button_Settings.Text = "Settings"
-        Me.Button_Settings.UseVisualStyleBackColor = True
+        Me.Button_Settings.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button_Settings.UseVisualStyleBackColor = False
         '
         'Button_Multiple
         '
@@ -61,31 +69,68 @@ Partial Class Main_Menu
         '
         'Button_Order
         '
+        Me.Button_Order.BackColor = System.Drawing.Color.Transparent
         Me.Button_Order.Enabled = False
-        Me.Button_Order.Location = New System.Drawing.Point(132, 250)
+        Me.Button_Order.FlatAppearance.BorderSize = 0
+        Me.Button_Order.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button_Order.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button_Order.ForeColor = System.Drawing.SystemColors.ControlLightLight
+        Me.Button_Order.Location = New System.Drawing.Point(71, 250)
         Me.Button_Order.Name = "Button_Order"
-        Me.Button_Order.Size = New System.Drawing.Size(117, 65)
+        Me.Button_Order.Size = New System.Drawing.Size(151, 65)
         Me.Button_Order.TabIndex = 7
         Me.Button_Order.Text = "Create Order"
-        Me.Button_Order.UseVisualStyleBackColor = True
+        Me.Button_Order.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button_Order.UseVisualStyleBackColor = False
         '
         'Label_SettingsError
         '
         Me.Label_SettingsError.AutoSize = True
         Me.Label_SettingsError.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label_SettingsError.ForeColor = System.Drawing.Color.Red
-        Me.Label_SettingsError.Location = New System.Drawing.Point(194, 59)
+        Me.Label_SettingsError.Location = New System.Drawing.Point(139, 59)
         Me.Label_SettingsError.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0)
         Me.Label_SettingsError.Name = "Label_SettingsError"
         Me.Label_SettingsError.Size = New System.Drawing.Size(112, 17)
         Me.Label_SettingsError.TabIndex = 8
         Me.Label_SettingsError.Text = "Update Settings!"
         '
+        'Button_Order2
+        '
+        Me.Button_Order2.BackColor = System.Drawing.Color.Transparent
+        Me.Button_Order2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.copy_line
+        Me.Button_Order2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button_Order2.Enabled = False
+        Me.Button_Order2.FlatAppearance.BorderSize = 0
+        Me.Button_Order2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button_Order2.Location = New System.Drawing.Point(71, 258)
+        Me.Button_Order2.Name = "Button_Order2"
+        Me.Button_Order2.Size = New System.Drawing.Size(55, 49)
+        Me.Button_Order2.TabIndex = 10
+        Me.Button_Order2.UseVisualStyleBackColor = False
+        '
+        'Button_Settings2
+        '
+        Me.Button_Settings2.BackColor = System.Drawing.Color.Transparent
+        Me.Button_Settings2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.setting
+        Me.Button_Settings2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button_Settings2.FlatAppearance.BorderSize = 0
+        Me.Button_Settings2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button_Settings2.Location = New System.Drawing.Point(11, 47)
+        Me.Button_Settings2.Margin = New System.Windows.Forms.Padding(2)
+        Me.Button_Settings2.Name = "Button_Settings2"
+        Me.Button_Settings2.Size = New System.Drawing.Size(54, 41)
+        Me.Button_Settings2.TabIndex = 9
+        Me.Button_Settings2.UseVisualStyleBackColor = False
+        '
         'Main_Menu
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
         Me.ClientSize = New System.Drawing.Size(800, 500)
+        Me.Controls.Add(Me.Button_Order2)
+        Me.Controls.Add(Me.Button_Settings2)
         Me.Controls.Add(Me.Label_SettingsError)
         Me.Controls.Add(Me.Button_Order)
         Me.Controls.Add(Me.Button_Settings)
@@ -105,4 +150,6 @@ Partial Class Main_Menu
     Friend WithEvents Button_Individual As Button
     Friend WithEvents Button_Order As Button
     Friend WithEvents Label_SettingsError As Label
+    Friend WithEvents Button_Settings2 As Button
+    Friend WithEvents Button_Order2 As Button
 End Class
diff --git a/Wardrobe/GUI/Main_Menu.vb b/Wardrobe/GUI/Main_Menu.vb
index 7491155..5e9d675 100644
--- a/Wardrobe/GUI/Main_Menu.vb
+++ b/Wardrobe/GUI/Main_Menu.vb
@@ -100,7 +100,6 @@ Public Class Main_Menu
     ' ---------------------------------- Settings ----------------------------------
     ' --- Settings button clicked ---
     Private Sub Button_Settings_Click(sender As Object, e As EventArgs) Handles Button_Settings.Click
-        AppForm.fillMode = True
         AppForm.Panel_Start.Controls.Clear()
         Settings.TopLevel = False
         AppForm.Panel_Start.Controls.Add(Settings)
diff --git a/Wardrobe/GUI/Settings.Designer.vb b/Wardrobe/GUI/Settings.Designer.vb
index 8991749..f641c5c 100644
--- a/Wardrobe/GUI/Settings.Designer.vb
+++ b/Wardrobe/GUI/Settings.Designer.vb
@@ -31,37 +31,53 @@ Partial Class Settings
         Me.Label_Tel = New System.Windows.Forms.Label()
         Me.TextBox_Mail = New System.Windows.Forms.TextBox()
         Me.Label_Mail = New System.Windows.Forms.Label()
-        Me.Button_Save = New System.Windows.Forms.Button()
         Me.Label_Name_Needed = New System.Windows.Forms.Label()
         Me.Label_Phone_Needed = New System.Windows.Forms.Label()
         Me.Label_Mail_Needed = New System.Windows.Forms.Label()
         Me.Label_KB_Updated = New System.Windows.Forms.Label()
         Me.Label_File_Path = New System.Windows.Forms.Label()
         Me.CheckBox_NoSW = New System.Windows.Forms.CheckBox()
+        Me.Button_Save = New System.Windows.Forms.Button()
+        Me.Button_KB2 = New System.Windows.Forms.Button()
+        Me.Button_FilePath2 = New System.Windows.Forms.Button()
+        Me.Button_save2 = New System.Windows.Forms.Button()
         Me.SuspendLayout()
         '
         'Button_KB
         '
-        Me.Button_KB.Location = New System.Drawing.Point(506, 113)
+        Me.Button_KB.BackColor = System.Drawing.Color.Transparent
+        Me.Button_KB.FlatAppearance.BorderSize = 0
+        Me.Button_KB.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button_KB.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button_KB.ForeColor = System.Drawing.SystemColors.ControlLightLight
+        Me.Button_KB.Location = New System.Drawing.Point(40, 162)
         Me.Button_KB.Name = "Button_KB"
-        Me.Button_KB.Size = New System.Drawing.Size(160, 68)
+        Me.Button_KB.Size = New System.Drawing.Size(224, 68)
         Me.Button_KB.TabIndex = 0
         Me.Button_KB.Text = "Update Knowledge Base"
-        Me.Button_KB.UseVisualStyleBackColor = True
+        Me.Button_KB.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button_KB.UseVisualStyleBackColor = False
         '
         'Button_FilePath
         '
-        Me.Button_FilePath.Location = New System.Drawing.Point(506, 263)
+        Me.Button_FilePath.BackColor = System.Drawing.Color.Transparent
+        Me.Button_FilePath.FlatAppearance.BorderSize = 0
+        Me.Button_FilePath.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button_FilePath.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button_FilePath.ForeColor = System.Drawing.SystemColors.ControlLightLight
+        Me.Button_FilePath.Location = New System.Drawing.Point(40, 48)
         Me.Button_FilePath.Name = "Button_FilePath"
-        Me.Button_FilePath.Size = New System.Drawing.Size(160, 68)
+        Me.Button_FilePath.Size = New System.Drawing.Size(174, 68)
         Me.Button_FilePath.TabIndex = 1
         Me.Button_FilePath.Text = "Update File Path"
-        Me.Button_FilePath.UseVisualStyleBackColor = True
+        Me.Button_FilePath.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button_FilePath.UseVisualStyleBackColor = False
         '
         'Label_Name
         '
         Me.Label_Name.AutoSize = True
-        Me.Label_Name.Location = New System.Drawing.Point(72, 159)
+        Me.Label_Name.ForeColor = System.Drawing.SystemColors.ControlLightLight
+        Me.Label_Name.Location = New System.Drawing.Point(56, 331)
         Me.Label_Name.Name = "Label_Name"
         Me.Label_Name.Size = New System.Drawing.Size(38, 13)
         Me.Label_Name.TabIndex = 2
@@ -69,8 +85,10 @@ Partial Class Settings
         '
         'TextBox_Name
         '
+        Me.TextBox_Name.BackColor = System.Drawing.SystemColors.ScrollBar
+        Me.TextBox_Name.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.TextBox_Name.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBox_Name.Location = New System.Drawing.Point(159, 156)
+        Me.TextBox_Name.Location = New System.Drawing.Point(143, 328)
         Me.TextBox_Name.Name = "TextBox_Name"
         Me.TextBox_Name.Size = New System.Drawing.Size(171, 21)
         Me.TextBox_Name.TabIndex = 3
@@ -79,7 +97,8 @@ Partial Class Settings
         '
         Me.Label_UserData.AutoSize = True
         Me.Label_UserData.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label_UserData.Location = New System.Drawing.Point(71, 112)
+        Me.Label_UserData.ForeColor = System.Drawing.SystemColors.ControlLightLight
+        Me.Label_UserData.Location = New System.Drawing.Point(55, 284)
         Me.Label_UserData.Name = "Label_UserData"
         Me.Label_UserData.Size = New System.Drawing.Size(181, 20)
         Me.Label_UserData.TabIndex = 4
@@ -87,8 +106,10 @@ Partial Class Settings
         '
         'TextBox_Phone
         '
+        Me.TextBox_Phone.BackColor = System.Drawing.SystemColors.ScrollBar
+        Me.TextBox_Phone.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.TextBox_Phone.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBox_Phone.Location = New System.Drawing.Point(159, 197)
+        Me.TextBox_Phone.Location = New System.Drawing.Point(143, 369)
         Me.TextBox_Phone.Name = "TextBox_Phone"
         Me.TextBox_Phone.Size = New System.Drawing.Size(171, 21)
         Me.TextBox_Phone.TabIndex = 6
@@ -96,7 +117,8 @@ Partial Class Settings
         'Label_Tel
         '
         Me.Label_Tel.AutoSize = True
-        Me.Label_Tel.Location = New System.Drawing.Point(72, 200)
+        Me.Label_Tel.ForeColor = System.Drawing.SystemColors.ControlLightLight
+        Me.Label_Tel.Location = New System.Drawing.Point(56, 372)
         Me.Label_Tel.Name = "Label_Tel"
         Me.Label_Tel.Size = New System.Drawing.Size(81, 13)
         Me.Label_Tel.TabIndex = 5
@@ -104,8 +126,10 @@ Partial Class Settings
         '
         'TextBox_Mail
         '
+        Me.TextBox_Mail.BackColor = System.Drawing.SystemColors.ScrollBar
+        Me.TextBox_Mail.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.TextBox_Mail.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBox_Mail.Location = New System.Drawing.Point(159, 239)
+        Me.TextBox_Mail.Location = New System.Drawing.Point(143, 411)
         Me.TextBox_Mail.Name = "TextBox_Mail"
         Me.TextBox_Mail.Size = New System.Drawing.Size(171, 21)
         Me.TextBox_Mail.TabIndex = 8
@@ -113,26 +137,18 @@ Partial Class Settings
         'Label_Mail
         '
         Me.Label_Mail.AutoSize = True
-        Me.Label_Mail.Location = New System.Drawing.Point(72, 242)
+        Me.Label_Mail.ForeColor = System.Drawing.SystemColors.ControlLightLight
+        Me.Label_Mail.Location = New System.Drawing.Point(56, 414)
         Me.Label_Mail.Name = "Label_Mail"
         Me.Label_Mail.Size = New System.Drawing.Size(29, 13)
         Me.Label_Mail.TabIndex = 7
         Me.Label_Mail.Text = "Mail:"
         '
-        'Button_Save
-        '
-        Me.Button_Save.Location = New System.Drawing.Point(330, 379)
-        Me.Button_Save.Name = "Button_Save"
-        Me.Button_Save.Size = New System.Drawing.Size(129, 54)
-        Me.Button_Save.TabIndex = 9
-        Me.Button_Save.Text = "Save"
-        Me.Button_Save.UseVisualStyleBackColor = True
-        '
         'Label_Name_Needed
         '
         Me.Label_Name_Needed.AutoSize = True
         Me.Label_Name_Needed.ForeColor = System.Drawing.Color.Red
-        Me.Label_Name_Needed.Location = New System.Drawing.Point(336, 159)
+        Me.Label_Name_Needed.Location = New System.Drawing.Point(320, 331)
         Me.Label_Name_Needed.Name = "Label_Name_Needed"
         Me.Label_Name_Needed.Size = New System.Drawing.Size(45, 13)
         Me.Label_Name_Needed.TabIndex = 10
@@ -142,7 +158,7 @@ Partial Class Settings
         '
         Me.Label_Phone_Needed.AutoSize = True
         Me.Label_Phone_Needed.ForeColor = System.Drawing.Color.Red
-        Me.Label_Phone_Needed.Location = New System.Drawing.Point(336, 202)
+        Me.Label_Phone_Needed.Location = New System.Drawing.Point(320, 374)
         Me.Label_Phone_Needed.Name = "Label_Phone_Needed"
         Me.Label_Phone_Needed.Size = New System.Drawing.Size(45, 13)
         Me.Label_Phone_Needed.TabIndex = 11
@@ -152,7 +168,7 @@ Partial Class Settings
         '
         Me.Label_Mail_Needed.AutoSize = True
         Me.Label_Mail_Needed.ForeColor = System.Drawing.Color.Red
-        Me.Label_Mail_Needed.Location = New System.Drawing.Point(336, 244)
+        Me.Label_Mail_Needed.Location = New System.Drawing.Point(320, 416)
         Me.Label_Mail_Needed.Name = "Label_Mail_Needed"
         Me.Label_Mail_Needed.Size = New System.Drawing.Size(45, 13)
         Me.Label_Mail_Needed.TabIndex = 12
@@ -161,7 +177,7 @@ Partial Class Settings
         'Label_KB_Updated
         '
         Me.Label_KB_Updated.AutoSize = True
-        Me.Label_KB_Updated.Location = New System.Drawing.Point(698, 143)
+        Me.Label_KB_Updated.Location = New System.Drawing.Point(301, 190)
         Me.Label_KB_Updated.Name = "Label_KB_Updated"
         Me.Label_KB_Updated.Size = New System.Drawing.Size(0, 13)
         Me.Label_KB_Updated.TabIndex = 13
@@ -169,7 +185,7 @@ Partial Class Settings
         'Label_File_Path
         '
         Me.Label_File_Path.AutoSize = True
-        Me.Label_File_Path.Location = New System.Drawing.Point(698, 291)
+        Me.Label_File_Path.Location = New System.Drawing.Point(252, 76)
         Me.Label_File_Path.Name = "Label_File_Path"
         Me.Label_File_Path.Size = New System.Drawing.Size(0, 13)
         Me.Label_File_Path.TabIndex = 14
@@ -177,18 +193,84 @@ Partial Class Settings
         'CheckBox_NoSW
         '
         Me.CheckBox_NoSW.AutoSize = True
-        Me.CheckBox_NoSW.Location = New System.Drawing.Point(506, 81)
+        Me.CheckBox_NoSW.ForeColor = System.Drawing.SystemColors.ControlLightLight
+        Me.CheckBox_NoSW.Location = New System.Drawing.Point(49, 139)
         Me.CheckBox_NoSW.Name = "CheckBox_NoSW"
         Me.CheckBox_NoSW.Size = New System.Drawing.Size(140, 17)
         Me.CheckBox_NoSW.TabIndex = 15
         Me.CheckBox_NoSW.Text = "Run without SolidWorks"
         Me.CheckBox_NoSW.UseVisualStyleBackColor = True
         '
+        'Button_Save
+        '
+        Me.Button_Save.BackColor = System.Drawing.Color.Transparent
+        Me.Button_Save.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button_Save.FlatAppearance.BorderSize = 0
+        Me.Button_Save.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Silver
+        Me.Button_Save.FlatAppearance.MouseOverBackColor = System.Drawing.Color.DarkGray
+        Me.Button_Save.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button_Save.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button_Save.ForeColor = System.Drawing.SystemColors.ControlLightLight
+        Me.Button_Save.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button_Save.Location = New System.Drawing.Point(654, 377)
+        Me.Button_Save.Name = "Button_Save"
+        Me.Button_Save.Size = New System.Drawing.Size(101, 53)
+        Me.Button_Save.TabIndex = 9
+        Me.Button_Save.Text = "Save"
+        Me.Button_Save.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button_Save.UseVisualStyleBackColor = False
+        '
+        'Button_KB2
+        '
+        Me.Button_KB2.BackColor = System.Drawing.Color.Transparent
+        Me.Button_KB2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.undo_arrow
+        Me.Button_KB2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button_KB2.FlatAppearance.BorderSize = 0
+        Me.Button_KB2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button_KB2.Location = New System.Drawing.Point(49, 176)
+        Me.Button_KB2.Name = "Button_KB2"
+        Me.Button_KB2.Size = New System.Drawing.Size(42, 40)
+        Me.Button_KB2.TabIndex = 19
+        Me.Button_KB2.UseVisualStyleBackColor = False
+        '
+        'Button_FilePath2
+        '
+        Me.Button_FilePath2.BackColor = System.Drawing.Color.Transparent
+        Me.Button_FilePath2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.folder_search
+        Me.Button_FilePath2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button_FilePath2.FlatAppearance.BorderSize = 0
+        Me.Button_FilePath2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button_FilePath2.Location = New System.Drawing.Point(49, 66)
+        Me.Button_FilePath2.Name = "Button_FilePath2"
+        Me.Button_FilePath2.Size = New System.Drawing.Size(42, 32)
+        Me.Button_FilePath2.TabIndex = 18
+        Me.Button_FilePath2.UseVisualStyleBackColor = False
+        '
+        'Button_save2
+        '
+        Me.Button_save2.BackColor = System.Drawing.Color.Transparent
+        Me.Button_save2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Save_settings
+        Me.Button_save2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button_save2.FlatAppearance.BorderSize = 0
+        Me.Button_save2.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent
+        Me.Button_save2.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent
+        Me.Button_save2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button_save2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button_save2.Location = New System.Drawing.Point(663, 387)
+        Me.Button_save2.Name = "Button_save2"
+        Me.Button_save2.Size = New System.Drawing.Size(43, 36)
+        Me.Button_save2.TabIndex = 7
+        Me.Button_save2.UseVisualStyleBackColor = False
+        '
         'Settings
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
         Me.ClientSize = New System.Drawing.Size(800, 500)
+        Me.Controls.Add(Me.Button_KB2)
+        Me.Controls.Add(Me.Button_FilePath2)
+        Me.Controls.Add(Me.Button_save2)
         Me.Controls.Add(Me.CheckBox_NoSW)
         Me.Controls.Add(Me.Label_File_Path)
         Me.Controls.Add(Me.Label_KB_Updated)
@@ -229,4 +311,7 @@ Partial Class Settings
     Friend WithEvents Label_KB_Updated As Label
     Friend WithEvents Label_File_Path As Label
     Friend WithEvents CheckBox_NoSW As CheckBox
+    Friend WithEvents Button_save2 As Button
+    Friend WithEvents Button_FilePath2 As Button
+    Friend WithEvents Button_KB2 As Button
 End Class
diff --git a/Wardrobe/GUI/Settings.vb b/Wardrobe/GUI/Settings.vb
index d25e2d0..bfd8e93 100644
--- a/Wardrobe/GUI/Settings.vb
+++ b/Wardrobe/GUI/Settings.vb
@@ -66,7 +66,7 @@ Public Class Settings
         End If
     End Sub
     Private Sub Button_KB_Click(sender As Object, e As EventArgs) Handles Button_KB.Click
-        'adminClass.updateDatabase() 'Update KB
+        adminClass.updateDatabase() 'Update KB
 
         Dim timeNow As Date = Date.Now
         KBUpdateTime = timeNow.ToString()
@@ -90,7 +90,17 @@ Public Class Settings
 
         Check_Settings()
 
-        AppForm.fillMode = True
+        AppForm.Panel_Start.Controls.Clear()
+        Main_Menu.TopLevel = False
+        AppForm.Panel_Start.Controls.Add(Main_Menu)
+        Main_Menu.Show()
+    End Sub
+
+    Private Sub Button_save2_Click(sender As Object, e As EventArgs) Handles Button_save2.Click
+        System.IO.File.WriteAllLines(AppForm.appDataPath & "\SavedData.txt", appDataList.ToArray())
+
+        Check_Settings()
+
         AppForm.Panel_Start.Controls.Clear()
         Main_Menu.TopLevel = False
         AppForm.Panel_Start.Controls.Add(Main_Menu)
diff --git a/Wardrobe/My Project/Resources.Designer.vb b/Wardrobe/My Project/Resources.Designer.vb
index d8f1356..f2380f9 100644
--- a/Wardrobe/My Project/Resources.Designer.vb	
+++ b/Wardrobe/My Project/Resources.Designer.vb	
@@ -80,6 +80,26 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property copy_line() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("copy-line", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property folder_search() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("folder-search", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized resource of type System.Drawing.Bitmap.
         '''</summary>
@@ -90,6 +110,26 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property Save_settings() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("Save-settings", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property setting() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("setting", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized resource of type System.Drawing.Bitmap.
         '''</summary>
@@ -119,5 +159,15 @@ Namespace My.Resources
                 Return CType(obj,System.Drawing.Bitmap)
             End Get
         End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property undo_arrow() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("undo-arrow", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
     End Module
 End Namespace
diff --git a/Wardrobe/My Project/Resources.resx b/Wardrobe/My Project/Resources.resx
index c7a00ac..b06d7ed 100644
--- a/Wardrobe/My Project/Resources.resx	
+++ b/Wardrobe/My Project/Resources.resx	
@@ -118,22 +118,37 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="AngleCorner" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AngleCorner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SquareSide" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SquareSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="AngleSide" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\AngleSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Radius" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Radius.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SquareMiddle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SquareMiddle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="folder-search" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\folder-search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Save-settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Save-settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="setting" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\setting.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="SquareCorner" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\SquareCorner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SquareMiddle" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\SquareMiddle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="undo-arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\undo-arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SquareSide" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\SquareSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="AngleCorner" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\AngleCorner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Radius" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Radius.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="copy-line" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\copy-line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Wardrobe/Resources/Save-settings.png b/Wardrobe/Resources/Save-settings.png
new file mode 100644
index 0000000..a9d1fcb
Binary files /dev/null and b/Wardrobe/Resources/Save-settings.png differ
diff --git a/Wardrobe/Resources/copy-line.png b/Wardrobe/Resources/copy-line.png
new file mode 100644
index 0000000..9e91a48
Binary files /dev/null and b/Wardrobe/Resources/copy-line.png differ
diff --git a/Wardrobe/Resources/folder-search.png b/Wardrobe/Resources/folder-search.png
new file mode 100644
index 0000000..6f278f0
Binary files /dev/null and b/Wardrobe/Resources/folder-search.png differ
diff --git a/Wardrobe/Resources/setting.png b/Wardrobe/Resources/setting.png
new file mode 100644
index 0000000..7214a5d
Binary files /dev/null and b/Wardrobe/Resources/setting.png differ
diff --git a/Wardrobe/Resources/undo-arrow.png b/Wardrobe/Resources/undo-arrow.png
new file mode 100644
index 0000000..d4df03e
Binary files /dev/null and b/Wardrobe/Resources/undo-arrow.png differ
diff --git a/Wardrobe/Wardrobe.vbproj b/Wardrobe/Wardrobe.vbproj
index f833d7f..0114556 100644
--- a/Wardrobe/Wardrobe.vbproj
+++ b/Wardrobe/Wardrobe.vbproj
@@ -232,5 +232,20 @@
   <ItemGroup>
     <None Include="Resources\SquareSide.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Save-settings.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\folder-search.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\undo-arrow.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\setting.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\copy-line.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
\ No newline at end of file