diff --git a/template/css/style.css b/template/css/style.css
index fada038..972fb33 100644
--- a/template/css/style.css
+++ b/template/css/style.css
@@ -364,6 +364,8 @@ body {
   width: 144px;
   height: 144px;
   border-radius: 50%;
+  object-fit: cover;
+  object-position: center center;
 }
 .user-page .user-details .user-comment {
   font-size: 0.9em;
diff --git a/template/css/style.scss b/template/css/style.scss
index 9efc1ca..e00abbc 100644
--- a/template/css/style.scss
+++ b/template/css/style.scss
@@ -423,6 +423,8 @@ body {
       width: 144px;
       height: 144px;
       border-radius: 50%;
+      object-fit: cover;
+      object-position: center center;
     }
 
     .user-comment {
diff --git a/template/small-tn-normal.jet.html b/template/small-tn-normal.jet.html
index 5cb3771..a62b917 100644
--- a/template/small-tn-normal.jet.html
+++ b/template/small-tn-normal.jet.html
@@ -1,6 +1,6 @@
-{{ range . }} {{ if not (isEmpty .ID) }}
+{{ range . }} {{ if .ID }}
 <div class="artwork-thumbnail-small artwork-thumbnail">
-  {{ template "thumbnail-dt.html" . }} {{ template "thumbnail-tt.html" . }} {{
-  template "thumbnail-at.html" . }}
+  {{ include "thumbnail-dt" . }} {{ include "thumbnail-tt" . }} {{ include
+  "thumbnail-at" . }}
 </div>
 {{ end }} {{ end }}
diff --git a/template/tag.jet.html b/template/tag.jet.html
index c68abcc..1b90b40 100644
--- a/template/tag.jet.html
+++ b/template/tag.jet.html
@@ -89,7 +89,7 @@
   <div>{{ include "small-tn" Data.Artworks.Artworks }}</div>
 
   <div class="pagination">
-    {{ if toInt (.Queries.Page) == 1 }}
+    {{ if toInt (Queries.Page) == 1 }}
     <a href="#" class="pagination-button disabled">First</a>
     <a href="#" class="pagination-button disabled">Previous</a>
     {{ else }}
@@ -105,7 +105,7 @@
     >
     {{ end }}
 
-    <a href="#" class="pagination-button disabled">{{ .Queries.Page }}</a>
+    <a href="#" class="pagination-button disabled">{{ Queries.Page }}</a>
 
     <a
       href="/tags/{{ Tag.Name }}?category={{ Queries.Category }}&order={{ Queries.Order }}&mode={{ Queries.Mode }}&page={{ inc(toInt(Queries.Page)) }}"