diff --git a/_includes/post-nav.html b/_includes/post-nav.html
index bb3b52d..9de3f08 100644
--- a/_includes/post-nav.html
+++ b/_includes/post-nav.html
@@ -9,10 +9,10 @@
     <p>{{ page.previous.title }}</p>
   </a>
   {% else %}
-  <span class="btn btn-outline-primary disabled"
+  <div class="btn btn-outline-primary disabled"
     prompt="{{ site.data.locales[lang].post.button.previous }}">
     <p>-</p>
-  </span>
+  </div>
   {% endif %}
 
   {% if page.next.url %}
@@ -21,10 +21,10 @@
     <p>{{ page.next.title }}</p>
   </a>
   {% else %}
-  <span class="btn btn-outline-primary disabled"
+  <div class="btn btn-outline-primary disabled"
     prompt="{{ site.data.locales[lang].post.button.next }}">
     <p>-</p>
-  </span>
+  </div>
   {% endif %}
 
 </div>
diff --git a/_includes/post-paginator.html b/_includes/post-paginator.html
index 9d9608c..9d6a98d 100644
--- a/_includes/post-paginator.html
+++ b/_includes/post-paginator.html
@@ -47,7 +47,7 @@
     {% if show %}
       <!-- show number -->
       <li class="page-item {% if i == paginator.page %} active{% endif %}">
-        <a class="page-link btn-box-shadow" href="{{ site.baseurl }}/{% if i > 1%}page{{ i }}/{% endif %}">{{ i }}</a>
+        <a class="page-link btn-box-shadow" href="{% if i > 1 %}{{ site.paginate_path | replace: ':num', i | relative_url }}{% else %}{{ '/' | relative_url }}{% endif %}">{{ i }}</a>
       </li>
     {% else %}
       <!-- hide number -->
diff --git a/_includes/refactor-content.html b/_includes/refactor-content.html
index dd09205..83329b3 100644
--- a/_includes/refactor-content.html
+++ b/_includes/refactor-content.html
@@ -217,7 +217,7 @@
       {% assign left = left | replace: '">', '"><span class="mr-2">' | append: '</span>' %}
 
       {% assign _new_content = _new_content | append: mark_start
-          | append: left | append: anchor | append: mark_end | append: right
+          | append: left | append: anchor | append: right
       %}
 
     {% endfor %}
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 9d45a43..4ecf539 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -5,7 +5,7 @@
 <div id="sidebar" class="d-flex flex-column align-items-end">
   <div class="profile-wrapper text-center">
     <div id="avatar">
-      <a href="{{ '/' | relative_url }}" alt="avatar" class="mx-auto">
+      <a href="{{ '/' | relative_url }}" class="mx-auto">
         {% if site.avatar != empty and site.avatar %}
           {% capture avatar_url %}
             {% if site.avatar contains '://' %}