diff --git a/src/assets/scss/ProgressBar.scss b/src/assets/scss/ProgressBar.scss
index 7c81d5fa..77940f34 100644
--- a/src/assets/scss/ProgressBar.scss
+++ b/src/assets/scss/ProgressBar.scss
@@ -4,7 +4,7 @@ input[type="range"] {
   width: calc(100% - 2px);
   height: 0.3rem;
   border-radius: 5px;
-  background: $gray4 linear-gradient(90deg, $accent, $darkestblue) no-repeat;
+  background: $gray4 linear-gradient(90deg, $darkblue, $darkestblue) no-repeat;
   background-size: 100% 100%;
 
   &::-webkit-slider-thumb {
diff --git a/src/components/BottomBar.vue b/src/components/BottomBar.vue
index 58287db0..3b40cdac 100644
--- a/src/components/BottomBar.vue
+++ b/src/components/BottomBar.vue
@@ -30,7 +30,7 @@
               </span>
             </div>
             <div class="tags">
-              <div class="title ellip">
+              <div v-tooltip class="title ellip">
                 {{ queue.currenttrack?.title || "Hello there" }}
               </div>
               <ArtistName
diff --git a/src/components/RightSideBar/Queue.vue b/src/components/RightSideBar/Queue.vue
index dad447cc..386016a4 100644
--- a/src/components/RightSideBar/Queue.vue
+++ b/src/components/RightSideBar/Queue.vue
@@ -1,13 +1,14 @@
 <template>
   <QueueActions />
   <div
+    ref="scrollable"
     class="scrollable-r"
     v-bind="containerProps"
     style="height: 100%"
     @mouseover="mouseover = true"
     @mouseout="mouseover = false"
   >
-    <div class="inner" v-bind="wrapperProps" >
+    <div class="inner" v-bind="wrapperProps">
       <TrackItem
         style="height: 64px"
         v-for="t in tracks"
@@ -34,6 +35,7 @@ import QueueActions from "./Queue/QueueActions.vue";
 
 const queue = useQStore();
 const mouseover = ref(false);
+const scrollable = ref<HTMLElement>();
 
 function playFromQueue(index: number) {
   queue.play(index);
@@ -51,8 +53,8 @@ const {
 });
 
 onMounted(() => {
-  scrollTo(queue.currentindex);
-  queue.setScrollFunction(scrollTo, mouseover);
+  // scrollTo(queue.currentindex);
+  queue.setScrollFunction(scrollToCurrent, mouseover);
 });
 
 onBeforeUnmount(() => {
@@ -60,6 +62,18 @@ onBeforeUnmount(() => {
 });
 
 // TODO: Handle focusing current track on song end
+
+
+function scrollToCurrent() {
+  const elem = document.getElementsByClassName('scrollable-r')[0] as HTMLElement;
+  const itemHeight = 64;
+
+  const top = queue.currentindex * itemHeight - itemHeight;
+   elem.scroll({
+    top,
+    behavior: "smooth",
+  });
+}
 </script>
 
 <style lang="scss">
diff --git a/src/components/shared/SongItem.vue b/src/components/shared/SongItem.vue
index db904940..e7519294 100644
--- a/src/components/shared/SongItem.vue
+++ b/src/components/shared/SongItem.vue
@@ -14,9 +14,7 @@
     <div class="flex">
       <div v-auto-animate @click.pre@dblclick.prevent="emitUpdate" class="thumbnail">
         <img
-          loading="lazy"
           :src="imguri + track.image"
-          alt=""
           class="album-art image rounded-sm"
         />
         <div
diff --git a/src/components/shared/TrackItem.vue b/src/components/shared/TrackItem.vue
index a31e88c5..a9f07832 100644
--- a/src/components/shared/TrackItem.vue
+++ b/src/components/shared/TrackItem.vue
@@ -13,7 +13,6 @@
     <div class="album-art">
       <img
         :src="paths.images.thumb.small + track.image"
-        alt=""
         class="rounded-sm"
       />
       <div
diff --git a/src/config.ts b/src/config.ts
index b0dd42e3..a4e01823 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,5 +1,5 @@
 // "local" | "remote"
-let mode = "remote";
+let mode = "local";
 
 export interface D<T = string> {
   [key: string]: T;
diff --git a/src/layouts/HeaderAndVList.vue b/src/layouts/HeaderAndVList.vue
index 2fcc3b97..3814bdef 100644
--- a/src/layouts/HeaderAndVList.vue
+++ b/src/layouts/HeaderAndVList.vue
@@ -2,26 +2,27 @@
   <!-- JUST A COMMENT: 64 is single item height, 24 is gap height -->
   <div class="header-list-layout">
     <div
+      id="v-page-scrollable"
       v-bind="containerProps"
       style="height: 100%"
-      :style="{ paddingTop: !no_header ? headerHeight - 64 + 24 + 'px' : 0 }"
       @scroll="handleScroll"
     >
       <div
         v-bind="wrapperProps"
-        class="scrollable"
-        ref="scrollable"
+        class="v-list"
+        ref="v_list"
         :class="{
           isSmall: isSmall,
           isMedium: isMedium || on_album_page,
         }"
       >
-        <div class="header rounded" style="height: 64px" v-if="!no_header">
-          <div
-            ref="header"
-            :style="{ top: -headerHeight + 64 - 24 + 'px' }"
-            class="header-content"
-          >
+        <div
+          ref="header"
+          class="header rounded"
+          v-if="!no_header"
+          :style="{ height: headerHeight + 24 + 'px' }"
+        >
+          <div ref="header_content" class="header-content">
             <slot name="header"></slot>
           </div>
         </div>
@@ -54,7 +55,7 @@
 
 <script setup lang="ts">
 import { useElementSize, useVirtualList } from "@vueuse/core";
-import { computed, ref } from "vue";
+import { computed, onMounted, onUpdated, ref, watch } from "vue";
 
 import { Track } from "@/interfaces";
 import useQStore from "@/stores/queue";
@@ -79,8 +80,10 @@ function updateQueue(index: number) {
 }
 
 // SCROLLABLE AREA
-const scrollable = ref<HTMLElement>();
-const { width } = useElementSize(scrollable);
+let scrollable: HTMLElement;
+const v_list = ref<HTMLElement>();
+const header_content = ref<HTMLElement>();
+const { width } = useElementSize(v_list);
 
 const brk = {
   sm: 500,
@@ -92,28 +95,38 @@ const isMedium = computed(() => width.value > brk.sm && width.value < brk.md);
 
 // VIRTUAL LIST
 const source = computed(() => props.tracks);
+
 const {
   list: tracks,
   containerProps,
   wrapperProps,
 } = useVirtualList(source, {
   itemHeight: 60,
-  overscan: 15,
+  overscan: 20,
+});
+
+// watch source changes and scroll to top
+watch(source, () => {
+  scrollable.scroll(0, 0);
 });
 
 // HEADER
 const header = ref<HTMLElement>();
-const { height: headerHeight } = useElementSize(header);
+const { height: headerHeight } = useElementSize(header_content);
 
 function handleScroll(e: Event) {
   const scrollTop = (e.target as HTMLElement).scrollTop;
 
-  if (scrollTop > headerHeight.value) {
+  if (scrollTop > (header.value?.offsetHeight || 0)) {
     header.value ? (header.value.style.opacity = "0") : null;
   } else {
     header.value ? (header.value.style.opacity = "1") : null;
   }
 }
+
+onMounted(() => {
+  scrollable = document.getElementById("v-page-scrollable") as HTMLElement;
+});
 </script>
 
 <style lang="scss">
@@ -121,7 +134,7 @@ function handleScroll(e: Event) {
   margin-right: -$medium;
   height: 100%;
 
-  .scrollable {
+  .v-list {
     padding-right: calc(1rem - $small + 2px);
     scrollbar-width: thin;
 
@@ -134,7 +147,7 @@ function handleScroll(e: Event) {
     }
   }
 
-  .scrollable.isSmall {
+  .v-list.isSmall {
     // hide album and artists columns
     .songlist-item {
       grid-template-columns: 1.5rem 2fr 2.5rem 2.5rem;
@@ -153,7 +166,7 @@ function handleScroll(e: Event) {
     }
   }
 
-  .scrollable.isMedium {
+  .v-list.isMedium {
     // hide album column
     .songlist-item {
       grid-template-columns: 1.5rem 1.5fr 1fr 2.5rem 2.5rem;
@@ -163,14 +176,5 @@ function handleScroll(e: Event) {
       display: none !important;
     }
   }
-
-  .header {
-    position: relative;
-
-    .header-content {
-      position: absolute;
-      width: 100%;
-    }
-  }
 }
 </style>