diff --git a/resources/js/Components/DropdownLink.vue b/resources/js/Components/DropdownLink.vue
index 6238e52a..0f207045 100644
--- a/resources/js/Components/DropdownLink.vue
+++ b/resources/js/Components/DropdownLink.vue
@@ -5,10 +5,22 @@ defineProps({
     href: String,
     as: String,
 });
+
+const dropdownLinkClasses = "block px-4 py-2 text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-800 transition duration-150 ease-in-out";
 </script>
 
 <template>
-    <Link :href="href" class="block px-4 py-2 text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-800 transition duration-150 ease-in-out">
-        <slot />
-    </Link>
+    <div>
+        <button v-if="as === 'button'" :class="dropdownLinkClasses" class="w-full text-start">
+            <slot />
+        </button>
+
+        <a v-else-if="as === 'a'" :class="dropdownLinkClasses" class="w-full text-start" :href="href">
+            <slot />
+        </a>
+
+        <Link v-else :href="href" :class="dropdownLinkClasses">
+            <slot />
+        </Link>
+    </div>
 </template>
diff --git a/resources/js/Components/Navbar/UserDropdown.vue b/resources/js/Components/Navbar/UserDropdown.vue
index 94511050..61320c0c 100644
--- a/resources/js/Components/Navbar/UserDropdown.vue
+++ b/resources/js/Components/Navbar/UserDropdown.vue
@@ -82,7 +82,7 @@ const logout = () => {
                     <div class="border-t border-gray-200 dark:border-gray-600" />
 
                     <!-- Authentication -->
-                    <form @submit.prevent="logout">
+                    <form method="POST" @submit.prevent="logout">
                         <DropdownLink as="button">
                             Log Out
                         </DropdownLink>
diff --git a/resources/js/Components/Navigation/BackButton.vue b/resources/js/Components/Navigation/BackButton.vue
index 974dbb17..5955674b 100644
--- a/resources/js/Components/Navigation/BackButton.vue
+++ b/resources/js/Components/Navigation/BackButton.vue
@@ -6,13 +6,18 @@ const props = defineProps({
     route: {
         type: String,
         required: true,
-    }
-})
-
+    },
+});
 </script>
 
 <template>
-    <Link :href="props.route">
-        <Icon icon="mdi:arrow-back" class="text-xl my-auto"></Icon>
-    </Link>
+    <div>
+        <Link :href="props.route">
+            <div class="flex flex-row gap-2">
+                <Icon icon="mdi:arrow-back" class="text-xl my-auto"></Icon>
+                <slot />
+            </div>
+        </Link>
+        <div class="mt-2 border-t border-gray-200 dark:border-gray-700"></div>
+    </div>
 </template>
diff --git a/resources/js/Components/Navigation/Navbar.vue b/resources/js/Components/Navigation/Navbar.vue
index e22461c8..b37530e4 100644
--- a/resources/js/Components/Navigation/Navbar.vue
+++ b/resources/js/Components/Navigation/Navbar.vue
@@ -3,8 +3,8 @@ import { ref } from "vue";
 import { Link, router } from "@inertiajs/vue3";
 import { Icon } from "@iconify/vue";
 import UserDropdown from "@/Components/Navbar/UserDropdown.vue";
-import NavLink from "@/Components/NavLink.vue";
 import NavLinkDropdown from "@/Components/NavLinkDropdown.vue";
+// import NavLink from "@/Components/NavLink.vue";
 import DropdownLink from "@/Components/DropdownLink.vue";
 import ResponsiveNavLink from "@/Components/ResponsiveNavLink.vue";
 import SecondaryButton from "@/Components/SecondaryButton.vue";
@@ -56,7 +56,7 @@ const { isDark, toggleDark } = useDarkMode();
 
                         <NavLinkDropdown
                             label="Resources"
-                            :active="route().current('resources.*')"
+                            :active="route().current('resources.index') || route().current('resource_edits.index')"
                         >
                             <DropdownLink :href="route('resources.index')">
                                 <Icon icon="mdi:magnify" class="mr-2" />
diff --git a/resources/js/Components/ResourceEdits/ApprovalActions.vue b/resources/js/Components/ResourceEdits/ApprovalActions.vue
new file mode 100644
index 00000000..aae57d08
--- /dev/null
+++ b/resources/js/Components/ResourceEdits/ApprovalActions.vue
@@ -0,0 +1,88 @@
+<script setup>
+import { Icon } from "@iconify/vue";
+import Upvotable from "@/Components/Upvote/Upvotable.vue";
+
+defineProps({
+    editedResource: {
+        type: Object,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <div class="mt-8 border-t border-gray-200 dark:border-gray-800 pt-6">
+        <div class="flex justify-center">
+            <Upvotable
+                :flexRow="true"
+                :upvotable-key="'edit'"
+                :upvotable-id="editedResource.id"
+                :initial-votes="editedResource.vote_score"
+                :user-vote="editedResource.user_vote"
+                :refresh="true"
+                class="flex items-center gap-6"
+            >
+                <!-- Downvote (Reject) Button -->
+                <template #alreadyDownvotedIcon>
+                    <span
+                        class="inline-flex items-center px-4 py-2 bg-red-600 text-white rounded-lg font-medium"
+                    >
+                        <Icon
+                            icon="mdi:close-circle"
+                            class="w-4 h-4 mr-2"
+                        />
+                        Rejected
+                    </span>
+                </template>
+                <template #downvoteIcon>
+                    <span
+                        class="inline-flex items-center px-4 py-2 bg-red-50 hover:bg-red-100 text-red-700 border border-red-200 rounded-lg font-medium transition-colors cursor-pointer"
+                    >
+                        <Icon
+                            icon="mdi:close-circle-outline"
+                            class="w-4 h-4 mr-2"
+                        />
+                        Reject Changes
+                    </span>
+                </template>
+
+                <!-- Vote Count -->
+                <template #votes="{ votes }">
+                    <div class="flex flex-col items-center">
+                        <span
+                            class="text-2xl font-bold text-gray-900 dark:text-gray-100"
+                            >{{ votes }}</span
+                        >
+                        <span class="text-sm text-gray-600 dark:text-gray-300">
+                            Approval{{ votes === 1 ? "" : "s" }}
+                        </span>
+                    </div>
+                </template>
+
+                <!-- Upvote (Approve) Button -->
+                <template #alreadyUpvotedIcon>
+                    <span
+                        class="inline-flex items-center px-4 py-2 bg-green-500 text-white rounded-lg font-medium"
+                    >
+                        <Icon
+                            icon="mdi:check-circle"
+                            class="w-4 h-4 mr-2"
+                        />
+                        Approved!
+                    </span>
+                </template>
+                <template #upvoteIcon>
+                    <span
+                        class="inline-flex items-center px-4 py-2 bg-green-200 hover:bg-green-300 text-green-800 border border-green-300 rounded-lg font-medium transition-colors cursor-pointer"
+                    >
+                        <Icon
+                            icon="mdi:check-circle-outline"
+                            class="w-4 h-4 mr-2"
+                        />
+                        Approve Changes
+                    </span>
+                </template>
+            </Upvotable>
+        </div>
+    </div>
+</template>
diff --git a/resources/js/Components/ResourceEdits/DiffViewTab.vue b/resources/js/Components/ResourceEdits/DiffViewTab.vue
new file mode 100644
index 00000000..ac894bff
--- /dev/null
+++ b/resources/js/Components/ResourceEdits/DiffViewTab.vue
@@ -0,0 +1,47 @@
+<script setup>
+import { Icon } from "@iconify/vue";
+
+defineProps({
+    changedFields: {
+        type: Array,
+        required: true,
+    },
+    hasChanges: {
+        type: Boolean,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <div v-if="hasChanges" class="space-y-6">
+        <div
+            v-for="field in changedFields"
+            :key="field.key"
+            class="bg-gray-50 dark:bg-gray-900 border border-gray-200 dark:border-gray-800 rounded-lg overflow-hidden"
+        >
+            <div
+                class="bg-gray-100 dark:bg-gray-800 px-4 py-2 border-b border-gray-200 dark:border-gray-800"
+            >
+                <h3
+                    class="font-semibold text-gray-900 dark:text-gray-100 flex items-center gap-2"
+                >
+                    <Icon
+                        icon="mdi:file-edit"
+                        class="w-4 h-4 text-primary"
+                    />
+                    {{ field.label }}
+                </h3>
+            </div>
+            <div class="p-4">
+                <component
+                    :is="field.component"
+                    :field="field"
+                />
+            </div>
+        </div>
+    </div>
+    <p v-else class="text-gray-500 dark:text-gray-400 italic p-4">
+        No changes to display in diff.
+    </p>
+</template>
diff --git a/resources/js/Components/ResourceEdits/FieldDisplay.vue b/resources/js/Components/ResourceEdits/FieldDisplay.vue
new file mode 100644
index 00000000..96c4ccd9
--- /dev/null
+++ b/resources/js/Components/ResourceEdits/FieldDisplay.vue
@@ -0,0 +1,54 @@
+<script setup>
+import Tag from "primevue/tag";
+import ResourceThumbnail from "@/Components/Resources/ResourceThumbnail.vue";
+
+defineProps({
+    field: {
+        type: Object,
+        required: true,
+    },
+    value: {
+        required: true,
+    },
+    altText: {
+        type: String,
+        default: 'Image',
+    },
+});
+</script>
+
+<template>
+    <div>
+        <h3 class="font-semibold text-gray-600 dark:text-gray-300 mb-2">
+            {{ field.label }}:
+        </h3>
+        <div v-if="field.key === 'image_url'">
+            <p v-if="!value" class="italic">Image Removed</p>
+            <ResourceThumbnail
+                v-else
+                :src="value"
+                :alt="altText"
+            />
+        </div>
+        <div
+            v-else-if="Array.isArray(value)"
+            class="flex flex-wrap gap-2"
+        >
+            <Tag
+                v-for="item in value"
+                :key="item"
+                :value="field.formatter ? field.formatter(item) : item"
+            />
+        </div>
+        <div
+            v-else
+            class="text-gray-800 dark:text-gray-100 p-2 rounded"
+        >
+            {{
+                field.formatter
+                    ? field.formatter(value)
+                    : value
+            }}
+        </div>
+    </div>
+</template>
diff --git a/resources/js/Components/ResourceEdits/HeaderSection.vue b/resources/js/Components/ResourceEdits/HeaderSection.vue
new file mode 100644
index 00000000..c949e2e7
--- /dev/null
+++ b/resources/js/Components/ResourceEdits/HeaderSection.vue
@@ -0,0 +1,71 @@
+<script setup>
+import { Icon } from "@iconify/vue";
+import BackButton from "@/Components/Navigation/BackButton.vue";
+import UserProfile from "@/Components/Profile/UserProfile.vue";
+import PrimaryButton from "@/Components/PrimaryButton.vue";
+
+defineProps({
+    editedResource: {
+        type: Object,
+        required: true,
+    },
+    originalResource: {
+        type: Object,
+        required: true,
+    },
+});
+
+const emit = defineEmits(['merge']);
+</script>
+
+<template>
+    <div class="my-2">
+        <BackButton
+            :route="
+                route('resources.show', {
+                    slug: originalResource.slug,
+                    tab: 'edits',
+                })
+            "
+        >
+            <span class="my-auto">Back to {{ originalResource.name }}</span>
+        </BackButton>
+        <div class="border-b border-gray-200 dark:border-gray-800 pb-6 mb-6">
+            <div class="flex items-start justify-between">
+                <div class="flex-1">
+                    <div class="flex items-center gap-3 mb-3">
+                        <h1
+                            class="text-3xl font-bold text-gray-900 dark:text-gray-100"
+                        >
+                            {{ editedResource.edit_title }}
+                        </h1>
+                    </div>
+                    <p
+                        class="text-gray-700 dark:text-gray-300 text-lg leading-relaxed mb-4"
+                    >
+                        {{ editedResource.edit_description }}
+                    </p>
+
+                    <UserProfile
+                        :user="editedResource.user"
+                        :date="editedResource.created_at"
+                    />
+                </div>
+                <div
+                    v-if="editedResource.can_merge_edits"
+                    class="ml-6"
+                >
+                    <PrimaryButton
+                        @click="emit('merge', editedResource.id)"
+                    >
+                        <Icon
+                            icon="mdi:source-merge"
+                            class="w-4 h-4 mr-2"
+                        />
+                        Merge Changes
+                    </PrimaryButton>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
diff --git a/resources/js/Components/ResourceEdits/SplitViewTab.vue b/resources/js/Components/ResourceEdits/SplitViewTab.vue
new file mode 100644
index 00000000..a5bae38f
--- /dev/null
+++ b/resources/js/Components/ResourceEdits/SplitViewTab.vue
@@ -0,0 +1,101 @@
+<script setup>
+import { Icon } from "@iconify/vue";
+import { Link } from "@inertiajs/vue3";
+import FieldDisplay from "./FieldDisplay.vue";
+
+defineProps({
+    changedFields: {
+        type: Array,
+        required: true,
+    },
+    originalResource: {
+        type: Object,
+        required: true,
+    },
+    hasChanges: {
+        type: Boolean,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
+        <!-- Proposed Changes Column -->
+        <div
+            class="bg-gray-50 dark:bg-gray-900 border border-gray-200 dark:border-gray-800 rounded-lg"
+        >
+            <div
+                class="bg-primary/5 dark:bg-primary/10 border-b border-gray-200 dark:border-gray-800 px-4 py-3"
+            >
+                <h2
+                    class="text-lg font-semibold text-gray-900 dark:text-gray-100 flex items-center gap-2"
+                >
+                    <Icon
+                        icon="mdi:plus-circle"
+                        class="w-5 h-5 text-primary"
+                    />
+                    Proposed Changes
+                </h2>
+            </div>
+            <div class="p-4 space-y-4">
+                <FieldDisplay
+                    v-for="field in changedFields"
+                    :key="field.key"
+                    :field="field"
+                    :value="field.proposedValue"
+                    altText="Proposed Image"
+                />
+                <p
+                    v-if="!hasChanges"
+                    class="text-gray-500 dark:text-gray-400 italic"
+                >
+                    No changes were proposed.
+                </p>
+            </div>
+        </div>
+
+        <!-- Current Version Column -->
+        <div
+            class="bg-gray-50 dark:bg-gray-900 border border-gray-200 dark:border-gray-800 rounded-lg"
+        >
+            <div
+                class="bg-gray-100 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-800 px-4 py-3"
+            >
+                <Link
+                    :href="
+                        route('resources.show', {
+                            slug: originalResource.slug,
+                        })
+                    "
+                    class="group"
+                >
+                    <h2
+                        class="text-lg font-semibold text-gray-900 dark:text-gray-100 flex items-center gap-2 group-hover:text-primary duration-200"
+                    >
+                        <Icon
+                            icon="mdi:file-document"
+                            class="w-5 h-5 text-gray-600 dark:text-gray-300 group-hover:text-primary duration-200"
+                        />
+                        Current Version
+                    </h2>
+                </Link>
+            </div>
+            <div class="p-4 space-y-4">
+                <FieldDisplay
+                    v-for="field in changedFields"
+                    :key="field.key"
+                    :field="field"
+                    :value="field.originalValue"
+                    altText="Current Image"
+                />
+                <p
+                    v-if="!hasChanges"
+                    class="text-gray-500 dark:text-gray-400 italic"
+                >
+                    No changes to compare.
+                </p>
+            </div>
+        </div>
+    </div>
+</template>
diff --git a/resources/js/Pages/ResourceEdits/Create.vue b/resources/js/Pages/ResourceEdits/Create.vue
index 539152b4..3d57d4e9 100644
--- a/resources/js/Pages/ResourceEdits/Create.vue
+++ b/resources/js/Pages/ResourceEdits/Create.vue
@@ -34,7 +34,8 @@ const props = defineProps({
         required: true,
     },
 });
-// TODO: MOVE TO AXIOS BECAUSE REDIRECT FROM SUCCESSES WILL NOT CLEAR STORAGE, CONFIRM WITH TEST
+
+// TODO: MOVE TO AXIOS BECAUSE REDIRECT FROM SUCCESSES WILL NOT CLEAR STORAGE, CONFIRM WITH TEST IN FUTURE
 const formData = useForm({
     edit_title: "",
     edit_description: "",
diff --git a/resources/js/Pages/ResourceEdits/Show.vue b/resources/js/Pages/ResourceEdits/Show.vue
index 2494e4d7..7b028e9f 100644
--- a/resources/js/Pages/ResourceEdits/Show.vue
+++ b/resources/js/Pages/ResourceEdits/Show.vue
@@ -1,20 +1,16 @@
 <script setup>
 import { computed } from "vue";
-import { Head, Link, router } from "@inertiajs/vue3";
-import { Icon } from "@iconify/vue";
+import { Head, router } from "@inertiajs/vue3";
 import { diffChars } from "diff";
 import { getDifficultyLabel, getPricingLabel, getPlatformLabel } from "@/Helpers/labels";
 
 import AppLayout from "@/Layouts/AppLayout.vue";
-import Tag from "primevue/tag";
-import TabView from "primevue/tabview";
+import Tabs from 'primevue/tabs';
+import TabList from 'primevue/tablist';
+import Tab from 'primevue/tab';
+import TabPanels from 'primevue/tabpanels';
 import TabPanel from "primevue/tabpanel";
-import ResourceThumbnail from "@/Components/Resources/ResourceThumbnail.vue";
-import Upvotable from "@/Components/Upvote/Upvotable.vue";
 import Commentable from "@/Components/Comments/Commentable.vue";
-import PrimaryButton from "@/Components/PrimaryButton.vue";
-import UserProfile from "@/Components/Profile/UserProfile.vue";
-import BackButton from "@/Components/Navigation/BackButton.vue";
 
 // Component mapping for the Difference (Diff) view
 import TextDiffViewer from "@/Components/Diff/TextDiffViewer.vue";
@@ -22,6 +18,12 @@ import SelectDiffViewer from "@/Components/Diff/SelectDiffViewer.vue";
 import TagDiffViewer from "@/Components/Diff/TagDiffViewer.vue";
 import ImageDiffViewer from "@/Components/Diff/ImageDiffViewer.vue";
 
+// Resource Edit Components
+import HeaderSection from "@/Components/ResourceEdits/HeaderSection.vue";
+import SplitViewTab from "@/Components/ResourceEdits/SplitViewTab.vue";
+import DiffViewTab from "@/Components/ResourceEdits/DiffViewTab.vue";
+import ApprovalActions from "@/Components/ResourceEdits/ApprovalActions.vue";
+
 const props = defineProps({
     editedResource: {
         type: Object,
@@ -106,325 +108,39 @@ const hasChanges = computed(() => changedFields.value.length > 0);
             <div class="bg-white dark:bg-gray-900 overflow-hidden shadow-xl sm:rounded-lg border border-transparent dark:border-gray-800">
                 <div class="p-7 sm:p-8">
                     <!-- Header Section -->
-                    <div class="my-2">
-                        <BackButton
-                            :route="
-                                route('resources.show', {
-                                    slug: originalResource.slug,
-                                    tab: 'edits',
-                                })
-                            "
-                        />
-                    </div>
-                    <div class="border-b border-gray-200 dark:border-gray-800 pb-6 mb-6">
-                        <div class="flex items-start justify-between">
-                            <div class="flex-1">
-                                <div class="flex items-center gap-3 mb-3">
-                                    <h1
-                                        class="text-3xl font-bold text-gray-900 dark:text-gray-100"
-                                    >
-                                        {{ editedResource.edit_title }}
-                                    </h1>
-                                </div>
-                                <p
-                                    class="text-gray-700 dark:text-gray-300 text-lg leading-relaxed mb-4"
-                                >
-                                    {{ editedResource.edit_description }}
-                                </p>
-
-                                <UserProfile
-                                    :user="editedResource.user"
-                                    :date="editedResource.created_at"
+                    <HeaderSection
+                        :edited-resource="editedResource"
+                        :original-resource="originalResource"
+                        @merge="mergeEdits"
+                    />
+
+                    <Tabs value="0">
+                        <TabList>
+                            <Tab value="0">Split View</Tab>
+                            <Tab value="1">View Differences</Tab>
+                        </TabList>
+                        <TabPanels>
+                            <!-- Side-by-Side Comparison Tab -->
+                            <TabPanel value="0">
+                                <SplitViewTab
+                                    :changed-fields="changedFields"
+                                    :original-resource="originalResource"
+                                    :has-changes="hasChanges"
                                 />
-                            </div>
-                            <div
-                                v-if="editedResource.can_merge_edits"
-                                class="ml-6"
-                            >
-                                <PrimaryButton
-                                    @click="mergeEdits(editedResource.id)"
-                                >
-                                    <Icon
-                                        icon="mdi:source-merge"
-                                        class="w-4 h-4 mr-2"
-                                    />
-                                    Merge Changes
-                                </PrimaryButton>
-                            </div>
-                        </div>
-                    </div>
-
-                    <TabView class="custom-tabview">
-                        <!-- Side-by-Side Comparison Tab -->
-                        <TabPanel header="Split View" class="custom-tab-panel">
-                            <div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
-                                <!-- Proposed Changes Column -->
-                                <div
-                                    class="bg-gray-50 dark:bg-gray-900 border border-gray-200 dark:border-gray-800 rounded-lg"
-                                >
-                                    <div
-                                        class="bg-primary/5 dark:bg-primary/10 border-b border-gray-200 dark:border-gray-800 px-4 py-3"
-                                    >
-                                        <h2
-                                            class="text-lg font-semibold text-gray-900 dark:text-gray-100 flex items-center gap-2"
-                                        >
-                                            <Icon
-                                                icon="mdi:plus-circle"
-                                                class="w-5 h-5 text-primary"
-                                            />
-                                            Proposed Changes
-                                        </h2>
-                                    </div>
-                                    <div class="p-4 space-y-4">
-                                        <div
-                                            v-for="field in changedFields"
-                                            :key="field.key"
-                                        >
-                                            <h3
-                                                class="font-semibold text-gray-600 dark:text-gray-300 mb-2"
-                                            >
-                                                {{ field.label }}:
-                                            </h3>
-                                            <div
-                                                v-if="field.key === 'image_url'"
-                                            >
-                                                <p v-if="!field.proposedValue" class="italic">Image Removed</p>
-                                                <ResourceThumbnail
-                                                    :src="field.proposedValue"
-                                                    :alt="'Proposed Image'"
-                                                />
-                                            </div>
-                                            <div
-                                                v-else-if="
-                                                    Array.isArray(
-                                                        field.proposedValue
-                                                    )
-                                                "
-                                                class="flex flex-wrap gap-2"
-                                            >
-                                                <Tag
-                                                    v-for="item in field.proposedValue"
-                                                    :key="item"
-                                                    :value="field.formatter ? field.formatter(item) : item"
-                                                />
-                                            </div>
-                                            <div
-                                                v-else
-                                                class="text-gray-800 dark:text-gray-100 p-2 rounded"
-                                            >
-                                                {{
-                                                    field.formatter
-                                                        ? field.formatter(
-                                                              field.proposedValue
-                                                          )
-                                                        : field.proposedValue
-                                                }}
-                                            </div>
-                                        </div>
-                                        <p
-                                            v-if="!hasChanges"
-                                            class="text-gray-500 dark:text-gray-400 italic"
-                                        >
-                                            No changes were proposed.
-                                        </p>
-                                    </div>
-                                </div>
+                            </TabPanel>
 
-                                <!-- Current Version Column -->
-                                <div
-                                    class="bg-gray-50 dark:bg-gray-900 border border-gray-200 dark:border-gray-800 rounded-lg"
-                                >
-                                    <div
-                                        class="bg-gray-100 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-800 px-4 py-3"
-                                    >
-                                        <Link
-                                            :href="
-                                                route('resources.show', {
-                                                    slug: originalResource.slug,
-                                                })
-                                            "
-                                            class="group"
-                                        >
-                                            <h2
-                                                class="text-lg font-semibold text-gray-900 dark:text-gray-100 flex items-center gap-2 group-hover:text-primary duration-200"
-                                            >
-                                                <Icon
-                                                    icon="mdi:file-document"
-                                                    class="w-5 h-5 text-gray-600 dark:text-gray-300 group-hover:text-primary duration-200"
-                                                />
-                                                Current Version
-                                            </h2>
-                                        </Link>
-                                    </div>
-                                    <div class="p-4 space-y-4">
-                                        <div
-                                            v-for="field in changedFields"
-                                            :key="field.key"
-                                        >
-                                            <h3
-                                                class="font-semibold text-gray-600 dark:text-gray-300 mb-2"
-                                            >
-                                                {{ field.label }}:
-                                            </h3>
-                                            <div
-                                                v-if="field.key === 'image_url'"
-                                            >
-                                                <p v-if="!field.originalValue" class="italic">Image Removed</p>
-                                                <ResourceThumbnail
-                                                    :src="field.originalValue"
-                                                    :alt="'Current Image'"
-                                                />
-                                            </div>
-                                            <div
-                                                v-else-if="
-                                                    Array.isArray(
-                                                        field.originalValue
-                                                    )
-                                                "
-                                                class="flex flex-wrap gap-2"
-                                            >
-                                                <Tag
-                                                    v-for="item in field.originalValue"
-                                                    :key="item"
-                                                    :value="field.formatter ? field.formatter(item) : item"
-                                                />
-                                            </div>
-                                            <div
-                                                v-else
-                                                class="text-gray-800 dark:text-gray-100 p-2 rounded"
-                                            >
-                                                {{
-                                                    field.formatter
-                                                        ? field.formatter(
-                                                              field.originalValue
-                                                          )
-                                                        : field.originalValue
-                                                }}
-                                            </div>
-                                        </div>
-                                        <p
-                                            v-if="!hasChanges"
-                                            class="text-gray-500 dark:text-gray-400 italic"
-                                        >
-                                            No changes to compare.
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                        </TabPanel>
+                            <!-- Diff Tab -->
+                            <TabPanel value="1">
+                                <DiffViewTab
+                                    :changed-fields="changedFields"
+                                    :has-changes="hasChanges"
+                                />
+                            </TabPanel>
+                        </TabPanels>
+                    </Tabs>
 
-                        <!-- Diff Tab -->
-                        <TabPanel
-                            header="View Differences"
-                            class="custom-tab-panel"
-                        >
-                            <div v-if="hasChanges" class="space-y-6">
-                                <div
-                                    v-for="field in changedFields"
-                                    :key="field.key"
-                                    class="bg-gray-50 dark:bg-gray-900 border border-gray-200 dark:border-gray-800 rounded-lg overflow-hidden"
-                                >
-                                    <div
-                                        class="bg-gray-100 dark:bg-gray-800 px-4 py-2 border-b border-gray-200 dark:border-gray-800"
-                                    >
-                                        <h3
-                                            class="font-semibold text-gray-900 dark:text-gray-100 flex items-center gap-2"
-                                        >
-                                            <Icon
-                                                icon="mdi:file-edit"
-                                                class="w-4 h-4 text-primary"
-                                            />
-                                            {{ field.label }}
-                                        </h3>
-                                    </div>
-                                    <div class="p-4">
-                                        <component
-                                            :is="field.component"
-                                            :field="field"
-                                        />
-                                    </div>
-                                </div>
-                            </div>
-                            <p v-else class="text-gray-500 dark:text-gray-400 italic p-4">
-                                No changes to display in diff.
-                            </p>
-                        </TabPanel>
-                    </TabView>
                     <!-- Approval Actions -->
-                    <div class="mt-8 border-t border-gray-200 dark:border-gray-800 pt-6">
-                        <div class="flex justify-center">
-                            <Upvotable
-                                :flexRow="true"
-                                :upvotable-key="'edit'"
-                                :upvotable-id="editedResource.id"
-                                :initial-votes="editedResource.vote_score"
-                                :user-vote="editedResource.user_vote"
-                                :refresh="true"
-                                class="flex items-center gap-6"
-                            >
-                                <!-- Downvote (Reject) Button -->
-                                <template #alreadyDownvotedIcon>
-                                    <span
-                                        class="inline-flex items-center px-4 py-2 bg-red-600 text-white rounded-lg font-medium"
-                                    >
-                                        <Icon
-                                            icon="mdi:close-circle"
-                                            class="w-4 h-4 mr-2"
-                                        />
-                                        Rejected
-                                    </span>
-                                </template>
-                                <template #downvoteIcon>
-                                    <span
-                                        class="inline-flex items-center px-4 py-2 bg-red-50 hover:bg-red-100 text-red-700 border border-red-200 rounded-lg font-medium transition-colors cursor-pointer"
-                                    >
-                                        <Icon
-                                            icon="mdi:close-circle-outline"
-                                            class="w-4 h-4 mr-2"
-                                        />
-                                        Reject Changes
-                                    </span>
-                                </template>
-
-                                <!-- Vote Count -->
-                                <template #votes="{ votes }">
-                                    <div class="flex flex-col items-center">
-                                        <span
-                                            class="text-2xl font-bold text-gray-900 dark:text-gray-100"
-                                            >{{ votes }}</span
-                                        >
-                                        <span class="text-sm text-gray-600 dark:text-gray-300">
-                                            Approval{{ votes === 1 ? "" : "s" }}
-                                        </span>
-                                    </div>
-                                </template>
-
-                                <!-- Upvote (Approve) Button -->
-                                <template #alreadyUpvotedIcon>
-                                    <span
-                                        class="inline-flex items-center px-4 py-2 bg-green-500 text-white rounded-lg font-medium"
-                                    >
-                                        <Icon
-                                            icon="mdi:check-circle"
-                                            class="w-4 h-4 mr-2"
-                                        />
-                                        Approved!
-                                    </span>
-                                </template>
-                                <template #upvoteIcon>
-                                    <span
-                                        class="inline-flex items-center px-4 py-2 bg-green-200 hover:bg-green-300 text-green-800 border border-green-300 rounded-lg font-medium transition-colors cursor-pointer"
-                                    >
-                                        <Icon
-                                            icon="mdi:check-circle-outline"
-                                            class="w-4 h-4 mr-2"
-                                        />
-                                        Approve Changes
-                                    </span>
-                                </template>
-                            </Upvotable>
-                        </div>
-                    </div>
+                    <ApprovalActions :edited-resource="editedResource" />
 
                     <Commentable
                         :commentable-id="props.editedResource.id"