diff --git a/CRD/App.axaml b/CRD/App.axaml
index 00654fb..6d777cb 100644
--- a/CRD/App.axaml
+++ b/CRD/App.axaml
@@ -10,6 +10,13 @@
         <crd:ViewLocator />
     </Application.DataTemplates>
     
+    <Application.Resources>
+        <x:Double x:Key="ContentDialogMinWidth">500</x:Double>
+        <x:Double x:Key="ContentDialogMaxWidth">1500</x:Double>
+        <x:Double x:Key="ContentDialogMinHeight">150</x:Double>
+        <x:Double x:Key="ContentDialogMaxHeight">700</x:Double>
+    </Application.Resources>
+    
     <Application.Styles>
         <sty:FluentAvaloniaTheme PreferSystemTheme="True" PreferUserAccentColor="True"/>
         <StyleInclude Source="avares://CRD/Styling/ControlsGalleryStyles.axaml" />
diff --git a/CRD/Downloader/CalendarManager.cs b/CRD/Downloader/CalendarManager.cs
index 83443e0..f07ce4c 100644
--- a/CRD/Downloader/CalendarManager.cs
+++ b/CRD/Downloader/CalendarManager.cs
@@ -152,7 +152,6 @@ public class CalendarManager{
             return forDate;
         }
 
-    
 
         CalendarWeek week = new CalendarWeek();
         week.CalendarDays = new List<CalendarDay>();
@@ -170,21 +169,17 @@ public class CalendarManager{
         }
 
         week.CalendarDays.Reverse();
-        
+
         var firstDayOfWeek = week.CalendarDays.First().DateTime;
 
-        var newEpisodesBase = await CrunchyrollManager.Instance.CrEpisode.GetNewEpisodes(CrunchyrollManager.Instance.CrunOptions.HistoryLang, 200,firstDayOfWeek, true);
-        
+        var newEpisodesBase = await CrunchyrollManager.Instance.CrEpisode.GetNewEpisodes(CrunchyrollManager.Instance.CrunOptions.HistoryLang, 200, firstDayOfWeek, true);
+
         if (newEpisodesBase is{ Data.Count: > 0 }){
             var newEpisodes = newEpisodesBase.Data;
 
             foreach (var crBrowseEpisode in newEpisodes){
                 var targetDate = CrunchyrollManager.Instance.CrunOptions.CalendarFilterByAirDate ? crBrowseEpisode.EpisodeMetadata.EpisodeAirDate : crBrowseEpisode.LastPublic;
 
-                if (targetDate.Kind == DateTimeKind.Utc){
-                    targetDate = targetDate.ToLocalTime();
-                }
-                
                 if (CrunchyrollManager.Instance.CrunOptions.CalendarHideDubs && crBrowseEpisode.EpisodeMetadata.SeasonTitle != null &&
                     (crBrowseEpisode.EpisodeMetadata.SeasonTitle.EndsWith("Dub)") || crBrowseEpisode.EpisodeMetadata.AudioLocale != Locale.JaJp)){
                     continue;
@@ -218,6 +213,18 @@ public class CalendarManager{
                     calendarDay.CalendarEpisodes?.Add(calEpisode);
                 }
             }
+
+            foreach (var weekCalendarDay in week.CalendarDays){
+                if (weekCalendarDay.CalendarEpisodes != null)
+                    weekCalendarDay.CalendarEpisodes = weekCalendarDay.CalendarEpisodes
+                        .OrderBy(e => e.DateTime)
+                        .ThenBy(e => e.SeasonName)
+                        .ThenBy(e => {
+                            double parsedNumber;
+                            return double.TryParse(e.EpisodeNumber, out parsedNumber) ? parsedNumber : double.MinValue;
+                        })
+                        .ToList();
+            }
         }
 
 
diff --git a/CRD/Downloader/Crunchyroll/CRAuth.cs b/CRD/Downloader/Crunchyroll/CRAuth.cs
index b239501..51ea53a 100644
--- a/CRD/Downloader/Crunchyroll/CRAuth.cs
+++ b/CRD/Downloader/Crunchyroll/CRAuth.cs
@@ -48,7 +48,7 @@ public class CrAuth{
     }
 
     private void JsonTokenToFileAndVariable(string content){
-        crunInstance.Token = JsonConvert.DeserializeObject<CrToken>(content, crunInstance.SettingsJsonSerializerSettings);
+        crunInstance.Token = Helpers.Deserialize<CrToken>(content, crunInstance.SettingsJsonSerializerSettings);
 
 
         if (crunInstance.Token != null && crunInstance.Token.expires_in != null){
diff --git a/CRD/Downloader/Crunchyroll/CrunchyrollManager.cs b/CRD/Downloader/Crunchyroll/CrunchyrollManager.cs
index 7d6f973..589f915 100644
--- a/CRD/Downloader/Crunchyroll/CrunchyrollManager.cs
+++ b/CRD/Downloader/Crunchyroll/CrunchyrollManager.cs
@@ -166,7 +166,7 @@ public class CrunchyrollManager{
             if (File.Exists(CfgManager.PathCrHistory)){
                 var decompressedJson = CfgManager.DecompressJsonFile(CfgManager.PathCrHistory);
                 if (!string.IsNullOrEmpty(decompressedJson)){
-                    HistoryList = JsonConvert.DeserializeObject<ObservableCollection<HistorySeries>>(decompressedJson) ?? new ObservableCollection<HistorySeries>();
+                    HistoryList = Helpers.Deserialize<ObservableCollection<HistorySeries>>(decompressedJson,CrunchyrollManager.Instance.SettingsJsonSerializerSettings) ?? new ObservableCollection<HistorySeries>();
 
                     foreach (var historySeries in HistoryList){
                         historySeries.Init();
@@ -1611,7 +1611,7 @@ public class CrunchyrollManager{
             Data = new List<Dictionary<string, Dictionary<string, StreamDetails>>>()
         };
 
-        var playStream = JsonConvert.DeserializeObject<CrunchyStreamData>(responseContent, SettingsJsonSerializerSettings);
+        var playStream = Helpers.Deserialize<CrunchyStreamData>(responseContent, SettingsJsonSerializerSettings);
         if (playStream == null) return temppbData;
 
         if (!string.IsNullOrEmpty(playStream.Token)){
@@ -1758,7 +1758,7 @@ public class CrunchyrollManager{
             showRequestResponse = await HttpClientReq.Instance.SendHttpRequest(showRequest);
 
             if (showRequestResponse.IsOk){
-                CrunchyOldChapter chapterData = JsonConvert.DeserializeObject<CrunchyOldChapter>(showRequestResponse.ResponseContent);
+                CrunchyOldChapter chapterData = Helpers.Deserialize<CrunchyOldChapter>(showRequestResponse.ResponseContent,SettingsJsonSerializerSettings);
 
                 DateTime epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 
diff --git a/CRD/Downloader/History.cs b/CRD/Downloader/History.cs
index ff39bab..e69f0bb 100644
--- a/CRD/Downloader/History.cs
+++ b/CRD/Downloader/History.cs
@@ -379,12 +379,22 @@ public class History(){
         }
     }
 
+    private CrSeriesBase? cachedSeries;
+
     private async Task RefreshSeriesData(string seriesId, HistorySeries historySeries){
-        var series = await crunInstance.CrSeries.SeriesById(seriesId, string.IsNullOrEmpty(crunInstance.CrunOptions.HistoryLang) ? crunInstance.DefaultLocale : crunInstance.CrunOptions.HistoryLang, true);
-        if (series?.Data != null){
-            historySeries.SeriesDescription = series.Data.First().Description;
-            historySeries.ThumbnailImageUrl = GetSeriesThumbnail(series);
-            historySeries.SeriesTitle = series.Data.First().Title;
+        if (cachedSeries == null || (cachedSeries.Data != null && cachedSeries.Data.First().Id != seriesId)){
+            cachedSeries = await crunInstance.CrSeries.SeriesById(seriesId, string.IsNullOrEmpty(crunInstance.CrunOptions.HistoryLang) ? crunInstance.DefaultLocale : crunInstance.CrunOptions.HistoryLang, true);
+        } else{
+            return;
+        }
+
+        if (cachedSeries?.Data != null){
+            var series = cachedSeries.Data.First();
+            historySeries.SeriesDescription = series.Description;
+            historySeries.ThumbnailImageUrl = GetSeriesThumbnail(cachedSeries);
+            historySeries.SeriesTitle = series.Title;
+            historySeries.HistorySeriesAvailableDubLang = series.AudioLocales;
+            historySeries.HistorySeriesAvailableSoftSubs = series.SubtitleLocales;
         }
     }
 
@@ -758,13 +768,13 @@ public class History(){
         return highestSimilarity < 0.8 ? null : closestMatch;
     }
 
-    private double CalculateSimilarity(string source, string target){
+    public double CalculateSimilarity(string source, string target){
         int distance = LevenshteinDistance(source, target);
         return 1.0 - (double)distance / Math.Max(source.Length, target.Length);
     }
 
 
-    public int LevenshteinDistance(string source, string target){
+    private int LevenshteinDistance(string source, string target){
         if (string.IsNullOrEmpty(source)){
             return string.IsNullOrEmpty(target) ? 0 : target.Length;
         }
diff --git a/CRD/Utils/HLS/HLSDownloader.cs b/CRD/Utils/HLS/HLSDownloader.cs
index f7c0972..e66b7c0 100644
--- a/CRD/Utils/HLS/HLSDownloader.cs
+++ b/CRD/Utils/HLS/HLSDownloader.cs
@@ -7,6 +7,7 @@ using System.Security.Cryptography;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using CRD.Downloader;
+using CRD.Downloader.Crunchyroll;
 using CRD.Utils.Parser.Utils;
 using CRD.Utils.Structs;
 using Newtonsoft.Json;
@@ -62,7 +63,7 @@ public class HlsDownloader{
             try{
                 Console.WriteLine("Resume data found! Trying to resume...");
                 string resumeFileContent = File.ReadAllText($"{fn}.resume");
-                var resumeData = JsonConvert.DeserializeObject<ResumeData>(resumeFileContent);
+                var resumeData = Helpers.Deserialize<ResumeData>(resumeFileContent, null);
 
                 if (resumeData != null){
                     if (resumeData.Total == _data.M3U8Json?.Segments.Count &&
diff --git a/CRD/Utils/Helpers.cs b/CRD/Utils/Helpers.cs
index 9905ca7..c91ff51 100644
--- a/CRD/Utils/Helpers.cs
+++ b/CRD/Utils/Helpers.cs
@@ -9,6 +9,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Avalonia.Media.Imaging;
+using CRD.Utils.JsonConv;
 using CRD.Utils.Structs;
 using CRD.Utils.Structs.Crunchyroll.Music;
 using Newtonsoft.Json;
@@ -16,15 +17,11 @@ using Newtonsoft.Json;
 namespace CRD.Utils;
 
 public class Helpers{
-    /// <summary>
-    /// Deserializes a JSON string into a specified .NET type.
-    /// </summary>
-    /// <typeparam name="T">The type of the object to deserialize to.</typeparam>
-    /// <param name="json">The JSON string to deserialize.</param>
-    /// <param name="serializerSettings">The settings for deserialization if null default settings will be used</param>
-    /// <returns>The deserialized object of type T.</returns>
     public static T? Deserialize<T>(string json, JsonSerializerSettings? serializerSettings){
         try{
+            serializerSettings ??= new JsonSerializerSettings();
+            serializerSettings.Converters.Add(new UtcToLocalTimeConverter());
+
             return JsonConvert.DeserializeObject<T>(json, serializerSettings);
         } catch (JsonException ex){
             Console.Error.WriteLine($"Error deserializing JSON: {ex.Message}");
@@ -49,32 +46,12 @@ public class Helpers{
         dialogue = Regex.Replace(dialogue, @"</i>", "{\\i0}");
         dialogue = Regex.Replace(dialogue, @"<u>", "{\\u1}");
         dialogue = Regex.Replace(dialogue, @"</u>", "{\\u0}");
-        
+
         dialogue = Regex.Replace(dialogue, @"<[^>]+>", ""); // Remove any other HTML-like tags
 
         return dialogue;
     }
 
-    public static string ExtractDialogue(string[] lines, int startLine){
-        var dialogueBuilder = new StringBuilder();
-
-        for (int i = startLine; i < lines.Length && !string.IsNullOrWhiteSpace(lines[i]); i++){
-            if (!lines[i].Contains("-->") && !lines[i].StartsWith("STYLE")){
-                string line = lines[i].Trim();
-                // Remove HTML tags and keep the inner text
-                line = Regex.Replace(line, @"<[^>]+>", "");
-                dialogueBuilder.Append(line + "\\N");
-            }
-        }
-
-        // Remove the last newline character
-        if (dialogueBuilder.Length > 0){
-            dialogueBuilder.Length -= 2; // Remove the last "\N"
-        }
-
-        return dialogueBuilder.ToString();
-    }
-
     public static void OpenUrl(string url){
         try{
             Process.Start(new ProcessStartInfo{
@@ -423,4 +400,5 @@ public class Helpers{
 
         return languageGroups;
     }
+    
 }
\ No newline at end of file
diff --git a/CRD/Utils/JsonConv/UtcToLocalTimeConverter.cs b/CRD/Utils/JsonConv/UtcToLocalTimeConverter.cs
new file mode 100644
index 0000000..cdf9174
--- /dev/null
+++ b/CRD/Utils/JsonConv/UtcToLocalTimeConverter.cs
@@ -0,0 +1,19 @@
+using System;
+using Newtonsoft.Json;
+
+namespace CRD.Utils.JsonConv;
+
+public class UtcToLocalTimeConverter : JsonConverter<DateTime>{
+    public override DateTime ReadJson(JsonReader reader, Type objectType, DateTime existingValue, bool hasExistingValue, JsonSerializer serializer){
+        return reader.Value switch{
+            null => DateTime.MinValue,
+            DateTime dateTime when dateTime.Kind == DateTimeKind.Utc => dateTime.ToLocalTime(),
+            DateTime dateTime => dateTime,
+            _ => throw new JsonSerializationException($"Unexpected token parsing date. Expected DateTime, got {reader.Value.GetType()}.")
+        };
+    }
+
+    public override void WriteJson(JsonWriter writer, DateTime value, JsonSerializer serializer){
+        writer.WriteValue(value);
+    }
+}
\ No newline at end of file
diff --git a/CRD/Utils/Sonarr/Models/SonarrSeries.cs b/CRD/Utils/Sonarr/Models/SonarrSeries.cs
index f14604e..b86032c 100644
--- a/CRD/Utils/Sonarr/Models/SonarrSeries.cs
+++ b/CRD/Utils/Sonarr/Models/SonarrSeries.cs
@@ -129,7 +129,10 @@ public class SonarrSeries{
     /// The images.
     /// </value>
     [JsonProperty("images")]
-    public List<SonarrImage> Images{ get; set; }
+    public List<SonarrImage>? Images{ get; set; }
+    
+    [JsonIgnore]
+    public string ImageUrl{ get; set; }
 
     /// <summary>
     /// Gets or sets the type of the series.
diff --git a/CRD/Utils/Sonarr/SonarrClient.cs b/CRD/Utils/Sonarr/SonarrClient.cs
index 4aeaa7b..9015099 100644
--- a/CRD/Utils/Sonarr/SonarrClient.cs
+++ b/CRD/Utils/Sonarr/SonarrClient.cs
@@ -74,7 +74,7 @@ public class SonarrClient{
             apiUrl = $"http{(properties.UseSsl ? "s" : "")}://{(!string.IsNullOrEmpty(properties.Host) ? properties.Host : "localhost")}:{properties.Port}{(properties.UrlBase ?? "")}/api";
         }
     }
-
+    
     public async Task CheckSonarrSettings(){
        
         SetApiUrl();
@@ -109,7 +109,7 @@ public class SonarrClient{
         List<SonarrSeries> series = [];
         
         try{
-            series = JsonConvert.DeserializeObject<List<SonarrSeries>>(json) ?? [];
+            series = Helpers.Deserialize<List<SonarrSeries>>(json,null) ?? [];
         } catch (Exception e){
             MainWindow.Instance.ShowError("Sonarr GetSeries error \n" + e);
             Console.Error.WriteLine("Sonarr GetSeries error \n" + e);
@@ -124,7 +124,7 @@ public class SonarrClient{
         List<SonarrEpisode> episodes = [];
         
         try{
-            episodes = JsonConvert.DeserializeObject<List<SonarrEpisode>>(json) ?? [];
+            episodes = Helpers.Deserialize<List<SonarrEpisode>>(json,null) ?? [];
         } catch (Exception e){
             MainWindow.Instance.ShowError("Sonarr GetEpisodes error \n" + e);
             Console.Error.WriteLine("Sonarr GetEpisodes error \n" + e);
@@ -138,7 +138,7 @@ public class SonarrClient{
         var json = await GetJson($"/v3/episode/id={episodeId}");
         var episode = new SonarrEpisode();
         try{
-            episode = JsonConvert.DeserializeObject<SonarrEpisode>(json) ?? new SonarrEpisode();
+            episode = Helpers.Deserialize<SonarrEpisode>(json,null) ?? new SonarrEpisode();
         } catch (Exception e){
             MainWindow.Instance.ShowError("Sonarr GetEpisode error \n" + e);
             Console.Error.WriteLine("Sonarr GetEpisode error \n" + e);
diff --git a/CRD/Utils/Structs/Crunchyroll/StreamLimits.cs b/CRD/Utils/Structs/Crunchyroll/StreamLimits.cs
index b9401d3..134fd49 100644
--- a/CRD/Utils/Structs/Crunchyroll/StreamLimits.cs
+++ b/CRD/Utils/Structs/Crunchyroll/StreamLimits.cs
@@ -14,7 +14,7 @@ public class StreamError{
 
     public static StreamError? FromJson(string json){
         try{
-            return JsonConvert.DeserializeObject<StreamError>(json);
+            return Helpers.Deserialize<StreamError>(json,null);
         } catch (Exception e){
             Console.Error.WriteLine(e);
             return null;
diff --git a/CRD/Utils/Structs/History/HistorySeries.cs b/CRD/Utils/Structs/History/HistorySeries.cs
index 09fbdcd..502368c 100644
--- a/CRD/Utils/Structs/History/HistorySeries.cs
+++ b/CRD/Utils/Structs/History/HistorySeries.cs
@@ -52,6 +52,12 @@ public class HistorySeries : INotifyPropertyChanged{
     [JsonProperty("history_series_add_date")]
     public DateTime? HistorySeriesAddDate{ get; set; }
 
+    [JsonProperty("history_series_available_soft_subs")]
+    public List<string> HistorySeriesAvailableSoftSubs{ get; set; } =[];
+
+    [JsonProperty("history_series_available_dub_lang")]
+    public List<string> HistorySeriesAvailableDubLang{ get; set; } =[];
+    
     [JsonProperty("history_series_soft_subs_override")]
     public List<string> HistorySeriesSoftSubsOverride{ get; set; } =[];
 
diff --git a/CRD/Utils/Updater/Updater.cs b/CRD/Utils/Updater/Updater.cs
index b121821..d40fc13 100644
--- a/CRD/Utils/Updater/Updater.cs
+++ b/CRD/Utils/Updater/Updater.cs
@@ -49,9 +49,9 @@ public class Updater : INotifyPropertyChanged{
     public async Task<bool> CheckForUpdatesAsync(){
         try{
             using (var client = new HttpClient()){
-                client.DefaultRequestHeaders.Add("User-Agent", "C# App"); // GitHub API requires a user agent
+                client.DefaultRequestHeaders.Add("User-Agent", "C# App");
                 var response = await client.GetStringAsync(apiEndpoint);
-                var releaseInfo = JsonConvert.DeserializeObject<dynamic>(response);
+                var releaseInfo = Helpers.Deserialize<dynamic>(response,null);
 
                 var latestVersion = releaseInfo.tag_name;
                 downloadUrl = releaseInfo.assets[0].browser_download_url;
@@ -63,10 +63,10 @@ public class Updater : INotifyPropertyChanged{
                 if (latestVersion != currentVersion){
                     Console.WriteLine("Update available: " + latestVersion + " - Current Version: " + currentVersion);
                     return true;
-                } else{
-                    Console.WriteLine("No updates available.");
-                    return false;
                 }
+
+                Console.WriteLine("No updates available.");
+                return false;
             }
         } catch (Exception e){
             Console.Error.WriteLine("Failed to get Update information");
diff --git a/CRD/ViewModels/AccountPageViewModel.cs b/CRD/ViewModels/AccountPageViewModel.cs
index 84ae245..bcb25b4 100644
--- a/CRD/ViewModels/AccountPageViewModel.cs
+++ b/CRD/ViewModels/AccountPageViewModel.cs
@@ -111,7 +111,7 @@ public partial class AccountPageViewModel : ViewModelBase{
                 CloseButtonText = "Close"
             };
 
-            var viewModel = new ContentDialogInputLoginViewModel(dialog, this);
+            var viewModel = new Utils.ContentDialogInputLoginViewModel(dialog, this);
             dialog.Content = new ContentDialogInputLoginView(){
                 DataContext = viewModel
             };
diff --git a/CRD/ViewModels/SeriesPageViewModel.cs b/CRD/ViewModels/SeriesPageViewModel.cs
index e3cc3f1..ee9e04e 100644
--- a/CRD/ViewModels/SeriesPageViewModel.cs
+++ b/CRD/ViewModels/SeriesPageViewModel.cs
@@ -13,7 +13,10 @@ using CRD.Utils;
 using CRD.Utils.Sonarr;
 using CRD.Utils.Structs;
 using CRD.Utils.Structs.History;
+using CRD.ViewModels.Utils;
 using CRD.Views;
+using CRD.Views.Utils;
+using FluentAvalonia.UI.Controls;
 using ReactiveUI;
 
 namespace CRD.ViewModels;
@@ -27,25 +30,39 @@ public partial class SeriesPageViewModel : ViewModelBase{
 
     [ObservableProperty]
     public static bool _sonarrAvailable;
-    
+
+    [ObservableProperty]
+    public static bool _sonarrConnected;
+
     private IStorageProvider? _storageProvider;
 
-    public SeriesPageViewModel(){
-        
+    [ObservableProperty]
+    private string _availableDubs;
 
-        
+    [ObservableProperty]
+    private string _availableSubs;
+
+    public SeriesPageViewModel(){
         _selectedSeries = CrunchyrollManager.Instance.SelectedSeries;
 
         if (_selectedSeries.ThumbnailImage == null){
             _selectedSeries.LoadImage();
         }
 
-        if (!string.IsNullOrEmpty(SelectedSeries.SonarrSeriesId) && CrunchyrollManager.Instance.CrunOptions.SonarrProperties != null){
-            SonarrAvailable = SelectedSeries.SonarrSeriesId.Length > 0 && CrunchyrollManager.Instance.CrunOptions.SonarrProperties.SonarrEnabled;
+        if (CrunchyrollManager.Instance.CrunOptions.SonarrProperties != null){
+            SonarrConnected = CrunchyrollManager.Instance.CrunOptions.SonarrProperties.SonarrEnabled;
+
+            if (!string.IsNullOrEmpty(SelectedSeries.SonarrSeriesId)){
+                SonarrAvailable = SelectedSeries.SonarrSeriesId.Length > 0 && SonarrConnected;
+            } else{
+                SonarrAvailable = false;
+            }
         } else{
-            SonarrAvailable = false;
+            SonarrConnected = SonarrAvailable = false;
         }
-        
+
+        AvailableDubs = "Available Dubs: " + string.Join(", ", SelectedSeries.HistorySeriesAvailableDubLang);
+        AvailableSubs = "Available Subs: " + string.Join(", ", SelectedSeries.HistorySeriesAvailableSoftSubs);
     }
 
     [RelayCommand]
@@ -79,6 +96,44 @@ public partial class SeriesPageViewModel : ViewModelBase{
         _storageProvider = storageProvider ?? throw new ArgumentNullException(nameof(storageProvider));
     }
 
+    [RelayCommand]
+    public async Task MatchSonarrSeries_Button(){
+        var dialog = new ContentDialog(){
+            Title = "Sonarr Matching",
+            PrimaryButtonText = "Save",
+            CloseButtonText = "Close",
+            FullSizeDesired = true
+        };
+
+        var viewModel = new ContentDialogSonarrMatchViewModel(dialog, SelectedSeries.SonarrSeriesId,SelectedSeries.SeriesTitle);
+        dialog.Content = new ContentDialogSonarrMatchView(){
+            DataContext = viewModel
+        };
+
+        var dialogResult = await dialog.ShowAsync();
+
+        if (dialogResult == ContentDialogResult.Primary){
+            SelectedSeries.SonarrSeriesId = viewModel.CurrentSonarrSeries.Id.ToString();
+            SelectedSeries.SonarrTvDbId = viewModel.CurrentSonarrSeries.TvdbId.ToString();
+            SelectedSeries.SonarrSlugTitle = viewModel.CurrentSonarrSeries.TitleSlug;
+            
+            if (CrunchyrollManager.Instance.CrunOptions.SonarrProperties != null){
+                SonarrConnected = CrunchyrollManager.Instance.CrunOptions.SonarrProperties.SonarrEnabled;
+                
+                if (!string.IsNullOrEmpty(SelectedSeries.SonarrSeriesId)){
+                    SonarrAvailable = SelectedSeries.SonarrSeriesId.Length > 0 && SonarrConnected;
+                } else{
+                    SonarrAvailable = false;
+                }
+            } else{
+                SonarrConnected = SonarrAvailable = false;
+            }
+
+            UpdateData("");
+        }
+        
+    }
+
 
     [RelayCommand]
     public async Task DownloadSeasonAll(HistorySeason season){
@@ -105,13 +160,16 @@ public partial class SeriesPageViewModel : ViewModelBase{
 
         await Task.WhenAll(downloadTasks);
     }
-    
+
     [RelayCommand]
     public async Task UpdateData(string? season){
         await SelectedSeries.FetchData(season);
 
         SelectedSeries.Seasons.Refresh();
 
+        AvailableDubs = "Available Dubs: " + string.Join(", ", SelectedSeries.HistorySeriesAvailableDubLang);
+        AvailableSubs = "Available Subs: " + string.Join(", ", SelectedSeries.HistorySeriesAvailableSoftSubs);
+
         // MessageBus.Current.SendMessage(new NavigationMessage(typeof(SeriesPageViewModel), false, true));
     }
 
@@ -122,6 +180,7 @@ public partial class SeriesPageViewModel : ViewModelBase{
             SelectedSeries.Seasons.Remove(objectToRemove);
             CfgManager.UpdateHistoryFile();
         }
+
         MessageBus.Current.SendMessage(new NavigationMessage(typeof(SeriesPageViewModel), false, true));
     }
 
diff --git a/CRD/ViewModels/ContentDialogInputLoginViewModel.cs b/CRD/ViewModels/Utils/ContentDialogInputLoginViewModel.cs
similarity index 95%
rename from CRD/ViewModels/ContentDialogInputLoginViewModel.cs
rename to CRD/ViewModels/Utils/ContentDialogInputLoginViewModel.cs
index e3ec828..b71fc3e 100644
--- a/CRD/ViewModels/ContentDialogInputLoginViewModel.cs
+++ b/CRD/ViewModels/Utils/ContentDialogInputLoginViewModel.cs
@@ -1,12 +1,10 @@
 using System;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CRD.Downloader;
 using CRD.Downloader.Crunchyroll;
-using CRD.Utils;
 using CRD.Utils.Structs;
 using FluentAvalonia.UI.Controls;
 
-namespace CRD.ViewModels;
+namespace CRD.ViewModels.Utils;
 
 public partial class ContentDialogInputLoginViewModel : ViewModelBase{
     private readonly ContentDialog dialog;
diff --git a/CRD/ViewModels/Utils/ContentDialogSonarrMatchViewModel.cs b/CRD/ViewModels/Utils/ContentDialogSonarrMatchViewModel.cs
new file mode 100644
index 0000000..5cb0908
--- /dev/null
+++ b/CRD/ViewModels/Utils/ContentDialogSonarrMatchViewModel.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Avalonia.Media.Imaging;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CRD.Downloader.Crunchyroll;
+using CRD.Utils;
+using CRD.Utils.Sonarr;
+using CRD.Utils.Sonarr.Models;
+using DynamicData;
+using FluentAvalonia.UI.Controls;
+
+namespace CRD.ViewModels.Utils;
+
+public partial class ContentDialogSonarrMatchViewModel : ViewModelBase{
+    private readonly ContentDialog dialog;
+
+    [ObservableProperty]
+    private SonarrSeries _currentSonarrSeries;
+
+    [ObservableProperty]
+    private Bitmap? _currentSeriesImage;
+
+    [ObservableProperty]
+    private SonarrSeries _selectedItem;
+
+    [ObservableProperty]
+    private ObservableCollection<SonarrSeries> _sonarrSeriesList = new();
+
+    public ContentDialogSonarrMatchViewModel(ContentDialog dialog, string? currentSonarrId, string? seriesTitle){
+        if (dialog is null){
+            throw new ArgumentNullException(nameof(dialog));
+        }
+
+        this.dialog = dialog;
+        dialog.Closed += DialogOnClosed;
+        dialog.PrimaryButtonClick += SaveButton;
+
+        CurrentSonarrSeries = SonarrClient.Instance.SonarrSeries.Find(e => e.Id.ToString() == currentSonarrId) ?? new SonarrSeries(){ Title = "No series matched" };
+
+        SetImageUrl(CurrentSonarrSeries);
+
+        LoadList(seriesTitle);
+    }
+
+    private void SaveButton(ContentDialog sender, ContentDialogButtonClickEventArgs args){
+        dialog.PrimaryButtonClick -= SaveButton;
+        
+    }
+
+    private void LoadList(string? title){
+        var list = PopulateSeriesList(title);
+        SonarrSeriesList.AddRange(list);
+    }
+
+    private List<SonarrSeries> PopulateSeriesList(string? title){
+        var seriesList = SonarrClient.Instance.SonarrSeries.ToList();
+
+
+        if (!string.IsNullOrEmpty(title)){
+            seriesList.Sort((series1, series2) => {
+                double similarity1 = Helpers.CalculateCosineSimilarity(series1.Title.ToLower(), title.ToLower());
+                double similarity2 = Helpers.CalculateCosineSimilarity(series2.Title.ToLower(), title.ToLower());
+
+                return similarity2.CompareTo(similarity1);
+            });
+        } else{
+            seriesList.Sort((series1, series2) => string.Compare(series1.Title, series2.Title, StringComparison.OrdinalIgnoreCase));
+        }
+
+        seriesList = seriesList.Take(20).ToList();
+
+        foreach (var sonarrSeries in seriesList){
+            SetImageUrl(sonarrSeries);
+        }
+
+        return seriesList;
+    }
+
+    private void SetImageUrl(SonarrSeries sonarrSeries){
+        var properties = CrunchyrollManager.Instance.CrunOptions.SonarrProperties;
+        if (properties == null || sonarrSeries.Images == null){
+            return;
+        }
+
+        var baseUrl = "";
+        baseUrl = $"http{(properties.UseSsl ? "s" : "")}://{(!string.IsNullOrEmpty(properties.Host) ? properties.Host : "localhost")}:{properties.Port}{(properties.UrlBase ?? "")}";
+
+        sonarrSeries.ImageUrl = baseUrl + sonarrSeries.Images.Find(e => e.CoverType == SonarrCoverType.Poster)?.Url;
+    }
+
+
+    partial void OnSelectedItemChanged(SonarrSeries value){
+        CurrentSonarrSeries = value;
+    }
+
+    private void DialogOnClosed(ContentDialog sender, ContentDialogClosedEventArgs args){
+        dialog.Closed -= DialogOnClosed;
+    }
+}
\ No newline at end of file
diff --git a/CRD/ViewModels/ContentDialogUpdateViewModel.cs b/CRD/ViewModels/Utils/ContentDialogUpdateViewModel.cs
similarity index 93%
rename from CRD/ViewModels/ContentDialogUpdateViewModel.cs
rename to CRD/ViewModels/Utils/ContentDialogUpdateViewModel.cs
index 8afe0c5..6c59cb1 100644
--- a/CRD/ViewModels/ContentDialogUpdateViewModel.cs
+++ b/CRD/ViewModels/Utils/ContentDialogUpdateViewModel.cs
@@ -1,12 +1,10 @@
 using System;
 using System.ComponentModel;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CRD.Downloader;
-using CRD.Utils.Structs;
 using CRD.Utils.Updater;
 using FluentAvalonia.UI.Controls;
 
-namespace CRD.ViewModels;
+namespace CRD.ViewModels.Utils;
 
 public partial class ContentDialogUpdateViewModel : ViewModelBase{
     private readonly ContentDialog dialog;
diff --git a/CRD/Views/MainWindow.axaml.cs b/CRD/Views/MainWindow.axaml.cs
index cdb7f98..7fdafcf 100644
--- a/CRD/Views/MainWindow.axaml.cs
+++ b/CRD/Views/MainWindow.axaml.cs
@@ -9,6 +9,7 @@ using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Windowing;
 using ReactiveUI;
+using ContentDialogUpdateViewModel = CRD.ViewModels.Utils.ContentDialogUpdateViewModel;
 
 namespace CRD.Views;
 
diff --git a/CRD/Views/SeriesPageView.axaml b/CRD/Views/SeriesPageView.axaml
index 28f9fd7..d10759a 100644
--- a/CRD/Views/SeriesPageView.axaml
+++ b/CRD/Views/SeriesPageView.axaml
@@ -27,464 +27,494 @@
 
             <Button Grid.Row="0" Grid.Column="0" Command="{Binding NavBack}" Margin="0 0 0  10">Back</Button>
 
-            <Image Grid.Row="1" Grid.Column="0" Margin="10" Source="{Binding SelectedSeries.ThumbnailImage}" Width="240"
-                   Height="360">
-            </Image>
+            <ScrollViewer Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2">
+
+                <StackPanel Orientation="Vertical">
+
+                    <Grid Margin="10" VerticalAlignment="Top" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions> 
+                        <Image Grid.Column="0" Margin="10" Source="{Binding SelectedSeries.ThumbnailImage}" Width="240"
+                               Height="360">
+                        </Image>
 
 
-            <Grid Grid.Row="1" Grid.Column="1">
+                        <Grid Grid.Column="1">
 
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
 
-                <TextBlock Grid.Row="0" FontSize="50" Text="{Binding SelectedSeries.SeriesTitle}"></TextBlock>
-                <TextBlock Grid.Row="1" FontSize="20" TextWrapping="Wrap" Text="{Binding SelectedSeries.SeriesDescription}"></TextBlock>
-                <StackPanel Grid.Row="3" Orientation="Vertical">
+                            <TextBlock Grid.Row="0" FontSize="50" Text="{Binding SelectedSeries.SeriesTitle}"></TextBlock>
+                            <TextBlock Grid.Row="1" FontSize="20" TextWrapping="Wrap" Text="{Binding SelectedSeries.SeriesDescription}"></TextBlock>
+                            <TextBlock Grid.Row="3" FontSize="15" Opacity="0.8" TextWrapping="Wrap" Text="{Binding AvailableDubs}"></TextBlock>
+                            <TextBlock Grid.Row="4" FontSize="15" Opacity="0.8" TextWrapping="Wrap" Text="{Binding AvailableSubs}"></TextBlock>
+                            <StackPanel Grid.Row="5" Orientation="Vertical">
 
-                    <StackPanel Orientation="Horizontal" Margin="0 10 10 10">
+                                <StackPanel Orientation="Horizontal" Margin="0 10 10 10">
 
-                        <Button Width="34" Height="34" Margin="0 0 10 0" Background="Transparent"
-                                BorderThickness="0" CornerRadius="50"
-                                Command="{Binding SelectedSeries.OpenCrPage}">
-                            <Grid>
-                                <controls:ImageIcon Source="../Assets/crunchy_icon_round.png" Width="30" Height="30" />
-                            </Grid>
-                        </Button>
+                                    <Button Width="34" Height="34" Margin="0 0 10 0" Background="Transparent"
+                                            BorderThickness="0" CornerRadius="50"
+                                            Command="{Binding SelectedSeries.OpenCrPage}">
+                                        <Grid>
+                                            <controls:ImageIcon Source="../Assets/crunchy_icon_round.png" Width="30" Height="30" />
+                                        </Grid>
+                                    </Button>
 
-                        <Button Width="34" Height="34" Margin="0 0 10 0" Background="Transparent"
-                                BorderThickness="0" CornerRadius="50"
-                                IsVisible="{Binding SonarrAvailable}"
-                                Command="{Binding SelectedSeries.OpenSonarrPage}">
-                            <Grid>
-                                <controls:ImageIcon Source="../Assets/sonarr.png" Width="30" Height="30" />
-                            </Grid>
-                        </Button>
+                                    <Button Width="34" Height="34" Margin="0 0 10 0" Background="Transparent"
+                                            BorderThickness="0" CornerRadius="50"
+                                            IsVisible="{Binding SonarrAvailable}"
+                                            Command="{Binding SelectedSeries.OpenSonarrPage}">
+                                        <Grid>
+                                            <controls:ImageIcon Source="../Assets/sonarr.png" Width="30" Height="30" />
+                                        </Grid>
+                                    </Button>
 
-                    </StackPanel>
-
-                    <StackPanel Orientation="Horizontal">
-                        <Button Command="{Binding UpdateData}" Margin="0 0 5  10">Refresh Series</Button>
-                        <ToggleButton IsChecked="{Binding EditMode}" Margin="0 0 5  10">Edit</ToggleButton>
-
-                        <Button Margin="0 0 5 10" FontStyle="Italic"
-                                VerticalAlignment="Center"
-                                Command="{Binding OpenFolderDialogAsync}">
-                            <ToolTip.Tip>
-                                <TextBlock Text="{Binding SelectedSeries.SeriesDownloadPath}" FontSize="15" />
-                            </ToolTip.Tip>
-                            <StackPanel Orientation="Horizontal">
-                                <controls:SymbolIcon Symbol="Folder" FontSize="18" />
-                            </StackPanel>
-                        </Button>
-
-                        <StackPanel>
-                            <ToggleButton x:Name="SeriesOverride" Margin="0 0 5 10" FontStyle="Italic"
-                                          VerticalAlignment="Center"
-                                          IsVisible="{Binding EditMode}">
-                                <StackPanel Orientation="Horizontal">
-                                    <controls:SymbolIcon Symbol="Speaker2" FontSize="18" />
                                 </StackPanel>
-                            </ToggleButton>
 
-                            <Popup IsLightDismissEnabled="True"
-                                   MaxWidth="400"
-                                   MaxHeight="600"
-                                   IsOpen="{Binding IsChecked, ElementName=SeriesOverride, Mode=TwoWay}"
-                                   Placement="Bottom"
-                                   PlacementTarget="{Binding ElementName=SeriesOverride}">
-                                <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Command="{Binding UpdateData}" Margin="0 0 5  10">Refresh Series</Button>
+                                    <ToggleButton IsChecked="{Binding EditMode}" Margin="0 0 5  10">Edit</ToggleButton>
+
+                                    <Button Margin="0 0 5 10" FontStyle="Italic"
+                                            VerticalAlignment="Center"
+                                            Command="{Binding OpenFolderDialogAsync}">
+                                        <ToolTip.Tip>
+                                            <TextBlock Text="{Binding SelectedSeries.SeriesDownloadPath}" FontSize="15" />
+                                        </ToolTip.Tip>
+                                        <StackPanel Orientation="Horizontal">
+                                            <controls:SymbolIcon Symbol="Folder" FontSize="18" />
+                                        </StackPanel>
+                                    </Button>
 
                                     <StackPanel>
-                                        <controls:SettingsExpander Header="Language Override">
+                                        <ToggleButton x:Name="SeriesOverride" Margin="0 0 5 10" FontStyle="Italic"
+                                                      VerticalAlignment="Center"
+                                                      IsVisible="{Binding EditMode}">
+                                            <StackPanel Orientation="Horizontal">
+                                                <controls:SymbolIcon Symbol="Speaker2" FontSize="18" />
+                                            </StackPanel>
+                                        </ToggleButton>
+
+                                        <Popup IsLightDismissEnabled="True"
+                                               MaxWidth="400"
+                                               MaxHeight="600"
+                                               IsOpen="{Binding IsChecked, ElementName=SeriesOverride, Mode=TwoWay}"
+                                               Placement="Bottom"
+                                               PlacementTarget="{Binding ElementName=SeriesOverride}">
+                                            <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
 
-                                            <controls:SettingsExpander.Footer>
                                                 <StackPanel>
-                                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 0 0 10">
-                                                        <TextBlock Text="Dub" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 10 0"></TextBlock>
-                                                        <StackPanel>
-                                                            <ToggleButton x:Name="DropdownButtonDub" Width="210" HorizontalContentAlignment="Stretch">
-                                                                <ToggleButton.Content>
-                                                                    <Grid>
-                                                                        <Grid.ColumnDefinitions>
-                                                                            <ColumnDefinition Width="*" />
-                                                                            <ColumnDefinition Width="Auto" />
-                                                                        </Grid.ColumnDefinitions>
-                                                                        <TextBlock HorizontalAlignment="Center" Text="{Binding SelectedSeries.SelectedDubs}"
-                                                                                   VerticalAlignment="Center" />
-                                                                        <Path Grid.Column="1" Data="M 0,1 L 4,4 L 8,1" Stroke="White" StrokeThickness="1"
-                                                                              VerticalAlignment="Center" Margin="5,0,5,0" Stretch="Uniform" Width="8" />
-                                                                    </Grid>
-                                                                </ToggleButton.Content>
-                                                            </ToggleButton>
-                                                            <Popup IsLightDismissEnabled="True"
-                                                                   IsOpen="{Binding IsChecked, ElementName=DropdownButtonDub, Mode=TwoWay}"
-                                                                   Placement="Bottom"
-                                                                   PlacementTarget="{Binding ElementName=DropdownButtonDub}">
-                                                                <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
-                                                                    <ListBox x:Name="ListBoxDubsSelection" SelectionMode="Multiple,Toggle" Width="210"
-                                                                             MaxHeight="400"
-                                                                             ItemsSource="{Binding SelectedSeries.DubLangList , Mode=OneWay}"
-                                                                             SelectedItems="{Binding SelectedSeries.SelectedDubLang}">
-                                                                        <ListBox.ItemTemplate>
-                                                                            <DataTemplate DataType="{x:Type structs:StringItem}">
-                                                                                <TextBlock Text="{Binding stringValue}"></TextBlock>
-                                                                            </DataTemplate>
-                                                                        </ListBox.ItemTemplate>
-                                                                    </ListBox>
-                                                                </Border>
-                                                            </Popup>
-                                                        </StackPanel>
-                                                    </StackPanel>
+                                                    <controls:SettingsExpander Header="Language Override">
 
-                                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                                        <TextBlock Text="Sub" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 10 0"></TextBlock>
-                                                        <StackPanel>
-                                                            <ToggleButton x:Name="DropdownButtonSub" Width="210" HorizontalContentAlignment="Stretch">
-                                                                <ToggleButton.Content>
-                                                                    <Grid>
-                                                                        <Grid.ColumnDefinitions>
-                                                                            <ColumnDefinition Width="*" />
-                                                                            <ColumnDefinition Width="Auto" />
-                                                                        </Grid.ColumnDefinitions>
-                                                                        <TextBlock HorizontalAlignment="Center" Text="{Binding SelectedSeries.SelectedSubs}"
-                                                                                   VerticalAlignment="Center" />
-                                                                        <Path Grid.Column="1" Data="M 0,1 L 4,4 L 8,1" Stroke="White" StrokeThickness="1"
-                                                                              VerticalAlignment="Center" Margin="5,0,5,0" Stretch="Uniform" Width="8" />
-                                                                    </Grid>
-                                                                </ToggleButton.Content>
-                                                            </ToggleButton>
-                                                            <Popup IsLightDismissEnabled="True"
-                                                                   IsOpen="{Binding IsChecked, ElementName=DropdownButtonSub, Mode=TwoWay}" Placement="Bottom"
-                                                                   PlacementTarget="{Binding ElementName=DropdownButtonSub}">
-                                                                <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
-                                                                    <ListBox SelectionMode="Multiple,Toggle" Width="210"
-                                                                             MaxHeight="400"
-                                                                             ItemsSource="{Binding SelectedSeries.SubLangList , Mode=OneWay}"
-                                                                             SelectedItems="{Binding SelectedSeries.SelectedSubLang}">
-                                                                        <ListBox.ItemTemplate>
-                                                                            <DataTemplate DataType="{x:Type structs:StringItem}">
-                                                                                <TextBlock Text="{Binding stringValue}"></TextBlock>
-                                                                            </DataTemplate>
-                                                                        </ListBox.ItemTemplate>
-                                                                    </ListBox>
-                                                                </Border>
-                                                            </Popup>
-                                                        </StackPanel>
-                                                    </StackPanel>
+                                                        <controls:SettingsExpander.Footer>
+                                                            <StackPanel>
+                                                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 0 0 10">
+                                                                    <TextBlock Text="Dub" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 10 0"></TextBlock>
+                                                                    <StackPanel>
+                                                                        <ToggleButton x:Name="DropdownButtonDub" Width="210" HorizontalContentAlignment="Stretch">
+                                                                            <ToggleButton.Content>
+                                                                                <Grid>
+                                                                                    <Grid.ColumnDefinitions>
+                                                                                        <ColumnDefinition Width="*" />
+                                                                                        <ColumnDefinition Width="Auto" />
+                                                                                    </Grid.ColumnDefinitions>
+                                                                                    <TextBlock HorizontalAlignment="Center" Text="{Binding SelectedSeries.SelectedDubs}"
+                                                                                               VerticalAlignment="Center" />
+                                                                                    <Path Grid.Column="1" Data="M 0,1 L 4,4 L 8,1" Stroke="White" StrokeThickness="1"
+                                                                                          VerticalAlignment="Center" Margin="5,0,5,0" Stretch="Uniform" Width="8" />
+                                                                                </Grid>
+                                                                            </ToggleButton.Content>
+                                                                        </ToggleButton>
+                                                                        <Popup IsLightDismissEnabled="True"
+                                                                               IsOpen="{Binding IsChecked, ElementName=DropdownButtonDub, Mode=TwoWay}"
+                                                                               Placement="Bottom"
+                                                                               PlacementTarget="{Binding ElementName=DropdownButtonDub}">
+                                                                            <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
+                                                                                <ListBox x:Name="ListBoxDubsSelection" SelectionMode="Multiple,Toggle" Width="210"
+                                                                                         MaxHeight="400"
+                                                                                         ItemsSource="{Binding SelectedSeries.DubLangList , Mode=OneWay}"
+                                                                                         SelectedItems="{Binding SelectedSeries.SelectedDubLang}">
+                                                                                    <ListBox.ItemTemplate>
+                                                                                        <DataTemplate DataType="{x:Type structs:StringItem}">
+                                                                                            <TextBlock Text="{Binding stringValue}"></TextBlock>
+                                                                                        </DataTemplate>
+                                                                                    </ListBox.ItemTemplate>
+                                                                                </ListBox>
+                                                                            </Border>
+                                                                        </Popup>
+                                                                    </StackPanel>
+                                                                </StackPanel>
 
+                                                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                                                    <TextBlock Text="Sub" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 10 0"></TextBlock>
+                                                                    <StackPanel>
+                                                                        <ToggleButton x:Name="DropdownButtonSub" Width="210" HorizontalContentAlignment="Stretch">
+                                                                            <ToggleButton.Content>
+                                                                                <Grid>
+                                                                                    <Grid.ColumnDefinitions>
+                                                                                        <ColumnDefinition Width="*" />
+                                                                                        <ColumnDefinition Width="Auto" />
+                                                                                    </Grid.ColumnDefinitions>
+                                                                                    <TextBlock HorizontalAlignment="Center" Text="{Binding SelectedSeries.SelectedSubs}"
+                                                                                               VerticalAlignment="Center" />
+                                                                                    <Path Grid.Column="1" Data="M 0,1 L 4,4 L 8,1" Stroke="White" StrokeThickness="1"
+                                                                                          VerticalAlignment="Center" Margin="5,0,5,0" Stretch="Uniform" Width="8" />
+                                                                                </Grid>
+                                                                            </ToggleButton.Content>
+                                                                        </ToggleButton>
+                                                                        <Popup IsLightDismissEnabled="True"
+                                                                               IsOpen="{Binding IsChecked, ElementName=DropdownButtonSub, Mode=TwoWay}" Placement="Bottom"
+                                                                               PlacementTarget="{Binding ElementName=DropdownButtonSub}">
+                                                                            <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
+                                                                                <ListBox SelectionMode="Multiple,Toggle" Width="210"
+                                                                                         MaxHeight="400"
+                                                                                         ItemsSource="{Binding SelectedSeries.SubLangList , Mode=OneWay}"
+                                                                                         SelectedItems="{Binding SelectedSeries.SelectedSubLang}">
+                                                                                    <ListBox.ItemTemplate>
+                                                                                        <DataTemplate DataType="{x:Type structs:StringItem}">
+                                                                                            <TextBlock Text="{Binding stringValue}"></TextBlock>
+                                                                                        </DataTemplate>
+                                                                                    </ListBox.ItemTemplate>
+                                                                                </ListBox>
+                                                                            </Border>
+                                                                        </Popup>
+                                                                    </StackPanel>
+                                                                </StackPanel>
+
+
+                                                            </StackPanel>
+
+
+                                                        </controls:SettingsExpander.Footer>
+
+                                                    </controls:SettingsExpander>
 
                                                 </StackPanel>
 
-
-                                            </controls:SettingsExpander.Footer>
-
-                                        </controls:SettingsExpander>
-
+                                            </Border>
+                                        </Popup>
                                     </StackPanel>
-
-                                </Border>
-                            </Popup>
-                        </StackPanel>
+                                    
+                                    <StackPanel IsVisible="{Binding EditMode}">
+                                        <Button Width="30" Height="30" Margin="0 0 10 0" 
+                                                BorderThickness="0" 
+                                                IsVisible="{Binding SonarrConnected}"
+                                                Command="{Binding MatchSonarrSeries_Button}">
+                                            <Grid>
+                                                <controls:ImageIcon Source="../Assets/sonarr.png" Width="25" Height="25" />
+                                            </Grid>
+                                        </Button>
+                                    </StackPanel>
+                                    
 
 
-                    </StackPanel>
+                                </StackPanel>
+
+
+                            </StackPanel>
+
+                        </Grid>
+                    </Grid>
+
+
+                    <ItemsControl ItemsSource="{Binding SelectedSeries.Seasons}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+
+                                <controls:SettingsExpander
+                                    Header="{Binding CombinedProperty}"
+                                    ItemsSource="{Binding EpisodesList}"
+
+                                    Description="{Binding SeasonTitle}"
+                                    IsExpanded="{Binding IsExpanded}">
+
+
+                                    <controls:SettingsExpander.ItemTemplate>
+                                        <DataTemplate>
+
+                                            <Grid VerticalAlignment="Center">
+
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                </Grid.ColumnDefinitions>
+
+                                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                                                    <TextBlock Text="E"></TextBlock>
+                                                    <TextBlock Text="{Binding Episode}"></TextBlock>
+                                                    <TextBlock Text=" - "></TextBlock>
+                                                    <TextBlock Text="{Binding EpisodeTitle}"></TextBlock>
+                                                </StackPanel>
+
+                                                <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
+
+                                                    <StackPanel VerticalAlignment="Center" Margin="0 0 5 0"
+                                                                IsVisible="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).SonarrAvailable}">
+
+
+                                                        <controls:ImageIcon IsVisible="{Binding SonarrHasFile}"
+                                                                            Source="../Assets/sonarr.png" Width="25"
+                                                                            Height="25" />
+
+                                                        <controls:ImageIcon IsVisible="{Binding !SonarrHasFile}"
+                                                                            Source="../Assets/sonarr_inactive.png" Width="25"
+                                                                            Height="25" />
+
+
+                                                    </StackPanel>
+
+
+                                                    <Button Width="34" Height="34" Margin="0 0 10 0" Background="Transparent"
+                                                            BorderThickness="0" CornerRadius="50"
+                                                            IsVisible="{Binding !WasDownloaded}"
+                                                            Command="{Binding $parent[controls:SettingsExpander].((history:HistorySeason)DataContext).UpdateDownloaded}"
+                                                            CommandParameter="{Binding EpisodeId}">
+                                                        <Grid>
+                                                            <Ellipse Width="25" Height="25" Fill="Gray" />
+                                                            <controls:SymbolIcon Symbol="Checkmark" FontSize="18" />
+                                                        </Grid>
+                                                    </Button>
+
+                                                    <Button Width="34" Height="34" Margin="0 0 10 0" Background="Transparent"
+                                                            BorderThickness="0" CornerRadius="50"
+                                                            IsVisible="{Binding WasDownloaded}"
+                                                            Command="{Binding $parent[controls:SettingsExpander].((history:HistorySeason)DataContext).UpdateDownloaded}"
+                                                            CommandParameter="{Binding EpisodeId}">
+                                                        <Grid>
+                                                            <Ellipse Width="25" Height="25" Fill="#21a556" />
+                                                            <controls:SymbolIcon Symbol="Checkmark" FontSize="18" />
+                                                        </Grid>
+                                                    </Button>
+
+                                                    <Button Margin="0 0 5 0" FontStyle="Italic" HorizontalAlignment="Right"
+                                                            VerticalAlignment="Center" Command="{Binding DownloadEpisode}">
+                                                        <StackPanel Orientation="Horizontal">
+                                                            <controls:SymbolIcon Symbol="Download" FontSize="18" />
+                                                        </StackPanel>
+                                                    </Button>
+
+                                                </StackPanel>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </controls:SettingsExpander.ItemTemplate>
+
+                                    <controls:SettingsExpander.Footer>
+                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                                            <TextBlock Text="{Binding DownloadedEpisodes}" VerticalAlignment="Center"></TextBlock>
+                                            <TextBlock Text="/" VerticalAlignment="Center"></TextBlock>
+                                            <TextBlock Text="{Binding EpisodesList.Count}" VerticalAlignment="Center"></TextBlock>
+                                            <Button Margin="10 0 0 0" FontStyle="Italic"
+                                                    VerticalAlignment="Center"
+                                                    Command="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).UpdateData}"
+                                                    CommandParameter="{Binding SeasonId}">
+                                                <ToolTip.Tip>
+                                                    <TextBlock Text="Refresh Season" FontSize="15" />
+                                                </ToolTip.Tip>
+                                                <StackPanel Orientation="Horizontal">
+                                                    <controls:SymbolIcon Symbol="Refresh" FontSize="18" />
+                                                </StackPanel>
+                                            </Button>
+
+                                            <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                                                <ToggleButton x:Name="ToggleDownloadAdd" Margin="10 0 0 0" FontStyle="Italic"
+                                                              VerticalAlignment="Center">
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <controls:SymbolIcon Symbol="Download" FontSize="18" />
+                                                    </StackPanel>
+                                                </ToggleButton>
+
+                                                <Popup IsLightDismissEnabled="True"
+                                                       MaxWidth="400"
+                                                       MaxHeight="600"
+                                                       IsOpen="{Binding IsChecked, ElementName=ToggleDownloadAdd, Mode=TwoWay}"
+                                                       Placement="Bottom"
+                                                       PlacementTarget="{Binding ElementName=ToggleDownloadAdd}">
+                                                    <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
+
+                                                        <StackPanel>
+                                                            <Button Margin="10 5"
+                                                                    VerticalAlignment="Center"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    Content="Download All"
+                                                                    Command="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).DownloadSeasonAll}"
+                                                                    CommandParameter="{Binding }">
+                                                            </Button>
+                                                            <Button Margin="10 5"
+                                                                    VerticalAlignment="Center"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    Content="Download Missing"
+                                                                    Command="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).DownloadSeasonMissing}"
+                                                                    CommandParameter="{Binding }">
+                                                            </Button>
+                                                            <Button Margin="10 5"
+                                                                    VerticalAlignment="Center"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    Content="Download Missing from Sonarr"
+                                                                    IsEnabled="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).SonarrAvailable}"
+                                                                    Command="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).DownloadSeasonMissingSonarr}"
+                                                                    CommandParameter="{Binding }">
+                                                            </Button>
+                                                        </StackPanel>
+
+                                                    </Border>
+                                                </Popup>
+                                            </StackPanel>
+
+                                            <Button Margin="10 0 0 0" FontStyle="Italic"
+                                                    VerticalAlignment="Center"
+                                                    Command="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).OpenFolderDialogAsync}"
+                                                    CommandParameter="{Binding .}">
+                                                <ToolTip.Tip>
+                                                    <TextBlock Text="{Binding SeasonDownloadPath}" FontSize="15" />
+                                                </ToolTip.Tip>
+                                                <StackPanel Orientation="Horizontal">
+                                                    <controls:SymbolIcon Symbol="Folder" FontSize="18" />
+                                                </StackPanel>
+                                            </Button>
+
+                                            <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                                                <ToggleButton x:Name="SeasonOverride" Margin="10 0 0 0" FontStyle="Italic"
+                                                              VerticalAlignment="Center"
+                                                              IsVisible="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).EditMode}">
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <controls:SymbolIcon Symbol="Speaker2" FontSize="18" />
+                                                    </StackPanel>
+                                                </ToggleButton>
+
+                                                <Popup IsLightDismissEnabled="True"
+                                                       MaxWidth="400"
+                                                       MaxHeight="600"
+                                                       IsOpen="{Binding IsChecked, ElementName=SeasonOverride, Mode=TwoWay}"
+                                                       Placement="Bottom"
+                                                       PlacementTarget="{Binding ElementName=SeasonOverride}">
+                                                    <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
+
+                                                        <StackPanel>
+                                                            <controls:SettingsExpander Header="Language Override">
+
+                                                                <controls:SettingsExpander.Footer>
+                                                                    <StackPanel>
+                                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 0 0 10">
+                                                                            <TextBlock Text="Dub" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 10 0"></TextBlock>
+                                                                            <StackPanel>
+                                                                                <ToggleButton x:Name="SeasonOverrideDropdownButtonDub" Width="210" HorizontalContentAlignment="Stretch">
+                                                                                    <ToggleButton.Content>
+                                                                                        <Grid>
+                                                                                            <Grid.ColumnDefinitions>
+                                                                                                <ColumnDefinition Width="*" />
+                                                                                                <ColumnDefinition Width="Auto" />
+                                                                                            </Grid.ColumnDefinitions>
+                                                                                            <TextBlock HorizontalAlignment="Center" Text="{Binding SelectedDubs}"
+                                                                                                       VerticalAlignment="Center" />
+                                                                                            <Path Grid.Column="1" Data="M 0,1 L 4,4 L 8,1" Stroke="White" StrokeThickness="1"
+                                                                                                  VerticalAlignment="Center" Margin="5,0,5,0" Stretch="Uniform" Width="8" />
+                                                                                        </Grid>
+                                                                                    </ToggleButton.Content>
+                                                                                </ToggleButton>
+                                                                                <Popup IsLightDismissEnabled="True"
+                                                                                       IsOpen="{Binding IsChecked, ElementName=SeasonOverrideDropdownButtonDub, Mode=TwoWay}"
+                                                                                       Placement="Bottom"
+                                                                                       PlacementTarget="{Binding ElementName=SeasonOverrideDropdownButtonDub}">
+                                                                                    <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
+                                                                                        <ListBox x:Name="ListBoxDubsSelection" SelectionMode="Multiple,Toggle" Width="210"
+                                                                                                 MaxHeight="400"
+                                                                                                 ItemsSource="{Binding DubLangList , Mode=OneWay}"
+                                                                                                 SelectedItems="{Binding SelectedDubLang}">
+                                                                                            <ListBox.ItemTemplate>
+                                                                                                <DataTemplate DataType="{x:Type structs:StringItem}">
+                                                                                                    <TextBlock Text="{Binding stringValue}"></TextBlock>
+                                                                                                </DataTemplate>
+                                                                                            </ListBox.ItemTemplate>
+                                                                                        </ListBox>
+                                                                                    </Border>
+                                                                                </Popup>
+                                                                            </StackPanel>
+                                                                        </StackPanel>
+
+                                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                                                            <TextBlock Text="Sub" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 10 0"></TextBlock>
+                                                                            <StackPanel>
+                                                                                <ToggleButton x:Name="SeasonOverrideDropdownButtonSub" Width="210" HorizontalContentAlignment="Stretch">
+                                                                                    <ToggleButton.Content>
+                                                                                        <Grid>
+                                                                                            <Grid.ColumnDefinitions>
+                                                                                                <ColumnDefinition Width="*" />
+                                                                                                <ColumnDefinition Width="Auto" />
+                                                                                            </Grid.ColumnDefinitions>
+                                                                                            <TextBlock HorizontalAlignment="Center" Text="{Binding SelectedSubs}"
+                                                                                                       VerticalAlignment="Center" />
+                                                                                            <Path Grid.Column="1" Data="M 0,1 L 4,4 L 8,1" Stroke="White" StrokeThickness="1"
+                                                                                                  VerticalAlignment="Center" Margin="5,0,5,0" Stretch="Uniform" Width="8" />
+                                                                                        </Grid>
+                                                                                    </ToggleButton.Content>
+                                                                                </ToggleButton>
+                                                                                <Popup IsLightDismissEnabled="True"
+                                                                                       IsOpen="{Binding IsChecked, ElementName=SeasonOverrideDropdownButtonSub, Mode=TwoWay}" Placement="Bottom"
+                                                                                       PlacementTarget="{Binding ElementName=SeasonOverrideDropdownButtonSub}">
+                                                                                    <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
+                                                                                        <ListBox SelectionMode="Multiple,Toggle" Width="210"
+                                                                                                 MaxHeight="400"
+                                                                                                 ItemsSource="{Binding SubLangList , Mode=OneWay}"
+                                                                                                 SelectedItems="{Binding SelectedSubLang}">
+                                                                                            <ListBox.ItemTemplate>
+                                                                                                <DataTemplate DataType="{x:Type structs:StringItem}">
+                                                                                                    <TextBlock Text="{Binding stringValue}"></TextBlock>
+                                                                                                </DataTemplate>
+                                                                                            </ListBox.ItemTemplate>
+                                                                                        </ListBox>
+                                                                                    </Border>
+                                                                                </Popup>
+                                                                            </StackPanel>
+                                                                        </StackPanel>
+
+
+                                                                    </StackPanel>
+
+
+                                                                </controls:SettingsExpander.Footer>
+
+                                                            </controls:SettingsExpander>
+
+                                                        </StackPanel>
+
+                                                    </Border>
+                                                </Popup>
+                                            </StackPanel>
+
+
+                                            <Button Margin="10 0 0 0" FontStyle="Italic"
+                                                    VerticalAlignment="Center"
+                                                    Command="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).RemoveSeason}"
+                                                    CommandParameter="{Binding SeasonId}"
+                                                    IsVisible="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).EditMode}">
+                                                <ToolTip.Tip>
+                                                    <TextBlock Text="Remove Season" FontSize="15" />
+                                                </ToolTip.Tip>
+                                                <StackPanel Orientation="Horizontal">
+                                                    <controls:SymbolIcon Symbol="Delete" FontSize="18" />
+                                                </StackPanel>
+                                            </Button>
+                                        </StackPanel>
+                                    </controls:SettingsExpander.Footer>
+
+                                </controls:SettingsExpander>
+
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
 
 
                 </StackPanel>
 
-            </Grid>
 
-
-            <ScrollViewer Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2">
-                <ItemsControl ItemsSource="{Binding SelectedSeries.Seasons}">
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-
-                            <controls:SettingsExpander
-                                Header="{Binding CombinedProperty}"
-                                ItemsSource="{Binding EpisodesList}"
-
-                                Description="{Binding SeasonTitle}"
-                                IsExpanded="{Binding IsExpanded}">
-
-
-                                <controls:SettingsExpander.ItemTemplate>
-                                    <DataTemplate>
-
-                                        <Grid VerticalAlignment="Center">
-
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="*" />
-                                                <ColumnDefinition Width="Auto" />
-                                            </Grid.ColumnDefinitions>
-
-                                            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                                                <TextBlock Text="E"></TextBlock>
-                                                <TextBlock Text="{Binding Episode}"></TextBlock>
-                                                <TextBlock Text=" - "></TextBlock>
-                                                <TextBlock Text="{Binding EpisodeTitle}"></TextBlock>
-                                            </StackPanel>
-
-                                            <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-
-                                                <StackPanel VerticalAlignment="Center" Margin="0 0 5 0"
-                                                            IsVisible="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).SonarrAvailable}">
-
-
-                                                    <controls:ImageIcon IsVisible="{Binding SonarrHasFile}"
-                                                                        Source="../Assets/sonarr.png" Width="25"
-                                                                        Height="25" />
-
-                                                    <controls:ImageIcon IsVisible="{Binding !SonarrHasFile}"
-                                                                        Source="../Assets/sonarr_inactive.png" Width="25"
-                                                                        Height="25" />
-
-
-                                                </StackPanel>
-
-
-                                                <Button Width="34" Height="34" Margin="0 0 10 0" Background="Transparent"
-                                                        BorderThickness="0" CornerRadius="50"
-                                                        IsVisible="{Binding !WasDownloaded}"
-                                                        Command="{Binding $parent[controls:SettingsExpander].((history:HistorySeason)DataContext).UpdateDownloaded}"
-                                                        CommandParameter="{Binding EpisodeId}">
-                                                    <Grid>
-                                                        <Ellipse Width="25" Height="25" Fill="Gray" />
-                                                        <controls:SymbolIcon Symbol="Checkmark" FontSize="18" />
-                                                    </Grid>
-                                                </Button>
-
-                                                <Button Width="34" Height="34" Margin="0 0 10 0" Background="Transparent"
-                                                        BorderThickness="0" CornerRadius="50"
-                                                        IsVisible="{Binding WasDownloaded}"
-                                                        Command="{Binding $parent[controls:SettingsExpander].((history:HistorySeason)DataContext).UpdateDownloaded}"
-                                                        CommandParameter="{Binding EpisodeId}">
-                                                    <Grid>
-                                                        <Ellipse Width="25" Height="25" Fill="#21a556" />
-                                                        <controls:SymbolIcon Symbol="Checkmark" FontSize="18" />
-                                                    </Grid>
-                                                </Button>
-
-                                                <Button Margin="0 0 5 0" FontStyle="Italic" HorizontalAlignment="Right"
-                                                        VerticalAlignment="Center" Command="{Binding DownloadEpisode}">
-                                                    <StackPanel Orientation="Horizontal">
-                                                        <controls:SymbolIcon Symbol="Download" FontSize="18" />
-                                                    </StackPanel>
-                                                </Button>
-
-                                            </StackPanel>
-                                        </Grid>
-                                    </DataTemplate>
-                                </controls:SettingsExpander.ItemTemplate>
-
-                                <controls:SettingsExpander.Footer>
-                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                                        <TextBlock Text="{Binding DownloadedEpisodes}" VerticalAlignment="Center"></TextBlock>
-                                        <TextBlock Text="/" VerticalAlignment="Center"></TextBlock>
-                                        <TextBlock Text="{Binding EpisodesList.Count}" VerticalAlignment="Center"></TextBlock>
-                                        <Button Margin="10 0 0 0" FontStyle="Italic"
-                                                VerticalAlignment="Center"
-                                                Command="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).UpdateData}"
-                                                CommandParameter="{Binding SeasonId}">
-                                            <ToolTip.Tip>
-                                                <TextBlock Text="Refresh Season" FontSize="15" />
-                                            </ToolTip.Tip>
-                                            <StackPanel Orientation="Horizontal">
-                                                <controls:SymbolIcon Symbol="Refresh" FontSize="18" />
-                                            </StackPanel>
-                                        </Button>
-                                        
-                                        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                                            <ToggleButton x:Name="ToggleDownloadAdd" Margin="10 0 0 0" FontStyle="Italic"
-                                                          VerticalAlignment="Center">
-                                                <StackPanel Orientation="Horizontal">
-                                                    <controls:SymbolIcon Symbol="Download" FontSize="18" />
-                                                </StackPanel>
-                                            </ToggleButton>
-
-                                            <Popup IsLightDismissEnabled="True"
-                                                   MaxWidth="400"
-                                                   MaxHeight="600"
-                                                   IsOpen="{Binding IsChecked, ElementName=ToggleDownloadAdd, Mode=TwoWay}"
-                                                   Placement="Bottom"
-                                                   PlacementTarget="{Binding ElementName=ToggleDownloadAdd}">
-                                                <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
-
-                                                    <StackPanel>
-                                                        <Button Margin="10 5" 
-                                                                VerticalAlignment="Center"
-                                                                HorizontalAlignment="Stretch"
-                                                                Content="Download All"
-                                                                Command="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).DownloadSeasonAll}"
-                                                                CommandParameter="{Binding }">
-                                                        </Button>
-                                                        <Button Margin="10 5"  
-                                                                VerticalAlignment="Center"
-                                                                HorizontalAlignment="Stretch"
-                                                                Content="Download Missing"
-                                                                Command="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).DownloadSeasonMissing}"
-                                                                CommandParameter="{Binding }">
-                                                        </Button>
-                                                        <Button Margin="10 5"  
-                                                                VerticalAlignment="Center"
-                                                                HorizontalAlignment="Stretch"
-                                                                Content="Download Missing from Sonarr"
-                                                                IsEnabled="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).SonarrAvailable}"
-                                                                Command="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).DownloadSeasonMissingSonarr}"
-                                                                CommandParameter="{Binding }">
-                                                        </Button>
-                                                    </StackPanel>
-
-                                                </Border>
-                                            </Popup>
-                                        </StackPanel>
-
-                                        <Button Margin="10 0 0 0" FontStyle="Italic"
-                                                VerticalAlignment="Center"
-                                                Command="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).OpenFolderDialogAsync}"
-                                                CommandParameter="{Binding .}">
-                                            <ToolTip.Tip>
-                                                <TextBlock Text="{Binding SeasonDownloadPath}" FontSize="15" />
-                                            </ToolTip.Tip>
-                                            <StackPanel Orientation="Horizontal">
-                                                <controls:SymbolIcon Symbol="Folder" FontSize="18" />
-                                            </StackPanel>
-                                        </Button>
-
-                                        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                                            <ToggleButton x:Name="SeasonOverride" Margin="10 0 0 0" FontStyle="Italic"
-                                                          VerticalAlignment="Center"
-                                                          IsVisible="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).EditMode}">
-                                                <StackPanel Orientation="Horizontal">
-                                                    <controls:SymbolIcon Symbol="Speaker2" FontSize="18" />
-                                                </StackPanel>
-                                            </ToggleButton>
-
-                                            <Popup IsLightDismissEnabled="True"
-                                                   MaxWidth="400"
-                                                   MaxHeight="600"
-                                                   IsOpen="{Binding IsChecked, ElementName=SeasonOverride, Mode=TwoWay}"
-                                                   Placement="Bottom"
-                                                   PlacementTarget="{Binding ElementName=SeasonOverride}">
-                                                <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
-
-                                                    <StackPanel>
-                                                        <controls:SettingsExpander Header="Language Override">
-
-                                                            <controls:SettingsExpander.Footer>
-                                                                <StackPanel>
-                                                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 0 0 10">
-                                                                        <TextBlock Text="Dub" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 10 0"></TextBlock>
-                                                                        <StackPanel>
-                                                                            <ToggleButton x:Name="SeasonOverrideDropdownButtonDub" Width="210" HorizontalContentAlignment="Stretch">
-                                                                                <ToggleButton.Content>
-                                                                                    <Grid>
-                                                                                        <Grid.ColumnDefinitions>
-                                                                                            <ColumnDefinition Width="*" />
-                                                                                            <ColumnDefinition Width="Auto" />
-                                                                                        </Grid.ColumnDefinitions>
-                                                                                        <TextBlock HorizontalAlignment="Center" Text="{Binding SelectedDubs}"
-                                                                                                   VerticalAlignment="Center" />
-                                                                                        <Path Grid.Column="1" Data="M 0,1 L 4,4 L 8,1" Stroke="White" StrokeThickness="1"
-                                                                                              VerticalAlignment="Center" Margin="5,0,5,0" Stretch="Uniform" Width="8" />
-                                                                                    </Grid>
-                                                                                </ToggleButton.Content>
-                                                                            </ToggleButton>
-                                                                            <Popup IsLightDismissEnabled="True"
-                                                                                   IsOpen="{Binding IsChecked, ElementName=SeasonOverrideDropdownButtonDub, Mode=TwoWay}"
-                                                                                   Placement="Bottom"
-                                                                                   PlacementTarget="{Binding ElementName=SeasonOverrideDropdownButtonDub}">
-                                                                                <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
-                                                                                    <ListBox x:Name="ListBoxDubsSelection" SelectionMode="Multiple,Toggle" Width="210"
-                                                                                             MaxHeight="400"
-                                                                                             ItemsSource="{Binding DubLangList , Mode=OneWay}"
-                                                                                             SelectedItems="{Binding SelectedDubLang}">
-                                                                                        <ListBox.ItemTemplate>
-                                                                                            <DataTemplate DataType="{x:Type structs:StringItem}">
-                                                                                                <TextBlock Text="{Binding stringValue}"></TextBlock>
-                                                                                            </DataTemplate>
-                                                                                        </ListBox.ItemTemplate>
-                                                                                    </ListBox>
-                                                                                </Border>
-                                                                            </Popup>
-                                                                        </StackPanel>
-                                                                    </StackPanel>
-
-                                                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                                                        <TextBlock Text="Sub" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 10 0"></TextBlock>
-                                                                        <StackPanel>
-                                                                            <ToggleButton x:Name="SeasonOverrideDropdownButtonSub" Width="210" HorizontalContentAlignment="Stretch">
-                                                                                <ToggleButton.Content>
-                                                                                    <Grid>
-                                                                                        <Grid.ColumnDefinitions>
-                                                                                            <ColumnDefinition Width="*" />
-                                                                                            <ColumnDefinition Width="Auto" />
-                                                                                        </Grid.ColumnDefinitions>
-                                                                                        <TextBlock HorizontalAlignment="Center" Text="{Binding SelectedSubs}"
-                                                                                                   VerticalAlignment="Center" />
-                                                                                        <Path Grid.Column="1" Data="M 0,1 L 4,4 L 8,1" Stroke="White" StrokeThickness="1"
-                                                                                              VerticalAlignment="Center" Margin="5,0,5,0" Stretch="Uniform" Width="8" />
-                                                                                    </Grid>
-                                                                                </ToggleButton.Content>
-                                                                            </ToggleButton>
-                                                                            <Popup IsLightDismissEnabled="True"
-                                                                                   IsOpen="{Binding IsChecked, ElementName=SeasonOverrideDropdownButtonSub, Mode=TwoWay}" Placement="Bottom"
-                                                                                   PlacementTarget="{Binding ElementName=SeasonOverrideDropdownButtonSub}">
-                                                                                <Border BorderThickness="1" Background="{DynamicResource ComboBoxDropDownBackground}">
-                                                                                    <ListBox SelectionMode="Multiple,Toggle" Width="210"
-                                                                                             MaxHeight="400"
-                                                                                             ItemsSource="{Binding SubLangList , Mode=OneWay}"
-                                                                                             SelectedItems="{Binding SelectedSubLang}">
-                                                                                        <ListBox.ItemTemplate>
-                                                                                            <DataTemplate DataType="{x:Type structs:StringItem}">
-                                                                                                <TextBlock Text="{Binding stringValue}"></TextBlock>
-                                                                                            </DataTemplate>
-                                                                                        </ListBox.ItemTemplate>
-                                                                                    </ListBox>
-                                                                                </Border>
-                                                                            </Popup>
-                                                                        </StackPanel>
-                                                                    </StackPanel>
-
-
-                                                                </StackPanel>
-
-
-                                                            </controls:SettingsExpander.Footer>
-
-                                                        </controls:SettingsExpander>
-
-                                                    </StackPanel>
-
-                                                </Border>
-                                            </Popup>
-                                        </StackPanel>
-
-
-                                        <Button Margin="10 0 0 0" FontStyle="Italic"
-                                                VerticalAlignment="Center"
-                                                Command="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).RemoveSeason}"
-                                                CommandParameter="{Binding SeasonId}"
-                                                IsVisible="{Binding $parent[UserControl].((vm:SeriesPageViewModel)DataContext).EditMode}">
-                                            <ToolTip.Tip>
-                                                <TextBlock Text="Remove Season" FontSize="15" />
-                                            </ToolTip.Tip>
-                                            <StackPanel Orientation="Horizontal">
-                                                <controls:SymbolIcon Symbol="Delete" FontSize="18" />
-                                            </StackPanel>
-                                        </Button>
-                                    </StackPanel>
-                                </controls:SettingsExpander.Footer>
-
-                            </controls:SettingsExpander>
-
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
             </ScrollViewer>
         </Grid>
 
diff --git a/CRD/Views/Utils/ContentDialogInputLoginView.axaml b/CRD/Views/Utils/ContentDialogInputLoginView.axaml
index 9847e61..d343069 100644
--- a/CRD/Views/Utils/ContentDialogInputLoginView.axaml
+++ b/CRD/Views/Utils/ContentDialogInputLoginView.axaml
@@ -3,7 +3,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="clr-namespace:CRD.ViewModels"
-             x:DataType="vm:ContentDialogInputLoginViewModel"
+             xmlns:utils="clr-namespace:CRD.ViewModels.Utils"
+             x:DataType="utils:ContentDialogInputLoginViewModel"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="CRD.Views.Utils.ContentDialogInputLoginView">
     
diff --git a/CRD/Views/Utils/ContentDialogSonarrMatchView.axaml b/CRD/Views/Utils/ContentDialogSonarrMatchView.axaml
new file mode 100644
index 0000000..629aabe
--- /dev/null
+++ b/CRD/Views/Utils/ContentDialogSonarrMatchView.axaml
@@ -0,0 +1,104 @@
+<controls:ContentDialog xmlns="https://github.com/avaloniaui"
+                        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                        xmlns:vm="clr-namespace:CRD.ViewModels.Utils"
+                        xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+                        xmlns:models="clr-namespace:CRD.Utils.Sonarr.Models"
+                        xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
+                        x:DataType="vm:ContentDialogSonarrMatchViewModel"
+                        x:Class="CRD.Views.Utils.ContentDialogSonarrMatchView">
+    
+    <Grid HorizontalAlignment="Stretch" MaxHeight="500" >
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        
+        <Border Grid.Column="0" Grid.Row="1" CornerRadius="10" Background="{DynamicResource ButtonBackground}">
+            <Grid Margin="10" VerticalAlignment="Top">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <!-- Image -->
+                <Image Grid.Column="0" Margin="10" asyncImageLoader:ImageLoader.Source="{Binding CurrentSonarrSeries.ImageUrl}" MaxWidth="120" MaxHeight="180"></Image>
+                
+                <Grid Grid.Column="1" Margin="10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" /> <!-- Takes up most space for the title -->
+                        <ColumnDefinition Width="Auto" />
+                        <!-- Takes up space as needed for the time -->
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding CurrentSonarrSeries.Title}" FontWeight="Bold"
+                               FontSize="16"
+                               TextWrapping="Wrap" VerticalAlignment="Center" />
+                    <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentSonarrSeries.Year}" FontStyle="Italic"
+                               HorizontalAlignment="Right" VerticalAlignment="Center" />
+                    <TextBlock Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
+                               Text="{Binding CurrentSonarrSeries.Overview}"
+                               FontStyle="Italic" Opacity="0.8" TextWrapping="Wrap" />
+                    
+                    <TextBlock Grid.Row="0" Grid.Column="0" FontSize="1" Text=" " Width="1500" Opacity="0" />
+                </Grid>
+            </Grid>
+        </Border>
+        
+        <!-- <Rectangle Grid.Row="2" Width="1500" Height="0" Fill="Gray" Margin="10,0" /> -->
+        <!-- <TextBlock Grid.Column="0" Grid.Row="2" Text="Series"></TextBlock> -->
+        
+        <ListBox Grid.Row="3" SelectedItem="{Binding SelectedItem}" ItemsSource="{Binding SonarrSeriesList}">
+
+            <ListBox.ItemTemplate>
+                <DataTemplate DataType="{x:Type models:SonarrSeries}">
+                    <StackPanel>
+                        <Border Padding="10" Margin="5" BorderThickness="1">
+                            <Grid Margin="10" VerticalAlignment="Top">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <!-- Image -->
+                                <asyncImageLoader:AdvancedImage Grid.Column="0" MaxWidth="120" MaxHeight="180" Source="{Binding ImageUrl}"
+                                                                Stretch="Fill" />
+
+                                <!-- Text Content -->
+                                <Grid Grid.Column="1" Margin="10" VerticalAlignment="Top">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" /> <!-- Takes up most space for the title -->
+                                        <ColumnDefinition Width="Auto" />
+                                        <!-- Takes up space as needed for the time -->
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="*" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Grid.Column="0" Text="{Binding Title}" FontWeight="Bold"
+                                               FontSize="16"
+                                               TextWrapping="Wrap" />
+                                    <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Year}" FontStyle="Italic"
+                                               HorizontalAlignment="Right" TextWrapping="Wrap" />
+                                    <TextBlock Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
+                                               Text="{Binding Overview}"
+                                               FontStyle="Italic" Opacity="0.8" TextWrapping="Wrap" />
+                                </Grid>
+                            </Grid>
+                        </Border>
+                        <Border Background="LightGray" Height="1" Margin="0,5" HorizontalAlignment="Stretch" />
+                    </StackPanel>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+
+        </ListBox>
+
+    </Grid>
+
+</controls:ContentDialog>
\ No newline at end of file
diff --git a/CRD/Views/Utils/ContentDialogSonarrMatchView.axaml.cs b/CRD/Views/Utils/ContentDialogSonarrMatchView.axaml.cs
new file mode 100644
index 0000000..3ac06fc
--- /dev/null
+++ b/CRD/Views/Utils/ContentDialogSonarrMatchView.axaml.cs
@@ -0,0 +1,11 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace CRD.Views.Utils;
+
+public partial class ContentDialogSonarrMatchView : UserControl{
+    public ContentDialogSonarrMatchView(){
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/CRD/Views/Utils/ContentDialogUpdateView.axaml b/CRD/Views/Utils/ContentDialogUpdateView.axaml
index 84e94f5..edeb066 100644
--- a/CRD/Views/Utils/ContentDialogUpdateView.axaml
+++ b/CRD/Views/Utils/ContentDialogUpdateView.axaml
@@ -3,7 +3,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="clr-namespace:CRD.ViewModels"
-             x:DataType="vm:ContentDialogUpdateViewModel"
+             xmlns:utils="clr-namespace:CRD.ViewModels.Utils"
+             x:DataType="utils:ContentDialogUpdateViewModel"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="CRD.Views.Utils.ContentDialogUpdateView">