diff --git a/site/layouts/_default/baseof.html b/site/layouts/_default/baseof.html
index 42cca3e2..fcd8e795 100644
--- a/site/layouts/_default/baseof.html
+++ b/site/layouts/_default/baseof.html
@@ -14,7 +14,6 @@
             {{ partial "components/footer/footer.html" . }}
         </div>
     </div>
-    {{ partial "components/cookie-notice.html" . }}
     {{ partial "scripts/body-scripts.html" . }}
 </body>
 </html>
diff --git a/site/layouts/_partials/blog/post-info.html b/site/layouts/_partials/blog/post-info.html
index f3b1c672..494740e4 100644
--- a/site/layouts/_partials/blog/post-info.html
+++ b/site/layouts/_partials/blog/post-info.html
@@ -28,19 +28,21 @@
 {{ $hasLabel := .has_label | default false }}
 
 {{ $label := "" }}
-{{ if and (not $context.Params.author) $hasLabel }}
+{{ $postAuthor := $context.Params.author }}
+
+{{ if and (not $postAuthor) $hasLabel }}
     {{ $label = "Posted on" }}
 {{ end }}
 
 <div class="post-info">
-    {{ with $context.Params.author }}
-        <span class="post-author">{{ . }}</span>
-        <span>on</span>
-    {{ end }}
-    {{ with $context.Params.publishdate }}
-        {{ partial "components/iso-date.html" (dict
+    {{- with $postAuthor -}}
+        {{- $author := printf "%s %s&nbsp;" . "on" -}}
+        <span class="post-author">{{ $author | safeHTML }}</span>
+    {{- end -}}
+    {{- with $context.Params.publishdate -}}
+        {{- partial "components/iso-date.html" (dict
             "date" .
             "label" $label
-        ) }}
-    {{ end }}
+        ) -}}
+    {{- end -}}
 </div>
diff --git a/site/layouts/_partials/components/cookie-notice.html b/site/layouts/_partials/components/cookie-notice.html
deleted file mode 100644
index 7091ac20..00000000
--- a/site/layouts/_partials/components/cookie-notice.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-  ~ Copyright 2025, TeamDev. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Redistribution and use in source and/or binary forms, with or without
-  ~ modification, must retain the above copyright notice and the following
-  ~ disclaimer.
-  ~
-  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  -->
-
-{{ $websiteURL := "spine.io" }}
-{{ $notice := "uses cookies to help operate the site and gather analytics data. You can read more about it in our [Privacy&nbsp;Statement](privacy-statement/)." }}
-
-<div id="cookie-notice">
-    <div class="cookie-content">
-        <div class="cookie-text">
-            <span>{{ $websiteURL }}</span>
-            <span>{{ $notice | markdownify }}</span>
-        </div>
-        <div id="cookie-consent-btn"
-             class="btn agree-btn">
-            <span class="btn-label">I agree</span>
-        </div>
-    </div>
-</div>
diff --git a/site/layouts/_partials/components/iso-date.html b/site/layouts/_partials/components/iso-date.html
index 9179eae8..b6990aa3 100644
--- a/site/layouts/_partials/components/iso-date.html
+++ b/site/layouts/_partials/components/iso-date.html
@@ -24,14 +24,14 @@
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 
-{{ $date := .date }}
-{{ $label := .label }}
+{{- $date := .date -}}
+{{- $label := .label -}}
 
-{{ $formattedDate := $date | time.Format ":date_long" }}
-{{ $isoDate := $date | time.Format "2006-01-02" }}
+{{- $formattedDate := $date | time.Format ":date_long" -}}
+{{- $isoDate := $date | time.Format "2006-01-02" -}}
 <p class="date">
-    {{ with $label }}
-        {{ .}}
-    {{ end }}
+    {{- with $label -}}
+        <span>{{ . }}&nbsp;</span>
+    {{- end -}}
     <time datetime="{{ $isoDate }}">{{ $formattedDate }}</time>
 </p>