diff --git a/src/App.vue b/src/App.vue
index 2615bfb7..d4c365e1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,7 +18,7 @@
     </div>
     <!-- <SearchInput v-if="settings.use_sidebar && xl" /> -->
     <RightSideBar v-if="settings.use_sidebar && xl" />
-    <NowPlayingRight />
+    <BottomBar />
   </section>
 </template>
 
@@ -43,14 +43,14 @@ import { readLocalStorage, writeLocalStorage } from "@/utils";
 
 // @small-components
 import Modal from "@/components/modal.vue";
-import ContextMenu from "@/components/contextMenu.vue";
+import ContextMenu from "@/components/ContextMenu.vue";
 import Notification from "@/components/Notification.vue";
 
 // @app-grid-components
 import NavBar from "@/components/nav/NavBar.vue";
 import LeftSidebar from "./components/LeftSidebar/index.vue";
 import RightSideBar from "@/components/RightSideBar/Main.vue";
-import NowPlayingRight from "@/components/RightSideBar/NowPlayingRight.vue";
+import BottomBar from "@/components/BottomBar.vue";
 
 const queue = useQStore();
 const router = useRouter();
diff --git a/src/assets/scss/Global/app-grid.scss b/src/assets/scss/Global/app-grid.scss
index 36035370..491fea72 100644
--- a/src/assets/scss/Global/app-grid.scss
+++ b/src/assets/scss/Global/app-grid.scss
@@ -1,3 +1,5 @@
+$g-border: solid 1px $gray5;
+
 #app-grid {
   display: grid;
   grid-template-columns: min-content 1fr 29rem;
@@ -9,7 +11,7 @@
 
   gap: 0 1.5rem;
   height: 100%;
-  border: solid 1px $gray3;
+  border: $g-border;
   border-top: none;
   border-bottom: none;
   margin: 0 auto;
@@ -26,7 +28,7 @@
 
 .r-sidebar {
   grid-area: r-sidebar;
-  border-left: solid 1px $gray3;
+  border-left: $g-border;
 }
 
 .topnav {
@@ -41,11 +43,12 @@
   grid-template-rows: 1fr max-content;
   // border-top: none !important;
   // border-bottom: none !important;
-  border-right: solid 1px $gray3;
+  border-right: $g-border;
 }
 
 .b-bar {
   grid-area: bottombar;
+  border-top: $g-border;
 }
 
 // ====== MODIFIERS =======
diff --git a/src/assets/scss/moz.scss b/src/assets/scss/moz.scss
index 5156eecf..2e5a157a 100644
--- a/src/assets/scss/moz.scss
+++ b/src/assets/scss/moz.scss
@@ -14,23 +14,7 @@
     }
   }
 
-  // #app-grid.isSmall,
-  // #app-grid.disableSidebar {
-  //   #acontent {
-  //     margin-right: -$small;
-  //     padding-right: $medium;
-
-  //     .search-view {
-  //       margin-right: -0.8rem;
-  //     }
-  //   }
-  // }
-
-  // #app-grid.isSmall #page-search {
-  //   margin-right: $smaller;
-  // }
-
-  // #app-grid.disableSidebar #page-search {
-  //   margin-right: $smaller;
-  // }
+  #app-grid.noSidebar > #acontent {
+    padding-right: 1rem !important;
+  }
 }
diff --git a/src/components/RightSideBar/NowPlayingRight.vue b/src/components/BottomBar.vue
similarity index 91%
rename from src/components/RightSideBar/NowPlayingRight.vue
rename to src/components/BottomBar.vue
index 1ae3d2c6..2b7a41da 100644
--- a/src/components/RightSideBar/NowPlayingRight.vue
+++ b/src/components/BottomBar.vue
@@ -31,11 +31,13 @@
             </div>
             <div class="tags">
               <div class="title ellip">
-                {{ queue.currenttrack?.title || 'Hello there' }}
+                {{ queue.currenttrack?.title || "Hello there" }}
               </div>
               <ArtistName
                 :artists="queue.currenttrack?.artist || []"
-                :albumartist="queue.currenttrack?.albumartist || 'Welcome to alice'"
+                :albumartist="
+                  queue.currenttrack?.albumartist || 'Welcome to alice'
+                "
                 class="artist"
               />
             </div>
@@ -69,12 +71,12 @@ import { formatSeconds } from "@/utils";
 import { Routes } from "@/composables/enums";
 import useSettingsStore from "@/stores/settings";
 
-import ArtistName from "../shared/ArtistName.vue";
-import HotKeys from "../LeftSidebar/NP/HotKeys.vue";
-import Progress from "../LeftSidebar/NP/Progress.vue";
+import ArtistName from "@/components/shared/ArtistName.vue";
+import HotKeys from "@/components/LeftSidebar/NP/HotKeys.vue";
+import Progress from "@/components/LeftSidebar/NP/Progress.vue";
 
-import HeartSvg from "../../assets/icons/heart.svg";
-// import PlusSvg from "../../assets/icons/plus.svg";
+import HeartSvg from "@/assets/icons/heart.svg";
+// import PlusSvg from "@/assets/icons/plus.svg";
 
 const queue = useQStore();
 const settings = useSettingsStore();
@@ -82,13 +84,10 @@ const settings = useSettingsStore();
 
 <style lang="scss">
 .b-bar {
-  // height: 100%;
   background-color: rgb(22, 22, 22);
   display: grid;
   align-items: center;
   z-index: 1;
-  border-top: solid 1px $gray3;
-
 
   &:hover {
     ::-moz-range-thumb {
diff --git a/src/components/contextMenu.vue b/src/components/ContextMenu.vue
similarity index 100%
rename from src/components/contextMenu.vue
rename to src/components/ContextMenu.vue
diff --git a/src/components/Home.vue b/src/components/HomePage.vue
similarity index 100%
rename from src/components/Home.vue
rename to src/components/HomePage.vue
diff --git a/src/components/LeftSidebar/nowPlayingImg.vue b/src/components/LeftSidebar/NowPlayingImg.vue
similarity index 100%
rename from src/components/LeftSidebar/nowPlayingImg.vue
rename to src/components/LeftSidebar/NowPlayingImg.vue
diff --git a/src/components/LeftSidebar/index.vue b/src/components/LeftSidebar/index.vue
index 4460bef9..7c2ef145 100644
--- a/src/components/LeftSidebar/index.vue
+++ b/src/components/LeftSidebar/index.vue
@@ -11,7 +11,7 @@
 
 <script setup lang="ts">
 import Navigation from "@/components/LeftSidebar/Navigation.vue";
-import NPImg from "@/components/LeftSidebar/nowPlayingImg.vue";
+import NPImg from "./NowPlayingImg.vue";
 import Logo from "@/components/Logo.vue";
 
 import useSettingsStore from "@/stores/settings";
diff --git a/src/components/RightSideBar/Main.vue b/src/components/RightSideBar/Main.vue
index 683b6a6a..e476f03d 100644
--- a/src/components/RightSideBar/Main.vue
+++ b/src/components/RightSideBar/Main.vue
@@ -16,10 +16,10 @@
 </template>
 
 <script setup lang="ts">
-import Search from "./Search/Main.vue";
-import Queue from "./Queue.vue";
-import DashBoard from "./Home/Main.vue";
 import useTabStore from "../../stores/tabs";
+import DashBoard from "./Home/Main.vue";
+import Queue from "./Queue.vue";
+import Search from "./Search/Main.vue";
 import SearchInput from "./SearchInput.vue";
 
 const tabs = useTabStore();
diff --git a/src/components/nav/Titles/APTitle.vue b/src/components/nav/Titles/APTitle.vue
index f8e7f978..e262fb5f 100644
--- a/src/components/nav/Titles/APTitle.vue
+++ b/src/components/nav/Titles/APTitle.vue
@@ -16,14 +16,14 @@
 </template>
 
 <script setup lang="ts">
-import { useRoute } from "vue-router";
 import { computed } from "@vue/reactivity";
+import { useRoute } from "vue-router";
 
+import Input from "@/components/shared/NavSearchInput.vue";
 import PlayBtn from "@/components/shared/PlayBtn.vue";
 import { playSources, Routes } from "@/composables/enums";
 import useAlbumStore from "@/stores/pages/album";
 import usePStore from "@/stores/pages/playlist";
-import Input from "@/components/shared/Input.vue";
 
 defineProps<{
   header_shown: boolean;
diff --git a/src/components/nav/Titles/Folder.vue b/src/components/nav/Titles/Folder.vue
index feecf801..8295a617 100644
--- a/src/components/nav/Titles/Folder.vue
+++ b/src/components/nav/Titles/Folder.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script setup lang="ts">
-import SearchInput from "@/components/shared/Input.vue";
+import SearchInput from "@/components/shared/NavSearchInput.vue";
 import { Routes } from "@/composables/enums";
 import { subPath } from "@/interfaces";
 import { focusElem } from "@/utils";
diff --git a/src/components/shared/Input.vue b/src/components/shared/NavSearchInput.vue
similarity index 100%
rename from src/components/shared/Input.vue
rename to src/components/shared/NavSearchInput.vue
diff --git a/src/router/routes.ts b/src/router/routes.ts
index d0f245ae..dc7eb6c6 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -4,13 +4,10 @@ import useFStore from "@/stores/pages/folder";
 import usePTrackStore from "@/stores/pages/playlist";
 import usePStore from "@/stores/pages/playlists";
 
-import Home from "@/views/Home.vue";
-
 const routes = [
   {
     path: "/",
     name: "Home",
-    component: Home,
     redirect: "/folder/$home",
   },
   {
@@ -42,7 +39,7 @@ const routes = [
   {
     path: "/playlist/:pid",
     name: "PlaylistView",
-    component: () => import("@/views/playlist/index.vue"),
+    component: () => import("@/views/PlaylistView/index.vue"),
     beforeEnter: async (to: any) => {
       state.loading.value = true;
       await usePTrackStore()
@@ -60,7 +57,7 @@ const routes = [
   {
     path: "/albums/:hash",
     name: "AlbumView",
-    component: () => import("@/views/album/index.vue"),
+    component: () => import("@/views/AlbumView/index.vue"),
     beforeEnter: async (to: any) => {
       state.loading.value = true;
       const store = useAStore();
@@ -83,7 +80,7 @@ const routes = [
   {
     path: "/search/:page",
     name: "SearchView",
-    component: () => import("@/views/search/main.vue"),
+    component: () => import("@/views/SearchView/main.vue"),
   },
   {
     path: "/queue",
@@ -117,5 +114,7 @@ const routesList = routes.map((route, index) => {
 });
 
 // TODO: Use dynamic keys in routesList
+//       Try adding an index.ts on Foldered views, import main component and export it ...
+//       Then try importing it here as @/views/ThatView
 
 export { routes, routesList };
diff --git a/src/views/album/Bottom.vue b/src/views/AlbumView/Bottom.vue
similarity index 100%
rename from src/views/album/Bottom.vue
rename to src/views/AlbumView/Bottom.vue
diff --git a/src/views/album/Content.vue b/src/views/AlbumView/Content.vue
similarity index 100%
rename from src/views/album/Content.vue
rename to src/views/AlbumView/Content.vue
diff --git a/src/views/album/index.vue b/src/views/AlbumView/index.vue
similarity index 100%
rename from src/views/album/index.vue
rename to src/views/AlbumView/index.vue
diff --git a/src/views/Home.vue b/src/views/HomeView.vue
similarity index 77%
rename from src/views/Home.vue
rename to src/views/HomeView.vue
index 9a18c87d..84a26c45 100644
--- a/src/views/Home.vue
+++ b/src/views/HomeView.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import Home from "@/components/Home.vue";
+import Home from "@/components/HomePage.vue";
 </script>
 <style>
 .home {
diff --git a/src/views/playlist/index.vue b/src/views/PlaylistView/index.vue
similarity index 100%
rename from src/views/playlist/index.vue
rename to src/views/PlaylistView/index.vue
diff --git a/src/views/Search.vue b/src/views/SearchView.vue
similarity index 100%
rename from src/views/Search.vue
rename to src/views/SearchView.vue
diff --git a/src/views/search/albums.vue b/src/views/SearchView/albums.vue
similarity index 100%
rename from src/views/search/albums.vue
rename to src/views/SearchView/albums.vue
diff --git a/src/views/search/artists.vue b/src/views/SearchView/artists.vue
similarity index 100%
rename from src/views/search/artists.vue
rename to src/views/SearchView/artists.vue
diff --git a/src/views/search/folders.vue b/src/views/SearchView/folders.vue
similarity index 100%
rename from src/views/search/folders.vue
rename to src/views/SearchView/folders.vue
diff --git a/src/views/search/main.vue b/src/views/SearchView/main.vue
similarity index 100%
rename from src/views/search/main.vue
rename to src/views/SearchView/main.vue
diff --git a/src/views/search/tracks.vue b/src/views/SearchView/tracks.vue
similarity index 100%
rename from src/views/search/tracks.vue
rename to src/views/SearchView/tracks.vue