diff --git a/packages/frontend/src/lib/i18n/locales/en.ts b/packages/frontend/src/lib/i18n/locales/en.ts
index 18c9e3f..356d0ee 100644
--- a/packages/frontend/src/lib/i18n/locales/en.ts
+++ b/packages/frontend/src/lib/i18n/locales/en.ts
@@ -274,6 +274,8 @@ export default {
 			trending: "Trending",
 			recent: "Most Recent",
 			popular: "Most Liked",
+			most_liked: "Most Liked",
+			most_played: "Most Played",
 			duration: "By Duration",
 			name: "A-Z",
 		},
diff --git a/packages/frontend/src/routes/models/[slug]/+page.svelte b/packages/frontend/src/routes/models/[slug]/+page.svelte
index 2c1505e..3c8df20 100644
--- a/packages/frontend/src/routes/models/[slug]/+page.svelte
+++ b/packages/frontend/src/routes/models/[slug]/+page.svelte
@@ -27,6 +27,14 @@ let images = $derived(
 		thumbnail: getAssetUrl(p.id, "thumbnail"),
 	})),
 );
+
+// Calculate total likes and plays from all videos
+let totalLikes = $derived(
+	data.videos.reduce((sum, video) => sum + (video.likes_count || 0), 0)
+);
+let totalPlays = $derived(
+	data.videos.reduce((sum, video) => sum + (video.plays_count || 0), 0)
+);
 </script>
 
 <Meta
@@ -171,32 +179,26 @@ let images = $derived(
 
       <!-- Stats -->
       <div
-        class="grid grid-cols-2 md:grid-cols-5 gap-4 mt-6 pt-6 border-t border-border/50"
+        class="grid grid-cols-2 md:grid-cols-4 gap-4 mt-6 pt-6 border-t border-border/50"
       >
-        <!-- <div class="text-center">
-          <div class="text-2xl font-bold text-primary">
-            {data.model.subscribers}
-          </div>
-          <div class="text-sm text-muted-foreground">Followers</div>
-        </div> -->
         <div class="text-center">
           <div class="text-2xl font-bold text-primary">
             {data.videos.length}
           </div>
           <div class="text-sm text-muted-foreground">{$_('models.videos')}</div>
         </div>
-        <!-- <div class="text-center">
+        <div class="text-center">
           <div class="text-2xl font-bold text-primary">
-            {data.model.stats.totalViews}
+            {totalLikes.toLocaleString()}
           </div>
-          <div class="text-sm text-muted-foreground">Total Views</div>
-        </div> -->
-        <!-- <div class="text-center">
+          <div class="text-sm text-muted-foreground">Total Likes</div>
+        </div>
+        <div class="text-center">
           <div class="text-2xl font-bold text-primary">
-            {data.model.stats.likes}
+            {totalPlays.toLocaleString()}
           </div>
-          <div class="text-sm text-muted-foreground">Likes</div>
-        </div> -->
+          <div class="text-sm text-muted-foreground">Total Plays</div>
+        </div>
         <div class="text-center">
           <div class="text-2xl font-bold text-primary">
             {data.commentsCount}
@@ -267,15 +269,18 @@ let images = $derived(
                 >
                   {video.title}
                 </h3>
-                <!-- <div
+                <div
                   class="flex items-center justify-between text-sm text-muted-foreground"
                 >
-                  <span>{video.views} views</span>
                   <div class="flex items-center gap-1">
-                    <HeartIcon class="w-4 h-4" />
-                    {video.likes}
+                    <span class="icon-[ri--play-fill] w-4 h-4"></span>
+                    {video.plays_count || 0}
                   </div>
-                </div> -->
+                  <div class="flex items-center gap-1">
+                    <span class="icon-[ri--heart-fill] w-4 h-4"></span>
+                    {video.likes_count || 0}
+                  </div>
+                </div>
               </CardContent>
             </Card>
           {/each}
diff --git a/packages/frontend/src/routes/videos/+page.svelte b/packages/frontend/src/routes/videos/+page.svelte
index e2d27ed..ad55264 100644
--- a/packages/frontend/src/routes/videos/+page.svelte
+++ b/packages/frontend/src/routes/videos/+page.svelte
@@ -17,7 +17,7 @@ import { formatVideoDuration } from "$lib/utils";
 const timeAgo = new TimeAgo("en");
 
 let searchQuery = $state("");
-let sortBy = $state("trending");
+let sortBy = $state("recent");
 let categoryFilter = $state("all");
 let durationFilter = $state("all");
 
@@ -42,20 +42,14 @@ const filteredVideos = $derived(() => {
 			return matchesSearch && matchesCategory && matchesDuration;
 		})
 		.sort((a, b) => {
-			// if (sortBy === "trending")
-			//   return (
-			//     parseInt(b.views.replace(/[^\d]/g, "")) -
-			//     parseInt(a.views.replace(/[^\d]/g, ""))
-			//   );
 			if (sortBy === "recent")
 				return (
 					new Date(b.upload_date).getTime() - new Date(a.upload_date).getTime()
 				);
-			// if (sortBy === "popular")
-			//   return (
-			//     parseInt(b.likes.replace(/[^\d]/g, "")) -
-			//     parseInt(a.likes.replace(/[^\d]/g, ""))
-			//   );
+			if (sortBy === "most_liked")
+				return (b.likes_count || 0) - (a.likes_count || 0);
+			if (sortBy === "most_played")
+				return (b.plays_count || 0) - (a.plays_count || 0);
 			if (sortBy === "duration") return b.movie.duration - a.movie.duration;
 			return a.title.localeCompare(b.title);
 		});
@@ -175,23 +169,23 @@ const filteredVideos = $derived(() => {
             <SelectTrigger
               class="w-full lg:w-48 bg-background/50 border-primary/20 focus:border-primary"
             >
-              {sortBy === 'trending'
-                ? $_('videos.sort.trending')
-                : sortBy === 'recent'
-                  ? $_('videos.sort.recent')
-                  : sortBy === 'popular'
-                    ? $_('videos.sort.popular')
+              {sortBy === 'recent'
+                ? $_('videos.sort.recent')
+                : sortBy === 'most_liked'
+                  ? $_('videos.sort.most_liked')
+                  : sortBy === 'most_played'
+                    ? $_('videos.sort.most_played')
                     : sortBy === 'duration'
                       ? $_('videos.sort.duration')
                       : $_('videos.sort.name')}
             </SelectTrigger>
             <SelectContent>
-              <SelectItem value="trending"
-                >{$_('videos.sort.trending')}</SelectItem
-              >
               <SelectItem value="recent">{$_('videos.sort.recent')}</SelectItem>
-              <SelectItem value="popular"
-                >{$_('videos.sort.popular')}</SelectItem
+              <SelectItem value="most_liked"
+                >{$_('videos.sort.most_liked')}</SelectItem
+              >
+              <SelectItem value="most_played"
+                >{$_('videos.sort.most_played')}</SelectItem
               >
               <SelectItem value="duration"
                 >{$_('videos.sort.duration')}</SelectItem