diff --git a/SimpleLauncher/EditSystem.xaml.cs b/SimpleLauncher/EditSystem.xaml.cs
index 29bc5c6..1bc7a71 100644
--- a/SimpleLauncher/EditSystem.xaml.cs
+++ b/SimpleLauncher/EditSystem.xaml.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms;
@@ -341,6 +342,10 @@ private void AddSystemButton_Click(object sender, RoutedEventArgs e)
         {
             ClearFields();
             AdjustPlaceholderVisibility();
+
+            SaveSystemButton.IsEnabled = true;
+            DeleteSystemButton.IsEnabled = false;
+            
             MessageBox.Show("You can add a new system now.", "Info", MessageBoxButton.OK, MessageBoxImage.Information);
         }
 
@@ -535,6 +540,44 @@ private void SaveSystemButton_Click(object sender, RoutedEventArgs e)
 
             MessageBox.Show("System saved successfully.", "Info", MessageBoxButton.OK,
                 MessageBoxImage.Information);
+            
+            // Create a folder inside images folder with the same name as SystemName
+            // only do that if user does not provide the SystemImageFolder
+            if (string.IsNullOrWhiteSpace(systemImageFolder))
+            {
+                // Get the application directory
+                string applicationDirectory = AppDomain.CurrentDomain.BaseDirectory;
+
+                // Construct the path to the 'images' directory
+                string imagesDirectory = Path.Combine(applicationDirectory, "images");
+
+                // Check if 'images' directory exists
+                if (!Directory.Exists(imagesDirectory))
+                {
+                    Directory.CreateDirectory(imagesDirectory);
+                }
+
+                // Use SystemName as the name for the new folder inside 'images'
+                string newFolderPath = Path.Combine(imagesDirectory, systemName);
+
+                try
+                {
+                    // Check if the folder exists, and create it if it doesn't
+                    if (!Directory.Exists(newFolderPath))
+                    {
+                        Directory.CreateDirectory(newFolderPath);
+                        MessageBox.Show($"I have also created a folder for this System within the 'images' folder at {newFolderPath}.\n\nYou may place the cover images for this System inside this folder.", "Info", MessageBoxButton.OK, MessageBoxImage.Information);
+                    }
+                }
+                catch (Exception exception)
+                {
+                    string formattedException = $"The Simple Launcher failed to create an image folder for the newly created system.\n\nException detail: {exception}";
+                    Task logTask = LogErrors.LogErrorAsync(exception, formattedException);
+                    logTask.Wait(TimeSpan.FromSeconds(2));
+                    throw;
+                }
+
+            }
         }
 
         private static void AddEmulatorToXml(XElement emulatorsElement, string name, string location, string parameters)
diff --git a/SimpleLauncher/GameButtonFactory.cs b/SimpleLauncher/GameButtonFactory.cs
index bea37cc..aad5580 100644
--- a/SimpleLauncher/GameButtonFactory.cs
+++ b/SimpleLauncher/GameButtonFactory.cs
@@ -29,15 +29,14 @@ internal class GameButtonFactory(
 
         public async Task<Button> CreateGameButtonAsync(string filePath, string systemName, SystemConfig systemConfig)
         {
-            // Load Video Url and Info Url from settings.xml
-            string videoUrl = settings.VideoUrl;
-            string infoUrl = settings.InfoUrl;
-            
             string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(filePath);
             fileNameWithoutExtension = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ToTitleCase(fileNameWithoutExtension);
             
             string imagePath = DetermineImagePath(fileNameWithoutExtension, systemConfig.SystemName, systemConfig);
             bool isDefaultImage = imagePath.EndsWith(DefaultImagePath);
+            
+            // Default search term for Video link and Info link
+            string searchTerm = fileNameWithoutExtension;
 
             var textBlock = new TextBlock
             {
@@ -54,6 +53,9 @@ public async Task<Button> CreateGameButtonAsync(string filePath, string systemNa
                 var machine = machines.FirstOrDefault(m => m.MachineName.Equals(fileNameWithoutExtension, StringComparison.OrdinalIgnoreCase));
                 if (machine != null)
                 {
+                    // Check if the machine's description is not null or empty; otherwise, keep using fileNameWithoutExtension
+                    searchTerm = !string.IsNullOrWhiteSpace(machine.Description) ? machine.Description : fileNameWithoutExtension;
+
                     var descriptionTextBlock = new TextBlock
                     {
                         Text = machine.Description,
@@ -67,9 +69,8 @@ public async Task<Button> CreateGameButtonAsync(string filePath, string systemNa
                     textBlock.Inlines.Add(descriptionTextBlock);
                 }
             }
-
-            var youtubeIcon = CreateYoutubeIcon(fileNameWithoutExtension, systemName, videoUrl);
-            var infoIcon = CreateInfoIcon(fileNameWithoutExtension, systemName, infoUrl);
+            var youtubeIcon = CreateYoutubeIcon(searchTerm, systemName, settings.VideoUrl);
+            var infoIcon = CreateInfoIcon(searchTerm, systemName, settings.InfoUrl);
 
             var grid = new Grid
             {
@@ -226,7 +227,7 @@ private static void LoadFallbackImage(Image imageControl, Button button, string
             }
         }
 
-        private Image CreateYoutubeIcon(string fileNameWithoutExtension, string systemName, string videoUrl)
+        private Image CreateYoutubeIcon(string searchTerm, string systemName, string videoUrl)
         {
             var youtubeIcon = new Image
             {
@@ -246,8 +247,8 @@ private Image CreateYoutubeIcon(string fileNameWithoutExtension, string systemNa
             youtubeIcon.PreviewMouseLeftButtonUp += (_, e) =>
             {
                 PlayClick.PlayClickSound();
-                string searchTerm = $"{fileNameWithoutExtension} {systemName}";
-                string searchUrl = $"{videoUrl}{Uri.EscapeDataString(searchTerm)}";
+                string searchTerm2 = $"{searchTerm} {systemName}";
+                string searchUrl = $"{videoUrl}{Uri.EscapeDataString(searchTerm2)}";
 
                 try
                 {
@@ -259,9 +260,9 @@ private Image CreateYoutubeIcon(string fileNameWithoutExtension, string systemNa
                 }
                 catch (Exception exception)
                 {
-                    string contextMessage = $"There was a problem open up the Video Link.\n\nException detail: {exception}";
+                    string contextMessage = $"There was a problem open up the Video Link.\n\nException details: {exception}";
                     Task logTask = LogErrors.LogErrorAsync(exception, contextMessage);
-                    MessageBox.Show($"There was a problem open up the Video Link.\n\nException detail: {exception.Message}.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show($"There was a problem open up the Video Link.\n\nException details: {exception.Message}.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
                     logTask.Wait(TimeSpan.FromSeconds(2));
                     throw;
                 }
@@ -270,7 +271,7 @@ private Image CreateYoutubeIcon(string fileNameWithoutExtension, string systemNa
             return youtubeIcon;
         }
 
-        private Image CreateInfoIcon(string fileNameWithoutExtension, string systemName, string infoUrl)
+        private Image CreateInfoIcon(string searchTerm, string systemName, string infoUrl)
         {
             var infoIcon = new Image
             {
@@ -290,8 +291,8 @@ private Image CreateInfoIcon(string fileNameWithoutExtension, string systemName,
             infoIcon.PreviewMouseLeftButtonUp += (_, e) =>
             {
                 PlayClick.PlayClickSound();
-                string searchTerm = $"{fileNameWithoutExtension} {systemName}";
-                string searchUrl = $"{infoUrl}{Uri.EscapeDataString(searchTerm)}";
+                string searchTerm2 = $"{searchTerm} {systemName}";
+                string searchUrl = $"{infoUrl}{Uri.EscapeDataString(searchTerm2)}";
                 try
                 {
                     Process.Start(new ProcessStartInfo
@@ -302,9 +303,9 @@ private Image CreateInfoIcon(string fileNameWithoutExtension, string systemName,
                 }
                 catch (Exception exception)
                 {
-                    string contextMessage = $"There was a problem open up the Info Link.\n\nException detail: {exception}";
+                    string contextMessage = $"There was a problem open up the Info Link.\n\nException details: {exception}";
                     Task logTask = LogErrors.LogErrorAsync(exception, contextMessage);
-                    MessageBox.Show($"There was a problem open up the Info Link.\n\nException detail: {exception.Message}.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show($"There was a problem open up the Info Link.\n\nException details: {exception.Message}.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
                     logTask.Wait(TimeSpan.FromSeconds(2));
                     throw;
                 }
diff --git a/SimpleLauncher/MainWindow.xaml.cs b/SimpleLauncher/MainWindow.xaml.cs
index ea75016..8a782e5 100644
--- a/SimpleLauncher/MainWindow.xaml.cs
+++ b/SimpleLauncher/MainWindow.xaml.cs
@@ -39,7 +39,7 @@ public MainWindow()
             
             // Load mame.xml
             string xmlPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "mame.xml");
-            _machines = MameConfig.LoadFromXml(xmlPath).Result;
+            _machines = MameConfig.LoadFromXml(xmlPath);
             
             // Load system.xml
             try
diff --git a/SimpleLauncher/MameConfig.cs b/SimpleLauncher/MameConfig.cs
index 1fb6df0..2b55269 100644
--- a/SimpleLauncher/MameConfig.cs
+++ b/SimpleLauncher/MameConfig.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Xml.Linq;
 
@@ -12,7 +12,20 @@ public class MameConfig
         public string MachineName { get; private init; }
         public string Description { get; private init; }
 
-        public static async Task<List<MameConfig>> LoadFromXml(string xmlPath)        {
+        public static List<MameConfig> LoadFromXml(string xmlPath)
+        {
+            // Check if the mame.xml file exists
+            if (!File.Exists(xmlPath))
+            {
+                MessageBox.Show("The file mame.xml could not be found.\n\nThe application will be Shutdown.\n\nPlease reinstall Simple Launcher to restore this file.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+
+                // Shutdown the application and exit
+                Application.Current.Shutdown();
+                Environment.Exit(0);
+
+                return new List<MameConfig>(); // This is technically unreachable due to the application exit above
+            }
+
             try
             {
                 XDocument xmlDoc = XDocument.Load(xmlPath);
@@ -23,12 +36,15 @@ public class MameConfig
                         Description = m.Element("Description")?.Value
                     }).ToList();
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-                string errorMessage = $"Error loading MAME configurations from XML.\n\nException detail: {ex}";
-                MessageBox.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                await LogErrors.LogErrorAsync(ex, $"{errorMessage}\n\nException details: {ex}");
-                return [];
+                MessageBox.Show("I could not load the file mame.xml or it is corrupted.\n\nThe application will be Shutdown.\n\nPlease reinstall Simple Launcher to restore this file.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+
+                // Shutdown current application instance
+                Application.Current.Shutdown();
+                Environment.Exit(0);
+
+                return new List<MameConfig>(); // This line is also technically unreachable due to the application exit
             }
         }
     }
diff --git a/SimpleLauncher/SystemConfig.cs b/SimpleLauncher/SystemConfig.cs
index fda794b..aad72e7 100644
--- a/SimpleLauncher/SystemConfig.cs
+++ b/SimpleLauncher/SystemConfig.cs
@@ -30,7 +30,7 @@ public static List<SystemConfig> LoadSystemConfigs(string xmlPath)
         {
             try
             {
-                // Check for the existence of the system.xml file
+                // Check for the existence of the system.xml
                 if (!File.Exists(xmlPath))
                 {
                     // Search for backup files in the application directory
@@ -52,17 +52,30 @@ public static List<SystemConfig> LoadSystemConfigs(string xmlPath)
                         }
                         else
                         {
-                            string systemModel = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "system_model.xml");
-                            // Rename system.model to to system.xml
-                            File.Copy(systemModel, xmlPath!,
-                                false); // Does not Overwrite the file if it already exists
+                            try
+                            {
+                                // Location of system_model.xml
+                                string systemModel = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "system_model.xml");
+
+                                // Rename system.model to to system.xml
+                                File.Copy(systemModel, xmlPath!, false); // Does not Overwrite the file if it already exists
+                            }
+                            catch (Exception)
+                            {
+                                string contextMessage = $"The file system_model.xml is missing.\n\nThe application will be Shutdown.\n\nPlease reinstall Simple Launcher to restore this file.";
+                                MessageBox.Show(contextMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+
+                                // Shutdown the application and exit
+                                Application.Current.Shutdown();
+                                Environment.Exit(0);
+                            }
                         }
                     }
                     catch (Exception ex)
                     {
-                        string contextMessage = $"Error creating the file system.xml.\n\nException details: {ex}\n";
+                        string contextMessage = $"The file system.xml is corrupted.\n\nException details: {ex}";
                         Task logTask = LogErrors.LogErrorAsync(ex, contextMessage);
-                        MessageBox.Show($"The system.xml is broken: {ex.Message}\n\nPlease fix it manually or delete it.\n\nIf you choose to delete it the application will create one for you.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                        MessageBox.Show($"The system.xml is corrupted: {ex.Message}\n\nPlease fix it manually or delete it.\n\nIf you choose to delete it the application will create one for you.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
                         logTask.Wait(TimeSpan.FromSeconds(2));
                         return null;
                     }
@@ -126,7 +139,7 @@ public static List<SystemConfig> LoadSystemConfigs(string xmlPath)
             }
             catch (Exception ex2)
             {
-                string contextMessage = $"Error loading system configurations from XML.\n\nException details: {ex2}";
+                string contextMessage = $"Error loading system configurations from system.xml.\n\nException details: {ex2}";
                 Task logTask = LogErrors.LogErrorAsync(ex2, contextMessage);
                 MessageBox.Show($"The system.xml is broken: {ex2.Message}\n\nPlease fix it manually or delete it.\n\nIf you choose to delete it the application will create one for you.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
                 logTask.Wait(TimeSpan.FromSeconds(2));