diff --git a/static/player.ts b/static/player.ts
index a71bdb4..1758b8a 100644
--- a/static/player.ts
+++ b/static/player.ts
@@ -317,7 +317,7 @@ const initPlayer = (): void => {
       const left = (segment.start / bounds.duration) * 100
       const width = ((segment.end - segment.start) / bounds.duration) * 100
       const bar = document.createElement('div')
-      bar.className = 'absolute top-0 h-full bg-white/70'
+      bar.className = 'absolute top-0 h-full bg-white/80'
       bar.style.left = `${left}%`
       bar.style.width = `${width}%`
       segmentsTrack.appendChild(bar)
@@ -365,9 +365,7 @@ const initPlayer = (): void => {
     if (buffered && video) {
       let maxBuffered = 0
       for (let i = 0; i < video.buffered.length; i++) {
-        if (video.buffered.start(i) <= currentTime + 1) { // Adding small tolerance
-          maxBuffered = Math.max(maxBuffered, video.buffered.end(i))
-        }
+        maxBuffered = Math.max(maxBuffered, video.buffered.end(i))
       }
       const bufferedDisplayTime = displayTimeFromAbsolute(maxBuffered)
       const bufferedPct = Math.max(0, Math.min(100, (bufferedDisplayTime / bounds.duration) * 100))
diff --git a/templates/components/video_player.gohtml b/templates/components/video_player.gohtml
index 1475853..216a245 100644
--- a/templates/components/video_player.gohtml
+++ b/templates/components/video_player.gohtml
@@ -88,11 +88,11 @@
             <span data-preview-time>0:00</span>
           </div>
           <div class="relative flex h-1.5 w-full items-center rounded-full bg-white/20 transition-all group-hover/progress:h-2">
-            <div data-buffered class="absolute left-0 top-0 h-full rounded-full bg-white/30 z-0" style="width: 0%"></div>
-            <div data-progress class="bg-accent relative z-10 h-full rounded-full" style="width: 0%"></div>
+            <div data-buffered class="absolute left-0 top-0 h-full rounded-full bg-white/40 z-0 transition-all duration-200" style="width: 0%"></div>
+            <div data-progress class="bg-accent absolute left-0 top-0 z-10 h-full rounded-full" style="width: 0%"></div>
             <div data-segments class="absolute inset-0 z-20 pointer-events-none overflow-hidden rounded-full"></div>
           </div>
-          <div data-scrubber class="bg-accent pointer-events-none absolute top-1/2 z-30 h-3.5 w-3.5 -translate-x-1/2 -translate-y-1/2 rounded-full opacity-0 shadow-sm transition-[opacity,transform] group-hover/progress:scale-110 group-hover/progress:opacity-100" style="left: 0%"></div>
+          <div data-scrubber class="bg-accent pointer-events-none absolute top-1/2 z-30 h-3.5 w-3.5 -translate-x-1/2 -translate-y-1/2 rounded-full shadow-sm transition-[transform] group-hover/progress:scale-125" style="left: 0%"></div>
         </div>
         <span class="w-12 text-center" data-duration>0:00</span>
       </div>