diff --git a/src/assets/css/Search/Search.scss b/src/assets/css/Search/Search.scss
index d3609d30..797ec0a5 100644
--- a/src/assets/css/Search/Search.scss
+++ b/src/assets/css/Search/Search.scss
@@ -1,21 +1,14 @@
-.right-search .v0 {
-  max-height: 0em;
-  transition: max-height 0.5s ease;
-}
-
-.right-search .v1 {
-  max-height: 25rem;
-  transition: max-height 0.5s ease;
-}
-
 .right-search {
   position: relative;
   border-radius: $small;
-  margin: 0.5rem 0 0 0;
-  padding: 1rem $small 0 0;
   background-color: #03000eab;
+  display: grid;
+  grid-template-rows: min-content 1fr;
   overflow: hidden;
   width: auto;
+  height: 100%;
+  padding: $small $small 0 $small;
+  // margin: $small 0 $small 0;
 
   .no-res {
     text-align: center;
@@ -79,12 +72,11 @@
 }
 
 .right-search .scrollable {
-  width: 100%;
-  height: 26rem;
   overflow-y: auto;
-  scroll-behavior: smooth;
-  padding: 0 $small 0 0;
-  margin-bottom: 0.5rem;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
 }
 
 .right-search {
@@ -94,7 +86,7 @@
     position: relative;
 
     input {
-      width: calc(100% - 6rem);
+      width: calc(100% - 2.5rem);
       border: none;
       line-height: 2.5rem;
       background-color: transparent;
@@ -102,7 +94,7 @@
       font-size: 1rem;
       outline: none;
       transition: all 0.5s ease;
-      padding-left: $small;
+      padding-left: 0.4rem;
 
       &:focus {
         transition: all 0.5s ease;
@@ -116,5 +108,3 @@
     }
   }
 }
-
-
diff --git a/src/assets/icons/_search.svg b/src/assets/icons/_search.svg
new file mode 100644
index 00000000..7b63261b
--- /dev/null
+++ b/src/assets/icons/_search.svg
@@ -0,0 +1 @@
+<svg fill="#ffffff" xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="48px" height="48px"><path d="M 20.5 6 C 12.509634 6 6 12.50964 6 20.5 C 6 28.49036 12.509634 35 20.5 35 C 23.956359 35 27.133709 33.779044 29.628906 31.75 L 39.439453 41.560547 A 1.50015 1.50015 0 1 0 41.560547 39.439453 L 31.75 29.628906 C 33.779044 27.133709 35 23.956357 35 20.5 C 35 12.50964 28.490366 6 20.5 6 z M 20.5 9 C 26.869047 9 32 14.130957 32 20.5 C 32 23.602612 30.776198 26.405717 28.791016 28.470703 A 1.50015 1.50015 0 0 0 28.470703 28.791016 C 26.405717 30.776199 23.602614 32 20.5 32 C 14.130953 32 9 26.869043 9 20.5 C 9 14.130957 14.130953 9 20.5 9 z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/dashboard.svg b/src/assets/icons/dashboard.svg
new file mode 100644
index 00000000..4dfb2c80
--- /dev/null
+++ b/src/assets/icons/dashboard.svg
@@ -0,0 +1,6 @@
+<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="28" y="25" width="104.69" height="104.69" rx="40" fill="#055096"/>
+<rect x="167.028" y="170.31" width="104.69" height="104.69" rx="40" fill="#C43A3A"/>
+<rect x="28" y="170.31" width="104.69" height="104.69" rx="40" fill="#C4C4C4"/>
+<rect x="167.028" y="25" width="104.69" height="104.69" rx="40" fill="white"/>
+</svg>
diff --git a/src/assets/icons/queue.svg b/src/assets/icons/queue.svg
new file mode 100644
index 00000000..a0dd923e
--- /dev/null
+++ b/src/assets/icons/queue.svg
@@ -0,0 +1,6 @@
+<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="25" y="65" width="250" height="44.8439" rx="22.4219" fill="white"/>
+<rect x="25" y="190.999" width="168.664" height="44.8439" rx="22.4219" fill="white"/>
+<rect x="230.156" y="190.999" width="44.8439" height="44.8439" rx="22.4219" fill="#055096"/>
+<rect x="25" y="127.999" width="211.511" height="44.8439" rx="22.4219" fill="#C43A3A"/>
+</svg>
diff --git a/src/assets/icons/search.svg b/src/assets/icons/search.svg
index 7b63261b..079bb6a4 100644
--- a/src/assets/icons/search.svg
+++ b/src/assets/icons/search.svg
@@ -1 +1,5 @@
-<svg fill="#ffffff" xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="48px" height="48px"><path d="M 20.5 6 C 12.509634 6 6 12.50964 6 20.5 C 6 28.49036 12.509634 35 20.5 35 C 23.956359 35 27.133709 33.779044 29.628906 31.75 L 39.439453 41.560547 A 1.50015 1.50015 0 1 0 41.560547 39.439453 L 31.75 29.628906 C 33.779044 27.133709 35 23.956357 35 20.5 C 35 12.50964 28.490366 6 20.5 6 z M 20.5 9 C 26.869047 9 32 14.130957 32 20.5 C 32 23.602612 30.776198 26.405717 28.791016 28.470703 A 1.50015 1.50015 0 0 0 28.470703 28.791016 C 26.405717 30.776199 23.602614 32 20.5 32 C 14.130953 32 9 26.869043 9 20.5 C 9 14.130957 14.130953 9 20.5 9 z"/></svg>
\ No newline at end of file
+<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="113.788" cy="121.788" r="88.7875" fill="#C4C4C4"/>
+<path d="M130.102 159.761L152.799 133.981L262.11 230.216C269.229 236.483 269.919 247.335 263.652 254.454V254.454C257.385 261.573 246.533 262.263 239.414 255.996L130.102 159.761Z" fill="#C4C4C4"/>
+<circle cx="113.959" cy="121.616" r="68.6944" fill="#055096"/>
+</svg>
diff --git a/src/components/RightSideBar/Home/Main.vue b/src/components/RightSideBar/Home/Main.vue
new file mode 100644
index 00000000..9529aa67
--- /dev/null
+++ b/src/components/RightSideBar/Home/Main.vue
@@ -0,0 +1,14 @@
+<template>
+  <div class="r-home image">
+   
+  </div>
+</template>
+
+<style lang="scss">
+.r-home {
+  height: 100%;
+  width: 31rem;
+  background-image: url("https://pro2-bar-s3-cdn-cf2.myportfolio.com/a534e2586a621751e93466e77f5228be/d686c78b-9cd7-4eeb-a660-69cfaf7e4cac_rw_600.gif");
+  color: transparent;
+}
+</style>
diff --git a/src/components/RightSideBar/Main.vue b/src/components/RightSideBar/Main.vue
index e8d9d715..0a35b6b2 100644
--- a/src/components/RightSideBar/Main.vue
+++ b/src/components/RightSideBar/Main.vue
@@ -1,20 +1,25 @@
 <template>
   <div class="r-sidebar">
-    <!-- <div class="m-np"> -->
-      <!-- <NowPlaying class="hidden"/> -->
-    <!-- </div> -->
-    <div class="s">
-      <Search
-        v-model:search="search"
-        @expandSearch="expandSearch"
-        @collapseSearch="collapseSearch"
-      />
-    </div>
-    <div class="q">
-      <UpNext v-model:up_next="up_next" @expandQueue="expandQueue" />
-    </div>
-    <div class="r">
-      <RecommendedArtist />
+    <div class="grid">
+      <div class="r-content border rounded">
+        <div class="r-dash" v-if="current_tab == tabs.home">
+          <DashBoard/>
+        </div>
+        <div class="r-search" v-if="current_tab == tabs.search">
+          <Search
+            v-model:search="search"
+            @expandSearch="expandSearch"
+            @collapseSearch="collapseSearch"
+          />
+        </div>
+
+        <div class="r-queue" v-if="current_tab == tabs.queue">
+          <UpNext v-model:up_next="up_next" @expandQueue="expandQueue" />
+        </div>
+      </div>
+      <div class="tab-keys card-dark border">
+        <Tabs :current_tab="current_tab" :tabs="tabs" @changeTab="changeTab" />
+      </div>
     </div>
   </div>
 </template>
@@ -22,8 +27,11 @@
 <script setup>
 import { ref } from "vue";
 import Search from "../Search.vue";
-import UpNext from "./UpNext.vue";
-import RecommendedArtist from "@/components/RightSideBar/Recommendation.vue";
+import UpNext from "./Queue.vue";
+import Tabs from "./Tabs.vue";
+import Main from "./Home/Main.vue";
+
+const DashBoard = Main;
 
 let up_next = ref(true);
 let search = ref(false);
@@ -39,17 +47,54 @@ const expandSearch = () => {
 const collapseSearch = () => {
   search.value = false;
 };
+
+const tabs = {
+  home: "home",
+  search: "search",
+  queue: "queue",
+};
+
+const current_tab = ref(tabs.search);
+
+function changeTab(tab) {
+  current_tab.value = tab;
+}
 </script>
 
 <style lang="scss">
 .r-sidebar {
-  border-radius: 5px;
-  margin-right: 0.5rem;
-  margin-bottom: $small;
-  overflow-y: auto;
-  width: 30em;
-  display: grid;
-  grid-auto-flow: row;
-  grid-template-rows: min-content min-content auto;
+  width: 34em;
+
+  .grid {
+    height: 100%;
+    display: grid;
+    grid-template-areas: "content tabs";
+
+    .r-content {
+      grid-area: content;
+      width: 100%;
+      overflow: hidden;
+      margin: $small $small $small 0;
+
+      .r-search {
+        height: 100%;
+      }
+
+      .r-dash {
+        height: 100%;
+      }
+
+      .r-queue {
+        height: 100%;
+      }
+    }
+
+    .tab-keys {
+      grid-area: tabs;
+      width: 3rem;
+      padding: $small;
+      margin-left: $small;
+    }
+  }
 }
 </style>
diff --git a/src/components/RightSideBar/Queue.vue b/src/components/RightSideBar/Queue.vue
new file mode 100644
index 00000000..255cb0d6
--- /dev/null
+++ b/src/components/RightSideBar/Queue.vue
@@ -0,0 +1,144 @@
+<template>
+  <div class="up-next border">
+    <p class="heading">COMING UP NEXT</p>
+    <div class="r-grid">
+      <div class="main-item h-1 border" @click="playNext">
+        <div
+          class="album-art image"
+          :style="{
+            backgroundImage: `url(&quot;${next.image}&quot;)`,
+          }"
+        ></div>
+        <div class="tags">
+          <p class="title ellip">{{ next.title }}</p>
+          <hr />
+          <p class="artist ellip">
+            <span v-for="artist in putCommas(next.artists)" :key="artist">{{
+              artist
+            }}</span>
+          </p>
+        </div>
+      </div>
+      <div class="scrollable-r border">
+        <TrackItem v-for="song in queue" :key="song" :track="song" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { ref, toRefs } from "@vue/reactivity";
+import perks from "@/composables/perks.js";
+import audio from "@/composables/playAudio.js";
+import { watch } from "@vue/runtime-core";
+import TrackItem from "../shared/TrackItem.vue";
+
+export default {
+  props: ["up_next"],
+  setup(props, { emit }) {
+    const is_expanded = toRefs(props).up_next;
+    const queue = ref(perks.queue);
+    const next = ref(perks.next);
+
+    let collapse = () => {
+      emit("expandQueue");
+    };
+
+    watch(is_expanded, (newVal) => {
+      if (newVal) {
+        setTimeout(() => {
+          perks.focusCurrent();
+        }, 1000);
+      }
+    });
+
+    const { playNext } = audio;
+
+    const putCommas = perks.putCommas;
+    return {
+      collapse,
+      is_expanded,
+      playNext,
+      putCommas,
+      queue,
+      next,
+    };
+  },
+  components: { TrackItem },
+};
+</script>
+
+<style lang="scss">
+.up-next {
+  background-color: $card-dark;
+  border-radius: 0.5rem;
+  padding: $small;
+  overflow: hidden;
+  height: 100%;
+
+  
+
+  .heading {
+    position: relative;
+    margin: 0.5rem 0 1rem 0;
+  }
+
+  .main-item {
+    display: flex;
+    align-items: center;
+    padding: 0.5rem;
+    border-radius: 0.5rem;
+    cursor: pointer;
+    margin-bottom: 0.5rem;
+
+    .album-art {
+      width: 4.5rem;
+      height: 4.5rem;
+      background-image: url(../../assets/images/null.webp);
+      margin: 0 0.5rem 0 0;
+      border-radius: 0.5rem;
+    }
+
+    .tags {
+      hr {
+        border: none;
+        margin: 0.3rem;
+      }
+      .title {
+        width: 20rem;
+        margin: 0;
+      }
+      .artist {
+        width: 20rem;
+        margin: 0;
+        font-size: small;
+      }
+    }
+
+    &:hover {
+      background-color: $blue;
+    }
+  }
+
+  .r-grid {
+    position: relative;
+    height: calc(100% - 2rem);
+    overflow: hidden;
+    width: 100%;
+    display: grid;
+    grid-template-rows: min-content 1fr;
+
+    .scrollable-r {
+      margin-bottom: $small;
+      padding: $small;
+      overflow: auto;
+      background-color: $card-dark;
+      border-radius: 0.5rem;
+
+      &::-webkit-scrollbar-track {
+        background-color: transparent;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/RightSideBar/Tabs.vue b/src/components/RightSideBar/Tabs.vue
new file mode 100644
index 00000000..236db188
--- /dev/null
+++ b/src/components/RightSideBar/Tabs.vue
@@ -0,0 +1,63 @@
+<template>
+  <div class="r-tabs">
+    <button v-for="tab in props.tabs"
+    @click="changeTab(tab)"
+    :key="tab"
+      class="image t-item rounded"
+      :class="{ active_tab: props.current_tab == tab }, `${tab}`"
+    ></button>
+    <div>
+    </div>
+  </div>
+</template>
+
+<script setup>import { onMounted } from 'vue';
+
+const props = defineProps({
+  current_tab: String,
+  tabs: Object,
+});
+
+const emit = defineEmits(['changeTab'])
+
+function changeTab(tab) {
+  if (tab == props.current_tab) return;
+
+  emit('changeTab', tab)
+}
+
+</script>
+
+<style lang="scss">
+.r-tabs {
+  display: flex;
+  flex-direction: column;
+  gap: $small;
+
+  .t-item {
+    width: 2rem;
+    height: 2rem;
+    background-size: 1.5rem;
+  }
+
+  .active_tab {
+    border-right: solid;
+    border-radius: $small 0 0 $small;
+  }
+
+  .search {
+    background-image: url("../../assets/icons/search.svg");
+    background-color: rgba(35, 35, 66, 0.247);
+  }
+
+  .queue {
+    background-image: url("../../assets/icons/queue.svg");
+    background-color: rgba(46, 25, 33, 0.445);
+  }
+
+  .home {
+    background-image: url("../../assets/icons/dashboard.svg");
+    background-color: rgba(148, 102, 50, 0.445);
+  }
+}
+</style>
diff --git a/src/components/RightSideBar/UpNext.vue b/src/components/RightSideBar/UpNext.vue
deleted file mode 100644
index 9450c767..00000000
--- a/src/components/RightSideBar/UpNext.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-<template>
-  <div class="up-next border">
-    <p class="heading">
-      COMING UP NEXT <span class="more" @click="collapse">SEE ALL</span>
-    </p>
-    <div class="main-item h-1 border" @click="playNext">
-      <div
-        class="album-art image"
-        :style="{
-          backgroundImage: `url(&quot;${next.image}&quot;)`,
-        }"
-      ></div>
-      <div class="tags">
-        <p class="title ellip">{{ next.title }}</p>
-        <hr />
-        <p class="artist ellip">
-          <span v-for="artist in putCommas(next.artists)" :key="artist">{{
-            artist
-          }}</span>
-        </p>
-      </div>
-    </div>
-    <div>
-      <div
-        :class="{ v0: !is_expanded, v1: is_expanded }"
-        class="scrollable border"
-      >
-        <TrackItem v-for="song in queue" :key="song" :track="song" />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { ref, toRefs } from "@vue/reactivity";
-import perks from "@/composables/perks.js";
-import audio from "@/composables/playAudio.js";
-import { watch } from "@vue/runtime-core";
-import TrackItem from "../shared/TrackItem.vue";
-
-export default {
-  props: ["up_next"],
-  setup(props, { emit }) {
-    const is_expanded = toRefs(props).up_next;
-    const queue = ref(perks.queue);
-    const next = ref(perks.next);
-
-    let collapse = () => {
-      emit("expandQueue");
-    };
-
-    watch(is_expanded, (newVal) => {
-      if (newVal) {
-        setTimeout(() => {
-          perks.focusCurrent();
-        }, 1000);
-      }
-    });
-
-    const { playNext } = audio;
-
-    const putCommas = perks.putCommas;
-    return {
-      collapse,
-      is_expanded,
-      playNext,
-      putCommas,
-      queue,
-      next,
-    };
-  },
-  components: { TrackItem },
-};
-</script>
-
-<style lang="scss">
-.up-next .v0 {
-  max-height: 0;
-  transition: max-height 0.5s ease;
-  visibility: hidden;
-  padding: 0;
-}
-
-.up-next .v1 {
-  max-height: 21em;
-  transition: max-height 0.5s ease;
-  padding: $small;
-
-  .currentInQueue {
-    border: 2px solid $pink;
-
-    &:hover {
-      color: #fff;
-    }
-  }
-}
-
-.up-next {
-  padding: 0.5rem;
-  margin-top: $small;
-  background-color: $card-dark;
-  border-radius: 0.5rem;
-}
-
-.up-next .heading {
-  position: relative;
-  margin: 0.5rem 0 1rem 0;
-
-  span {
-    position: absolute;
-    right: 0.5rem;
-    padding: 0.5rem;
-    border-radius: 0.5rem;
-    user-select: none;
-
-    &:hover {
-      background: $blue;
-      cursor: pointer;
-    }
-  }
-}
-
-.up-next .main-item {
-  display: flex;
-  align-items: center;
-  padding: 0.5rem;
-  border-radius: 0.5rem;
-  cursor: pointer;
-  margin-bottom: 0.5rem;
-
-  .album-art {
-    width: 4.5rem;
-    height: 4.5rem;
-    background-image: url(../../assets/images/null.webp);
-    margin: 0 0.5rem 0 0;
-    border-radius: 0.5rem;
-  }
-
-  .tags {
-    hr {
-      border: none;
-      margin: 0.3rem;
-    }
-    .title {
-      width: 20rem;
-      margin: 0;
-    }
-    .artist {
-      width: 20rem;
-      margin: 0;
-      font-size: small;
-    }
-  }
-
-  &:hover {
-    background-color: $blue;
-  }
-}
-
-.up-next .scrollable {
-  overflow-y: auto;
-  background-color: $card-dark;
-  border-radius: 0.5rem;
-
-  &::-webkit-scrollbar-track {
-    background-color: transparent;
-  }
-}
-</style>
diff --git a/src/components/Search.vue b/src/components/Search.vue
index 1733502f..b8e4f8ba 100644
--- a/src/components/Search.vue
+++ b/src/components/Search.vue
@@ -1,33 +1,35 @@
 <template>
-  <div class="right-search border" ref="searchComponent">
-    <div class="input">
-      <Loader />
-      <Filters :filters="filters" @removeFilter="removeFilter" />
-      <div class="input-loader border">
-        <input
-          type="search"
-          id="search"
-          @focus="activateMagicFlag"
-          @blur="removeMagicFlag"
-          @keyup.backspace="removeLastFilter"
-          placeholder="find your music"
-          v-model="query"
-        />
-        <div class="search-icon image"></div>
-        <!--  -->
-      </div>
-      <div
-        class="suggestions v00"
-        :class="{
-          v00: !filters.length && !query,
-          v11: filters.length || query,
-        }"
-      >
-        <div class="item">Kenny Rogers</div>
+  <div class="right-search" ref="searchComponent">
+    <div>
+      <div class="input">
+        <Loader />
+        <Filters :filters="filters" @removeFilter="removeFilter" />
+        <div class="input-loader border">
+          <input
+            type="text"
+            id="search"
+            @focus="activateMagicFlag"
+            @blur="removeMagicFlag"
+            @keyup.backspace="removeLastFilter"
+            placeholder="find your music"
+            v-model="query"
+          />
+          <div class="search-icon image"></div>
+          <!--  -->
+        </div>
+        <div
+          class="suggestions v00"
+          :class="{
+            v00: !filters.length && !query,
+            v11: filters.length || query,
+          }"
+        >
+          <div class="item">Kenny Rogers</div>
+        </div>
       </div>
+      <div class="separator no-border"></div>
+      <Options :magic_flag="magic_flag" @addFilter="addFilter" />
     </div>
-    <div class="separator no-border"></div>
-    <Options :magic_flag="magic_flag" @addFilter="addFilter" />
     <div class="scrollable" :class="{ v0: !is_hidden, v1: is_hidden }">
       <TracksGrid
         :tracks="tracks.tracks"
diff --git a/src/components/Search/AlbumGrid.vue b/src/components/Search/AlbumGrid.vue
index 24e307d5..7eecd0cd 100644
--- a/src/components/Search/AlbumGrid.vue
+++ b/src/components/Search/AlbumGrid.vue
@@ -35,7 +35,6 @@ export default {
   border-radius: 0.5rem;
   background: #0f131b44;
 
-  margin-left: $small;
   margin-top: $small;
   padding: $small 0;
   overflow-x: hidden;
diff --git a/src/components/Search/ArtistGrid.vue b/src/components/Search/ArtistGrid.vue
index 7bc9c09d..20952667 100644
--- a/src/components/Search/ArtistGrid.vue
+++ b/src/components/Search/ArtistGrid.vue
@@ -38,8 +38,8 @@ export default {
 .right-search .artists-results {
   border-radius: 0.5rem;
   background: #1214178c;
-  margin: 0 0 0 $small;
   padding: $small 0;
+  margin-bottom: $small;
 
   .grid {
     padding: 0 0 0 $small;
diff --git a/src/components/Search/Filters.vue b/src/components/Search/Filters.vue
index ac145814..dceafdc9 100644
--- a/src/components/Search/Filters.vue
+++ b/src/components/Search/Filters.vue
@@ -29,9 +29,10 @@ export default {
 <style lang="scss">
 .right-search .filter {
   display: flex;
-  margin-left: 3rem;
+  margin-left: 2rem;
   height: 2rem;
 
+
   .item {
     &:hover {
       width: 4rem;
diff --git a/src/components/Search/LoadMore.vue b/src/components/Search/LoadMore.vue
index aae8b5cb..9cf7ce55 100644
--- a/src/components/Search/LoadMore.vue
+++ b/src/components/Search/LoadMore.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="morexx">
     <button @click="loadMore">
-      <div class="text">Load All</div>
+      <div class="text">Load More</div>
     </button>
   </div>
 </template>
diff --git a/src/components/Search/Loader.vue b/src/components/Search/Loader.vue
index 86c27e15..1fb53229 100644
--- a/src/components/Search/Loader.vue
+++ b/src/components/Search/Loader.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="loaderx" :class="{ loader: loading, not_loader: !loading }">
-    <div class="content" v-if="!loading">/</div>
+    <div v-if="!loading">😹</div>
   </div>
 </template>
 
@@ -18,15 +18,14 @@ export default {
 <style lang="scss">
 .loaderx {
   position: absolute;
-  left: 0.65rem;
   top: 0.65rem;
   width: 1.5rem;
   height: 1.5rem;
+  border-radius: 50%;
 }
 
 .loader {
   border: dotted $blue;
-  border-radius: 50%;
   animation: spin 0.25s linear infinite;
 
   @keyframes spin {
@@ -40,8 +39,7 @@ export default {
 }
 
 .not_loader {
-  border: solid 1px;
-  border-radius: 50%;
-  background-image: url("");
+  display: grid;
+  place-items: center;
 }
 </style>
diff --git a/src/components/Search/Options.vue b/src/components/Search/Options.vue
index 7c8634e3..3de91319 100644
--- a/src/components/Search/Options.vue
+++ b/src/components/Search/Options.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="options" v-if="magic_flag">
+  <div class="options border rounded">
     <div class="item info">Filter by:</div>
     <div
       class="item"
@@ -54,6 +54,7 @@ export default {
 <style lang="scss">
 .right-search .options {
   display: flex;
+  margin-bottom: $small;
 
   .item {
     margin: $small;
diff --git a/src/components/Search/TracksGrid.vue b/src/components/Search/TracksGrid.vue
index 34751adb..8b074438 100644
--- a/src/components/Search/TracksGrid.vue
+++ b/src/components/Search/TracksGrid.vue
@@ -41,7 +41,6 @@ function loadMore() {
 <style lang="scss">
 .right-search .tracks-results {
   border-radius: 0.5rem;
-  margin-left: $small;
   padding: $small;
 }
 </style>
diff --git a/src/components/shared/TrackItem.vue b/src/components/shared/TrackItem.vue
index 33bde766..f4c91e1a 100644
--- a/src/components/shared/TrackItem.vue
+++ b/src/components/shared/TrackItem.vue
@@ -51,6 +51,10 @@ const playThis = (song) => {
 </script>
 
 <style lang="scss">
+.currentInQueue {
+  border: solid 2px $pink;
+}
+
 .track-item {
   display: flex;
   align-items: center;