diff --git a/Gmeek.py b/Gmeek.py
index dab425d..274f9ac 100644
--- a/Gmeek.py
+++ b/Gmeek.py
@@ -12,7 +12,7 @@ from xpinyin import Pinyin
 from feedgen.feed import FeedGenerator
 from jinja2 import Environment, FileSystemLoader
 ######################################################################################
-i18n={"Search":"Search","switchTheme":"switch theme","link":"link","home":"home","comments":"comments","run":"run","days":"days"}
+i18n={"Search":"Search","switchTheme":"switch theme","link":"link","home":"home","comments":"comments","run":"run ","days":" days"}
 i18nCN={"Search":"搜索","switchTheme":"切换主题","link":"友情链接","home":"首页","comments":"评论","run":"网站运行","days":"天"}
 IconPlist={
     "post":"M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z",
diff --git a/templates/plist.html b/templates/plist.html
index 1327e1b..64458fa 100644
--- a/templates/plist.html
+++ b/templates/plist.html
@@ -44,18 +44,18 @@ h1 a:not([href]){color:inherit;text-decoration:none;vertical-align: bottom;font-
     </div>
     {% for num in postListJson -%}
     {% if postListJson[num]['label'] in blogBase['singlePage'] -%}
-    <button class="btn btn-invisible circle" onclick="window.location.href='/{{ postListJson[num]["label"] }}.html'" title="{{ postListJson[num]['postTitle'] }}">
+    <a href="/{{ postListJson[num]['label'] }}.html"><button class="btn btn-invisible circle" title="{{ postListJson[num]['postTitle'] }}">
         <svg class="octicon" width="16" height="16" >
             <path id="{{ postListJson[num]['postTitle'] }}" fill-rule="evenodd"></path>
         </svg>
-    </button>
+    </button></a>
     {%- endif %}
     {%- endfor %}
-    <button id="buttonRSS" class="btn btn-invisible circle" onclick="window.location.href='/rss.xml'" title="RSS">
+    <a href="/rss.xml"><button id="buttonRSS" class="btn btn-invisible circle" title="RSS">
         <svg class="octicon" width="16" height="16" >
             <path id="pathRSS" fill-rule="evenodd"></path>
         </svg>
-    </button>
+    </button></a>
     <button id="changeTheme" class="btn btn-invisible circle" onclick="modeSwitch()" title="{{ i18n['switchTheme'] }}">
         <svg class="octicon" width="16" height="16" >
             <path id="themeSwitch" fill-rule="evenodd"></path>
diff --git a/templates/post.html b/templates/post.html
index 4d16eb5..6556f39 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -19,17 +19,17 @@ h1 a:not([href]){color:inherit;text-decoration:none;vertical-align: bottom;font-
 </h1>
 <div class="title-right">
 
-    <button id="buttonHome" class="btn btn-invisible circle" onclick="window.location.href='/'" title="{{ i18n['home'] }}">
+    <a href="/"><button id="buttonHome" class="btn btn-invisible circle" title="{{ i18n['home'] }}">
         <svg class="octicon" width="16" height="16">
             <path id="pathHome" fill-rule="evenodd" d="{{ IconList['home'] }}"></path>
         </svg>
-    </button>
+    </button></a>
 
-    <button class="btn btn-invisible circle" onclick="window.open('{{ blogBase["postSourceUrl"] }}')" title="Issue">
+    <a href="{{ blogBase['postSourceUrl'] }}" target="_blank"><button class="btn btn-invisible circle" title="Issue">
         <svg class="octicon" width="16" height="16">
             <path id="pathIssue" fill-rule="evenodd" d="{{ IconList['github'] }}"></path>
         </svg>
-    </button>
+    </button></a>
 
     <button id="changeTheme" class="btn btn-invisible circle" onclick="modeSwitch();" title="{{ i18n['switchTheme'] }}">
         <svg class="octicon" width="16" height="16" >