diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html
index ca72b71c..5fb67b2d 100644
--- a/themes/buha/layouts/_default/single.html
+++ b/themes/buha/layouts/_default/single.html
@@ -13,6 +13,6 @@
         {{ $partial = "layout/single/nottranslated" }}
     {{ end }}
     <article>
-    {{ partial $partial (dict "context" . "pic" $pic "content" .Content  "partial_before" $partial_before) }}
+    {{ partial $partial (dict "context" . "pic" $pic "content" .Content  "partial_before" $partial_before "type" "article") }}
     </article>
 {{ end }}
diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html
index 997dbb94..92bc4007 100644
--- a/themes/buha/layouts/index.html
+++ b/themes/buha/layouts/index.html
@@ -16,7 +16,7 @@
         {{ partial "l1/article_list" (dict "context" . "pages" $featured "amount" "3" "title" "Featured") }}
 	{{ end }}
     {{ if gt (len $posts) 1 }}
-        {{ partial "l1/article_list" (dict "context" . "paginator" $paginator "amount" "5" "title" "News") }}
+        {{ partial "l1/article_list" (dict "context" . "paginator" $paginator "amount" "5" "title" "News" "type" "list") }}
         <div id="pagination_outer" style="display: flex; justify-content: center;">
             {{ partial "snippets/paginator" (dict "paginator" $paginator) }}
         </div>
diff --git a/themes/buha/layouts/partials/layout/single/article.html b/themes/buha/layouts/partials/layout/single/article.html
index 839ab515..79ba38ab 100644
--- a/themes/buha/layouts/partials/layout/single/article.html
+++ b/themes/buha/layouts/partials/layout/single/article.html
@@ -1,14 +1,11 @@
 {{ $metas := dict "when" .context.Params.when "price" .context.Params.price "contact" .context.Params.contact "covid"
 .context.Params.covid }}
-{{ if eq .type "list" }}
+{{ if eq .context.Type "list" }}
     {{ $metas = dict "when" .context.Params.when "price" .context.Params.price }}
 {{ end }}
 
 {{ $small := "solo" }}
 {{ $big := "solo" }}
-{{ $img := "" }}
-{{ $thumb := "" }}
-{{ $placeholder := site.Params.placeholder }}
 
 {{- if or (.context.Resources.ByType "image") (.context.Summary) -}}
     {{ $small = "multiple_small" }}
@@ -17,25 +14,25 @@
     {{ $small = "multiple_big"}}
 {{ end }}
 
-{{- if .context.Resources.ByType "image" -}}
-    {{- $img = index (.context.Resources.ByType "image") 0 -}}
-    {{ if ne .context.Content "" }}
-        {{- $thumb = $img.Resize "2048x" }}
-    {{ else if .type "list" }}
-        {{- $thumb = $img.Resize "500x" }}
-    {{ end }}
-{{ end }}
+
 
     {{ partial "snippets/article_metadata" $metas }}
     <div id="articleinner">
-        {{ if and (ne $img "") (eq .pic "true")}}
-            <div id="articlepicture" class="{{ $small }}" >
-                {{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
-                    <img src="{{- $thumb.Permalink -}}" class="borderrad4px" />
-                {{ if ne .type "list" }}</a>{{ end }}
-                {{ if eq .type "article" }}{{ end }}
-            </div>
-        {{ end }}
+{{- if and (.context.Resources.ByType "image") (eq .pic "true") -}}
+    {{- $img := index (.context.Resources.ByType "image") 0 -}}
+    {{- $thumb := index (.context.Resources.ByType "image") 0 -}}
+    {{ if ne .context.Content "" }}
+        {{- $thumb = $img.Resize "2048x" }}
+    {{ else if eq .type "list" }}
+        {{- $thumb = $img.Resize "500x" }}
+    {{ end }}
+    <div id="articlepicture" class="{{ $small }}" >
+        {{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
+            <img src="{{- $thumb.Permalink -}}" class="borderrad4px" />
+        {{ if ne .type "list" }}</a>{{ end }}
+        {{ if eq .type "article" }}{{ end }}
+    </div>    
+{{ end }}
         {{- if or .context.Content .context.Summary -}}
             <div id="articletext" class="{{ $big }}">
                 {{ if eq .type "contact" }}{{ partial "structure/contact" }}{{ end }}