diff --git a/ShiftOS Launcher/ShiftOS Launcher/FirstBootSetup.Designer.vb b/ShiftOS Launcher/ShiftOS Launcher/FirstBootSetup.Designer.vb
index f26f248..437da1b 100644
--- a/ShiftOS Launcher/ShiftOS Launcher/FirstBootSetup.Designer.vb	
+++ b/ShiftOS Launcher/ShiftOS Launcher/FirstBootSetup.Designer.vb	
@@ -28,6 +28,9 @@ Partial Class FirstBootSetup
         Me.TextBox1 = New System.Windows.Forms.TextBox()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.TextBox2 = New System.Windows.Forms.TextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Label2 = New System.Windows.Forms.Label()
         Me.SuspendLayout()
         '
         'RadioButton1
@@ -54,12 +57,11 @@ Partial Class FirstBootSetup
         '
         'TextBox1
         '
-        Me.TextBox1.Location = New System.Drawing.Point(12, 73)
+        Me.TextBox1.Location = New System.Drawing.Point(219, 73)
         Me.TextBox1.Name = "TextBox1"
-        Me.TextBox1.Size = New System.Drawing.Size(515, 20)
+        Me.TextBox1.Size = New System.Drawing.Size(232, 20)
         Me.TextBox1.TabIndex = 2
-        Me.TextBox1.Text = "Where do you want your ShiftOS executables to be save to? Nothing = C:\ShiftOS\La" & _
-    "uncher\ShiftOSEXE\"
+        Me.TextBox1.Text = "C:\ShiftOS\SoftwareData\Launcher\ShiftOSEXE"
         '
         'Button1
         '
@@ -72,17 +74,47 @@ Partial Class FirstBootSetup
         '
         'TextBox2
         '
-        Me.TextBox2.Location = New System.Drawing.Point(12, 100)
+        Me.TextBox2.Location = New System.Drawing.Point(87, 100)
         Me.TextBox2.Name = "TextBox2"
-        Me.TextBox2.Size = New System.Drawing.Size(212, 20)
+        Me.TextBox2.Size = New System.Drawing.Size(445, 20)
         Me.TextBox2.TabIndex = 4
-        Me.TextBox2.Text = "Type in a nickname here"
+        Me.TextBox2.Text = "Example: DevX"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(12, 76)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(201, 13)
+        Me.Label1.TabIndex = 5
+        Me.Label1.Text = "Where to save the ShiftOS Executables?"
+        '
+        'Button2
+        '
+        Me.Button2.Location = New System.Drawing.Point(457, 71)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(75, 23)
+        Me.Button2.TabIndex = 6
+        Me.Button2.Text = "Browse..."
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(12, 103)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(58, 13)
+        Me.Label2.TabIndex = 7
+        Me.Label2.Text = "Nickname:"
         '
         'FirstBootSetup
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(536, 261)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.Button2)
+        Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.TextBox2)
         Me.Controls.Add(Me.Button1)
         Me.Controls.Add(Me.TextBox1)
@@ -105,4 +137,7 @@ Partial Class FirstBootSetup
     Friend WithEvents TextBox1 As System.Windows.Forms.TextBox
     Friend WithEvents Button1 As System.Windows.Forms.Button
     Friend WithEvents TextBox2 As System.Windows.Forms.TextBox
+    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents Button2 As System.Windows.Forms.Button
+    Friend WithEvents Label2 As System.Windows.Forms.Label
 End Class
diff --git a/ShiftOS Launcher/ShiftOS Launcher/FirstBootSetup.vb b/ShiftOS Launcher/ShiftOS Launcher/FirstBootSetup.vb
index cbf2b79..dfac9e6 100644
--- a/ShiftOS Launcher/ShiftOS Launcher/FirstBootSetup.vb	
+++ b/ShiftOS Launcher/ShiftOS Launcher/FirstBootSetup.vb	
@@ -33,4 +33,11 @@
 
         Main_Launcher.UpdateOptions()
     End Sub
+
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        Dim folDialog As New FolderBrowserDialog
+        If folDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then
+            TextBox1.Text = folDialog.SelectedPath
+        End If
+    End Sub
 End Class
\ No newline at end of file