diff --git a/src/pages/[locale]/news/index.astro b/src/pages/[locale]/news/index.astro
index dda68d3..df6c3d3 100644
--- a/src/pages/[locale]/news/index.astro
+++ b/src/pages/[locale]/news/index.astro
@@ -32,11 +32,17 @@ const newsItems = await getCollection("news", (post)=>{
         <div class="flex flex-col md:gap-8 gap-2 lg:max-w-4xl mx-auto bg-white p-8">
         {
         [...newsItems]
-            .sort((a, b) => 
-            new Date(b.data.date).getTime() - new Date(a.data.date).getTime()
-            )
+            .sort((a, b) => {
+            const dateDiff =
+                new Date(b.data.date).getTime() - new Date(a.data.date).getTime()
+
+            if (dateDiff !== 0) return dateDiff
+
+            return (a.data.order ?? 0) - (b.data.order ?? 0)
+            })
+            .slice(0,6)
             .map((item) => (
-            <NewsList data={item} />
+            <NewsCard data={item} />
             ))
         }
         </div>
diff --git a/src/pages/news/index.astro b/src/pages/news/index.astro
index dda68d3..7082101 100644
--- a/src/pages/news/index.astro
+++ b/src/pages/news/index.astro
@@ -31,14 +31,20 @@ const newsItems = await getCollection("news", (post)=>{
 
         <div class="flex flex-col md:gap-8 gap-2 lg:max-w-4xl mx-auto bg-white p-8">
         {
-        [...newsItems]
-            .sort((a, b) => 
-            new Date(b.data.date).getTime() - new Date(a.data.date).getTime()
-            )
-            .map((item) => (
-            <NewsList data={item} />
-            ))
-        }
+            [...newsItems]
+                .sort((a, b) => {
+                const dateDiff =
+                    new Date(b.data.date).getTime() - new Date(a.data.date).getTime()
+
+                if (dateDiff !== 0) return dateDiff
+
+                return (a.data.order ?? 0) - (b.data.order ?? 0)
+                })
+                .slice(0,6)
+                .map((item) => (
+                <NewsCard data={item} />
+                ))
+            }
         </div>
     </div>
     <FooterSection />