diff --git a/components/LinkViews/DefaultView.tsx b/components/LinkViews/Layouts/CardView.tsx
similarity index 84%
rename from components/LinkViews/DefaultView.tsx
rename to components/LinkViews/Layouts/CardView.tsx
index 714ee73..bc684c5 100644
--- a/components/LinkViews/DefaultView.tsx
+++ b/components/LinkViews/Layouts/CardView.tsx
@@ -1,4 +1,4 @@
-import LinkCard from "@/components/LinkViews/LinkComponents/LinkCard";
+import LinkCard from "@/components/LinkViews/LinkCard";
 import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
 
 export default function DefaultGridView({
diff --git a/components/LinkViews/GridView.tsx b/components/LinkViews/Layouts/GridView.tsx
similarity index 64%
rename from components/LinkViews/GridView.tsx
rename to components/LinkViews/Layouts/GridView.tsx
index 04619c7..bd701bf 100644
--- a/components/LinkViews/GridView.tsx
+++ b/components/LinkViews/Layouts/GridView.tsx
@@ -1,5 +1,5 @@
-import LinkCardGrid from "@/components/LinkViews/LinkComponents/LinkCardGrid";
-import {LinkIncludingShortenedCollectionAndTags} from "@/types/global";
+import LinkGrid from "@/components/LinkViews/LinkGrid";
+import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
 
 export default function CompactGridView({
   links,
@@ -11,7 +11,7 @@ export default function CompactGridView({
       {links.map((e, i) => {
         return (
           <div key={i} className="break-inside-avoid mb-5">
-            <LinkCardGrid link={e} count={i}/>
+            <LinkGrid link={e} count={i} />
           </div>
         );
       })}
diff --git a/components/LinkViews/ListView.tsx b/components/LinkViews/Layouts/ListView.tsx
similarity index 69%
rename from components/LinkViews/ListView.tsx
rename to components/LinkViews/Layouts/ListView.tsx
index 8b08add..16f0064 100644
--- a/components/LinkViews/ListView.tsx
+++ b/components/LinkViews/Layouts/ListView.tsx
@@ -1,4 +1,4 @@
-import LinkRow from "@/components/LinkViews/LinkComponents/LinkRow";
+import LinkList from "@/components/LinkViews/LinkList";
 import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
 
 export default function ListView({
@@ -9,7 +9,7 @@ export default function ListView({
   return (
     <div className="flex flex-col">
       {links.map((e, i) => {
-        return <LinkRow key={i} link={e} count={i} />;
+        return <LinkList key={i} link={e} count={i} />;
       })}
     </div>
   );
diff --git a/components/LinkViews/LinkComponents/LinkCard.tsx b/components/LinkViews/LinkCard.tsx
similarity index 100%
rename from components/LinkViews/LinkComponents/LinkCard.tsx
rename to components/LinkViews/LinkCard.tsx
diff --git a/components/LinkViews/LinkComponents/LinkCardGrid.tsx b/components/LinkViews/LinkGrid.tsx
similarity index 98%
rename from components/LinkViews/LinkComponents/LinkCardGrid.tsx
rename to components/LinkViews/LinkGrid.tsx
index 8198884..89ebcf1 100644
--- a/components/LinkViews/LinkComponents/LinkCardGrid.tsx
+++ b/components/LinkViews/LinkGrid.tsx
@@ -18,7 +18,7 @@ type Props = {
   className?: string;
 };
 
-export default function LinkCardGrid({ link, count, className }: Props) {
+export default function LinkGrid({ link, count, className }: Props) {
   const { collections } = useCollectionStore();
 
   const { links } = useLinkStore();
diff --git a/components/LinkViews/LinkComponents/LinkRow.tsx b/components/LinkViews/LinkList.tsx
similarity index 100%
rename from components/LinkViews/LinkComponents/LinkRow.tsx
rename to components/LinkViews/LinkList.tsx
diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsx
index 49f904f..9df5819 100644
--- a/pages/collections/[id].tsx
+++ b/pages/collections/[id].tsx
@@ -1,4 +1,4 @@
-import LinkCard from "@/components/LinkViews/LinkComponents/LinkCard";
+import LinkCard from "@/components/LinkViews/LinkCard";
 import useCollectionStore from "@/store/collections";
 import useLinkStore from "@/store/links";
 import {
@@ -21,9 +21,9 @@ import EditCollectionModal from "@/components/ModalContent/EditCollectionModal";
 import EditCollectionSharingModal from "@/components/ModalContent/EditCollectionSharingModal";
 import DeleteCollectionModal from "@/components/ModalContent/DeleteCollectionModal";
 import ViewDropdown from "@/components/ViewDropdown";
-import DefaultView from "@/components/LinkViews/DefaultView";
-import GridView from "@/components/LinkViews/GridView";
-import ListView from "@/components/LinkViews/ListView";
+import CardView from "@/components/LinkViews/Layouts/CardView";
+import GridView from "@/components/LinkViews/Layouts/GridView";
+import ListView from "@/components/LinkViews/Layouts/ListView";
 
 export default function Index() {
   const { settings } = useLocalSettingsStore();
@@ -91,7 +91,7 @@ export default function Index() {
   );
 
   const linkView = {
-    [ViewMode.Default]: DefaultView,
+    [ViewMode.Default]: CardView,
     // [ViewMode.Grid]: GridView,
     [ViewMode.List]: ListView,
   };
diff --git a/pages/dashboard.tsx b/pages/dashboard.tsx
index 795353b..4f58834 100644
--- a/pages/dashboard.tsx
+++ b/pages/dashboard.tsx
@@ -2,7 +2,7 @@ import useLinkStore from "@/store/links";
 import useCollectionStore from "@/store/collections";
 import useTagStore from "@/store/tags";
 import MainLayout from "@/layouts/MainLayout";
-import LinkCard from "@/components/LinkViews/LinkComponents/LinkCard";
+import LinkCard from "@/components/LinkViews/LinkCard";
 import { useEffect, useState } from "react";
 import useLinks from "@/hooks/useLinks";
 import Link from "next/link";
diff --git a/pages/links/index.tsx b/pages/links/index.tsx
index c6efa28..40fa141 100644
--- a/pages/links/index.tsx
+++ b/pages/links/index.tsx
@@ -7,8 +7,8 @@ import React, { useState } from "react";
 import PageHeader from "@/components/PageHeader";
 import { Sort, ViewMode } from "@/types/global";
 import ViewDropdown from "@/components/ViewDropdown";
-import DefaultView from "@/components/LinkViews/DefaultView";
-import ListView from "@/components/LinkViews/ListView";
+import CardView from "@/components/LinkViews/Layouts/CardView";
+import ListView from "@/components/LinkViews/Layouts/ListView";
 
 export default function Links() {
   const { links } = useLinkStore();
@@ -21,7 +21,7 @@ export default function Links() {
   useLinks({ sort: sortBy });
 
   const linkView = {
-    [ViewMode.Default]: DefaultView,
+    [ViewMode.Default]: CardView,
     // [ViewMode.Grid]: GridView,
     [ViewMode.List]: ListView,
   };
diff --git a/pages/links/pinned.tsx b/pages/links/pinned.tsx
index 14d9dd9..2c754a4 100644
--- a/pages/links/pinned.tsx
+++ b/pages/links/pinned.tsx
@@ -6,8 +6,8 @@ import React, { useState } from "react";
 import PageHeader from "@/components/PageHeader";
 import { Sort, ViewMode } from "@/types/global";
 import ViewDropdown from "@/components/ViewDropdown";
-import DefaultView from "@/components/LinkViews/DefaultView";
-import ListView from "@/components/LinkViews/ListView";
+import CardView from "@/components/LinkViews/Layouts/CardView";
+import ListView from "@/components/LinkViews/Layouts/ListView";
 
 export default function PinnedLinks() {
   const { links } = useLinkStore();
@@ -20,7 +20,7 @@ export default function PinnedLinks() {
   useLinks({ sort: sortBy, pinnedOnly: true });
 
   const linkView = {
-    [ViewMode.Default]: DefaultView,
+    [ViewMode.Default]: CardView,
     // [ViewMode.Grid]: GridView,
     [ViewMode.List]: ListView,
   };
diff --git a/pages/search.tsx b/pages/search.tsx
index 330a519..c8b9f1b 100644
--- a/pages/search.tsx
+++ b/pages/search.tsx
@@ -7,9 +7,9 @@ import { Sort, ViewMode } from "@/types/global";
 import { useRouter } from "next/router";
 import React, { useState } from "react";
 import ViewDropdown from "@/components/ViewDropdown";
-import DefaultView from "@/components/LinkViews/DefaultView";
-import GridView from "@/components/LinkViews/GridView";
-import ListView from "@/components/LinkViews/ListView";
+import CardView from "@/components/LinkViews/Layouts/CardView";
+import GridView from "@/components/LinkViews/Layouts/GridView";
+import ListView from "@/components/LinkViews/Layouts/ListView";
 import PageHeader from "@/components/PageHeader";
 
 export default function Search() {
@@ -43,7 +43,7 @@ export default function Search() {
   });
 
   const linkView = {
-    [ViewMode.Default]: DefaultView,
+    [ViewMode.Default]: CardView,
     // [ViewMode.Grid]: GridView,
     [ViewMode.List]: ListView,
   };
diff --git a/pages/tags/[id].tsx b/pages/tags/[id].tsx
index 407a92d..52f134e 100644
--- a/pages/tags/[id].tsx
+++ b/pages/tags/[id].tsx
@@ -8,9 +8,9 @@ import { Sort, TagIncludingLinkCount, ViewMode } from "@/types/global";
 import useLinks from "@/hooks/useLinks";
 import { toast } from "react-hot-toast";
 import ViewDropdown from "@/components/ViewDropdown";
-import DefaultView from "@/components/LinkViews/DefaultView";
-import GridView from "@/components/LinkViews/GridView";
-import ListView from "@/components/LinkViews/ListView";
+import CardView from "@/components/LinkViews/Layouts/CardView";
+import GridView from "@/components/LinkViews/Layouts/GridView";
+import ListView from "@/components/LinkViews/Layouts/ListView";
 
 export default function Index() {
   const router = useRouter();
@@ -95,7 +95,7 @@ export default function Index() {
   );
 
   const linkView = {
-    [ViewMode.Default]: DefaultView,
+    [ViewMode.Default]: CardView,
     // [ViewMode.Grid]: GridView,
     [ViewMode.List]: ListView,
   };
@@ -109,7 +109,7 @@ export default function Index() {
         <div className="flex gap-3 items-center justify-between">
           <div className="flex gap-3 items-center">
             <div className="flex gap-2 items-center font-thin">
-              <i className={'bi-hash text-primary text-3xl'}/>
+              <i className={"bi-hash text-primary text-3xl"} />
 
               {renameTag ? (
                 <>
@@ -129,16 +129,16 @@ export default function Index() {
                       <i className={"bi-check text-neutral text-2xl"}></i>
                     </div>
                     <div
-                        onClick={() => cancelUpdateTag()}
-                        id="expand-dropdown"
-                        className="btn btn-ghost btn-square btn-sm"
+                      onClick={() => cancelUpdateTag()}
+                      id="expand-dropdown"
+                      className="btn btn-ghost btn-square btn-sm"
                     >
                       <i className={"bi-x text-neutral text-2xl"}></i>
                     </div>
                   </form>
                 </>
               ) : (
-                  <>
+                <>
                   <p className="sm:text-4xl text-3xl capitalize">
                     {activeTag?.name}
                   </p>
@@ -151,11 +151,13 @@ export default function Index() {
                       }`}
                     >
                       <div
-                          tabIndex={0}
-                          role="button"
-                          className="btn btn-ghost btn-sm btn-square text-neutral"
+                        tabIndex={0}
+                        role="button"
+                        className="btn btn-ghost btn-sm btn-square text-neutral"
                       >
-                        <i className={"bi-three-dots text-neutral text-2xl"}></i>
+                        <i
+                          className={"bi-three-dots text-neutral text-2xl"}
+                        ></i>
                       </div>
                       <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-box w-36 mt-1">
                         <li>