diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 6e6fecb8..67c84842 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -51,7 +51,7 @@
     <div class="min-w-0 min-h-0 max-w-prose">
       {{ .Content }}
     </div>
-   
+
 
 
 
@@ -77,64 +77,43 @@
       {{ end }}
     </section>
 
-    {{ else if and $cardView (not $cardViewScreenWidth) }}
+    {{ else }}
 
       {{ if $groupByYear }}
 
       {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }}
-        <h2 class="mt-12 mb-3 text-2xl font-bold text-neutral-700 first:mt-8 dark:text-neutral-300">
-          {{ .Key }}
-        </h2>
-        <section class="w-full grid gap-4 sm:grid-cols-2 md:grid-cols-3">
+        {{ if $cardViewScreenWidth }}
+        <div class="relative w-screen max-w-[1600px] px-[30px]" style="left: calc(max(-50vw,-800px) + 50%);">
+        {{ end }}
+          <h2 class="mt-12 mb-3 text-2xl font-bold text-neutral-700 first:mt-8 dark:text-neutral-300">
+            {{ .Key }}
+          </h2>
+        <section class="w-full grid gap-4 sm:grid-cols-2 md:grid-cols-3 {{ if $cardViewScreenWidth }} xl:grid-cols-4 2xl:grid-cols-5 {{ end }}">
           {{ range .Pages }}
           {{ partial "article-link/card.html" . }}
           {{ end }}
         </section>
+        {{ if $cardViewScreenWidth }} </div> {{ end }}
       {{ end }}
 
-    {{ else }}
+      {{ else }}
 
+        {{ if $cardViewScreenWidth }}
+        <div class="relative w-screen max-w-[1600px] px-[30px]" style="left: calc(max(-50vw,-800px) + 50%);">
+        <section class="w-full grid gap-4 sm:grid-cols-2 md:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5">
+        {{ else }}
         <section class="w-full grid gap-4 sm:grid-cols-2 md:grid-cols-3">
+        {{ end }}
           {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }}
           {{ range .Pages }}
           {{ partial "article-link/card.html" . }}
           {{ end }}
           {{ end }}
         </section>
+        {{ if $cardViewScreenWidth }} </div> {{ end }}
 
     {{ end }}
 
-    {{ else if and $cardView $cardViewScreenWidth }}
-
-      {{ if $groupByYear }}
-
-        {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }}
-        <div class="relative w-screen max-w-[1600px] px-[30px]" style="left: calc(max(-50vw,-800px) + 50%);">
-          <h2 class="mt-12 mb-3 text-2xl font-bold text-neutral-700 first:mt-8 dark:text-neutral-300">
-            {{ .Key }}
-          </h2>
-          <section class="w-full grid gap-4 sm:grid-cols-2 md:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5">
-            {{ range .Pages }}
-            {{ partial "article-link/card.html" . }}
-            {{ end }}
-          </section>
-        </div>
-        {{ end }}
-
-      {{ else }}
-
-        <div class="relative w-screen max-w-[1600px] px-[30px]" style="left: calc(max(-50vw,-800px) + 50%);">
-          <section class="w-full grid gap-4 sm:grid-cols-2 md:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5">
-            {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }}
-            {{ range .Pages }}
-            {{ partial "article-link/card.html" . }}
-            {{ end }}
-            {{ end }}
-          </section>
-        </div>
-
-      {{ end }}
-
     {{end}}
 
   {{ else }}