diff --git a/remoteapp-tool/RemoteAppMainWindow.Designer.vb b/remoteapp-tool/RemoteAppMainWindow.Designer.vb
index 49ef1a0..e300d8a 100644
--- a/remoteapp-tool/RemoteAppMainWindow.Designer.vb
+++ b/remoteapp-tool/RemoteAppMainWindow.Designer.vb
@@ -44,18 +44,18 @@ Partial Class RemoteAppMainWindow
         Me.CreateClientConnection = New System.Windows.Forms.Button()
         Me.ToolsMenuStrip = New System.Windows.Forms.MenuStrip()
         Me.FileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.NewRemoteAppadvancedToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
         Me.ExitToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.HostOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+        Me.RemoveUnusedFileTypeAssociationsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.HelpToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.WebsiteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
         Me.AboutToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-        Me.RemoveUnusedFileTypeAssociationsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.NewRemoteAppadvancedToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
         Me.ToolsMenuStrip.SuspendLayout()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -251,17 +251,28 @@ Partial Class RemoteAppMainWindow
         Me.FileToolStripMenuItem.Size = New System.Drawing.Size(37, 20)
         Me.FileToolStripMenuItem.Text = "File"
         '
+        'NewRemoteAppadvancedToolStripMenuItem
+        '
+        Me.NewRemoteAppadvancedToolStripMenuItem.Name = "NewRemoteAppadvancedToolStripMenuItem"
+        Me.NewRemoteAppadvancedToolStripMenuItem.Size = New System.Drawing.Size(235, 22)
+        Me.NewRemoteAppadvancedToolStripMenuItem.Text = "New RemoteApp (advanced)..."
+        '
+        'ToolStripSeparator2
+        '
+        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(232, 6)
+        '
         'ExitToolStripMenuItem
         '
         Me.ExitToolStripMenuItem.Name = "ExitToolStripMenuItem"
-        Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(92, 22)
+        Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(235, 22)
         Me.ExitToolStripMenuItem.Text = "Exit"
         '
         'ToolsToolStripMenuItem
         '
         Me.ToolsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.HostOptionsToolStripMenuItem, Me.ToolStripSeparator3, Me.RemoveUnusedFileTypeAssociationsToolStripMenuItem})
         Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem"
-        Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(94, 20)
+        Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(46, 20)
         Me.ToolsToolStripMenuItem.Text = "&Tools"
         '
         'HostOptionsToolStripMenuItem
@@ -270,6 +281,17 @@ Partial Class RemoteAppMainWindow
         Me.HostOptionsToolStripMenuItem.Size = New System.Drawing.Size(280, 22)
         Me.HostOptionsToolStripMenuItem.Text = "Host Options..."
         '
+        'ToolStripSeparator3
+        '
+        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(277, 6)
+        '
+        'RemoveUnusedFileTypeAssociationsToolStripMenuItem
+        '
+        Me.RemoveUnusedFileTypeAssociationsToolStripMenuItem.Name = "RemoveUnusedFileTypeAssociationsToolStripMenuItem"
+        Me.RemoveUnusedFileTypeAssociationsToolStripMenuItem.Size = New System.Drawing.Size(280, 22)
+        Me.RemoveUnusedFileTypeAssociationsToolStripMenuItem.Text = "Remove unused file type associations..."
+        '
         'HelpToolStripMenuItem
         '
         Me.HelpToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.WebsiteToolStripMenuItem, Me.ToolStripSeparator1, Me.AboutToolStripMenuItem})
@@ -306,28 +328,6 @@ Partial Class RemoteAppMainWindow
         Me.PictureBox1.TabIndex = 7
         Me.PictureBox1.TabStop = False
         '
-        'RemoveUnusedFileTypeAssociationsToolStripMenuItem
-        '
-        Me.RemoveUnusedFileTypeAssociationsToolStripMenuItem.Name = "RemoveUnusedFileTypeAssociationsToolStripMenuItem"
-        Me.RemoveUnusedFileTypeAssociationsToolStripMenuItem.Size = New System.Drawing.Size(280, 22)
-        Me.RemoveUnusedFileTypeAssociationsToolStripMenuItem.Text = "Remove unused file type associations..."
-        '
-        'NewRemoteAppadvancedToolStripMenuItem
-        '
-        Me.NewRemoteAppadvancedToolStripMenuItem.Name = "NewRemoteAppadvancedToolStripMenuItem"
-        Me.NewRemoteAppadvancedToolStripMenuItem.Size = New System.Drawing.Size(235, 22)
-        Me.NewRemoteAppadvancedToolStripMenuItem.Text = "New RemoteApp (advanced)..."
-        '
-        'ToolStripSeparator2
-        '
-        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(232, 6)
-        '
-        'ToolStripSeparator3
-        '
-        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(277, 6)
-        '
         'RemoteAppMainWindow
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!)
diff --git a/remoteapp-tool/RemoteAppMainWindow.vb b/remoteapp-tool/RemoteAppMainWindow.vb
index 8f032c9..6935d7f 100644
--- a/remoteapp-tool/RemoteAppMainWindow.vb
+++ b/remoteapp-tool/RemoteAppMainWindow.vb
@@ -164,4 +164,46 @@ Public Class RemoteAppMainWindow
         RemoteAppEditWindow.CreateRemoteApp(True)
         ReloadApps()
     End Sub
+
+    Private Sub RemoteAppMainWindow_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
+
+        ' Check to see if this is a pre-release or debug version.
+        ' This information comes from the project assembly description
+
+        Dim AssemblyDescription = My.Application.Info.Description.ToLower
+
+        If AssemblyDescription = "pre-release" OrElse AssemblyDescription = "debug" Then
+
+            ' Ask the user if the application worked correctly
+
+            Dim ProblemYesNo = MessageBox.Show("This is a " & AssemblyDescription & " version of RemoteApp Tool." & vbCrLf & vbCrLf & "Did it work correctly?", AssemblyDescription.ToUpper & " version feedback", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+
+            ' If the user had a problem, ask for more info.
+            ' Put the responses + version # into an array, ready to be inserted into a URL
+
+            Dim FeedbackResponses(3) As String
+            Dim VersionString = My.Application.Info.Version.ToString & " " & My.Application.Info.Description.ToString
+
+            If ProblemYesNo = DialogResult.No Then
+                'Dim FeedbackText = InputBox("Please describe the problem you experienced:", "Problem description")
+                FeedbackResponses = {VersionString, "No", ""}
+            ElseIf ProblemYesNo = DialogResult.Yes Then
+                FeedbackResponses = {VersionString, "Yes", ""}
+            End If
+
+            ' Build the Google Form URL
+
+            Dim FormUrl = "https://docs.google.com/forms/d/e/1FAIpQLSet6jkUvj23n9IK0L_aM8ckv40BfcI9e8VTdfcDdz2XtU-ERA/viewform?usp=pp_url&entry.64442428=" &
+                FeedbackResponses(0) &
+                "&entry.1809958859=" &
+                FeedbackResponses(1) &
+                "&entry.612126075=" &
+                FeedbackResponses(2)
+
+            ' Send the user to the filled Google Form to submit
+
+            System.Diagnostics.Process.Start(FormUrl)
+
+        End If
+    End Sub
 End Class
\ No newline at end of file