diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 4433d29d9..ba9de5f71 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -1,143 +1,61 @@
 <%= form_tag({}) do -%>
 <%= hidden_field_tag 'back_url', url_for(params), :id => nil %>
 <div class="autoscroll">
-	<!-- <table class="list issues">
-	<thead>
-	<tr>
-	<th class="checkbox hide-when-print">
-	<%= link_to image_tag('toggle_check.png'), {},
-	:onclick => 'toggleIssuesSelection(this); return false;',
-	:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
-	</th>
-	<% query.inline_columns.each do |column| %>
-	<%= column_header(column) %>
-	<% end %>
-	</tr>
-	</thead>
-	<% previous_group = false %>
-	<tbody>
-	<% issue_list(issues) do |issue, level| -%>
-	<% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
-	<% reset_cycle %>
-	<tr class="group open">
-	<td colspan="<%= query.inline_columns.size + 2 %>">
-	<span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
-	<%= group.blank? ? l(:label_none) : column_content(@query.group_by_column, issue) %> <span class="count"><%= @issue_count_by_group[group] %></span>
-	<%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
-	"toggleAllRowGroups(this)", :class => 'toggle-all') %>
-	</td>
-	</tr>
-	<% previous_group = group %>
-	<% end %>
-	<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
-	<td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
-	<%= raw query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, issue)}</td>"}.join %>
-	</tr>
-	<% @query.block_columns.each do |column|
-	if (text = column_content(column, issue)) && text.present? -%>
-	<tr class="<%= current_cycle %>">
-	<td colspan="<%= @query.inline_columns.size + 1 %>" class="<%= column.css_classes %>"><%= text %></td>
-	</tr>
-	<% end -%>
-	<% end -%>
-	<% end -%>
-	</tbody>
-	</table> -->
+	<ul class="anchor_nyan">
+		<% issue_list(issues) do |issue, level| -%>
+		<% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
+		<% reset_cycle %>
+		<% previous_group = group %>
+		<% end %>
+		<div style="">
+		<li id="issue-<%= issue.id %>" class="hascontextmenu-1  <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
+			<% column_content =  ( query.inline_columns.map {|column| "#{column_content_new(column, issue)}"}) %>
 
-	<!-- <thead>
-	<tr>
-	<th class="checkbox hide-when-print">
-	<%= link_to image_tag('toggle_check.png'), {},
-	:onclick => 'toggleIssuesSelection(this); return false;',
-	:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
-	</th>
-	<% query.inline_columns.each do |column| %>
-	<%= column_header(column) %>
-	<% end %>
-	</tr>
-	</thead>
-	<% previous_group = false %> -->
-	<!--Modified by nie-->
-	<ul>
-		<tbody>
-			<% issue_list(issues) do |issue, level| -%>
-			<% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
-			<% reset_cycle %>
-			<tr class="group open">
-				<td colspan="<%= query.inline_columns.size + 2 %>"><span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span> <%= group.blank? ? l(:label_none) : column_content(@query.group_by_column, issue) %> <span class="count"><%= @issue_count_by_group[group] %></span> <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
-				"toggleAllRowGroups(this)", :class => 'toggle-all') %> </td>
-			</tr>
-			<% previous_group = group %>
+			<!-- 在这里添加赞和踩-->
+			<span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => issue,:show_flag => true,:user_id =>User.current.id}%> </span>
+
+			<% if issue.tracker_id == 1 %>
+			<%= image_tag("/images/task.png", :class => "img-tag-issues") %>
+			<% end %>
+			<% if issue.tracker_id == 2 %>
+			<%= image_tag("/images/feature.png", :class => "img-tag-issues") %>
+			<% end %>
+			<% if issue.tracker_id == 3 %>
+			<%= image_tag("/images/support.png", :class => "img-tag-issues") %>
+			<% end %>
+			<% if issue.tracker_id == 4 %>
+			<%= image_tag("/images/issues.png", :class => "img-tag-issues") %>
 			<% end %>
-			<div style="float: right">
-			<li id="issue-<%= issue.id %>" class="hascontextmenu-1  <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
-				<% column_content =  ( query.inline_columns.map {|column| "#{column_content_new(column, issue)}"}) %>
 
-				<!-- 在这里添加赞和踩-->
-				<span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => issue,:show_flag => true,:user_id =>User.current.id}%> </span>
-
-				<% if issue.tracker_id == 1 %>
-				<%= image_tag("/images/task.png", :class => "img-tag-issues") %>
-				<% end %>
-				<% if issue.tracker_id == 2 %>
-				<%= image_tag("/images/feature.png", :class => "img-tag-issues") %>
-				<% end %>
-				<% if issue.tracker_id == 3 %>
-				<%= image_tag("/images/support.png", :class => "img-tag-issues") %>
-				<% end %>
-				<% if issue.tracker_id == 4 %>
-				<%= image_tag("/images/issues.png", :class => "img-tag-issues") %>
-				<% end %>
-
-				<ul class="issue_list">
-					<% unless issue.author.nil? || issue.author.name == "Anonymous" %>
-					<ul class="list-group-item-meta">
-						<span> <%= link_to issue.author.name, user_path(issue.author), :class => "bid_user_u" %></span><%= l(:label_post_on)%> <span> <% a = [] %>
-							<% a << column_content[1] %>
-							<% a << "##{column_content[0]}" << "(#{raw column_content[2]}):" << column_content[4] %>
-							<%= link_to a.join(' '), issue_path(issue), :class => "issue-link" %>
-					</ul>
-					<% end -%>
-					<ul class="list-group-item-meta">
-						<div class="issue-list-description">
-							<%= l(:field_description)%>:<%= issue.description %>
-						</div>
-					</ul>
-					<ul class="list-group-item-meta">
-						<% unless issue.assigned_to_id.nil? %>
-						<span><%= l(:field_assigned_to)%></span><%= raw column_content[5] %>
-						<% end %>
-						<!-- <%= raw column_content[6] %> -->
-						<%= l(:label_updated_time_on, format_date(issue.updated_on)).html_safe %>
-						<div class="find-comment-class">
-							<span><%= link_to l(:label_find_all_comments), issue_path(issue) %></span><%= l(:label_comments_count, :count => issue.journals.all.count) %>
-						</div>
-					</ul>
+			<ul class="issue_list anchor_nyan_issue_list">
+				<% unless issue.author.nil? || issue.author.name == "Anonymous" %>
+				<ul class="list-group-item-meta">
+					<span> <%= link_to issue.author.name, user_path(issue.author), :class => "bid_user_u" %></span><%= l(:label_post_on)%> <span> <% a = [] %>
+						<% a << column_content[1] %>
+						<% a << "##{column_content[0]}" << "(#{raw column_content[2]}):" << column_content[4] %>
+						<%= link_to a.join(' '), issue_path(issue), :class => "issue-link" %>
 				</ul>
-				
-			</li>
-			</div>
+				<% end -%>
+				<ul class="list-group-item-meta">
+					<div class="issue-list-description">
+						<%= l(:field_description)%>:<%= issue.description %>
+					</div>
+				</ul>
+				<ul class="list-group-item-meta">
+					<% unless issue.assigned_to_id.nil? %>
+					<span><%= l(:field_assigned_to)%></span><%= raw column_content[5] %>
+					<% end %>
+					<%= l(:label_updated_time_on, format_date(issue.updated_on)).html_safe %>
+					<div class="find-comment-class">
+						<span><%= link_to l(:label_find_all_comments), issue_path(issue) %></span><%= l(:label_comments_count, :count => issue.journals.all.count) %>
+					</div>
+				</ul>
+			</ul>
 			
-			
-			<% @query.block_columns.each do |column|
-			if (text = column_content(column, issue)) && text.present? -%>
-			<tr class="<%= current_cycle %>">
-				<td colspan="<%= @query.inline_columns.size + 1 %>" class="<%= column.css_classes %>"><%= text %></td>
-			</tr>
-			<% end -%>
-			<% end -%>
-			<% end -%>
-		</tbody>
+		</li>
+		</div>
+		
+		<% end -%>
 	</ul>
 </div>
-<div>
-<% end -%>
-
-</div>
-<div style="float: right; padding-top: 30px">
-	<% other_formats_links do |f| %>
-<%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
-<%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
-<%= f.link_to 'PDF', :url => params %>
-<% end %>
-</div>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index e9cf77db1..a483cb724 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,6 +1,3 @@
-<!--add by huang-->
-<!-- <h3 style="padding-top:0px;"> --><!--%= l(:field_issue) %-->
-<!-- div style="padding-bottom: 10px;padding-right:440px;float:right;font-size:11px;" -->
 <div class="content-title-top">
 	<%= link_to l(:label_issue_new), { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new,
               :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }, :class => 'icon icon-add' %>
@@ -15,8 +12,7 @@
 
 <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
 
-<%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project },
-:method => :get, :id => 'query_form') do %>
+<%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project }, :method => :get, :id => 'query_form') do %>
 <%= hidden_field_tag 'set_filter', '1' %>
 <div id="query_form_content" class="hide-when-print">
 	<fieldset id="filters" style="width:650px;" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
@@ -39,11 +35,7 @@
 				</tr>
 				<tr>
 					<td><label for='group_by'><%= l(:field_group_by) %></label></td>
-					<td><%= select_tag('group_by',
-					options_for_select(
-					[[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]},
-					@query.group_by)
-					) %></td>
+					<td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by) ) %></td>
 				</tr>
 				<tr>
 					<td><%= l(:button_show) %></td>
@@ -54,58 +46,49 @@
 	</fieldset>
 </div>
 <div class="buttons hide-when-print">
-
 	<%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
 	<%= link_to l(:label_issue_cancel_query), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>	
 </div>
 <% end %>
 
-
-
 <%= error_messages_for 'query' %>
+
 <% if @query.valid? %>
-<% if @issues.empty? %>
-<table>
-	<tr><td>
-<p class="nodata">
-	<%= l(:label_no_data) %>
-</p>
-<% else %>
-<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
-<!--Modified by nie-->
-<div class="pagination">
-	<ul>
-		<%= pagination_links_full @issue_pages, @issue_count %>
-	<ul>
-		</div>
-<% end %>
-</td></tr>
-<tr><td>
-
-</td></tr>
-</table>
-
-
-
-<div id="csv-export-options" style="display:none;">
-	<h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
-	<%= form_tag(params.merge({:format => 'csv',:page=>nil}), :method => :get, :id => 'csv-export-form') do %>
-	<p>
-		<label><%= radio_button_tag 'columns', '', true %> <%= l(:description_selected_columns) %></label>
-		<br />
-		<label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label>
-	</p>
-	<p>
-		<label><%= check_box_tag 'description', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label>
-	</p>
-	<p class="buttons">
-		<%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
-		<%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
-	</p>
+	<% if @issues.empty? %>
+		<p class="nodata">
+			<%= l(:label_no_data) %>
+		</p>
+	<% else %>
+		<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
+		<div class="pagination"><%= pagination_links_full @issue_pages, @issue_count %> </div>
 	<% end %>
-</div>
+	<div style="float: right; padding-top: 30px">
+		<% other_formats_links do |f| %>
+			<%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
+			<%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
+			<%= f.link_to 'PDF', :url => params %>
+		<% end %>
+	</div>
+
+
+	<div id="csv-export-options" style="display:none;">
+	  <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
+	  <%= form_tag(params.merge({:format => 'csv',:page=>nil}), :method => :get, :id => 'csv-export-form') do %>
+	  <p>
+	    <label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label>
+	  </p>
+	  <p>
+	    <label><%= check_box_tag 'description', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label>
+	  </p>
+	  <p class="buttons">
+	    <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
+	    <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
+	  </p>
+	  <% end %>
+	</div>
 
 <% end %>
+
 <%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %>
 
 <% content_for :sidebar do %>
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index eac4b1436..e23c66b26 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -1620,7 +1620,6 @@ div.autoscroll li.hascontextmenu-1{
 	margin-left: 10px;
 	padding: 8px 10px 0px 10px;/*by young*/
 	border-bottom: 1px dashed rgb(229,229,229);
-	width: 600px;/*by young*/
 	height: auto;
 }