diff --git a/AniStream/Models/Range.cs b/AniStream/Models/Range.cs
index 16fea2b..cf28ba0 100644
--- a/AniStream/Models/Range.cs
+++ b/AniStream/Models/Range.cs
@@ -1,14 +1,18 @@
 using System.Collections.Generic;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Juro.Core.Models.Anime;
 
 namespace AniStream.Models;
 
-public class Range
+public partial class Range : ObservableObject
 {
     public string Name { get; set; } = default!;
 
     public List<Episode> Episodes { get; set; } = new();
 
+    [ObservableProperty]
+    private bool _isSelected;
+
     public Range(IEnumerable<Episode> episodes, int startIndex, int endIndex)
     {
         Episodes.AddRange(episodes);
diff --git a/AniStream/ViewModels/EpisodeViewModel.cs b/AniStream/ViewModels/EpisodeViewModel.cs
index bc260d9..a32dc28 100644
--- a/AniStream/ViewModels/EpisodeViewModel.cs
+++ b/AniStream/ViewModels/EpisodeViewModel.cs
@@ -124,18 +124,20 @@ public async Task LoadEpisodes(IAnimeInfo anime)
         {
             var startIndex = 1;
             var endIndex = 0;
+
             for (var i = 0; i < EpisodeChunks.Count; i++)
             {
-                var chunk = EpisodeChunks[i].ToList();
                 if (_settingsService.EpisodesDescending)
                 {
-                    chunk.Reverse();
+                    EpisodeChunks[i] = EpisodeChunks[i].Reverse().ToArray();
                 }
 
-                endIndex = startIndex + chunk.Count - 1;
-                ranges.Add(new Range(chunk, startIndex, endIndex));
-                startIndex += chunk.Count;
+                endIndex = startIndex + EpisodeChunks[i].Length - 1;
+                ranges.Add(new Range(EpisodeChunks[i], startIndex, endIndex));
+                startIndex += EpisodeChunks[i].Length;
             }
+
+            ranges[0].IsSelected = true;
         }
         else
         {
@@ -147,20 +149,9 @@ public async Task LoadEpisodes(IAnimeInfo anime)
 
         result.ForEach(ep => ep.Image = anime.Image);
 
-        foreach (var episode in result)
-        {
-            var episodeKey = $"{Entity.Id}-{episode.Number}";
-            _playerSettings.WatchedEpisodes.TryGetValue(episodeKey, out var watchedEpisode);
-            if (watchedEpisode is not null)
-            {
-                episode.Progress = watchedEpisode.WatchedPercentage;
-            }
-        }
-
         RefreshEpisodesProgress();
 
         Entities.Push(EpisodeChunks[0]);
-
         Ranges.Push(ranges);
         OnPropertyChanged(nameof(Ranges));
     }
@@ -168,6 +159,13 @@ public async Task LoadEpisodes(IAnimeInfo anime)
     [RelayCommand]
     private void RangeSelected(Range range)
     {
+        for (var i = 0; i < Ranges.Count; i++)
+        {
+            Ranges[i].IsSelected = false;
+        }
+
+        range.IsSelected = true;
+
         Entities.ReplaceRange(range.Episodes);
     }
 
diff --git a/AniStream/ViewModels/Videos/VideoPlayerViewModel.cs b/AniStream/ViewModels/Videos/VideoPlayerViewModel.cs
index 245bf33..afde31e 100644
--- a/AniStream/ViewModels/Videos/VideoPlayerViewModel.cs
+++ b/AniStream/ViewModels/Videos/VideoPlayerViewModel.cs
@@ -73,16 +73,34 @@ public VideoPlayerViewModel(IAnimeInfo anime, Episode episode, VideoSource? vide
     public VideoPlayerViewModel(IAnimeInfo anime, Episode episode, Media media)
         : this(anime, episode, null, media) { }
 
+    [RelayCommand]
+    public void OnLoaded(IMediaElement mediaElement)
+    {
+        Shell.Current.Navigating += Current_Navigating;
+
+        MediaElement = mediaElement;
+        Controller = new(this, _anime, _episode, default!, _media);
+        Controller.OnLoaded(mediaElement);
+    }
+
+    private void Current_Navigating(object? sender, ShellNavigatingEventArgs e)
+    {
+        _cancellationTokenSource.Cancel();
+        UpdateProgress();
+    }
+
     [RelayCommand]
     private void OnUnloaded()
     {
+        Shell.Current.Navigating -= Current_Navigating;
+
         Controller.Dispose();
 
         ApplicationEx.SetOrientation(_initialOrientation);
     }
 
     [RelayCommand]
-    private async Task OnStateChanged(MediaElementState state)
+    private void OnStateChanged(MediaElementState state)
     {
         switch (state)
         {
@@ -97,10 +115,10 @@ private async Task OnStateChanged(MediaElementState state)
                 CanSaveProgress = true;
                 break;
             case MediaElementState.Paused:
-                await UpdateProgress();
+                UpdateProgress();
                 break;
             case MediaElementState.Stopped:
-                await UpdateProgress();
+                UpdateProgress();
                 break;
             case MediaElementState.Failed:
                 CanSaveProgress = false;
@@ -110,14 +128,6 @@ private async Task OnStateChanged(MediaElementState state)
         }
     }
 
-    [RelayCommand]
-    public void OnLoaded(IMediaElement mediaElement)
-    {
-        MediaElement = mediaElement;
-        Controller = new(this, _anime, _episode, default!, _media);
-        Controller.OnLoaded(mediaElement);
-    }
-
     public async Task ShowSpeedSelector()
     {
         var speeds = _playerSettings.GetSpeeds();
@@ -218,7 +228,7 @@ async Task ShowSheet()
         await sheet.ShowAsync();
     }
 
-    public async Task UpdateProgress()
+    public void UpdateProgress()
     {
         if (!CanSaveProgress)
             return;
diff --git a/AniStream/Views/BottomSheets/EpisodeSelectionSheet.xaml b/AniStream/Views/BottomSheets/EpisodeSelectionSheet.xaml
index b793ab2..bc7f9b8 100644
--- a/AniStream/Views/BottomSheets/EpisodeSelectionSheet.xaml
+++ b/AniStream/Views/BottomSheets/EpisodeSelectionSheet.xaml
@@ -70,7 +70,7 @@
                     <LinearItemsLayout ItemSpacing="8" Orientation="Vertical" />
                 </CollectionView.ItemsLayout>
                 <CollectionView.GroupHeaderTemplate>
-                    <DataTemplate x:DataType="{x:Type models:VideoServer}">
+                    <DataTemplate x:DataType="{x:Null}">
                         <Label
                             Margin="25,10,0,0"
                             FontAttributes="Bold"
diff --git a/AniStream/Views/Templates/EpisodeRangeTemplateView.xaml b/AniStream/Views/Templates/EpisodeRangeTemplateView.xaml
index 6dfaf7e..657572d 100644
--- a/AniStream/Views/Templates/EpisodeRangeTemplateView.xaml
+++ b/AniStream/Views/Templates/EpisodeRangeTemplateView.xaml
@@ -18,12 +18,20 @@
             HorizontalOptions="FillAndExpand"
             StrokeThickness="0"
             VerticalOptions="FillAndExpand">
+            <Border.Triggers>
+                <DataTrigger
+                    Binding="{Binding IsSelected}"
+                    TargetType="Border"
+                    Value="True">
+                    <Setter Property="BackgroundColor" Value="#4287f5" />
+                </DataTrigger>
+            </Border.Triggers>
             <Border.StrokeShape>
                 <RoundRectangle CornerRadius="22" />
             </Border.StrokeShape>
             <Label
                 Grid.Row="1"
-                Padding="20,13"
+                Padding="18,10"
                 FontAttributes="Bold"
                 FontFamily="SoraBold"
                 FontSize="15"
diff --git a/AniStream/Views/Templates/FullEpisodeTemplateView.xaml b/AniStream/Views/Templates/FullEpisodeTemplateView.xaml
index 7b43930..32b5a5d 100644
--- a/AniStream/Views/Templates/FullEpisodeTemplateView.xaml
+++ b/AniStream/Views/Templates/FullEpisodeTemplateView.xaml
@@ -8,11 +8,11 @@
     xmlns:local="clr-namespace:AniStream"
     xmlns:models="clr-namespace:Juro.Core.Models.Anime;assembly=Juro.Core"
     x:Name="this"
-    Margin="3,5"
+    Margin="20,5"
     Padding="0"
     x:DataType="models:Episode"
     BackgroundColor="Transparent"
-    HeightRequest="100">
+    HeightRequest="125">
     <Border.Resources>
         <ResourceDictionary>
             <converters:WatchedEpisodeProgressConverter x:Key="WatchedEpisodeProgressConverter" />
@@ -22,7 +22,15 @@
     <Border.StrokeShape>
         <RoundRectangle CornerRadius="10" />
     </Border.StrokeShape>
-    <Grid BackgroundColor="Transparent" ColumnDefinitions="auto,*">
+    <Grid BackgroundColor="{StaticResource Gray900}" ColumnDefinitions="auto,*">
+        <Grid.Behaviors>
+            <berry:TouchBehavior
+                Command="{Binding Parent.BindingContext.ItemClickCommand, Source={x:Reference this}}"
+                CommandParameter="{Binding BindingContext, Source={x:Reference this}}"
+                LongPressCommand="{Binding Parent.BindingContext.ShowSheetCommand, Source={x:Reference this}}"
+                LongPressCommandParameter="{Binding BindingContext, Source={x:Reference this}}"
+                NativeAnimation="True" />
+        </Grid.Behaviors>
         <Border StrokeThickness="0">
             <Border.StrokeShape>
                 <RoundRectangle CornerRadius="10" />
@@ -32,16 +40,7 @@
                 BackgroundColor="Transparent"
                 Opacity="0.8"
                 Source="{Binding Image}"
-                WidthRequest="190">
-                <Image.Behaviors>
-                    <berry:TouchBehavior NativeAnimation="True" />
-                    <berry:TouchBehavior
-                        Command="{Binding Parent.BindingContext.ItemClickCommand, Source={x:Reference this}}"
-                        CommandParameter="{Binding BindingContext, Source={x:Reference this}}"
-                        LongPressCommand="{Binding Parent.BindingContext.ShowSheetCommand, Source={x:Reference this}}"
-                        LongPressCommandParameter="{Binding BindingContext, Source={x:Reference this}}" />
-                </Image.Behaviors>
-            </Image>
+                WidthRequest="200" />
         </Border>
 
         <!--  Display Progress  -->
@@ -59,39 +58,45 @@
                 VerticalOptions="End" />
         </Grid>
 
-        <Label
-            Padding="5"
-            FontAttributes="Bold"
-            FontSize="15"
-            HorizontalTextAlignment="Start"
-            LineBreakMode="TailTruncation"
-            Opacity="0.9"
-            Text="{Binding Name}"
-            TextColor="#E9FFFFFF"
-            VerticalTextAlignment="Start" />
-        <Label
-            Padding="8,5"
-            FontAttributes="Bold"
-            FontFamily="SoraBold"
-            FontSize="25"
-            HorizontalTextAlignment="End"
-            LineBreakMode="TailTruncation"
-            Opacity="0.7"
-            Text="{Binding Number}"
-            TextColor="#E9FFFFFF"
-            VerticalTextAlignment="End" />
+        <Border
+            Grid.Column="0"
+            Margin="-10,-3,0,0"
+            Padding="4"
+            HorizontalOptions="Start"
+            StrokeThickness="0"
+            VerticalOptions="Start">
+            <Border.Background>
+                <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+                    <GradientStop Offset="0.4" Color="#AE000000" />
+                    <GradientStop Offset="1" Color="#31000000" />
+                </LinearGradientBrush>
+            </Border.Background>
+            <Border.StrokeShape>
+                <RoundRectangle CornerRadius="20,0,20,20" />
+            </Border.StrokeShape>
+            <Label
+                Padding="15,8,10,6"
+                FontAttributes="Bold"
+                FontSize="20"
+                HorizontalTextAlignment="Start"
+                LineBreakMode="TailTruncation"
+                Opacity="0.9"
+                Text="{Binding Number}"
+                TextColor="#E9FFFFFF"
+                VerticalTextAlignment="Start" />
+        </Border>
 
         <Label
             Grid.Column="1"
             Padding="8,5"
             FontAttributes="Bold"
             FontFamily="SoraBold"
-            FontSize="25"
+            FontSize="20"
             HorizontalOptions="Center"
             HorizontalTextAlignment="End"
             LineBreakMode="TailTruncation"
             Opacity="0.7"
-            Text="{Binding Number}"
+            Text="{Binding Name}"
             TextColor="#E9FFFFFF"
             VerticalOptions="Center"
             VerticalTextAlignment="End" />