diff --git a/js/settings.js b/js/settings.js
index cda04e3..9da8846 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -748,8 +748,7 @@ export function initializeSettings(scrobbler, player, api, ui) {
         showQualityBadgesToggle.checked = qualityBadgeSettings.isEnabled();
         showQualityBadgesToggle.addEventListener('change', (e) => {
             qualityBadgeSettings.setEnabled(e.target.checked);
-            // Re-render to reflect changes
-            ui.renderLibraryPage();
+            // Re-render queue if available, but don't force navigation to library
             if (window.renderQueueFunction) window.renderQueueFunction();
         });
     }
diff --git a/js/ui.js b/js/ui.js
index 3816449..81434ec 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -302,8 +302,15 @@ export class UIRenderer {
             ? `title="Blocked: ${contentBlockingSettings.isTrackBlocked(track.id) ? 'Track blocked' : contentBlockingSettings.isArtistBlocked(track.artist?.id) ? 'Artist blocked' : 'Album blocked'}"`
             : '';
 
+        const classList = [
+            'track-item',
+            isCurrentTrack ? 'playing' : '',
+            isUnavailable ? 'unavailable' : '',
+            isBlocked ? 'blocked' : ''
+        ].filter(Boolean).join(' ');
+
         return `
-            <div class="track-item ${isCurrentTrack ? 'playing' : ''} ${isUnavailable ? 'unavailable' : ''} ${isBlocked ? 'blocked' : ''}" 
+            <div class="${classList}" 
                  data-track-id="${track.id}" 
                  ${track.isLocal ? 'data-is-local="true"' : ''}
                  ${isUnavailable ? 'title="This track is currently unavailable"' : ''}
diff --git a/styles.css b/styles.css
index cdca476..381e819 100644
--- a/styles.css
+++ b/styles.css
@@ -1484,7 +1484,7 @@ input[type='search']::-webkit-search-cancel-button {
 /* Editable Playlist Track Items (with remove button) */
 .is-editable .track-list-header,
 .is-editable .track-item {
-    grid-template-columns: 40px 1fr 80px 90px;
+    grid-template-columns: 40px 1fr 32px 64px;
 }
 
 .detail-header {