diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index ae2912a..57d3988 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,14 +1,14 @@
 {{ define "main" }}
+  {{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }}
+  {{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }}
+
+  {{ $PageContext := . }}
+  {{ if .IsHome }}
+    {{ $PageContext = .Site }}
+  {{ end }}
+  {{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }}
+
   <div class="posts">
-    {{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }}
-    {{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }}
-
-    {{ $PageContext := . }}
-    {{ if .IsHome }}
-      {{ $PageContext = .Site }}
-    {{ end }}
-    {{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }}
-
     {{ range $paginator.Pages }}
     <div class="post on-list">
       <h1 class="post-title"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h1>
@@ -17,12 +17,9 @@
           <span class="post-date">
             {{ .Date.Format ($.Site.Params.DateFormatList | default "2006-01-02") }}
           </span>
+          
           {{ if $.Site.Params.LastModDisplay}}
-            {{ with .Lastmod }}
-              <span class="post-moddate">
-                  {{ $.Site.Params.LastModDisplay }} {{ .Format ($.Site.Params.DateFormatSingle | default "2006-01-02") }}
-              </span>
-            {{ end }}
+            {{ partial "lastmod.html" . }}
           {{ end }}
         {{ end }}
         {{ with .Params.Author }}<span class="post-author">— {{ $.Site.Params.WrittenBy | default "Written by" }} {{ . }}</span>{{ end }}
@@ -31,7 +28,6 @@
         {{ end }}
       </div>
 
-
       {{ if .Params.tags }}
         <span class="post-tags">
           {{ range .Params.tags }}
@@ -62,4 +58,4 @@
     {{ end }}
     {{ partial "pagination.html" . }}
   </div>
-{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 1173f71..5b4b80e 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,19 +1,18 @@
 {{ define "main" }}
+  {{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }}
+  {{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }}
+
   <div class="post">
     <h2 class="post-title"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h2>
     <div class="post-meta">
-      {{ with .Date | default nil }}
+      {{ if .Date | default nil }}
         <span class="post-date">
-            {{ .Format ($.Site.Params.DateFormatSingle | default "2006-01-02") }}
+          {{ .Date.Format ($.Site.Params.DateFormatSingle | default "2006-01-02") }}
         </span>
-      {{ end }}
       
-      {{ if $.Site.Params.LastModDisplay}}
-        {{ if .Date }}
-          {{ with .Lastmod }}
-            <span class="post-moddate">
-                {{ $.Site.Params.LastModDisplay }} {{ .Format ($.Site.Params.DateFormatSingle | default "2006-01-02") }}
-            </span>
+        {{ if eq .Type $contentTypeName }}
+          {{ if $.Site.Params.LastModDisplay}}
+            {{ partial "lastmod.html" . }}
           {{ end }}
         {{ end }}
       {{ end }}
@@ -72,4 +71,4 @@
 
     {{ partial "comments.html" . }}
     </div>
-{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/lastmod.html b/layouts/partials/lastmod.html
new file mode 100644
index 0000000..ff80115
--- /dev/null
+++ b/layouts/partials/lastmod.html
@@ -0,0 +1,7 @@
+{{ if gt .Lastmod .Date }}
+  {{ with .Lastmod }}
+    <span class="post-moddate">
+      ({{ $.Site.Params.LastModDisplay }} {{ .Format ($.Site.Params.DateFormatSingle | default "2006-01-02") }})
+    </span>
+  {{ end }}
+{{ end }}
\ No newline at end of file