diff --git a/GBM/Forms/frmChooseGame.Designer.vb b/GBM/Forms/frmChooseGame.Designer.vb
index 3eb9af2..1b498da 100644
--- a/GBM/Forms/frmChooseGame.Designer.vb
+++ b/GBM/Forms/frmChooseGame.Designer.vb
@@ -25,6 +25,7 @@ Partial Class frmChooseGame
         Me.lblChoose = New System.Windows.Forms.Label()
         Me.btnChoose = New System.Windows.Forms.Button()
         Me.lstGameBox = New System.Windows.Forms.ListBox()
+        Me.btnCancel = New System.Windows.Forms.Button()
         Me.SuspendLayout()
         '
         'lblChoose
@@ -38,9 +39,9 @@ Partial Class frmChooseGame
         '
         'btnChoose
         '
-        Me.btnChoose.Location = New System.Drawing.Point(124, 135)
+        Me.btnChoose.Location = New System.Drawing.Point(72, 135)
         Me.btnChoose.Name = "btnChoose"
-        Me.btnChoose.Size = New System.Drawing.Size(119, 23)
+        Me.btnChoose.Size = New System.Drawing.Size(90, 23)
         Me.btnChoose.TabIndex = 2
         Me.btnChoose.Text = "C&hoose Game"
         Me.btnChoose.UseVisualStyleBackColor = True
@@ -53,11 +54,21 @@ Partial Class frmChooseGame
         Me.lstGameBox.Size = New System.Drawing.Size(228, 95)
         Me.lstGameBox.TabIndex = 1
         '
+        'btnCancel
+        '
+        Me.btnCancel.Location = New System.Drawing.Point(168, 135)
+        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancel.Size = New System.Drawing.Size(75, 23)
+        Me.btnCancel.TabIndex = 3
+        Me.btnCancel.Text = "&Cancel"
+        Me.btnCancel.UseVisualStyleBackColor = True
+        '
         'frmChooseGame
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(255, 166)
+        Me.Controls.Add(Me.btnCancel)
         Me.Controls.Add(Me.lstGameBox)
         Me.Controls.Add(Me.btnChoose)
         Me.Controls.Add(Me.lblChoose)
@@ -75,4 +86,5 @@ Partial Class frmChooseGame
     Friend WithEvents lblChoose As System.Windows.Forms.Label
     Friend WithEvents btnChoose As System.Windows.Forms.Button
     Friend WithEvents lstGameBox As System.Windows.Forms.ListBox
+    Friend WithEvents btnCancel As Button
 End Class
diff --git a/GBM/Forms/frmChooseGame.vb b/GBM/Forms/frmChooseGame.vb
index 033b8e9..ff168b6 100644
--- a/GBM/Forms/frmChooseGame.vb
+++ b/GBM/Forms/frmChooseGame.vb
@@ -48,6 +48,7 @@
         oGame = DirectCast(oGamesHash.Item(sSelectedGame), clsGame)
         SaveSelection()
         bGameSelected = True
+        Me.DialogResult = DialogResult.OK
         Me.Close()
     End Sub
 
@@ -62,7 +63,11 @@
 
     Private Sub frmChooseGame_FormClosing(sender As System.Object, e As System.Windows.Forms.FormClosingEventArgs) Handles MyBase.FormClosing
         If bGameSelected = False Then
-            e.Cancel = True
+            Me.DialogResult = DialogResult.Cancel
         End If
     End Sub
+
+    Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
+        Me.Close()
+    End Sub
 End Class
\ No newline at end of file
diff --git a/GBM/Forms/frmFilter.Designer.vb b/GBM/Forms/frmFilter.Designer.vb
index 2da911f..ab8a97a 100644
--- a/GBM/Forms/frmFilter.Designer.vb
+++ b/GBM/Forms/frmFilter.Designer.vb
@@ -68,7 +68,7 @@ Partial Class frmFilter
         Me.btnRemove.Name = "btnRemove"
         Me.btnRemove.Size = New System.Drawing.Size(48, 23)
         Me.btnRemove.TabIndex = 4
-        Me.btnRemove.Text = "< <"
+        Me.btnRemove.Text = "<"
         Me.btnRemove.UseVisualStyleBackColor = True
         '
         'btnAdd
@@ -77,7 +77,7 @@ Partial Class frmFilter
         Me.btnAdd.Name = "btnAdd"
         Me.btnAdd.Size = New System.Drawing.Size(48, 23)
         Me.btnAdd.TabIndex = 3
-        Me.btnAdd.Text = "> >"
+        Me.btnAdd.Text = ">"
         Me.btnAdd.UseVisualStyleBackColor = True
         '
         'lstFilter
diff --git a/GBM/Forms/frmGameManager.Designer.vb b/GBM/Forms/frmGameManager.Designer.vb
index 2119134..8bd552c 100644
--- a/GBM/Forms/frmGameManager.Designer.vb
+++ b/GBM/Forms/frmGameManager.Designer.vb
@@ -93,7 +93,7 @@ Partial Class frmGameManager
         '
         Me.btnAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.btnAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnAdd.Location = New System.Drawing.Point(12, 527)
+        Me.btnAdd.Location = New System.Drawing.Point(12, 526)
         Me.btnAdd.Name = "btnAdd"
         Me.btnAdd.Size = New System.Drawing.Size(30, 23)
         Me.btnAdd.TabIndex = 2
@@ -104,7 +104,7 @@ Partial Class frmGameManager
         '
         Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.btnDelete.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnDelete.Location = New System.Drawing.Point(48, 527)
+        Me.btnDelete.Location = New System.Drawing.Point(48, 526)
         Me.btnDelete.Name = "btnDelete"
         Me.btnDelete.Size = New System.Drawing.Size(30, 23)
         Me.btnDelete.TabIndex = 3
@@ -114,7 +114,7 @@ Partial Class frmGameManager
         'btnBackup
         '
         Me.btnBackup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnBackup.Location = New System.Drawing.Point(616, 526)
+        Me.btnBackup.Location = New System.Drawing.Point(616, 525)
         Me.btnBackup.Name = "btnBackup"
         Me.btnBackup.Size = New System.Drawing.Size(75, 23)
         Me.btnBackup.TabIndex = 14
@@ -124,7 +124,7 @@ Partial Class frmGameManager
         'btnClose
         '
         Me.btnClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnClose.Location = New System.Drawing.Point(697, 526)
+        Me.btnClose.Location = New System.Drawing.Point(697, 525)
         Me.btnClose.Name = "btnClose"
         Me.btnClose.Size = New System.Drawing.Size(75, 23)
         Me.btnClose.TabIndex = 15
@@ -161,7 +161,7 @@ Partial Class frmGameManager
         '
         Me.btnExclude.Location = New System.Drawing.Point(9, 125)
         Me.btnExclude.Name = "btnExclude"
-        Me.btnExclude.Size = New System.Drawing.Size(176, 23)
+        Me.btnExclude.Size = New System.Drawing.Size(175, 23)
         Me.btnExclude.TabIndex = 13
         Me.btnExclude.Text = "E&xclude Items..."
         Me.btnExclude.UseVisualStyleBackColor = True
@@ -170,7 +170,7 @@ Partial Class frmGameManager
         '
         Me.btnInclude.Location = New System.Drawing.Point(9, 97)
         Me.btnInclude.Name = "btnInclude"
-        Me.btnInclude.Size = New System.Drawing.Size(176, 23)
+        Me.btnInclude.Size = New System.Drawing.Size(175, 23)
         Me.btnInclude.TabIndex = 10
         Me.btnInclude.Text = "In&clude Items..."
         Me.btnInclude.UseVisualStyleBackColor = True
@@ -251,7 +251,7 @@ Partial Class frmGameManager
         'chkTimeStamp
         '
         Me.chkTimeStamp.AutoSize = True
-        Me.chkTimeStamp.Location = New System.Drawing.Point(191, 129)
+        Me.chkTimeStamp.Location = New System.Drawing.Point(190, 129)
         Me.chkTimeStamp.Name = "chkTimeStamp"
         Me.chkTimeStamp.Size = New System.Drawing.Size(146, 17)
         Me.chkTimeStamp.TabIndex = 14
@@ -261,7 +261,7 @@ Partial Class frmGameManager
         'chkFolderSave
         '
         Me.chkFolderSave.AutoSize = True
-        Me.chkFolderSave.Location = New System.Drawing.Point(191, 101)
+        Me.chkFolderSave.Location = New System.Drawing.Point(190, 101)
         Me.chkFolderSave.Name = "chkFolderSave"
         Me.chkFolderSave.Size = New System.Drawing.Size(109, 17)
         Me.chkFolderSave.TabIndex = 11
@@ -568,7 +568,7 @@ Partial Class frmGameManager
         'btnMarkAsRestored
         '
         Me.btnMarkAsRestored.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnMarkAsRestored.Location = New System.Drawing.Point(429, 526)
+        Me.btnMarkAsRestored.Location = New System.Drawing.Point(429, 525)
         Me.btnMarkAsRestored.Name = "btnMarkAsRestored"
         Me.btnMarkAsRestored.Size = New System.Drawing.Size(100, 23)
         Me.btnMarkAsRestored.TabIndex = 12
@@ -578,7 +578,7 @@ Partial Class frmGameManager
         'btnRestore
         '
         Me.btnRestore.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnRestore.Location = New System.Drawing.Point(535, 526)
+        Me.btnRestore.Location = New System.Drawing.Point(535, 525)
         Me.btnRestore.Name = "btnRestore"
         Me.btnRestore.Size = New System.Drawing.Size(75, 23)
         Me.btnRestore.TabIndex = 13
diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb
index a5f95b6..7504ca9 100644
--- a/GBM/Forms/frmGameManager.vb
+++ b/GBM/Forms/frmGameManager.vb
@@ -1273,8 +1273,12 @@ Public Class frmGameManager
     Private Sub chkFolderSave_CheckedChanged(sender As Object, e As EventArgs) Handles chkFolderSave.CheckedChanged
         If chkFolderSave.Checked Then
             btnInclude.Enabled = False
+            If txtFileType.Text <> String.Empty Then
+                txtFileType.Text = String.Empty
+                UpdateBuilderButtonLabel(txtFileType.Text, "In&clude", btnInclude, False)
+            End If
         Else
-            btnInclude.Enabled = True
+                btnInclude.Enabled = True
         End If
     End Sub
 End Class
\ No newline at end of file
diff --git a/GBM/Forms/frmGameTags.Designer.vb b/GBM/Forms/frmGameTags.Designer.vb
index 851bb2b..9bf2eec 100644
--- a/GBM/Forms/frmGameTags.Designer.vb
+++ b/GBM/Forms/frmGameTags.Designer.vb
@@ -56,7 +56,7 @@ Partial Class frmGameTags
         Me.btnAdd.Name = "btnAdd"
         Me.btnAdd.Size = New System.Drawing.Size(48, 23)
         Me.btnAdd.TabIndex = 1
-        Me.btnAdd.Text = "> >"
+        Me.btnAdd.Text = ">"
         Me.btnAdd.UseVisualStyleBackColor = True
         '
         'btnRemove
@@ -65,7 +65,7 @@ Partial Class frmGameTags
         Me.btnRemove.Name = "btnRemove"
         Me.btnRemove.Size = New System.Drawing.Size(48, 23)
         Me.btnRemove.TabIndex = 2
-        Me.btnRemove.Text = "< <"
+        Me.btnRemove.Text = "<"
         Me.btnRemove.UseVisualStyleBackColor = True
         '
         'lblTags
diff --git a/GBM/Forms/frmMain.Designer.vb b/GBM/Forms/frmMain.Designer.vb
index e680c26..c41ac46 100644
--- a/GBM/Forms/frmMain.Designer.vb
+++ b/GBM/Forms/frmMain.Designer.vb
@@ -446,6 +446,7 @@ Partial Class frmMain
         '
         'lblLastAction
         '
+        Me.lblLastAction.AutoEllipsis = True
         Me.lblLastAction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblLastAction.Location = New System.Drawing.Point(12, 139)
         Me.lblLastAction.Name = "lblLastAction"
diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb
index 3038ae4..2216e22 100644
--- a/GBM/Forms/frmMain.vb
+++ b/GBM/Forms/frmMain.vb
@@ -231,21 +231,34 @@ Public Class frmMain
 
     End Sub
 
-    Private Sub DoMultiGameCheck()
+    Private Function DoMultiGameCheck() As Boolean
+        Dim oResult As DialogResult
+
         If oProcess.Duplicate = True Then
-            Dim sProcessPath As String
             Dim frm As New frmChooseGame
             frm.Process = oProcess
-            frm.ShowDialog()
-            'Reload settings
-            LoadGameSettings()
-            'Retain the process path from old object
-            sProcessPath = oProcess.GameInfo.ProcessPath
-            oProcess.GameInfo = frm.Game
-            'Set the process path into the new object
-            oProcess.GameInfo.ProcessPath = sProcessPath
+            oResult = frm.ShowDialog()
+            If oResult = DialogResult.OK Then
+                Dim sProcessPath As String
+                'Reload settings
+                LoadGameSettings()
+                'Retain the process path from old object
+                sProcessPath = oProcess.GameInfo.ProcessPath
+                oProcess.GameInfo = frm.Game
+                'Set the process path into the new object
+                oProcess.GameInfo.ProcessPath = sProcessPath
+                'A game was set, return and continue
+                Return True
+            Else
+                'No game was set, return to cancel
+                Return False
+            End If
+        Else
+            'The game is not a duplicate, return and continue
+            Return True
         End If
-    End Sub
+
+    End Function
 
     Private Sub RunBackup()
         Dim bDoBackup As Boolean
@@ -1398,10 +1411,15 @@ Public Class frmMain
     Private Sub bwMain_RunWorkerCompleted(sender As System.Object, e As System.ComponentModel.RunWorkerCompletedEventArgs) Handles bwMonitor.RunWorkerCompleted
         oProcess.EndTime = Now
         If Not bCancelledByUser Then
-            DoMultiGameCheck()
-            UpdateLog(oProcess.GameInfo.Name & " has ended.", False)
-            If oSettings.TimeTracking Then HandleTimeSpent()
-            RunBackup()
+            If DoMultiGameCheck() Then
+                UpdateLog(oProcess.GameInfo.Name & " has ended.", False)
+                If oSettings.TimeTracking Then HandleTimeSpent()
+                RunBackup()
+            Else
+                UpdateLog("The unidentified game has ended.", False)
+                ResetGameInfo()
+                ResumeScan()
+            End If
         End If
         bCancelledByUser = False
     End Sub
diff --git a/GBM/Forms/frmSettings.Designer.vb b/GBM/Forms/frmSettings.Designer.vb
index 7560cc2..b65407f 100644
--- a/GBM/Forms/frmSettings.Designer.vb
+++ b/GBM/Forms/frmSettings.Designer.vb
@@ -88,7 +88,7 @@ Partial Class frmSettings
         Me.chkTimeTracking.Location = New System.Drawing.Point(6, 111)
         Me.chkTimeTracking.Name = "chkTimeTracking"
         Me.chkTimeTracking.Size = New System.Drawing.Size(122, 17)
-        Me.chkTimeTracking.TabIndex = 5
+        Me.chkTimeTracking.TabIndex = 4
         Me.chkTimeTracking.Text = "Enable time tracking"
         Me.chkTimeTracking.UseVisualStyleBackColor = True
         '
@@ -108,7 +108,7 @@ Partial Class frmSettings
         Me.chkSync.Location = New System.Drawing.Point(6, 134)
         Me.chkSync.Name = "chkSync"
         Me.chkSync.Size = New System.Drawing.Size(208, 17)
-        Me.chkSync.TabIndex = 4
+        Me.chkSync.TabIndex = 5
         Me.chkSync.Text = "Sync game list data with backup folder"
         Me.chkSync.UseVisualStyleBackColor = True
         '