diff --git a/src/components/SinglePostCard.astro b/src/components/SinglePostCard.astro
index b7e2640..2900666 100644
--- a/src/components/SinglePostCard.astro
+++ b/src/components/SinglePostCard.astro
@@ -8,7 +8,6 @@ import {
 } from "./ui/card";
 
 const { post, lang } = Astro.props;
-// Astro.url.toString().split("/").slice(0,-2).concat(post.slug).join("/").split("/").slice(0,-1).join("/")
 ---
 
 <div>
diff --git a/src/pages/404.astro b/src/pages/404.astro
index e69de29..741e1b9 100644
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -0,0 +1,19 @@
+---
+import MainLayout from "../layouts/MainLayout.astro";
+import SinglePage from "../layouts/SinglePage.astro";
+---
+
+<MainLayout
+  title="Error 404"
+  ,
+  description="This page doesn't exists"
+  ,
+  lang="en"
+>
+  <SinglePage>
+    <div class="text-2xl text-center h-[80vh] grid place-content-center">
+      <p class="text-accent">It looks like this page doesn't exists!</p>
+      <a href={Astro.url.origin} class="text-blue-500">Home</a>
+    </div>
+  </SinglePage>
+</MainLayout>
diff --git a/src/pages/[lang]/blog/[...slug].astro b/src/pages/[lang]/blog/[...slug].astro
index 030e64f..2739664 100644
--- a/src/pages/[lang]/blog/[...slug].astro
+++ b/src/pages/[lang]/blog/[...slug].astro
@@ -29,6 +29,7 @@ const { Content } = await page.render();
     class="prose prose-moi m-[auto] sm:prose-sm md:prose-md xl:prose-lg text-justify"
   >
     <div class="text-center">
+      <!--<img src={page.data.image.url} alt={page.data.image.alt} class="rounded-lg max-h-[25vh] m-auto"> -->
       <h1 class="lg:text-4xl text-2xl">{page.data.title}</h1>
       <p>{page.data.author} • {formattedDate}</p>
     </div>
diff --git a/src/pages/[lang]/blog/index.astro b/src/pages/[lang]/blog/index.astro
index 759d6bd..807d302 100644
--- a/src/pages/[lang]/blog/index.astro
+++ b/src/pages/[lang]/blog/index.astro
@@ -22,7 +22,7 @@ var filtered_posts = posts.filter(
 
 <MainLayout title={title} description={description} lang={Astro.currentLocale}>
   <SinglePageBlogMode>
-    <PostsList filteredPosts={filtered_posts} />
+    <PostsList filteredPosts={filtered_posts} lang={Astro.currentLocale} />
     </div>
   </SinglePageBlogMode>
 </MainLayout>
diff --git a/src/pages/[lang]/blog/tags/[tag].astro b/src/pages/[lang]/blog/tags/[tag].astro
index c39c511..f05d23a 100644
--- a/src/pages/[lang]/blog/tags/[tag].astro
+++ b/src/pages/[lang]/blog/tags/[tag].astro
@@ -7,7 +7,7 @@ import PostsList from "../../../../components/PostsList.astro";
 
 export async function getStaticPaths() {
   const allPosts = await getBlogPosts();
-  const tags = ["test", "astro", "javascript"];
+  const tags = [...new Set(allPosts.map((post) => post.data.tags).flat())];
 
   var paths = [];
 
@@ -31,6 +31,6 @@ const filteredPosts = posts.filter((post) => post.data.tags?.includes(tag) && po
 
 <MainLayout title={tag} description={"desc"} lang={lang}>
   <SinglePageBlogMode>
-    <PostsList filteredPosts={filteredPosts} />
+    <PostsList filteredPosts={filteredPosts} lang={Astro.currentLocale} />
   </SinglePageBlogMode>
 </MainLayout>