diff --git a/assets/css/style.scss b/assets/css/style.scss
index 9928089..685318b 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -7,6 +7,10 @@ img, svg {
   position: static;
 }
 
+body {
+  @apply dark:bg-dark-900
+}
+
 * {
   @apply select-none outline-none;
 }
diff --git a/assets/img/404.png b/assets/img/404.png
deleted file mode 100644
index ae04eab..0000000
Binary files a/assets/img/404.png and /dev/null differ
diff --git a/assets/img/404.svg b/assets/img/404.svg
deleted file mode 100644
index 019fe9f..0000000
--- a/assets/img/404.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 400 300"><defs><linearGradient id="linear-gradient" x1="129.92" y1="151.83" x2="141.25" y2="124.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff" stop-opacity="0"/><stop offset="0.98" stop-color="#84210b"/></linearGradient><linearGradient id="linear-gradient-2" x1="191.4" y1="189.9" x2="201.69" y2="165.53" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-3" x1="252.75" y1="222.63" x2="261.58" y2="201.71" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-4" x1="57.42" y1="169.12" x2="64.55" y2="159.19" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-5" x1="215.78" y1="261.77" x2="221.13" y2="254.14" xlink:href="#linear-gradient"/></defs><title>141-150</title><g style="isolation:isolate"><g id="Layer_2" data-name="Layer 2"><path d="M26.94,144.57,162.55,65.7a6.41,6.41,0,0,1,6.41,0L371.75,181.75a6.41,6.41,0,0,1,0,11.12L242.09,267.75a20.93,20.93,0,0,1-20.93,0L27,155.67A6.41,6.41,0,0,1,26.94,144.57Z" fill="#ffb3a6"/><path d="M169.6,82.76V24h-3.9V82.49A4.91,4.91,0,0,0,169.6,82.76Z" fill="#772e29"/><polygon points="81.88 170.69 199.74 238.22 228.71 221.19 111.69 153.47 81.88 170.69" fill="#a04d42"/><polygon points="111.69 153.47 111.69 187.77 81.88 170.69 111.69 153.47" fill="#772e29"/><ellipse cx="168.11" cy="26.09" rx="14.8" ry="17.07" transform="translate(-1.89 32.55) rotate(-11)" fill="#f84a4b"/><ellipse cx="168.11" cy="26.09" rx="11.9" ry="13.73" transform="translate(-1.89 32.55) rotate(-11)" fill="none" stroke="#f2f2f2" stroke-miterlimit="10"/><path d="M169.12,17.52a2.2,2.2,0,0,0-2.9,0c-.87.91-.57,2.17-.57,3.32v3.68c0,1.4,0,2.8,0,4.2a2.12,2.12,0,0,0,2.89,2.12c1.19-.45,1.09-1.63,1.09-2.69,0-2.52,0-5,0-7.57,0-.88.27-2-.3-2.82A1.62,1.62,0,0,0,169.12,17.52Z" fill="#fff"/><path d="M167.21,32.9a1.24,1.24,0,0,0-.75.72c-.59,1.46,1,3.19,2.36,2a1.67,1.67,0,0,0-.49-2.61A1.49,1.49,0,0,0,167.21,32.9Z" fill="#fff"/><polyline points="197.09 118.25 125.5 160.24 84.02 135.03 142.61 100.82" opacity="0.63" fill="url(#linear-gradient)" style="mix-blend-mode:multiply"/><path d="M237.12,159.14a46.23,46.23,0,0,1-14.26,4.35c-7.5,1.1-17.71,2.92-24.61-1.16-6.46-3.82-6.82-10.54-4.3-16.72L146,173.35l50.75,28.15,55.93-32.8Z" opacity="0.63" fill="url(#linear-gradient-2)" style="mix-blend-mode:multiply"/><polyline points="305.38 204.42 257.36 232.59 213.8 208.42 264.25 179.21" opacity="0.63" fill="url(#linear-gradient-3)" style="mix-blend-mode:multiply"/><path d="M324.42,178.31l-2.47-1.43-9.51.91.87-2.66-12.07-3.34H264l-21.58,6.8V191l19.68,11.36-1,0v12.45l13.6,7.85L286,216.18l7.27,4.2,11.71-6.81v-8.42l32.78-19.05.09,0V173.69Zm-40.35,23.21-17.24-10,41.58-4.19Z" fill="#313131"/><path d="M324.42,178.31l-2.47-1.43-9.51.91.87-2.66-12.07-3.34H264l-21.58,6.8V191l19.68,11.36-1,0v12.45l13.6,7.85L286,216.18l7.27,4.2,11.71-6.81v-8.42l32.78-19.05.09,0V173.69Zm-40.35,23.21-17.24-10,41.58-4.19Z" fill="#606060" opacity="0.95"/><path d="M297.67,196.93l7.27,4.2-11.71,6.81-7.27-4.2-11.27,6.55-13.6-7.85,11.27-6.55-30-17.29,13.52-7.86,66-6.29,15.86,9.16Zm-13.6-7.85,24.34-14.14-41.58,4.19,17.24,10" fill="#313131"/><path d="M263.84,150.25V136.11l-10,1.22-.2-.12a39.56,39.56,0,0,0-5.57-2.63c-1.18-3.14-4-9.15-8.3-10.29-5.94-1.56-15.93.21-15.93.21l-22.06,9.64c.1,0,1.63.43,3.82.93a69.46,69.46,0,0,0-12,5.55,55.39,55.39,0,0,0-7.18,4.9l-8.84,1.07v14.35h0q.07,8.6,10.29,14.52,11.35,6.55,28.35,5.86A67.87,67.87,0,0,0,247.93,172q14.79-8.6,15.91-18.43A14.68,14.68,0,0,0,263.84,150.25Zm-56.72-1.78a46.55,46.55,0,0,1,19.35-6.57q9.44-.82,15,2.37a10.9,10.9,0,0,1,2.58,2c-5.86,7.65-15.12,12.8-24.62,14.79-7.31,1.53-13.85,1.05-20-3.36-.59-.42-1.24-.9-1.92-1.41Q200.27,152.45,207.13,148.46Z" fill="#313131"/><path d="M263.84,150.25V136.11l-10,1.22-.2-.12a39.56,39.56,0,0,0-5.57-2.63c-1.18-3.14-4-9.15-8.3-10.29-5.94-1.56-15.93.21-15.93.21l-22.06,9.64c.1,0,1.63.43,3.82.93a69.46,69.46,0,0,0-12,5.55,55.39,55.39,0,0,0-7.18,4.9l-8.84,1.07v14.35h0q.07,8.6,10.29,14.52,11.35,6.55,28.35,5.86A67.87,67.87,0,0,0,247.93,172q14.79-8.6,15.91-18.43A14.68,14.68,0,0,0,263.84,150.25Zm-56.72-1.78a46.55,46.55,0,0,1,19.35-6.57q9.44-.82,15,2.37a10.9,10.9,0,0,1,2.58,2c-5.86,7.65-15.12,12.8-24.62,14.79-7.31,1.53-13.85,1.05-20-3.36-.59-.42-1.24-.9-1.92-1.41Q200.27,152.45,207.13,148.46Z" fill="#606060" opacity="0.95"/><path d="M263.84,139.5q-1.12,9.83-15.91,18.43a67.87,67.87,0,0,1-31.78,9.29q-17,.69-28.35-5.86T177.6,145q1.15-9.85,15.93-18.44a67.75,67.75,0,0,1,31.77-9.27q17-.68,28.32,5.87T263.84,139.5ZM215,156.65a46.56,46.56,0,0,0,19.35-6.58q9.91-5.76,11.29-11.23t-4.16-8.67q-5.54-3.2-15-2.37a46.55,46.55,0,0,0-19.35,6.57q-9.9,5.75-11.28,11.23t4.15,8.67q5.55,3.2,15,2.38" fill="#313131"/><path d="M194.63,106.32l-2.47-1.43-9.51.91.87-2.66L171.45,99.8H134.19l-21.58,6.8V119l19.68,11.36-1,0v12.45l13.6,7.85,11.27-6.55,7.27,4.2,11.71-6.81v-8.42l32.78-19.05.09,0V101.7Zm-40.35,23.21-17.24-10,41.58-4.19Z" fill="#313131"/><path d="M194.63,106.32l-2.47-1.43-9.51.91.87-2.66L171.45,99.8H134.19l-21.58,6.8V119l19.68,11.36-1,0v12.45l13.6,7.85,11.27-6.55,7.27,4.2,11.71-6.81v-8.42l32.78-19.05.09,0V101.7Zm-40.35,23.21-17.24-10,41.58-4.19Z" fill="#606060" opacity="0.95"/><path d="M167.88,124.94l7.27,4.2-11.71,6.81-7.27-4.2-11.27,6.55-13.6-7.85,11.27-6.55-30-17.29,13.52-7.86,66-6.29L208,101.61Zm-13.6-7.85,24.34-14.14L137,107.13l17.24,10" fill="#313131"/><path d="M65.66,144.73,37.93,160.92l24.39,14.82,27.17-15.93C81.25,155.21,73,150.58,65.66,144.73Z" opacity="0.63" fill="url(#linear-gradient-4)" style="mix-blend-mode:multiply"/><path d="M224.82,236l-27.73,16.19L221.48,267l27.17-15.93C240.41,246.51,232.19,241.88,224.82,236Z" opacity="0.63" fill="url(#linear-gradient-5)" style="mix-blend-mode:multiply"/><path d="M77.8,166.71l22.3-13.23a3.41,3.41,0,0,0,.12-5.8l-18.43-12a5.71,5.71,0,0,0-6.31,0l-21.9,14.74a3.41,3.41,0,0,0,.15,5.75L71.17,166.7A6.47,6.47,0,0,0,77.8,166.71Z" fill="#b24800"/><path d="M77.8,164.71l22.3-13.23a3.41,3.41,0,0,0,.12-5.8l-18.43-12a5.71,5.71,0,0,0-6.31,0l-21.9,14.74a3.41,3.41,0,0,0,.15,5.75l17.43,10.46A6.47,6.47,0,0,0,77.8,164.71Z" fill="#df5d00"/><path d="M74.09,111.7,62.25,149.15s-2.89,9.5,14.87,8.54,15.42-9.78,15.42-9.78L80.69,111.7" fill="#ff8522"/><path d="M69.7,125.57S72.05,128,77.46,128c6.76,0,7.48-3.33,7.48-3.33l2.48,7.57s-1.78,4.27-10,4.13c-7.4-.12-10.3-2.78-10.3-2.78" fill="#fff"/><path d="M65.3,139.84a16.92,16.92,0,0,0,12,4.76c8.79-.1,12.09-6.35,12.09-6.35l2.61,8s-3.77,5.85-14.61,6.63c-10.22.73-14.61-5-14.61-5" fill="#fff"/><path d="M76.64,112H74.11L62.27,149.43s-2.69,8.86,13.11,8.6C75.72,142.67,76.49,127.33,76.64,112Z" fill="#ff8522" opacity="0.15" style="mix-blend-mode:multiply"/><ellipse cx="77.46" cy="111.98" rx="3.37" ry="1.93" fill="#ff9f57"/><path d="M233.64,260.5l22.3-13.23a3.41,3.41,0,0,0,.12-5.8l-18.43-12a5.71,5.71,0,0,0-6.31,0l-21.9,14.74a3.41,3.41,0,0,0,.15,5.75L227,260.48A6.47,6.47,0,0,0,233.64,260.5Z" fill="#b24800"/><path d="M233.64,258.49l22.3-13.23a3.41,3.41,0,0,0,.12-5.8l-18.43-12a5.71,5.71,0,0,0-6.31,0l-21.9,14.74a3.41,3.41,0,0,0,.15,5.75L227,258.48A6.47,6.47,0,0,0,233.64,258.49Z" fill="#df5d00"/><path d="M229.93,205.49l-11.84,37.45s-2.89,9.5,14.87,8.54,15.42-9.78,15.42-9.78l-11.84-36.21" fill="#ff8522"/><path d="M225.54,219.36s2.35,2.43,7.76,2.43c6.76,0,7.48-3.33,7.48-3.33l2.48,7.57s-1.78,4.27-10,4.13c-7.4-.12-10.3-2.78-10.3-2.78" fill="#fff"/><path d="M221.15,233.63a16.92,16.92,0,0,0,12,4.76c8.79-.1,12.09-6.35,12.09-6.35l2.61,8s-3.77,5.85-14.61,6.63c-10.22.73-14.61-5-14.61-5" fill="#fff"/><path d="M232.49,205.77h-2.54l-11.84,37.45s-2.69,8.86,13.11,8.6C231.56,236.46,232.33,221.12,232.49,205.77Z" fill="#ff8522" opacity="0.15" style="mix-blend-mode:multiply"/><ellipse cx="233.3" cy="205.77" rx="3.37" ry="1.93" fill="#ff9f57"/></g></g></svg>
\ No newline at end of file
diff --git a/components/Footer.vue b/components/Footer.vue
index 0d76598..35258c9 100644
--- a/components/Footer.vue
+++ b/components/Footer.vue
@@ -16,7 +16,9 @@
             <a class="font-semibold" href="https://twitter.com/ArthurDanj" target="_blank">
               <img class="inline img" src="@/assets/img/socials/twitter.svg" alt="Twitter logo" height="20" width="20" />
               <span class="link">Twitter</span>
-            </a> {{ $t('footer.separator') }}
+            </a>
+            <br class="md:hidden"/>
+            {{ $t('footer.separator') }}
             <a class="font-semibold" href="mailto:contact@arthurdanjou.fr" target="_blank">
               <svg class="inline img" width="20" height="20" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" />
@@ -24,11 +26,11 @@
               <span class="link">Mail</span>
               </a>
           </p>
+          <br class="md:hidden"/>
           <span class="inline dark:text-dark-200 text-gray-600 text-xs">
             {{ $t('footer.links_click') }}
           </span>
         </div>
-        <br class="md:hidden"/>
         <p>
           {{ $t('footer.credits') }}
           <a class="font-semibold" target="_blank" href="https://nuxtjs.org">
diff --git a/content/articles/fr/new-version-new-website.md b/content/articles/fr/new-version-new-website.md
index f6cd405..9dfa350 100644
--- a/content/articles/fr/new-version-new-website.md
+++ b/content/articles/fr/new-version-new-website.md
@@ -73,8 +73,6 @@ Dans cette version, j'ai utilisé plusieurs technologies :
 
 ## 5. Conclusion
 
-Pour conclure, je suis très satisfait du résultat de cette nouvelle version. 
-Je vous laisse visiter le reste du site
-
-### Informations Supplémentaires
+Pour conclure, je suis très satisfait du résultat de cette nouvelle version, de ses fonctionnalités.
+Je vous laisse visiter le reste du site et me donner votre avis !
 
diff --git a/content/articles/fr/test-1.md b/content/articles/fr/test-1.md
index 00ddbce..7d14677 100644
--- a/content/articles/fr/test-1.md
+++ b/content/articles/fr/test-1.md
@@ -28,6 +28,8 @@ console.log('Hello World !')
 
 Test de lien [Twitter](https://twitter.com/ArthurDanj)
 
+Lien [GitHub](https://github.com/arthurdanjou)
+
 ---
 
 Hey
@@ -36,9 +38,3 @@ __hey__
 _hey_
 ~~Hey~~
 
-```mermaid 
-graph TD
-  A --> B
-  B --> C
-  C --> A
-```
diff --git a/layouts/default.vue b/layouts/default.vue
index 164e82a..ab72648 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="dark:bg-dark-900 dark:text-white font-sans">
     <Header />
-    <Nuxt class="z-10 pt-16 lg:pt-24 content"/>
+    <Nuxt class="z-10 pt-16 lg:pt-24 content" />
     <Footer />
   </div>
 </template>
@@ -10,12 +10,9 @@
 import Header from "~/components/Header";
 import Footer from "~/components/Footer";
 export default {
-  components: {Footer, Header}
+  components: {Footer, Header},
 }
 </script>
 
 <style scoped>
-.content {
-  min-height: calc(100vh - 118px);
-}
 </style>
diff --git a/layouts/error-2.vue b/layouts/error-2.vue
deleted file mode 100644
index f2db3a4..0000000
--- a/layouts/error-2.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <div class="dark:bg-dark-900 dark:text-white font-sans">
-    <Nuxt class="content"/>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "error-2"
-}
-</script>
-
-<style scoped>
-.content {
-  min-height: calc(100vh - 118px);
-}
-</style>
diff --git a/layouts/error.vue b/layouts/error.vue
index 5b2b249..ace00c9 100644
--- a/layouts/error.vue
+++ b/layouts/error.vue
@@ -1,23 +1,36 @@
 <template>
-  <main class="error relative">
-    <div class="w-full h-screen">
-      <img class="w-full h-full" src="~/assets/img/404.png" alt="404 Image" />
-    </div>
-    <div class="text absolute inset-1/4 w-full h-screen mb-8">
-      <div class="flex items-center justify-center h-full">
-        <div class="flex flex-col justify-center text-center">
-          <h1 class="title dark:text-white font-bold">
-            404
-          </h1>
-          <h2 class="text-4xl dark:text-white">
-            {{ $t('404.description') }}
-          </h2>
-          <p class="text-2xl dark:text-dark-100 mb-4">
-            {{ $t('404.no_page') }}
-          </p>
+  <main class="error w-full px-5 xl:px-64">
+    <div class="mt-24 w-full h-full flex items-center justify-center">
+      <div class="flex flex-col items-center md:mb-20">
+        <div class="flex">
+          <div class="h-16 w-16 mr-4">
+            <svg class="icon inline" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
+            </svg>
+          </div>
+          <div class="mb-12 lining-nums">
+            <div class="mb-2">
+              <p v-if="error.statusCode === 404" class="text-3xl md:text-6xl dark:text-white font-bold">
+                {{ $t('error.error').toUpperCase() }} 404
+              </p>
+              <p v-else class="text-3xl md:text-6xl dark:text-white font-bold">
+                {{ $t('error.error').toUpperCase() }} 500
+              </p>
+            </div>
+            <div class="flex flex-col">
+              <p v-if="error.statusCode === 404" class="text-xl md:text-2xl text-gray-900 dark:text-dark-100">
+                {{ $t('error.no_page') }}
+              </p>
+              <p v-else class="text-xl md:text-2xl text-gray-900 dark:text-dark-100">
+                {{ $t('error.internal') }}
+              </p>
+            </div>
+          </div>
+        </div>
+        <div>
           <nuxt-link class="home-btn" to="/">
-            <div class="py-3 px-6 font-bold border-2 border-solid border-red-500 hover:bg-red-500 duration-300 rounded">
-              {{ $t('404.back') }}
+            <div class="w-full py-4 px-8 md:py-8 md:px-16 font-bold hover:bg-red-500 duration-500 rounded">
+              {{ $t('error.back') }}
               <svg class="inline arrow-img" height="32" width="32" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 14l-7 7m0 0l-7-7m7 7V3" />
               </svg>
@@ -32,23 +45,16 @@
 <script>
 export default {
   name: "error",
-  layout: "error-2"
+  props: ['error'],
+  head: {
+    title: 'Error - Arthur Danjou'
+  }
 }
 </script>
 
 <style scoped lang="scss">
 .error {
 
-  .text {
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-  }
-
-  .title {
-    font-size: 14rem;
-  }
-
   .home-btn:hover .arrow-img {
     transform: translate(3px, 0);
   }
diff --git a/locales/fr-FR.ts b/locales/fr-FR.ts
index 3f2c269..883b623 100644
--- a/locales/fr-FR.ts
+++ b/locales/fr-FR.ts
@@ -19,10 +19,11 @@ export default {
     copyrights: '© Copyright {date} - Tous droits réservés'
   },
 
-  404: {
-    description: 'Où suis-je ?',
+  error: {
     back: 'Revenir à l\'accueil',
-    no_page: 'La page demandée n\'existe pas'
+    no_page: 'La page demandée n\'existe pas',
+    internal: 'Erreur interne',
+    error: 'Erreur'
   },
 
   part: {
diff --git a/pages/blog/_slug.vue b/pages/blog/_slug.vue
index 261a089..e39119e 100644
--- a/pages/blog/_slug.vue
+++ b/pages/blog/_slug.vue
@@ -120,8 +120,12 @@ export default {
       liked: false
     }
   },
-  async asyncData({ params, $content, app, $axios }) {
-    const post = await $content(`articles/${app.i18n.locale}/`, params.slug).fetch()
+  async asyncData({ params, $content, app, $axios, error }) {
+    const post = await $content(`articles/${app.i18n.locale}/`, params.slug)
+      .fetch()
+      .catch(() => {
+        error({ statusCode: 404, message: "Post not found" });
+      });
     const {data: likes} = await $axios.get(`posts/${params.slug}`)
     const liked = await $axios.get(`posts/is/${params.slug}`)
     return {
diff --git a/pages/blog/index.vue b/pages/blog/index.vue
index 16e234f..87819e0 100644
--- a/pages/blog/index.vue
+++ b/pages/blog/index.vue
@@ -112,9 +112,11 @@ export default {
   methods: {
     displayTags(tags) {
       const tags_label = []
-      tags.map(tag => {
-        tags_label.push(tag)
-      })
+      if (tags.length > 0) {
+        tags.map(tag => {
+          tags_label.push(tag)
+        })
+      }
       return tags_label
     },
     async fetchPostsByTag(tag) {
diff --git a/pages/work/_slug.vue b/pages/work/_slug.vue
index ae50295..d19d23e 100644
--- a/pages/work/_slug.vue
+++ b/pages/work/_slug.vue
@@ -51,6 +51,7 @@
 
 <script>
 import WorkSkill from "~/components/WorkSkill";
+
 export default {
   components: {WorkSkill},
   head() {
@@ -63,14 +64,19 @@ export default {
       work: null
     }
   },
-  async asyncData({ params, $content }) {
-    let work
-    try {
-      work = await $content('works', params.slug).fetch()
-    } catch (e) {
-      return error({ message: 'Work not found' })
+  async asyncData({ params, $content, error }) {
+    const work = await $content('works', params.slug)
+      .fetch()
+      .catch(() => {
+        error({
+          statusCode: 404,
+          message: 'Work not found',
+        })
+      });
+    let skills = []
+    if (work) {
+      skills = await $content('skills').where({ slug: { $in: work.skills } }).fetch()
     }
-    const skills = await $content('skills').where({ slug: { $in: work.skills } }).fetch()
     return {
       work,
       skills