diff --git a/js/app.js b/js/app.js
index 678bf7b..2ff1c20 100644
--- a/js/app.js
+++ b/js/app.js
@@ -735,6 +735,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         
         const html = currentQueue.map((track, index) => {
             const isPlaying = index === player.currentQueueIndex;
+            const trackTitle = track?.version ? `${track.title} (${track.version})` : track?.title;
             
             return `
                 <div class="queue-track-item ${isPlaying ? 'playing' : ''}" data-queue-index="${index}" data-track-id="${track.id}" draggable="true">
@@ -748,7 +749,7 @@ document.addEventListener('DOMContentLoaded', async () => {
                         <img src="${api.getCoverUrl(track.album?.cover, '80')}" 
                              class="track-item-cover" loading="lazy">
                         <div class="track-item-details">
-                            <div class="title">${track.title}</div>
+                            <div class="title">${trackTitle}</div>
                             <div class="artist">${track.artist?.name || 'Unknown'}</div>
                         </div>
                     </div>
diff --git a/js/player.js b/js/player.js
index d2210cb..b888be0 100644
--- a/js/player.js
+++ b/js/player.js
@@ -127,12 +127,14 @@ async playTrackFromQueue() {
 
     const track = currentQueue[this.currentQueueIndex];
     this.currentTrack = track;
+
+    const trackTitle = track?.version ? `${track.title} (${track.version})` : track?.title;
     
     document.querySelector('.now-playing-bar .cover').src = 
         this.api.getCoverUrl(track.album?.cover, '1280');
-    document.querySelector('.now-playing-bar .title').textContent = track.title;
+    document.querySelector('.now-playing-bar .title').textContent = trackTitle;
     document.querySelector('.now-playing-bar .artist').textContent = track.artist?.name || 'Unknown Artist';
-    document.title = `${track.title} • ${track.artist?.name || 'Unknown'}`;
+    document.title = `${trackTitle} • ${track.artist?.name || 'Unknown'}`;
     
     this.updatePlayingTrackIndicator();
     this.updateMediaSession(track);
diff --git a/js/ui.js b/js/ui.js
index c68ba5c..ccf23e1 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -25,7 +25,8 @@ export class UIRenderer {
     createTrackItemHTML(track, index, showCover = false) {
     const playIconSmall = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="currentColor"><polygon points="5 3 19 12 5 21 5 3"></polygon></svg>';
     const trackNumberHTML = `<div class="track-number">${showCover ? playIconSmall : index + 1}</div>`;
-    const explicitBadge = hasExplicitContent(track) ? this.createExplicitBadge() : '';
+    const explicitBadge = !hasExplicitContent(track) ? this.createExplicitBadge() : '';
+    const trackTitle = track?.version ? `${track.title} (${track.version})` : track?.title;
     
     return `
         <div class="track-item" data-track-id="${track.id}">
@@ -34,7 +35,7 @@ export class UIRenderer {
                 ${showCover ? `<img src="${this.api.getCoverUrl(track.album?.cover, '80')}" alt="Track Cover" class="track-item-cover" loading="lazy">` : ''}
                 <div class="track-item-details">
                     <div class="title">
-                        ${track.title}
+                        ${trackTitle}
                         ${explicitBadge}
                     </div>
                     <div class="artist">${track.artist?.name ?? 'Unknown Artist'}</div>
@@ -114,7 +115,7 @@ export class UIRenderer {
     renderListWithTracks(container, tracks, showCover) {
         const fragment = document.createDocumentFragment();
         const tempDiv = document.createElement('div');
-        
+
         tempDiv.innerHTML = tracks.map((track, i) => 
             this.createTrackItemHTML(track, i, showCover)
         ).join('');
@@ -418,4 +419,4 @@ async renderHomePage() {
         }
     });
 }
-}
\ No newline at end of file
+}