diff --git a/app/views/admin/sites/show_system_preference.html.erb b/app/views/admin/sites/show_system_preference.html.erb
index 19360afb..6640a416 100644
--- a/app/views/admin/sites/show_system_preference.html.erb
+++ b/app/views/admin/sites/show_system_preference.html.erb
@@ -9,7 +9,7 @@
 <div class="tab-content">
   <div class="tab-pane  active in" id="summary">
         <h2><%= I18n.t("site.system_preference_.summary.disk_space") %>:</h2>
-         <%= content_tag :p,@site.disk_space %>
+         <%= content_tag :p,@site.disk_space.gsub(/\n/,"<br />").html_safe if @site.disk_space %>
         <h2><%= I18n.t("site.system_preference_.summary.code_update_at") %>: </h2>
         <% @site.system_package_info.each do |index,value| %>
           <h2><%= index.titleize %> <%= I18n.t("site.system_preference_.summary.version") %>:</h2>       
@@ -20,7 +20,7 @@
   <div class="tab-pane" id="commits">
     <% if @git_commit_list_file %>
       <% @git_commit_list_file.lines do |line|%>
-        <%= (line + "<br/>").html_safe %>
+        <%= line %><br/>
       <% end%>
       <% else %>
       <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
@@ -29,7 +29,7 @@
   <div class="tab-pane" id="backups">
     <%if @db_backup_list_file %>
       <% @db_backup_list_file.lines do |line|%>
-        <%=(line + "<br/>").html_safe %>
+        <%=line %><br/>
       <% end %>
       <% else %>
         <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
@@ -38,7 +38,7 @@
   <div class="tab-pane" id="resque_logs">
   <%if @db_backup_list_file %>
     <% @resque_logs_file.lines do |line|%>
-      <%=(line + "<br/>").html_safe %>
+      <%=line %><br/>
     <% end if @resque_logs_file%>
     <%else %>
           <div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
diff --git a/config/initializers/orbit_system_preference.rb b/config/initializers/orbit_system_preference.rb
index 2f7e8cb6..eca7716b 100644
--- a/config/initializers/orbit_system_preference.rb
+++ b/config/initializers/orbit_system_preference.rb
@@ -7,7 +7,7 @@ module OrbitSystemPreference
   DefaultDiskSpaceLimit = 3 #in GB
   module SystemPackage
     MongodbVersion = "mongod --version"
-    NginxVersion = "nginx -V"
+    NginxVersion = "nginx -V 2>&1"
     SystemVersion = "uname -a"
   end
 end
\ No newline at end of file
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 298e95f6..223e69a0 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -396,7 +396,7 @@ zh_tw:
       tab_backups: 備份記錄
       tab_commits: 程式版本
       tab_summary: 總覽
-      tab_logs: 登錄檔
+      tab_logs: 排程工作日誌
       summary:
         code_update_at:  程式更新紀錄
         disk_space: 硬碟空間