diff --git a/CSM/beta/VersionFeed.xml b/CSM/beta/VersionFeed.xml
index 7d2fac0f..27e47e3a 100644
--- a/CSM/beta/VersionFeed.xml
+++ b/CSM/beta/VersionFeed.xml
@@ -5,28 +5,24 @@
   <title>Conan Server Manager Version Feed</title>
   <subtitle>This is the Conan Server Manager beta version feed.</subtitle>
   <link href="http://servermanagers.freeforums.net/" />
-  <updated>2020-03-12T00:00:00Z</updated>
+  <updated>2020-03-13T00:00:00Z</updated>
 
   <entry>
-    <id>urn:uuid:DEA5605F-8087-4BC5-A344-B1443BFFE919</id>
-    <title>1.0.20 (1.0.20.1)</title>
-    <summary>1.0.20.1</summary>
+    <id>urn:uuid:0DB80A69-BA80-4451-A3C2-58C1918F5FBA</id>
+    <title>1.0.21 (1.0.21.1)</title>
+    <summary>1.0.21.1</summary>
     <link href="" />
-    <updated>2020-03-12T00:00:00Z</updated>
+    <updated>2020-03-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;">BUGFIX</u>
+          <u style="font-size: .9em;">New</u>
           <br/>
           <ul>
-            <li>Game Data - have crash when loading with an invalid gamedata file.</li>
-          </ul>
-          <u style="font-size: .9em;">CHANGE</u>
-          <br/>
-          <ul>
-            <li>Game Data Window - Added a validate button, to validate the user gamedata files.</li>
-            <li>Game Data Window - Displays the gamedata file in Red if the file is invalid.</li>
-            <li>Game Data Window - When adding a new gamedata file, will display an error if the file is invalid.</li>
+            <li>Main Window - the main window now stores the height and width of the window.</li>
+            <li>Main Window - new button (top right corner) to open the new Server Monitor window.</li>
+            <li>Server Monitor Window - new window that shows all you servers in one form. Allows you to Start, Stop, Update/Verify and open the Player List or RCON Windows.</li>
+            <li>Server Monitor Window - includes a button to create a shortcut on your desktop that can start the Server Monitor directly, without the server manager.</li>
           </ul>
         </p>
       </div>
diff --git a/CSM/beta/en-US.xaml b/CSM/beta/en-US.xaml
index 2e8f5850..22d9d3a8 100644
--- a/CSM/beta/en-US.xaml
+++ b/CSM/beta/en-US.xaml
@@ -303,6 +303,31 @@
     <sys:String x:Key="PluginsWindow_AddFilterExtension">*.dll</sys:String>
     <!--#endregion-->
 
+    <!--#region Server Monitor Window -->
+    <sys:String x:Key="ServerMonitor_Title">Server Monitor</sys:String>
+
+    <sys:String x:Key="ServerMonitor_TotalCountLabel">Total Servers:</sys:String>
+    <sys:String x:Key="ServerMonitor_ServerColumnLabel">Server</sys:String>
+    <sys:String x:Key="ServerMonitor_MapColumnLabel">Map</sys:String>
+    <sys:String x:Key="ServerMonitor_ModsColumnLabel">Mods</sys:String>
+    <sys:String x:Key="ServerMonitor_VersionColumnLabel">Version</sys:String>
+    <sys:String x:Key="ServerMonitor_PlayersColumnLabel">Players</sys:String>
+    <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_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>
+    <sys:String x:Key="ServerMonitor_StopServerTooltip">Stop the server.</sys:String>
+    <sys:String x:Key="ServerMonitor_InstallServerTooltip">Install the server.</sys:String>
+    <sys:String x:Key="ServerMonitor_UpgradeServerTooltip">Update/Verify the server.</sys:String>
+
+    <sys:String x:Key="ServerMonitor_UpgradeServer_FailedTitle">Server Update Error</sys:String>
+    <sys:String x:Key="ServerMonitor_UpgradeServer_FailedLabel">Another server is being upgraded, wait until the upgrade has finished and try again.</sys:String>
+    <sys:String x:Key="ServerMonitor_CloseWindow_ConfirmTitle">Confirm Window Close</sys:String>
+    <sys:String x:Key="ServerMonitor_CloseWindow_ConfirmLabel">You are currently perform a server update, closing the window with disconnect you from steamcmd. Do you want to continue closing the window?</sys:String>
+    <!--#endregion-->
+
     <!--#region Shutdown Window -->
     <sys:String x:Key="ShutdownWindow_Title">Server Shutdown</sys:String>
     <sys:String x:Key="ShutdownWindow_ProfileTitle">Server Shutdown - {0}</sys:String>
@@ -499,6 +524,7 @@
     <sys:String x:Key="MainWindow_OpenGameDataTooltip">Open Game Data</sys:String>
     <sys:String x:Key="MainWindow_OpenPluginsTooltip">Open Plugins</sys:String>
     <sys:String x:Key="MainWindow_OpenHelpTooltip">Open Help</sys:String>
+    <sys:String x:Key="MainWindow_OpenServerMonitorTooltip">Open Server Monitor</sys:String>
     <sys:String x:Key="MainWindow_UpdateToLabelFormat">Upgrade to {0} now!</sys:String>
     <sys:String x:Key="MainWindow_TaskStatusLabel">Task Status</sys:String>
     <sys:String x:Key="MainWindow_TaskAdminErrorTitle">Requires Administration Permissions</sys:String>
diff --git a/CSM/beta/latest.txt b/CSM/beta/latest.txt
index f789b7d5..fb68e7b2 100644
--- a/CSM/beta/latest.txt
+++ b/CSM/beta/latest.txt
@@ -1 +1 @@
-1.0.20.1
+1.0.21.1
diff --git a/CSM/beta/latest.zip b/CSM/beta/latest.zip
index 90e35065..7d3466be 100644
Binary files a/CSM/beta/latest.zip and b/CSM/beta/latest.zip differ