diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb
index cf8770c8c..35543398f 100644
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@@ -27,8 +27,7 @@
     <p><%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %></p>
     <script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script>
     <br/>
-    <%= f.submit :value => l(:button_change) %>
+    <%= f.submit :value => l(:button_change) %>&nbsp;&nbsp;<%= link_to l(:button_back), back_url ,:class => "button-canel",:style => "color: #ffffff;"%>
   </div>
 <% end %>
-<%= link_to l(:button_back), back_url %>
 </div>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 577c3ff7f..5da3c5d63 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -43,11 +43,14 @@
 				:data => {:confirm => l(:text_are_you_sure)},
 				:title => l(:button_delete)
 				) if @memo.destroyable_by?(User.current) %>
-			
-				
 		</div>
 
-		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>" style="word-break: break-all;word-wrap: break-word;"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
+        <div>&nbsp;</div>
+
+		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>"
+             style="word-break: break-all;word-wrap: break-word;">
+          <%= label_tag l(:field_subject) %>: <%=h @memo.subject %>
+        </div>
 		<div class="memo-content">
 		<%= textAreailizable(@memo,:content) %>
 			<p>							
diff --git a/app/views/stores/index.html.erb b/app/views/stores/index.html.erb
index 5df6ecca8..47ea32b91 100644
--- a/app/views/stores/index.html.erb
+++ b/app/views/stores/index.html.erb
@@ -1,71 +1,68 @@
 <% content_for :top_field do%>
-  <%= render 'search_bar' %>
+    <%= render 'search_bar' %>
 <% end %>
 
-<div class="resource_sum" id="IE_resource_sum_css">
-<% @attach_array.each do |k|%>
-	<div class="line_block" >
-		<p>
-			<%= @str_arr.shift %>
-		</p>
+<div class="resource_sum">
+  <% @attach_array.each do |k|%>
+      <div class="line_block">
+        <p>
+          <%= @str_arr.shift %>
+        </p>
 
-		<div class="table1">
-			<div class='table_row1'>
-				<div class='table_cell1 filename1' style='text-align: center;'><%=l(:label_attachment)%></div>
-				<div class='table_cell1 filedown1'><%=l(:field_downloads)%></div>
-				<div class='table_cell1 downicon1'><%=l(:button_download)%></div>
-			</div>
-		</div>
+        <div class="table1">
+          <div class='table_row1'>
+            <div class='table_cell1 filename1' style='text-align: center;'><%=l(:label_attachment)%></div>
+            <div class='table_cell1 filedown1'><%=l(:field_downloads)%></div>
+            <div class='table_cell1 downicon1'><%=l(:button_download)%></div>
+          </div>
+        </div>
 
-		<div class="table1">
-		<% k.each do |c1|%>
-			<div class="table_row1 <%= cycle 'odd', 'even' %>">
-				<div class="filename table_cell1 filename1" >
-					<%= link_to c1.filename, (attachFromUrl c1), {:title => c1.filename, :target => "_blank"} %>
-				</div>
-				<div  class="table_cell1 filedown1">
-					<%= c1.downloads %>
-				</div>
-				<div class="table_cell1 downicon1 filename download_icon" >
-					<%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>
-				</div>
-			</div>
-		<% end -%>
-		</div>
+        <div class="table1">
+          <% k.each do |c1|%>
+              <div class="table_row1 <%= cycle 'odd', 'even' %>">
+                <div class="filename table_cell1 filename1" >
+                  <%= link_to c1.filename, (attachFromUrl c1), {:title => c1.filename, :target => "_blank"} %>
+                </div>
+                <div  class="table_cell1 filedown1">
+                  <%= c1.downloads %>
+                </div>
+                <div class="table_cell1 downicon1 filename download_icon" >
+                  <%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>
+                </div>
+              </div>
+          <% end -%>
+        </div>
 
-	</div>
-<% end; reset_cycle %>
+      </div>
+  <% end; reset_cycle %>
 </div>
 <script type='text/javascript'>
- function validate_required(field,alerttxt)
-  {
-    with (field)
+    function validate_required(field,alerttxt)
     {
-      if (value==null||value=="")
-        {alert(alerttxt);$.find('form').attr("data-submitted",'');return false}
-      else {return true}
-    }
-  }
-
-  function validate_form(thisform) {
-    with (thisform)
-    {
-      if (validate_required(name,"name must be filled out!")==false)
-        {name.focus();return false}
-    }
-  }
-	$(document).ready(function($) {
-		$('.download_icon').find("a").attr("target", "_blank");
-		$('.download_icon').each(function(){
-			$(this).mouseenter(function(event) {
-				$(this).find('img').attr("src", "/images/button/download_focus.png")
-			});
-			$(this).mouseleave(function(event) {
-				$(this).find('img').attr("src", "/images/button/download.png")
-			});
-		});
-        if(navigator.appName=="Microsoft Internet Explorer"){
-            $("#IE_resource_sum_css").children(".line_block").css("width","45%");
+        with (field)
+        {
+            if (value==null||value=="")
+            {alert(alerttxt);$.find('form').attr("data-submitted",'');return false}
+            else {return true}
         }
-	});
+    }
+
+    function validate_form(thisform) {
+        with (thisform)
+        {
+            if (validate_required(name,"name must be filled out!")==false)
+            {name.focus();return false}
+        }
+    }
+    $(document).ready(function($) {
+        $('.download_icon').find("a").attr("target", "_blank");
+        $('.download_icon').each(function(){
+            $(this).mouseenter(function(event) {
+                $(this).find('img').attr("src", "/images/button/download_focus.png")
+            });
+            $(this).mouseleave(function(event) {
+                $(this).find('img').attr("src", "/images/button/download.png")
+            });
+        });
+    });
 </script>
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f71241223..fa8cf91f9 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1936,7 +1936,7 @@ zh:
   label_forum_edit: 编辑讨论区
   label_memo_create: 发布
   label_memo_new: 新建主题
-  label_memo_edit: 修改主题label_board_new
+  label_memo_edit: 修改主题
   label_memo_new_from_forum: 发布帖子
   label_forum: 公共贴吧
   label_forum_new: 新建贴吧
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 72b379585..1fda63f93 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2794,3 +2794,19 @@ div.repos_explain{
 	padding-top: 20px;
 	padding-bottom: 20px;
 }
+
+.button-canel{
+    padding-bottom: 5px;
+    width: auto;
+    height: 25px;
+    font-family: '微软雅黑',Arial,Helvetica,sans-serif;
+    font-size: 12px;
+    color: #ffffff;
+    padding: 3px 9px;
+    background: #15bccf;
+    border-radius: 4px;
+    border: 1px solid #15bccf;
+    box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
+    cursor: pointer;
+}