diff --git a/content/_data/works/aspnet.md b/content/_data/works/aspnet-core.md
similarity index 100%
rename from content/_data/works/aspnet.md
rename to content/_data/works/aspnet-core.md
diff --git a/content/_data/works/springboot.md b/content/_data/works/spring-boot.md
similarity index 100%
rename from content/_data/works/springboot.md
rename to content/_data/works/spring-boot.md
diff --git a/data/works.yaml b/data/works.yaml
index 11f8cde..512c3d5 100644
--- a/data/works.yaml
+++ b/data/works.yaml
@@ -1,36 +1,48 @@
-realworld:
-  - name: aspnet
-    title: ASP.NET Core Realworld
-    repo: adr1enbe4udou1n/aspnetcore-realworld-example-app
+- name: realworld
+  title: Conduit Apps Collection
+  description: true
+  projects:
+    - name: aspnet-core
+      title: ASP.NET Core Realworld
+      repo: adr1enbe4udou1n/aspnetcore-realworld-example-app
+      demo: https://aspnetrealworld.okami101.io/api
 
-  - name: springboot
-    title: Spring Boot Realworld
-    repo: adr1enbe4udou1n/spring-boot-realworld-example-app
+    - name: spring-boot
+      title: Spring Boot Realworld
+      repo: adr1enbe4udou1n/spring-boot-realworld-example-app
+      demo: https://springbootrealworld.okami101.io/api
 
-  - name: laravel
-    title: Laravel Realworld
-    repo: adr1enbe4udou1n/laravel-realworld-example-app
+    - name: laravel
+      title: Laravel Realworld
+      repo: adr1enbe4udou1n/laravel-realworld-example-app
+      demo: https://laravelrealworld.okami101.io/api
 
-  - name: symfony
-    title: Symfony Realworld
-    repo: adr1enbe4udou1n/symfony-realworld-example-app
+    - name: symfony
+      title: Symfony Realworld
+      repo: adr1enbe4udou1n/symfony-realworld-example-app
+      demo: https://symfonyrealworld.okami101.io/api
 
-  - name: nestjs
-    title: NestJS Realworld
-    repo: adr1enbe4udou1n/nestjs-realworld-example-app
+    - name: nestjs
+      title: NestJS Realworld
+      repo: adr1enbe4udou1n/nestjs-realworld-example-app
+      demo: https://nestjsrealworld.okami101.io/api
 
-  - name: fastapi
-    title: FastAPI Realworld
-    repo: adr1enbe4udou1n/fastapi-realworld-example-app
+    - name: fastapi
+      title: FastAPI Realworld
+      repo: adr1enbe4udou1n/fastapi-realworld-example-app
+      demo: https://fastapirealworld.okami101.io/api
 
-others:
-  - name: vuetify-admin
-    title: Vuetify Admin
-    repo: okami101/vuetify-admin
-    demo: https://va-demo.okami101.io/
-    docs: https://www.okami101.io/vuetify-admin
+- name: others
+  title: Other projects
+  description: false
+  projects:
+    - name: vuetify-admin
+      title: Vuetify Admin
+      repo: okami101/vuetify-admin
+      demo: https://va-demo.okami101.io/
+      docs: https://www.okami101.io/vuetify-admin
 
-  - name: laravel-rad-stack
-    title: Laravel RAD Stack
-    repo: adr1enbe4udou1n/laravel-rad-stack
-    demo: https://laravel-rad-stack.okami101.io/
+    - name: laravel-rad-stack
+      title: Laravel RAD Stack
+      repo: adr1enbe4udou1n/laravel-rad-stack
+      demo: https://laravel-rad-stack.okami101.io/
diff --git a/layouts/works/single.html b/layouts/works/single.html
index 7055d2f..0b30491 100644
--- a/layouts/works/single.html
+++ b/layouts/works/single.html
@@ -6,49 +6,20 @@
         </h1>
     </header>
     {{ .Content | emojify }}
+    {{ range $.Site.Data.works }}
     <section class="mb-8">
         <h2 class="text-xl mb-8 pb-2 border-b-8 border-primary-500 inline-block">
-            Conduit Apps Collection
+            {{ .title }}
         </h2>
 
+        {{ if .description }}
         <div class="prose dark:prose-light mb-8">
             {{ readFile (print "_data/works/realworld.md") | markdownify }}
         </div>
+        {{ end }}
 
         <div class="grid md:grid-cols-2 gap-4">
-            {{ range $.Site.Data.works.realworld }}
-            <div class="flex flex-col gap-4 rounded border-2 border-primary-500 p-4 h-full">
-                <div class="text-center">
-                    <a href="https://github.com/{{ .repo }}" target="_blank">
-                        <h3 class="pb-1 font-bold border-b-2 border-primary-500 inline-block">
-                            {{ .title }}
-                        </h3>
-                    </a>
-                </div>
-                <div class="prose dark:prose-light flex-grow">
-                    {{ readFile (print "_data/works/" .name ".md") | markdownify }}
-                </div>
-                <div class="flex justify-center gap-4">
-                    <a class="px-4 py-2 !text-neutral !no-underline !rounded-md bg-primary-600 hover:!bg-primary-500 dark:bg-primary-800 dark:hover:!bg-primary-700"
-                        href="https://github.com/{{ .repo }}" target="_blank" role="button">
-                        {{ partial "icon.html" "github" }}
-                    </a>
-                    <a class="px-4 py-2 !text-neutral !no-underline !rounded-md bg-primary-600 hover:!bg-primary-500 dark:bg-primary-800 dark:hover:!bg-primary-700"
-                        href="https://{{ .name }}realworld.okami101.io/api" target="_blank" role="button">
-                        OpenAPI
-                    </a>
-                </div>
-            </div>
-            {{ end }}
-        </div>
-    </section>
-    <section>
-        <h2 class="text-xl mb-8 pb-2 border-b-8 border-primary-500 inline-block">
-            Others projects
-        </h2>
-
-        <div class="grid md:grid-cols-2 gap-4">
-            {{ range $.Site.Data.works.others }}
+            {{ range .projects }}
             <div class="flex flex-col gap-4 rounded border-2 border-primary-500 p-4 h-full">
                 <div class="text-center">
                     <a href="https://github.com/{{ .repo }}" target="_blank">
@@ -82,5 +53,6 @@
             {{ end }}
         </div>
     </section>
+    {{ end }}
 </article>
 {{ end }}
\ No newline at end of file