diff --git a/server/app/lib/watchdoge.py b/server/app/lib/watchdoge.py
index 2838077b..e1ee16eb 100644
--- a/server/app/lib/watchdoge.py
+++ b/server/app/lib/watchdoge.py
@@ -4,15 +4,15 @@ This library contains the classes and functions related to the watchdog file wat
 import os
 import time
 
-from app.logger import logg
+from app.logger import get_logger
 from app import instances
-from app import models
-from app.helpers import Get, create_album_hash
-from app.lib.albumslib import create_album
+from app.helpers import create_album_hash
 from app.lib.taglib import get_tags
 from watchdog.events import PatternMatchingEventHandler
 from watchdog.observers import Observer
 
+log = get_logger()
+
 
 class OnMyWatch:
     """
@@ -31,7 +31,7 @@ class OnMyWatch:
         try:
             self.observer.start()
         except OSError:
-            logg.error("Could not start watchdog.")
+            log.error("Could not start watchdog.")
             return
 
         try:
@@ -55,18 +55,6 @@ def add_track(filepath: str) -> None:
     if tags is not None:
         hash = create_album_hash(tags["album"], tags["albumartist"])
         tags["albumhash"] = hash
-
-        album = instances.album_instance.find_album_by_hash(hash)
-        all_tracks = Get.get_all_tracks()
-        all_tracks.append(models.Track(tags))
-
-        if album is None:
-            album_data = create_album(tags, all_tracks)
-            album = models.Album(album_data)
-
-            instances.album_instance.insert_album(album)
-
-        tags["image"] = album.image
         instances.tracks_instance.insert_song(tags)
 
 
@@ -75,8 +63,6 @@ def remove_track(filepath: str) -> None:
     Removes a track from the music dict.
     """
 
-    filepath = filepath + "k"
-
     instances.tracks_instance.remove_song_by_filepath(filepath)
 
 
diff --git a/src/components/AlbumView/Header.vue b/src/components/AlbumView/Header.vue
index 26a979d9..8b3d0d93 100644
--- a/src/components/AlbumView/Header.vue
+++ b/src/components/AlbumView/Header.vue
@@ -9,13 +9,12 @@
       }"
     >
       <div class="art">
-        <div
-          class="image shadow-lg rounded"
-          :style="{
-            backgroundImage: `url(&quot;${imguri + album.image}&quot;)`,
-          }"
+        <img
+          :src="imguri + album.image"
+          alt=""
           v-motion-slide-from-left
-        ></div>
+          class="rounded shadow-lg"
+        />
       </div>
       <div class="info" :class="{ nocontrast: isLight() }">
         <div class="top" v-motion-slide-from-top>
@@ -50,7 +49,7 @@
 import useVisibility from "@/composables/useVisibility";
 import useNavStore from "@/stores/nav";
 import useAlbumStore from "@/stores/pages/album";
-import { reactive, ref } from "vue";
+import { ref } from "vue";
 import { playSources } from "../../composables/enums";
 import { formatSeconds } from "../../composables/perks";
 import { paths } from "../../config";
@@ -177,10 +176,6 @@ function theyContrast(color1: string, color2: string) {
 </script>
 
 <style lang="scss">
-.album-h {
-  height: auto;
-}
-
 .a-header {
   display: grid;
   grid-template-columns: max-content 1fr;
@@ -197,9 +192,10 @@ function theyContrast(color1: string, color2: string) {
     display: flex;
     align-items: flex-end;
 
-    .image {
+    img {
       width: 15rem;
       height: 15rem;
+      transition: all 0.2s ease-in-out;
     }
   }
 
diff --git a/src/components/LeftSidebar/SongCard.vue b/src/components/LeftSidebar/SongCard.vue
index 82baf7e8..dfdee52d 100644
--- a/src/components/LeftSidebar/SongCard.vue
+++ b/src/components/LeftSidebar/SongCard.vue
@@ -11,12 +11,7 @@
           }"
         >
           <div class="art">
-            <div
-              class="l-image image rounded"
-              :style="{
-                backgroundImage: `url(&quot;${imguri + track.image}&quot;)`,
-              }"
-            ></div>
+            <img :src="imguri + track.image" alt="" class="l-image rounded" />
           </div>
         </router-link>
 
diff --git a/src/components/RightSideBar/Main.vue b/src/components/RightSideBar/Main.vue
index d7db01f1..da6326ac 100644
--- a/src/components/RightSideBar/Main.vue
+++ b/src/components/RightSideBar/Main.vue
@@ -8,9 +8,8 @@
         <div class="r-search" v-show="tabs.current === tabs.tabs.search">
           <Search />
         </div>
-
         <div class="r-queue" v-show="tabs.current === tabs.tabs.queue">
-          <UpNext />
+          <Queue />
         </div>
       </div>
     </div>
@@ -19,7 +18,7 @@
 
 <script setup lang="ts">
 import Search from "./Search/Main.vue";
-import UpNext from "./Queue.vue";
+import Queue from "./Queue.vue";
 import DashBoard from "./Home/Main.vue";
 import useTabStore from "../../stores/tabs";
 
diff --git a/src/components/shared/ArtistCard.vue b/src/components/shared/ArtistCard.vue
index 5f2acfc8..686f9703 100644
--- a/src/components/shared/ArtistCard.vue
+++ b/src/components/shared/ArtistCard.vue
@@ -38,11 +38,11 @@ defineProps<{
   cursor: pointer;
 
   .artist-image {
-    width: 7em;
-    height: 7em;
+    width: 8em;
+    height: 8em;
     border-radius: 60%;
     margin-bottom: $small;
-    background-size: 7rem 7rem;
+    background-size: 8rem 8rem;
     background-position: center;
     background-repeat: no-repeat;
     transition: all 0.5s ease-in-out;
diff --git a/src/components/shared/SongItem.vue b/src/components/shared/SongItem.vue
index 51b8ce55..40394083 100644
--- a/src/components/shared/SongItem.vue
+++ b/src/components/shared/SongItem.vue
@@ -7,13 +7,12 @@
   >
     <div class="index">{{ props.index }}</div>
     <div class="flex">
-      <div
-        class="album-art image rounded"
-        :style="{
-          backgroundImage: `url(&quot;${imguri + props.song.image}&quot;`,
-        }"
-        @click="emitUpdate(props.song)"
-      >
+      <div @click="emitUpdate(props.song)" class="thumbnail">
+        <img
+          :src="imguri + props.song.image"
+          alt=""
+          class="album-art image rounded"
+        />
         <div
           class="now-playing-track image"
           v-if="props.isPlaying && props.isCurrent"
@@ -226,20 +225,25 @@ function emitUpdate(track: Track) {
 
   .flex {
     position: relative;
-    padding-left: 4rem;
     align-items: center;
 
+    .thumbnail {
+      margin-right: $small;
+      display: flex;
+    }
+
     .album-art {
-      position: absolute;
-      left: $small;
       width: 3rem;
       height: 3rem;
-      margin-right: 1rem;
-      display: grid;
-      place-items: center;
       cursor: pointer;
     }
 
+    .now-playing-track {
+      position: absolute;
+      left: $small;
+      top: $small;
+    }
+
     .title {
       cursor: pointer;
       word-break: break-all;
diff --git a/src/stores/tabs.ts b/src/stores/tabs.ts
index 68a097b2..1d092f83 100644
--- a/src/stores/tabs.ts
+++ b/src/stores/tabs.ts
@@ -3,8 +3,8 @@ import { focusElem } from "../composables/perks";
 
 const tablist = {
   home: "home",
-  search: "search",
   queue: "queue",
+  search: "search",
 };
 
 export default defineStore("tabs", {