diff --git a/assets/css/_page/_single.scss b/assets/css/_page/_single.scss
index acb10f362..e58deb698 100644
--- a/assets/css/_page/_single.scss
+++ b/assets/css/_page/_single.scss
@@ -73,7 +73,7 @@
   }
 
   .featured-image {
-    margin: 0.5rem 0 1rem 0;
+    margin: 1rem 0;
 
     img {
       display: block;
@@ -131,6 +131,7 @@
   }
 
   .content {
+    margin-block: 1rem;
     > h1,
     > h2 {
       font-size: 1.5em;
diff --git a/assets/css/_partials/_single/_collections.scss b/assets/css/_partials/_single/_collections.scss
index 728e1d799..a8f4b17ae 100644
--- a/assets/css/_partials/_single/_collections.scss
+++ b/assets/css/_partials/_single/_collections.scss
@@ -2,7 +2,7 @@
 .collection-card {
   font-size: 0.875rem;
   background-color: darken($global-background-color, 3%);
-  margin-block: 2rem -1rem;
+  margin-block: 1rem;
   padding: 1rem 1.25rem;
   position: relative;
   @include border-radius($global-border-radius * 1.5);
diff --git a/assets/css/_partials/_single/_reward.scss b/assets/css/_partials/_single/_reward.scss
index d5f032528..457bea74d 100644
--- a/assets/css/_partials/_single/_reward.scss
+++ b/assets/css/_partials/_single/_reward.scss
@@ -1,7 +1,6 @@
 .post-reward {
   padding: 1rem;
   text-align: center;
-  margin-bottom: -1rem;
   @extend .print-d-none;
 
   &:has(.reward-ways:empty) {
diff --git a/layouts/partials/custom.html b/layouts/partials/custom.html
index 855ac8f63..c3e1a683a 100644
--- a/layouts/partials/custom.html
+++ b/layouts/partials/custom.html
@@ -12,6 +12,9 @@
 {{- define "custom-aside" -}}
 {{- end -}}
 
+{{- define "custom-comment" -}}
+{{- end -}}
+
 {{- define "custom-footer" -}}
 {{- end -}}
 
@@ -20,3 +23,9 @@
 
 {{- define "custom-assets" -}}
 {{- end -}}
+
+{{- define "custom-post__footer:before" -}}
+{{- end -}}
+
+{{- define "custom-post__footer:after" -}}
+{{- end -}}
\ No newline at end of file
diff --git a/layouts/partials/single/comment.html b/layouts/partials/single/comment.html
index d8e4ec19d..559b666f9 100644
--- a/layouts/partials/single/comment.html
+++ b/layouts/partials/single/comment.html
@@ -331,6 +331,9 @@
         </noscript>
       {{- end -}}
     {{- end -}}
+
+    {{- /* Custom Comment System */ -}}
+    {{- block "custom-comment" . }}{{ end -}}
   </div>
   {{- /* lightgallery for Artalk and Twikoo */ -}}
   {{- $params := partial "function/params.html" -}}
diff --git a/layouts/partials/single/related.html b/layouts/partials/single/related.html
index a96a023ce..80fde770e 100644
--- a/layouts/partials/single/related.html
+++ b/layouts/partials/single/related.html
@@ -11,7 +11,6 @@
   {{- end -}}
   {{- $related := $posts.Related . | first ($params.related.count | default 5) -}}
   {{- with $related -}}
-    <hr class="awesome-hr" />
     <h2 id="see-also">{{ T "single.relatedContent" }}</h2>
     <ul>
       {{- range $i, $p := . -}}
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 41151bdd5..f3ff848d9 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -13,6 +13,9 @@
     {{- /* Collection List */ -}}
     {{- partial "single/collection-list.html" . -}}
 
+    {{- /* TODO Related Content */ -}}
+    {{/*  {{- partial "single/related.html" . -}}  */}}
+
     {{- /* Custom Aside */ -}}
     {{- block "custom-aside" . }}{{ end -}}
   </aside>
@@ -194,16 +197,19 @@ <h1 class="single-title animate__animated animate__flipInX">
     {{- /* FixIt Decryptor */ -}}
     {{- partial "single/fixit-decryptor.html" . -}}
 
+    {{- /* Custom block before post footer */ -}}
+    {{- block "custom-post__footer:before" . }}{{ end -}}
+
     {{- /* Footer */ -}}
     {{- partial "single/footer.html" . -}}
 
-    {{- /* Reward after Footer */ -}}
+    {{- /* Reward after post footer */ -}}
     {{- if eq $reward.position "after" -}}
       {{- partial "single/reward.html" . -}}
     {{- end -}}
 
-    {{- /* Custom post footer */ -}}
-    {{- block "custom-post__footer" . }}{{ end -}}
+    {{- /* Custom block after post footer */ -}}
+    {{- block "custom-post__footer:after" . }}{{ end -}}
 
     {{- /* Comment */ -}}
     {{- partial "single/comment.html" . -}}