diff --git a/server/app/api/__init__.py b/server/app/api/__init__.py
index 18d93dc..b9b916d 100644
--- a/server/app/api/__init__.py
+++ b/server/app/api/__init__.py
@@ -34,7 +34,7 @@ def initialize() -> None:
     albumslib.create_everything()
     folderslib.run_scandir()
     playlistlib.create_all_playlists()
-    # functions.reindex_tracks()
+    functions.reindex_tracks()
 
 
 initialize()
diff --git a/server/app/lib/watchdoge.py b/server/app/lib/watchdoge.py
index 1118a45..d7496e2 100644
--- a/server/app/lib/watchdoge.py
+++ b/server/app/lib/watchdoge.py
@@ -148,3 +148,7 @@ class Handler(PatternMatchingEventHandler):
 
 
 watch = OnMyWatch()
+
+# TODO
+# When removing a track, check if there are other tracks in the same album,
+# if it was the last one, remove the album.
\ No newline at end of file
diff --git a/src/components/FolderView/FolderItem.vue b/src/components/FolderView/FolderItem.vue
index c76aedb..8e4d144 100644
--- a/src/components/FolderView/FolderItem.vue
+++ b/src/components/FolderView/FolderItem.vue
@@ -13,7 +13,7 @@
   </router-link>
 </template>
 
-<script setup>
+<script setup lang="ts">
 const props = defineProps({
   folder: {
     type: Object,
diff --git a/src/components/FolderView/SongList.vue b/src/components/FolderView/SongList.vue
index 51d3f1d..e5fb9e6 100644
--- a/src/components/FolderView/SongList.vue
+++ b/src/components/FolderView/SongList.vue
@@ -20,9 +20,9 @@
         />
       </div>
     </div>
-    <div v-else-if="tracks.length === 0 && search_query">
+    <div v-else-if="tracks.length === 0">
       <div class="no-results">
-        <div class="text">Nothing down here 😑</div>
+        <div class="text">No tracks here</div>
       </div>
     </div>
   </div>
@@ -33,7 +33,6 @@ import { useRoute } from "vue-router";
 
 import SongItem from "../shared/SongItem.vue";
 
-import state from "../../composables/state";
 import useQStore from "../../stores/queue";
 import { Track } from "../../interfaces";
 
@@ -47,7 +46,6 @@ const props = defineProps<{
 }>();
 
 let route = useRoute().name;
-const search_query = state.search_query;
 
 /**
  * Plays a clicked track and updates the queue
diff --git a/src/components/RightSideBar/Queue.vue b/src/components/RightSideBar/Queue.vue
index fba3845..921d957 100644
--- a/src/components/RightSideBar/Queue.vue
+++ b/src/components/RightSideBar/Queue.vue
@@ -2,19 +2,21 @@
   <div class="up-next">
     <div class="r-grid">
       <UpNext :next="queue.next" :playNext="queue.playNext" />
-      <div
-        class="scrollable-r border rounded"
-        @mouseenter="setMouseOver(true)"
-        @mouseleave="setMouseOver(false)"
-      >
-        <TrackItem
-          v-for="t in queue.tracks"
-          :key="t.trackid"
-          :track="t"
-          @playThis="queue.play(t)"
-          :isCurrent="t.trackid === queue.current.trackid"
-          :isPlaying="queue.playing"
-        />
+      <div class="scrollable-r border rounded">
+        <div
+          class="inner"
+          @mouseenter="setMouseOver(true)"
+          @mouseleave="setMouseOver(false)"
+        >
+          <TrackItem
+            v-for="t in queue.tracks"
+            :key="t.trackid"
+            :track="t"
+            @playThis="queue.play(t)"
+            :isCurrent="t.trackid === queue.current.trackid"
+            :isPlaying="queue.playing"
+          />
+        </div>
       </div>
       <PlayingFrom :from="queue.from" />
     </div>
@@ -62,10 +64,17 @@ onUpdated(() => {
 
     .scrollable-r {
       height: 100%;
-      padding: $small;
-      overflow: auto;
-      overflow-x: hidden;
-      scrollbar-color: grey transparent;
+      padding: $small 0 $small $small;
+      overflow: hidden;
+
+      .inner {
+        height: 100%;
+        overflow: scroll;
+        margin-top: 1rem;
+        padding-right: $small;
+        overflow-x: hidden;
+        scrollbar-color: grey transparent;
+      }
     }
   }
 }
diff --git a/src/components/RightSideBar/Search/Main.vue b/src/components/RightSideBar/Search/Main.vue
index 139a7b8..4198abb 100644
--- a/src/components/RightSideBar/Search/Main.vue
+++ b/src/components/RightSideBar/Search/Main.vue
@@ -11,7 +11,6 @@
         <ArtistGrid />
       </Tab>
     </TabsWrapper>
-    <component :is="s.currentTab" />
   </div>
 </template>
 
@@ -22,8 +21,6 @@ import TracksGrid from "./TracksGrid.vue";
 import AlbumGrid from "./AlbumGrid.vue";
 import ArtistGrid from "./ArtistGrid.vue";
 import "@/assets/css/Search/Search.scss";
-import useSearchStore from "@/stores/search";
-const s = useSearchStore();
 
 </script>
 
diff --git a/src/components/RightSideBar/Search/Tab.vue b/src/components/RightSideBar/Search/Tab.vue
index a20172e..ac06763 100644
--- a/src/components/RightSideBar/Search/Tab.vue
+++ b/src/components/RightSideBar/Search/Tab.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-show="name == s.currentTab"  v-motion-slide-visible-top>
+  <div v-show="name == s.currentTab" v-motion-slide-visible-top>
     <slot />
   </div>
 </template>
diff --git a/src/components/RightSideBar/Search/TracksGrid.vue b/src/components/RightSideBar/Search/TracksGrid.vue
index 5358ccc..696216d 100644
--- a/src/components/RightSideBar/Search/TracksGrid.vue
+++ b/src/components/RightSideBar/Search/TracksGrid.vue
@@ -26,7 +26,7 @@ const queue = useQStore();
 const search = useSearchStore();
 
 function loadMore() {
-    search.updateLoadCounter("tracks", 5);
+  search.updateLoadCounter("tracks", 5);
   search.loadTracks(search.loadCounter.tracks);
 }
 
diff --git a/src/components/modals/updatePlaylist.vue b/src/components/modals/updatePlaylist.vue
index d880506..6a5da4d 100644
--- a/src/components/modals/updatePlaylist.vue
+++ b/src/components/modals/updatePlaylist.vue
@@ -41,7 +41,7 @@
       />
     </div>
     <div class="submit">
-      <input type="submit" class="rounded" value="Update" />
+      <input type="submit" id="updateplaylistsubmit" class="rounded" value="Update" @click="" />
     </div>
   </form>
 </template>
@@ -98,8 +98,19 @@ function handleFile(file: File) {
   image = file;
 }
 
+let clicked = false;
+
 function update_playlist(e: Event) {
   e.preventDefault();
+
+  if (!clicked) {
+    clicked = true;
+    const elem = document.getElementById("updateplaylistsubmit") as HTMLFormElement
+    elem.value = "Updating"
+  } else {
+    return;
+  }
+
   const form = e.target as HTMLFormElement;
   const formData = new FormData(form);
 
diff --git a/src/composables/perks.ts b/src/composables/perks.ts
index 6aa8fa7..79b9555 100644
--- a/src/composables/perks.ts
+++ b/src/composables/perks.ts
@@ -19,7 +19,7 @@ function focusElem(className: string, delay?: number) {
     if (dom) {
       dom.scrollIntoView({
         behavior: "smooth",
-        block: "center",
+        block: "start",
         inline: "center",
       });
     }
diff --git a/todo b/todo
new file mode 100644
index 0000000..f69cb3c
--- /dev/null
+++ b/todo
@@ -0,0 +1,16 @@
+### Server
+
+- [ ] Debug the watchdog module. It has some weird behavior.
+- [ ] Dynamically add files as they are being processed. Current behavior is: process all, then add them at once. This can cause impatience in case of lots of files.
+- [ ] Add settings module
+- [ ] In case of duplicates, select the higher bitrate track
+- [ ] Add and deploy demo branch
+
+### Client
+- [ ] Add processes tab to show running tasks, eg. when tagging files. I have no idea on how to go about it so far. Web sockets? 
+- [ ] Responsiveness, especially the track list.
+- [ ] Make dummy buttons functional.
+- [ ] Add settings page (or modal)
+- [ ] Add keyboard shortcuts listing page (or modal)
+- [ ] Add backspace shortcut to go back.
+- [ ] Implement Esc key to cancel modals.
\ No newline at end of file