diff --git a/languages/en.yml b/languages/en.yml
index 69f4f29..5b000eb 100755
--- a/languages/en.yml
+++ b/languages/en.yml
@@ -3,7 +3,7 @@ sidebar:
tagcloud: Tag Cloud
toc: Table of Contents
post:
- read_more: Read more
+ read_more: Read More
sticky: Sticky
comments: Comments
comments_placeholder: Unable to load comment system, please make sure your network can access
diff --git a/layout/_partial/header.ejs b/layout/_partial/header.ejs
index 5d8cb42..20c13b3 100755
--- a/layout/_partial/header.ejs
+++ b/layout/_partial/header.ejs
@@ -15,7 +15,7 @@
"
class="nav flat-box" href="<%= url_for(value.url) %>">
- <%= __('navbar.'+value.name) %>
+ <%= __('navbar.'+value.name) == ('navbar.'+value.name) ? value.name : __('navbar.'+value.name) %>
<%})%>
@@ -56,7 +56,7 @@
<% (config.nav_menu || []).forEach(function(value){ %>
" class="nav flat-box" href="<%= url_for(value.url) %>">
- <%= __('navbar.'+value.name) %>
+ <%= __('navbar.'+value.name) == ('navbar.'+value.name) ? value.name : __('navbar.'+value.name) %>
<%})%>
diff --git a/layout/_partial/side.ejs b/layout/_partial/side.ejs
index 0a5e942..3ff7b59 100755
--- a/layout/_partial/side.ejs
+++ b/layout/_partial/side.ejs
@@ -1,8 +1,8 @@
-<% if (config.widgets){ %>
+<% if (config.widgets && config.widgets.length){ %>
<%
let supportWidgets = ['author', 'category', 'list', 'music', 'tagcloud', 'toc', 'plain'];
%>
- <% (config.widgets||[]).forEach(function(item){ %>
+ <% config.widgets.forEach(function(item){ %>
<% if (item.enable != false){ %>
<% let widget_name = item.widget ? item.widget : 'plain'; %>
<% if (supportWidgets.indexOf(widget_name) > -1){ %>