diff --git a/CSM/ConanServerManager_1.1.41.exe b/CSM/ConanServerManager_1.1.41.exe
new file mode 100644
index 00000000..d38c3fb2
Binary files /dev/null and b/CSM/ConanServerManager_1.1.41.exe differ
diff --git a/CSM/ConanServerManager_1.1.41.zip b/CSM/ConanServerManager_1.1.41.zip
new file mode 100644
index 00000000..0e37fe3f
Binary files /dev/null and b/CSM/ConanServerManager_1.1.41.zip differ
diff --git a/CSM/VersionFeed.xml b/CSM/VersionFeed.xml
index fe70a326..5d727f64 100644
--- a/CSM/VersionFeed.xml
+++ b/CSM/VersionFeed.xml
@@ -5,7 +5,38 @@
   <title>Conan Server Manager Version Feed</title>
   <subtitle>This is the Conan Server Manager release version feed.</subtitle>
   <link href="http://servermanagers.freeforums.net/" />
-  <updated>2020-07-12T00:00:00Z</updated>
+  <updated>2020-07-13T00:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:1C99C798-11ED-4D57-A661-423D30D8B9AA</id>
+    <title>1.1.41 (1.1.41.8)</title>
+    <summary>1.1.41.8</summary>
+    <link href="" />
+    <updated>2020-07-13T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Added a new server manager updater check, when performing an upgrade of the server manager.</li>
+            <li>Added a new directory check when selecting the data directory, to make sure it is not underneath the installation folder.</li>
+            <li>New tray icon when the server manager starts.</li>
+            <li>New global setting to Minimize to Tray.</li>
+          </ul>
+          <u style="font-size: .9em;">CHANGE</u>
+          <br/>
+          <ul>
+            <li>Added a filter button to the filter boxes. Typing in the filter box no longer auto filters, you need to click the filter button to apply/clear the filter.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:45292341-D95A-42CE-88AB-C7B5E34AFAF9</id>
diff --git a/CSM/en-US.xaml b/CSM/en-US.xaml
index a35a678b..f4c64c8e 100644
--- a/CSM/en-US.xaml
+++ b/CSM/en-US.xaml
@@ -61,6 +61,11 @@
     <sys:String x:Key="SliderUnits_Levels">levels</sys:String>
     <!--#endregion-->
 
+    <!--#region General strings -->
+    <sys:String x:Key="General_FilterLabel">Filter:</sys:String>
+    <sys:String x:Key="General_FilterButtonTooltip">Click to apply the filter.</sys:String>
+    <!--#endregion-->
+
     <!--#region Application -->
     <sys:String x:Key="Application_RunAsAdministratorTitle">Run as Administrator</sys:String>
     <sys:String x:Key="Application_RunAsAdministratorLabel">This application requires administration priviledges to access ALL functionality. Would you like to Run as Administrator?</sys:String>
@@ -76,8 +81,13 @@
     <sys:String x:Key="Application_DataDirectory_DialogTitle">Select a Data Directory</sys:String>
     <sys:String x:Key="Application_DataDirectory_ConfirmTitle">Confirm location</sys:String>
     <sys:String x:Key="Application_DataDirectory_ConfirmLabel">The server manager will store profiles and SteamCMD in the following directories:\r\n\r\nProfiles: {0}\r\nSteamCMD: {1}\r\n\r\nIs this ok?</sys:String>
+    <sys:String x:Key="Application_DataDirectory_WithinInstallFolderErrorTitle">Data Directory Selection Error</sys:String>
+    <sys:String x:Key="Application_DataDirectory_WithinInstallFolderErrorLabel">The directory you have chosen is within the server manager installation folder. This is not recommended, please choose another folder.</sys:String>
     <sys:String x:Key="Application_Profile_SaveFailedTitle">Failed to save profile</sys:String>
     <sys:String x:Key="Application_Profile_SaveFailedLabel">Failed to save profile {0}.  {1}\n{2}</sys:String>
+
+    <sys:String x:Key="Application_NotifyIcon_ShowMainWindow">Show Main Window</sys:String>
+    <sys:String x:Key="Application_NotifyIcon_ShowServerMonitorWindow">Show Server Monitor</sys:String>
     <!--#endregion-->
 
     <!--#region Updater Window -->
@@ -164,7 +174,6 @@
     <sys:String x:Key="ModDetails_ModDetailFetchFailed_Label">Mod Details could not be fetched from steam.</sys:String>
 
     <sys:String x:Key="ModDetails_TotalCountLabel">Total Count:</sys:String>
-    <sys:String x:Key="ModDetails_FilterLabel">Filter:</sys:String>
 
     <sys:String x:Key="ModDetails_IndexColumnLabel">#</sys:String>
     <sys:String x:Key="ModDetails_ModIdColumnLabel">Mod ID</sys:String>
@@ -198,7 +207,6 @@
     <sys:String x:Key="WorkshopFiles_Refresh_FailedLabel">Loading workshop information from Steam failed, populating with the local cache instead.</sys:String>
     <sys:String x:Key="WorkshopFiles_TotalCountLabel">Count:</sys:String>
     <sys:String x:Key="WorkshopFiles_LastRefreshedLabel">Last Refreshed:</sys:String>
-    <sys:String x:Key="WorkshopFiles_FilterLabel">Filter:</sys:String>
     <sys:String x:Key="WorkshopFiles_FilterExistingLabel">Filter out existing mods</sys:String>
 
     <sys:String x:Key="WorkshopFiles_SelectedColumnLabel">Selected</sys:String>
@@ -345,6 +353,23 @@
     <sys:String x:Key="ServerMonitor_StatusColumnLabel">Status</sys:String>
 
     <sys:String x:Key="ServerMonitor_CreateShortcutButtonTooltip">Create a desktop shortcut to open this form directly.</sys:String>
+    <sys:String x:Key="ServerMonitor_SelectAllButtonTooltip">Select all the servers.</sys:String>
+    <sys:String x:Key="ServerMonitor_UnselectAllButtonTooltip">Unselect all the servers.</sys:String>
+    <sys:String x:Key="ServerMonitor_SelectedStartTooltip">Start the selected servers one at a time.</sys:String>
+    <sys:String x:Key="ServerMonitor_SelectedSaveBackupButtonTooltip">Perform a manual world save on the selected servers.</sys:String>
+
+    <sys:String x:Key="ServerMonitor_SelectedShutdownLabel">Shutdown Selected Servers</sys:String>
+    <sys:String x:Key="ServerMonitor_SelectedShutdownTooltip">Shutdown the selected servers, using the shutdown options.</sys:String>
+    <sys:String x:Key="ServerMonitor_SelectedStopLabel">Stop Selected Servers</sys:String>
+    <sys:String x:Key="ServerMonitor_SelectedStopTooltip">Force stop the selected servers. This will send a kill command to each server to stop the server immediately.</sys:String>
+
+    <sys:String x:Key="ServerMonitor_UpdateServerLabel">Update/Verify Selected Servers</sys:String>
+    <sys:String x:Key="ServerMonitor_UpdateServerTooltip">Perform an manual update/verify on the selected server files only.</sys:String>
+    <sys:String x:Key="ServerMonitor_UpdateServerModsLabel">Update/Verify Selected Server Mods</sys:String>
+    <sys:String x:Key="ServerMonitor_UpdateServerModsTooltip">Perform an manual update/verify on the selected server mods only.</sys:String>
+    <sys:String x:Key="ServerMonitor_UpdateServerAndModsLabel">Update/Verify Selected Servers and Mods</sys:String>
+    <sys:String x:Key="ServerMonitor_UpdateServerAndModsTooltip">Perform an manual update/verify on the selected servers and mods.</sys:String>
+
     <sys:String x:Key="ServerMonitor_PlayerListButtonTooltip">Open the Player List window.</sys:String>
     <sys:String x:Key="ServerMonitor_RCONButtonTooltip">Open the RCON window.</sys:String>
     <sys:String x:Key="ServerMonitor_StartServerTooltip">Start the server.</sys:String>
@@ -426,7 +451,6 @@
     <sys:String x:Key="RCON_PlayersLabel">Players:</sys:String>
     <sys:String x:Key="RCON_PlayersSeparatorLabel">/</sys:String>
     <sys:String x:Key="RCON_ModeLabel">Mode:</sys:String>
-    <sys:String x:Key="RCON_FilterLabel">Filter:</sys:String>
     <sys:String x:Key="RCON_ProfileCountLabel">Profiles:</sys:String>
     <sys:String x:Key="RCON_ProfileInvalidCountLabel">Invalid:</sys:String>
 
@@ -481,7 +505,6 @@
     <sys:String x:Key="PlayerList_CloseButtonLabel">Close</sys:String>
 
     <sys:String x:Key="PlayerList_TitleLabel">Player List: {0}</sys:String>
-    <sys:String x:Key="PlayerList_FilterLabel">Filter:</sys:String>
     <sys:String x:Key="PlayerList_ProfileCountLabel">Profiles:</sys:String>
     <sys:String x:Key="PlayerList_ProfileInvalidCountLabel">Invalid:</sys:String>
 
@@ -607,6 +630,7 @@
     <sys:String x:Key="GlobalSettings_ResetButtonLabel">Reset</sys:String>
     <sys:String x:Key="GlobalSettings_ResetButtonTooltip">This will reset ALL the user global settings for the server manager. The server manager will be closed if successful.</sys:String>
     <sys:String x:Key="GlobalSettings_RunAsAdministratorLabel">Enable Run as Administrator Prompt on Startup</sys:String>
+    <sys:String x:Key="GlobalSettings_MinimizeToTrayLabel">Minimize To Tray</sys:String>
     <sys:String x:Key="GlobalSettings_ManageFirewallLabel">Manage firewall settings automatically</sys:String>
     <sys:String x:Key="GlobalSettings_DataDirectoryLabel">Data Directory:</sys:String>
     <sys:String x:Key="GlobalSettings_BackupDirectoryLabel">Backup Directory:</sys:String>
diff --git a/CSM/latest.exe b/CSM/latest.exe
index aefa0f6b..d38c3fb2 100644
Binary files a/CSM/latest.exe and b/CSM/latest.exe differ
diff --git a/CSM/latest.txt b/CSM/latest.txt
index 2126f40b..7f57b8c2 100644
--- a/CSM/latest.txt
+++ b/CSM/latest.txt
@@ -1 +1 @@
-1.1.40
+1.1.41
diff --git a/CSM/latest.zip b/CSM/latest.zip
index d679163d..0e37fe3f 100644
Binary files a/CSM/latest.zip and b/CSM/latest.zip differ