diff --git a/app/views/attachments/file.html.erb b/app/views/attachments/file.html.erb
index 75fa1858c..0ce174545 100644
--- a/app/views/attachments/file.html.erb
+++ b/app/views/attachments/file.html.erb
@@ -1,26 +1,38 @@
-<h3><%=h @attachment.filename %></h3>
+<div id="wrapper">
+  <div id="wrapper2">
+    <div id="wrapper3">
+      <div id="main" class="nosidebar">
+        <div id="content_">
+          <h3><%=h @attachment.filename %></h3>
 
-<div class="attachments">
-<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
-   <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
-<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
-   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp
-   <span class="size">
-     <% if @attachment!=nil &&(@attachment.container_type == 'Document' || @attachment.container_type == 'WikiPage') &&
-        User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, @attachment.project) %>
-          <%= l(:review_assignments)+":" %><%=    link = link_to(l(:button_add), {:controller => 'code_review',
-                                          :action => 'assign', :action_type => 'attachment',
-                                          :id=>@attachment.project,
-                                          :change_id => '', :attachment_id => @attachment.id,
-                                         }, :class => 'icon icon-add') %>
-        <% end %>
-   </span></p>
+          <div class="attachments">
+            <p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
+              <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
+            <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
+              <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp
+           <span class="size">
+             <% if @attachment!=nil &&(@attachment.container_type == 'Document' || @attachment.container_type == 'WikiPage') &&
+                     User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, @attachment.project) %>
+                  <%= l(:review_assignments)+":" %><%=    link = link_to(l(:button_add), {:controller => 'code_review',
+                                                                                          :action => 'assign', :action_type => 'attachment',
+                                                                                          :id=>@attachment.project,
+                                                                                          :change_id => '', :attachment_id => @attachment.id,
+                                                                                       }, :class => 'icon icon-add') %>
+                <% end %>
+           </span></p>
+          </div>
+          &nbsp;
+          <%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
+
+          <% html_title @attachment.filename %>
+
+          <% content_for :header_tags do -%>
+              <%= stylesheet_link_tag "scm" -%>
+          <% end -%>
+          <div style="clear:both;"></div>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
-&nbsp;
-<%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
 
-<% html_title @attachment.filename %>
-
-<% content_for :header_tags do -%>
-    <%= stylesheet_link_tag "scm" -%>
-<% end -%>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 800f2ff9d..fe0b5ef84 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -1,5 +1,5 @@
 <%# course_model %>
-<% teacher_num = teacherCount(@course) %>
+<% teacher_num = searchTeacherAndAssistant(@course).count %>
 <% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
diff --git a/app/views/tags/tag_save.js.erb b/app/views/tags/tag_save.js.erb
index 5a29c113c..f6ada82eb 100644
--- a/app/views/tags/tag_save.js.erb
+++ b/app/views/tags/tag_save.js.erb
@@ -20,8 +20,9 @@ $('#tags_name2').val("");
         $("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @select_tag_name}) %>");
     <%else%>
         $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
-        $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/course_attachment_tag_name',
-                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
+        $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").replaceWith('<%= escape_javascript(render :partial => 'tags/tag_new', :locals => {:obj => @obj, :object_flag => "6"}) %>');
+//render :partial => 'tags/course_attachment_tag_name',
+//:locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag})
     <%end%>
 
     $("#tags_name_<%=@obj.id%>").val("");
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index 10561fe01..3553b4cef 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -362,9 +362,11 @@ $(document).ready(function () {
 });
 
     function showAndScrollTo(id, focus) {
+
         $('#' + id).show();
         if (focus !== null) {
-        $('#' + focus).focus();
+            $('#' + focus).focus();
+            issue_journal_kind_reply.focus();
         }
         $('html, body').animate({scrollTop: $('#' + id).offset().top}, 400);
     }