diff --git a/_includes/post-paginator.html b/_includes/post-paginator.html
index 668b49f..c432d1b 100644
--- a/_includes/post-paginator.html
+++ b/_includes/post-paginator.html
@@ -1,6 +1,6 @@
 <!-- The paginator for post list on HomgPage. -->
 
-<ul class="pagination align-items-center mt-4 mb-1 ps-lg-2">
+<ul class="pagination align-items-center mt-4 mb-5 ps-lg-2">
   <!-- left arrow -->
   {% if paginator.previous_page %}
     {% assign prev_url = paginator.previous_page_path | relative_url %}
diff --git a/_layouts/category.html b/_layouts/category.html
index 84fa487..81ea070 100644
--- a/_layouts/category.html
+++ b/_layouts/category.html
@@ -5,7 +5,7 @@ layout: page
 
 {% include lang.html %}
 
-<div id="page-category">
+<div id="page-category" class="mb-5">
   <h1 class="ps-lg-2">
     <i class="far fa-folder-open fa-fw text-muted"></i>
     {{ page.title }}
diff --git a/_layouts/home.html b/_layouts/home.html
index a5324a6..f1580f9 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -40,7 +40,16 @@ refactor: true
   {% endfor %}
 {% endif %}
 
-<div id="post-list">
+{% if paginator.total_pages > 1 %}
+  {% assign has_paginator = true %}
+{% endif %}
+
+<div
+  id="post-list"
+  {% unless has_paginator %}
+    class="mb-5"
+  {% endunless %}
+>
   {% for post in posts %}
     <a href="{{ post.url | relative_url }}" class="card-wrapper">
       <div class="card post-preview flex-md-row-reverse">
@@ -105,6 +114,6 @@ refactor: true
 </div>
 <!-- #post-list -->
 
-{% if paginator.total_pages > 1 %}
+{% if has_paginator %}
   {% include post-paginator.html %}
 {% endif %}
diff --git a/_layouts/page.html b/_layouts/page.html
index 447977d..fc2c915 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -5,11 +5,7 @@ layout: default
 {% include lang.html %}
 {% include origin-type.html %}
 
-{% if layout.tail_includes %}
-  {% assign has_tail = true %}
-{% endif %}
-
-<div class="row{% unless has_tail %} mb-5{% endunless %}">
+<div class="row">
   <!-- core -->
   <div id="core-wrapper" class="col-12 col-lg-11 col-xl-9 pe-xl-4">
     {% capture padding %}
@@ -56,7 +52,7 @@ layout: default
 </div>
 
 <!-- tail -->
-{% if has_tail %}
+{% if layout.tail_includes %}
   <div class="row">
     <div id="tail-wrapper" class="col-12 col-lg-11 col-xl-9 px-3 pe-xl-4 mt-5">
       {% for _include in layout.tail_includes %}
diff --git a/_layouts/tag.html b/_layouts/tag.html
index 3b90b8c..118c4e9 100644
--- a/_layouts/tag.html
+++ b/_layouts/tag.html
@@ -5,7 +5,7 @@ layout: page
 
 {% include lang.html %}
 
-<div id="page-tag">
+<div id="page-tag" class="mb-5">
   <h1 class="ps-lg-2">
     <i class="fa fa-tag fa-fw text-muted"></i>
     {{ page.title }}