diff --git a/src/assets/scss/Global/app-grid.scss b/src/assets/scss/Global/app-grid.scss
index 0d418059..e4e72bea 100644
--- a/src/assets/scss/Global/app-grid.scss
+++ b/src/assets/scss/Global/app-grid.scss
@@ -93,6 +93,7 @@ $g-border: solid 1px $gray5;
     height: 100%;
     width: 100%;
     padding-right: $small !important;
+    padding-bottom: $content-padding-bottom;
   }
 }
 
diff --git a/src/components/RightSideBar/Queue.vue b/src/components/RightSideBar/Queue.vue
index 9c95f354..06d66279 100644
--- a/src/components/RightSideBar/Queue.vue
+++ b/src/components/RightSideBar/Queue.vue
@@ -2,7 +2,6 @@
   <QueueActions />
   <div
     class="queue-virtual-scroller"
-    style="height: 100%"
     @mouseover="mouseover = true"
     @mouseout="mouseover = false"
   >
@@ -39,8 +38,8 @@ const mouseover = ref(false);
 
 const scrollerItems = computed(() => {
   return queue.tracklist.map((track) => ({
+    track,
     id: Math.random(),
-    track: track,
   }));
 });
 
diff --git a/src/components/shared/SongItem.vue b/src/components/shared/SongItem.vue
index 52852646..86d17282 100644
--- a/src/components/shared/SongItem.vue
+++ b/src/components/shared/SongItem.vue
@@ -100,8 +100,6 @@ function showMenu(e: Event) {
 </script>
 
 <style lang="scss">
-
-
 .songlist-item {
   display: grid;
   grid-template-columns: 1.5rem 2fr 1fr 1.5fr 2.5rem 2.5rem;
@@ -233,4 +231,8 @@ function showMenu(e: Event) {
     border-radius: 0 $small $small 0;
   }
 }
+
+.songlist-item.current {
+  background-color: $gray;
+}
 </style>
diff --git a/src/views/AlbumView/Content.vue b/src/views/AlbumView/Content.vue
deleted file mode 100644
index be2085f3..00000000
--- a/src/views/AlbumView/Content.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-  <div class="album-tracks rounded">
-    <div v-for="(disc, key) in discs" class="album-disc">
-      <SongList
-        :key="key"
-        :tracks="disc"
-        :on_album_page="true"
-        :disc="key"
-        :copyright="isLastDisc(key) ? copyright : null"
-        @playFromPage="playFromAlbumPage"
-      />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-// @stores
-import useQueueStore from "@/stores/queue";
-import useAlbumStore from "@/stores/pages/album";
-
-// @utils
-import { Track } from "@/interfaces";
-
-// @components
-import SongList from "@/components/FolderView/SongList.vue";
-
-// @setup
-
-const props = defineProps<{
-  discs: {
-    [key: string]: Track[];
-  };
-  copyright?: string;
-}>();
-
-const queue = useQueueStore();
-const album = useAlbumStore();
-
-// check if the disc is the last disc
-const isLastDisc = (disc: string | number) => {
-  const discs = Object.keys(props.discs);
-  return discs[discs.length - 1] === disc;
-};
-
-function playFromAlbumPage(index: number) {
-  const { title, artist, hash } = album.info;
-  queue.playFromAlbum(title, artist, hash, album.allTracks);
-  queue.play(index);
-}
-</script>
-
-<style lang="scss">
-.album-tracks {
-  display: grid;
-  gap: 1rem;
-}
-</style>
diff --git a/src/views/AlbumView/index.vue b/src/views/AlbumView/index.vue
index 9c37ef65..73c296ea 100644
--- a/src/views/AlbumView/index.vue
+++ b/src/views/AlbumView/index.vue
@@ -21,9 +21,9 @@
 <script setup lang="ts">
 import { computed } from "@vue/reactivity";
 import {
-onBeforeRouteLeave,
-onBeforeRouteUpdate,
-RouteLocationNormalized
+  onBeforeRouteLeave,
+  onBeforeRouteUpdate,
+  RouteLocationNormalized,
 } from "vue-router";
 
 import { Track } from "@/interfaces";
@@ -104,10 +104,6 @@ onBeforeRouteLeave(() => {
 .album-virtual-scroller {
   height: 100%;
 
-  .scroller {
-    padding-bottom: $content-padding-bottom;
-  }
-
   .songlist-item {
     grid-template-columns: 1.5rem 1.5fr 1fr 2.5rem 2.5rem;
   }
diff --git a/src/views/FolderView.vue b/src/views/FolderView.vue
index f0c1830a..56a3845f 100644
--- a/src/views/FolderView.vue
+++ b/src/views/FolderView.vue
@@ -1,9 +1,14 @@
 <template>
-  <div class="folder-view v-scroll-page" :class="{ isSmall, isMedium }">
+  <div
+    class="folder-view v-scroll-page"
+    style="height: 100%"
+    :class="{ isSmall, isMedium }"
+  >
     <DynamicScroller
       :items="scrollerItems"
       :min-item-size="64"
       class="scroller"
+      style="height: 100%"
     >
       <template v-slot="{ item, index, active }">
         <DynamicScrollerItem
@@ -106,14 +111,3 @@ onBeforeRouteLeave(() => {
   setTimeout(() => folder.resetQuery(), 500);
 });
 </script>
-
-<style lang="scss">
-.folder-view {
-  height: 100%;
-
-  .scroller {
-    height: 100%;
-    padding-bottom: $content-padding-bottom !important;
-  }
-}
-</style>
diff --git a/src/views/PlaylistView/index.vue b/src/views/PlaylistView/index.vue
index 1d37e5a0..70e77112 100644
--- a/src/views/PlaylistView/index.vue
+++ b/src/views/PlaylistView/index.vue
@@ -2,6 +2,7 @@
   <div
     class="playlist-virtual-scroller v-scroll-page"
     :class="{ isSmall, isMedium }"
+    style="height: 100%"
   >
     <RecycleScroller
       class="scroller"
@@ -9,6 +10,7 @@
       :item-size="null"
       key-field="id"
       v-slot="{ item }"
+      style="height: 100%"
     >
       <component
         :is="item.component"
@@ -80,16 +82,3 @@ onBeforeRouteLeave(() => {
   }, 500);
 });
 </script>
-
-<style lang="scss">
-.playlist-virtual-scroller {
-  height: 100%;
-  width: 100%;
-
-  .scroller {
-    height: 100%;
-    width: 100%;
-    padding-bottom: $content-padding-bottom;
-  }
-}
-</style>
diff --git a/src/views/QueueView.vue b/src/views/QueueView.vue
index 942ab858..19ec9780 100644
--- a/src/views/QueueView.vue
+++ b/src/views/QueueView.vue
@@ -1,29 +1,60 @@
 <template>
-  <div class="queue-view" style="height: 100%">
-    <Layout
-      :tracks="queue.tracklist"
-      :no_header="true"
-      @playFromPage="playFromQueue"
+  <div
+    class="queue-view-virtual-scroller v-scroll-page"
+    :class="{ isSmall, isMedium }"
+    style="height: 100%"
+  >
+    <RecycleScroller
+      class="scroller"
+      id="queue-page-scrollable"
+      style="height: 100%"
+      :items="scrollerItems"
+      :item-size="itemHeight"
+      key-field="id"
+      v-slot="{ item, index }"
     >
-    </Layout>
+      <SongItem
+        :track="item.track"
+        :index="index + 1"
+        :isCurrent="queue.currenttrack?.hash === item.track.hash"
+        :isCurrentPlaying="
+          queue.currenttrack?.hash === item.track.hash && queue.playing
+        "
+        @playThis="playFromQueue(index)"
+      />
+    </RecycleScroller>
   </div>
 </template>
 
 <script setup lang="ts">
-import useQStore from "@/stores/queue";
-import Layout from "@/layouts/HeaderAndVList.vue";
-import { onBeforeMount, onMounted } from "vue";
+import { computed, onMounted } from "vue";
 
+import useQStore from "@/stores/queue";
+import { createTrackProps } from "@/utils";
+import SongItem from "@/components/shared/SongItem.vue";
+import { isSmall, isMedium } from "@/stores/content-width";
+
+const itemHeight = 64;
 const queue = useQStore();
 
+const scrollerItems = computed(() => {
+  return queue.tracklist.map((track) => {
+    return {
+      track,
+      id: Math.random(),
+      props: createTrackProps(track),
+    };
+  });
+});
+
 function playFromQueue(index: number) {
   queue.play(index);
 }
 
 function scrollToCurrent() {
-  const scrollable = document.getElementById("v-page-scrollable");
+  const scrollable = document.getElementById("queue-page-scrollable");
   const itemHeight = 64;
-  const top = queue.currentindex * itemHeight - 290;
+  const top = queue.currentindex * itemHeight - itemHeight;
 
   scrollable?.scrollTo({
     top,
@@ -31,9 +62,17 @@ function scrollToCurrent() {
   });
 }
 
-onBeforeMount(() => {
+onMounted(() => {
   setTimeout(() => {
     scrollToCurrent();
   }, 1000);
 });
 </script>
+
+<style lang="scss">
+.queue-view-virtual-scroller {
+  .songlist-item.current {
+    background-color: $darkestblue !important;
+  }
+}
+</style>