diff --git a/app/assets/javascripts/spam2.js b/app/assets/javascripts/spam2.js
index c3258824c19..5853697836a 100644
--- a/app/assets/javascripts/spam2.js
+++ b/app/assets/javascripts/spam2.js
@@ -50,7 +50,8 @@ function pagination(id, url) {
 function search_table(filter, url) {
 	localStorage.setItem('filter', filter);
 	localStorage.setItem('page-select', pageselect);
-	window.location = url + filter + "/" + $("#pageselect").val();
+	window.location = url + filter + "/30";
+	localStorage.setItem('page-select', "30");
 }
 
 function batch_nav(bulk) {
diff --git a/app/assets/stylesheets/spam2.css b/app/assets/stylesheets/spam2.css
index 704b6024318..fbce44aa2bb 100644
--- a/app/assets/stylesheets/spam2.css
+++ b/app/assets/stylesheets/spam2.css
@@ -49,10 +49,6 @@
 	width: 100%;
 }
 
-#card-top {
-	margin-top: 2vh;
-}
-
 #bulk-nav {
 	margin-top: 2vh;
 	margin-bottom: 1vh;
@@ -68,6 +64,7 @@
 	 text-align: center;
 	 line-height: 1.6;
 }
+
 .border-curve {
 	border-radius: 40px;
 }
@@ -76,24 +73,14 @@
 	color: white !important;
 }
 
-#col-search {
-	cursor: text;
-	text-align: left !important;
-	margin-top: 2px;
-}
-
-#col-select {
-	margin-top: 2px;
-}
-
 .page-table {
 	width: 100%;
 	margin-top: 10px;
 }
 
 .card .navbar .nav .nav-item .active {
-	color: blue;
-	border-bottom: 2px blue solid;
+	color: #343a40;
+	border-bottom: 2px #343a40 solid;
 }
 
 .spam-alert {
@@ -106,8 +93,8 @@
 	#table-card,
 	#bulk-nav,
 	.nav_top,
-	.page-table,
-	#card-top {
+	.page-table
+	{
 		margin-left: 5vw;
 		width: 90vw;
 	}
@@ -115,9 +102,6 @@
 		font-size: 18px;
 		margin-bottom: 10px;
 	}
-	#card-top .card-header {
-		font-size: 18px;
-	}
 	#info-btn {
 		margin-left: 5vw;
 	}
diff --git a/app/controllers/batch_controller.rb b/app/controllers/batch_controller.rb
new file mode 100644
index 00000000000..aaf9dec52a6
--- /dev/null
+++ b/app/controllers/batch_controller.rb
@@ -0,0 +1,149 @@
+class BatchController < ApplicationController
+  before_action :require_user
+
+  def batch_spam
+    if logged_in_as(%w(moderator admin))
+      user_spamed = []
+      node_spamed = 0
+      params[:ids].split(',').uniq.each do |nid|
+        node = Node.find nid
+        node_spamed += 1
+        node.spam
+        user = node.author
+        user_spamed << user.id
+        user.ban
+      end
+      flash[:notice] = node_spamed.to_s + ' nodes spammed and ' + user_spamed.length.to_s + ' users banned.'
+      redirect_to '/spam2'
+    else
+      flash[:error] = 'Only admins and moderators can mark a batch spam.'
+      redirect_to '/dashboard'
+    end
+  end
+
+  def batch_publish
+    if logged_in_as(%w(moderator admin))
+      node_published = 0
+      user_published = []
+      params[:ids].split(',').uniq.each do |nid|
+        node = Node.find nid
+        node_published += 1
+        node.publish
+        user = node.author
+        user.unban
+        user_published << user.id
+      end
+      flash[:notice] = node_published.to_s + ' nodes published and ' + user_published.length.to_s + ' users unbanned.'
+      redirect_to '/spam2'
+    else
+      flash[:error] = 'Only admins and moderators can batch publish.'
+      redirect_to '/dashboard'
+    end
+  end
+
+  def batch_delete
+    if logged_in_as(%w(moderator admin))
+      node_delete = 0
+      params[:ids].split(',').uniq.each do |nid|
+        node = Node.find nid
+        node_delete += 1
+        node.delete
+      end
+      flash[:notice] = node_delete.to_s + ' nodes deleted'
+      redirect_back fallback_location: root_path
+    else
+      flash[:error] = 'Only admins and moderators can batch delete.'
+      redirect_to '/dashboard'
+    end
+  end
+
+  def batch_ban
+    if logged_in_as(%w(admin moderator))
+      user_ban = []
+      params[:ids].split(',').uniq.each do |nid|
+        node = Node.find nid
+        user = node.author
+        user_ban << user.id
+        user.ban
+      end
+      flash[:notice] = user_ban.length.to_s + ' users banned.'
+      redirect_back fallback_location: root_path
+    else
+      flash[:error] = 'Only admins and moderators can ban users.'
+      redirect_to '/dashboard'
+    end
+  end
+
+  def batch_unban
+    unbanned_users = []
+    if logged_in_as(%w(moderator admin))
+      params[:ids].split(',').uniq.each do |node_id|
+        node = Node.find node_id
+        user_unban = node.author
+        unbanned_users << user_unban.id
+        user_unban.unban
+      end
+      flash[:notice] = unbanned_users.length.to_s + ' users unbanned.'
+      redirect_back fallback_location: root_path
+    else
+      flash[:error] = 'Only admins and moderators can unban users.'
+      redirect_to '/dashboard'
+    end
+  end
+
+  def batch_ban_user
+    users = []
+    if logged_in_as(%w(admin moderator))
+      params[:ids].split(',').uniq.each do |user_id|
+        user_ban = User.find user_id
+        users << user_ban.id
+        user_ban.ban
+      end
+      flash[:notice] = users.length.to_s + ' users banned.'
+      redirect_back fallback_location: root_path
+    else
+      flash[:error] = 'Only moderators can moderate users.'
+      redirect_to '/dashboard'
+    end
+  end
+
+  def batch_unban_user
+    if logged_in_as(%w(moderator admin))
+      params[:ids].split(',').uniq.each do |id|
+        unban_user = User.find id
+        unban_user.unban
+      end
+      flash[:notice] = 'Success! users unbanned.'
+      redirect_back fallback_location: root_path
+    else
+      flash[:error] = 'Only admins and moderators can moderate users.'
+      redirect_to '/dashboard'
+    end
+  end
+
+  def batch_comment
+    if logged_in_as(%w(moderator admin))
+      comment_total = 0
+      params[:ids].split(',').uniq.each do |cid|
+        comment = Comment.find cid
+        comment_total += 1
+        case params[:type]
+        when 'publish'
+          comment.publish
+        when 'spam'
+          comment.spam
+          user.ban
+        when 'delete'
+          comment.delete
+        else
+          flash[:notice] = 'Invalid Url'
+        end
+      end
+      flash[:notice] = comment_total.to_s + ' comment moderated'
+      redirect_back fallback_location: root_path
+    else
+      flash[:error] = 'Only admins and moderators can moderate comments.'
+      redirect_to '/dashboard'
+    end
+  end
+end
diff --git a/app/controllers/spam2_controller.rb b/app/controllers/spam2_controller.rb
index fdf86fee2a5..94d7f29509f 100644
--- a/app/controllers/spam2_controller.rb
+++ b/app/controllers/spam2_controller.rb
@@ -16,8 +16,6 @@ def _spam
                  else
                    @nodes.where(status: [0, 4]).order('changed DESC')
                  end
-      @node_unmoderated_count = Node.where(status: 4).size
-      @node_flag_count = Node.where('flag > ?', 0).size
     else
       flash[:error] = 'Only moderators can moderate posts.'
       redirect_to '/dashboard'
@@ -48,6 +46,32 @@ def _spam_flags
     end
   end
 
+  def _spam_queue
+    if logged_in_as(%w(moderator admin))
+      @tags_followed = TagSelection.where(following: true, user_id: current_user.id)
+      @tag_queue = case params[:tag]
+                   when 'everything'
+                     TagSelection.where(following: true, user_id: current_user.id)
+                   else
+                     tids = Tag.where(name: params[:tag]).collect(&:tid)
+                     TagSelection.where(following: true, tid: tids, user_id: current_user.id)
+                   end
+      nodes = []
+      @tag_queue.each do |tag_queue_name|
+        nodes += NodeTag.where(tid: tag_queue_name.tid).collect(&:nid)
+      end
+      @queue = Node.where(status: [0, 4]).or(Node.where('flag > ?', 0))
+                    .where(nid: nodes, type: %w(note page))
+                    .paginate(page: params[:page], per_page: 30)
+                    .order('changed DESC')
+                    .distinct
+      render template: 'spam2/_spam'
+    else
+      flash[:error] = 'Only moderators can moderate posts.'
+      redirect_to '/dashboard'
+    end
+  end
+
   def _spam_users
     if logged_in_as(%w(moderator admin))
       @users = User.paginate(page: params[:page], per_page: params[:pagination])
@@ -61,8 +85,6 @@ def _spam_users
                  else
                    @users.where('rusers.status = 1')
                  end
-      @user_active_count = User.where('rusers.status = 1').size
-      @user_ban_count = User.where('rusers.status = 0').size
       render template: 'spam2/_spam'
     else
       flash[:error] = 'Only moderators can moderate other users.'
@@ -73,7 +95,7 @@ def _spam_users
   def _spam_revisions
     if logged_in_as(%w(admin moderator))
       @revisions = Revision.where(status: 0)
-                           .paginate(page: params[:page], per_page: 50)
+                           .paginate(page: params[:page], per_page: 30)
                            .order('timestamp DESC')
       render template: 'spam2/_spam'
     else
@@ -97,8 +119,6 @@ def _spam_comments
                     .or(@comments.where('flag > ?', 0))
                     .order('timestamp DESC')
                   end
-      @comment_unmoderated_count = Comment.where(status: 4).size
-      @comment_flag_count = Comment.where('flag > ?', 0).size
       render template: 'spam2/_spam'
     else
       flash[:error] = 'Only moderators can moderate comments.'
@@ -106,126 +126,6 @@ def _spam_comments
     end
   end
 
-  def batch_spam
-    if logged_in_as(%w(moderator admin))
-      user_spamed = []
-      node_spamed = 0
-      params[:ids].split(',').uniq.each do |nid|
-        node = Node.find nid
-        node_spamed += 1
-        node.spam
-        user = node.author
-        user_spamed << user.id
-        user.ban
-      end
-      flash[:notice] = node_spamed.to_s + ' nodes spammed and ' + user_spamed.size.to_s + ' users banned.'
-      redirect_to '/spam2'
-    else
-      flash[:error] = 'Only admins and moderators can mark a batch spam.'
-      redirect_to '/dashboard'
-    end
-  end
-
-  def batch_publish
-    if logged_in_as(%w(moderator admin))
-      node_published = 0
-      user_published = []
-      params[:ids].split(',').uniq.each do |nid|
-        node = Node.find nid
-        node_published += 1
-        node.publish
-        user = node.author
-        user.unban
-        user_published << user.id
-      end
-      flash[:notice] = node_published.to_s + ' nodes published and ' + user_published.size.to_s + ' users unbanned.'
-      redirect_to '/spam2'
-    else
-      flash[:error] = 'Only admins and moderators can batch publish.'
-      redirect_to '/dashboard'
-    end
-  end
-
-  def batch_delete
-    if logged_in_as(%w(moderator admin))
-      node_delete = 0
-      params[:ids].split(',').uniq.each do |nid|
-        node = Node.find nid
-        node_delete += 1
-        node.delete
-      end
-      flash[:notice] = node_delete.to_s + ' nodes deleted'
-      redirect_back fallback_location: root_path
-    else
-      flash[:error] = 'Only admins and moderators can batch delete.'
-      redirect_to '/dashboard'
-    end
-  end
-
-  def batch_ban
-    if logged_in_as(%w(admin moderator))
-      user_ban = []
-      params[:ids].split(',').uniq.each do |nid|
-        node = Node.find nid
-        user = node.author
-        user_ban << user.id
-        user.ban
-      end
-      flash[:notice] = user_ban.size.to_s + ' users banned.'
-      redirect_back fallback_location: root_path
-    else
-      flash[:error] = 'Only admins and moderators can ban users.'
-      redirect_to '/dashboard'
-    end
-  end
-
-  def batch_unban
-    unbanned_users = []
-    if logged_in_as(%w(moderator admin))
-      params[:ids].split(',').uniq.each do |node_id|
-        node = Node.find node_id
-        user_unban = node.author
-        unbanned_users << user_unban.id
-        user_unban.unban
-      end
-      flash[:notice] = unbanned_users.size.to_s + ' users unbanned.'
-      redirect_back fallback_location: root_path
-    else
-      flash[:error] = 'Only admins and moderators can unban users.'
-      redirect_to '/dashboard'
-    end
-  end
-
-  def batch_ban_user
-    users = []
-    if logged_in_as(%w(admin moderator))
-      params[:ids].split(',').uniq.each do |user_id|
-        user_ban = User.find user_id
-        users << user_ban.id
-        user_ban.ban
-      end
-      flash[:notice] = users.size.to_s + ' users banned.'
-      redirect_back fallback_location: root_path
-    else
-      flash[:error] = 'Only moderators can moderate users.'
-      redirect_to '/dashboard'
-    end
-  end
-
-  def batch_unban_user
-    if logged_in_as(%w(moderator admin))
-      params[:ids].split(',').uniq.each do |id|
-        unban_user = User.find id
-        unban_user.unban
-      end
-      flash[:notice] = 'Success! users unbanned.'
-      redirect_back fallback_location: root_path
-    else
-      flash[:error] = 'Only admins and moderators can moderate users.'
-      redirect_to '/dashboard'
-    end
-  end
-
   def flag_node
     @node = Node.find params[:id]
     @node.flag_node
diff --git a/app/views/spam2/_comments.html.erb b/app/views/spam2/_comments.html.erb
index 543bf22d3c6..ad0133efc44 100644
--- a/app/views/spam2/_comments.html.erb
+++ b/app/views/spam2/_comments.html.erb
@@ -1,6 +1,13 @@
 <script>
 $(document).ready(function () {
   var table = table_main("#comment_table");
+	$("#all").click(function () { //select all button
+		$('.selectedId').prop('checked', !$('.selectedId').prop('checked'));
+		var check = ($('.selectedId').filter(":checked").length == $('.selectedId').length);
+		$('#select-count').text($('.selectedId').filter(":checked").length);
+		$('#selectall').prop("checked", check);
+		disable_buttons('#selectall');
+  });
   var pageselect_val = localStorage.getItem('page-select') || '';
   $("#pageselect").val(pageselect_val);
 	$('#pageselect').change(function () {
@@ -17,6 +24,15 @@ $(document).ready(function () {
 	});
 	$('#unmoderated').on('click', function () { // unmoderated filter
 		search_table("unmoderated", "/spam2/comments/filter/");
+  });
+	$("#batch-spam").bind('click', function (e) { //batch spam
+		batch_nav("batch_comment/spam");
+	});
+	$("#batch-publish").bind('click', function (e) { //batch publish
+		batch_nav("batch_comment/publish");
+	});
+	$("#batch-delete").bind('click', function (e) { //batch delete
+		batch_nav("batch_comment/delete");
 	});
 });
 </script>
@@ -24,19 +40,19 @@ $(document).ready(function () {
   <div class="bg-light  navbar navbar-expand">
       <ul class="nav navbar-expand  navbar-nav-scroll">
       <li class="nav-item">
-        <a class="btn nav-link text-secondary font-weight-bold" data-toggle="tooltip" data-placement="top" title="Selected per page">Selected <span id="select-count" class="badge badge-dark">0</span></a>
+        <a class="btn nav-link text-secondary" data-toggle="tooltip" data-placement="top" title="Selected per page">Selected <span id="select-count" class="badge badge-dark">0</span></a>
       </li>
       <li class="nav-item">
-        <a id="reset" class="btn nav-link font-weight-bold <% if params[:type] == "all" %> active<% else %> text-secondary<% end %>"><i class="fa fa-arrow-circle-o-up <% if params[:type] == "all" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Latest updated Comments"></i> New Activity</a>
+        <a id="reset" class="btn nav-link <% if params[:type] == "all" %> active<% else %> text-secondary<% end %>"><i class="fa fa-arrow-circle-o-up <% if params[:type] == "all" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Latest updated Comments"></i> New Activity</a>
       </li>
       <li class="nav-item">
-        <a id="spammed" class="btn nav-link font-weight-bold <% if params[:type] == "spammed" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-ban <% if params[:type] == "spammed" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all Spammed Comments "></i> Spammed </a>
+        <a id="spammed" class="btn nav-link <% if params[:type] == "spammed" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-ban <% if params[:type] == "spammed" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all Spammed Comments "></i> Spammed </a>
       </li>
       <li class="nav-item">
-        <a id="unmoderated" class="btn nav-link font-weight-bold <% if params[:type] == "unmoderated" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-check-square-o <% if params[:type] == "unmoderated" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all unmoderated Comments"></i> Unmoderated</a>
+        <a id="unmoderated" class="btn nav-link <% if params[:type] == "unmoderated" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-check-square-o <% if params[:type] == "unmoderated" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all unmoderated Comments"></i> Unmoderated</a>
       </li>
       <li class="nav-item">
-        <a id="flagged" class="btn nav-link font-weight-bold <% if params[:type] == "flagged" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-flag <% if params[:type] == "flagged" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all Flagged Comments and sort by flag count"></i> Flagged</a>
+        <a id="flagged" class="btn nav-link <% if params[:type] == "flagged" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-flag <% if params[:type] == "flagged" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all Flagged Comments and sort by flag count"></i> Flagged</a>
       </li>
     </ul>
   </div>
@@ -59,16 +75,16 @@ $(document).ready(function () {
             <td><input  class="selectedId" value="<%= comment.id %>" type="checkbox" /></td>
             <td>
               <% unless comment.node.nil? %>
-                <i class="fa fa-<% if comment.flag == 0%>file text-secondary<% elsif comment.flag >10%>flag text-danger<% else %>flag text-dark<% end %>"></i> <a href="<%= comment.node&.path %>" id="node-hover" class="text-dark font-weight-bold" data-toggle="modal" data-target="#ninfo<%= comment.id %>"><%= comment.node&.title.truncate(15) %></a><br>
-                <span class="text-secondary small"><%= comment.node&.type.capitalize %>(<%= time_ago_in_words(comment.node&.created_at) %> ago)</span>
+                <% if comment.status == 1 %><i class="fa fa-check text-success"></i> <% elsif comment.status == 0 %><i class="fa fa-ban text-danger"></i> <% elsif comment.status == 4 %><i class="fa fa-circle text-primary"></i><% end %>
+                <a href="<%= comment.node&.path %>" id="node-hover" class="text-dark font-weight-bold" data-toggle="modal" data-target="#ninfo<%= comment.id %>"><%= comment.node&.title.truncate(15) %></a><br>
+                <span class="text-secondary small"><%= comment.node&.type.capitalize %> | <%= time_ago_in_words(comment.node&.created_at) %> ago</span>
               <% end %>            
               </td>
             <td style="width:200px;" class="text-secondary font-italic">
               <%= comment.body.truncate(20) %>
             </td>
             <td>
-              <a href="/profile/<%= comment.author&.name.truncate(15) %>" class="text-info"><%= comment.author&.name %></a> <br>
-                <% if comment.status == 1 %><span class="badge badge-pill badge-success"><i class="fa fa-check-circle text-white"></i> Published</span><% elsif comment.status == 0 %><span class="badge badge-pill badge-danger"><i class="fa fa-ban text-white"></i> Spammed</span><% elsif comment.status == 4 %><span class="badge badge-pill badge-primary"><i class="fa fa-circle text-white"></i> Unmoderated</span><% end %> <% if comment.flag > 0%><span class="badge badge-pill badge-light"> <%=  comment.flag %></span ><% end %>
+              <a href="/profile/<%= comment.author&.name %>" class="text-info"><%= comment.author&.name.truncate(15) %></a> <span class="badge badge-pill badge-light text-warning"><%= comment.flag%></span>
             </td>
             <td>
               <% unless comment.node.nil? %>
@@ -80,7 +96,7 @@ $(document).ready(function () {
                <a class="btn btn-xs font-weight-bold btn<% if comment.status != 0 %>-danger<% else %>-secondary disabled<% end %> spam" data-remote="true" href="/admin/mark_comment_spam/<%= comment.id %>"><i class="fa fa-ban fa-white"></i> Spam</a> 
                <a class="btn btn-xs font-weight-bold btn-secondary ban a<%= comment.author.id %>" <% if comment.author.status == 0 %>style="display:none;"<% end %> data-remote="true" href="/ban/<%= comment.author.id %>">Ban user</a>
                <a class="btn btn-xs font-weight-bold btn-secondary unban a-unban<%= comment.author.id %>" <% if comment.author.status == 1 %>style="display:none;"<% end %> data-remote="true" href="/unban/<%= comment.author.id %>">Unban user</a>
-               <a class="btn btn-xs text-dark font-weight-bold unflag btn-<% if comment.flag > 0%>warning <% else %>secondary disabled<% end %>" data-remote="true" href="/moderate/remove_flag_comment/<%= comment.id %>">Unflag</a>
+               <a class="btn btn-xs text-dark font-weight-bold unflag btn-<% if comment.flag > 0%>warning <% else %>warning disabled<% end %>" data-remote="true" href="/moderate/remove_flag_comment/<%= comment.id %>">Unflag</a>
                <%= link_to "/comment/delete/#{comment.cid}", data: { confirm: "Are you sure you want to delete this comment?" }, :remote => true, :class => "btn border-curve btn-sm font-weight-bold btn-light delete" do %>
                   <i class="fa fa-trash text-dark"></i>
                 <% end %>
diff --git a/app/views/spam2/_flags.html.erb b/app/views/spam2/_flags.html.erb
index 14cf0f5706f..46ac9aec053 100644
--- a/app/views/spam2/_flags.html.erb
+++ b/app/views/spam2/_flags.html.erb
@@ -49,22 +49,22 @@ $(document).ready(function () {
   <div class="bg-light  navbar navbar-expand">
     <ul class="nav navbar-expand  navbar-nav-scroll">
       <li class="nav-item">
-        <a class="btn nav-link text-secondary font-weight-bold" data-toggle="tooltip" data-placement="top" title="Selected per page">Selected <span id="select-count" class="badge badge-dark">0</span></a>
+        <a class="btn nav-link text-secondary" data-toggle="tooltip" data-placement="top" title="Selected per page">Selected <span id="select-count" class="badge badge-dark">0</span></a>
       </li>
       <li class="nav-item">
-        <a id="reset" class="btn nav-link font-weight-bold <% if params[:type] == "all" %> active<% else %> text-secondary<% end %>"><i class="fa fa-arrow-circle-o-up <% if params[:type] == "all" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Latest updated flagged Nodes"></i> Flagged</a>
+        <a id="reset" class="btn nav-link <% if params[:type] == "all" %> active<% else %> text-secondary<% end %>"><i class="fa fa-arrow-circle-o-up <% if params[:type] == "all" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Latest updated flagged Nodes"></i> Flagged</a>
       </li>
       <li class="nav-item">
-        <a id="spammed" class="btn nav-link font-weight-bold<% if params[:type] == "spammed" %>  active <% else %> text-secondary <% end %>"> <i class="fa fa-ban <% if params[:type] == "spammed" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all flag Nodes which are spammed"></i> Spammed </a>
+        <a id="spammed" class="btn nav-link <% if params[:type] == "spammed" %>  active <% else %> text-secondary <% end %>"> <i class="fa fa-ban <% if params[:type] == "spammed" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all flag Nodes which are spammed"></i> Spammed </a>
       </li>
       <li class="nav-item">
-        <a id="unmoderated" class="btn nav-link  font-weight-bold<% if params[:type] == "unmoderated" %>  active <% else %> text-secondary <% end %>"> <i class="fa fa-check-square-o <% if params[:type] == "unmoderated" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all flag Nodes which are unmoderated"></i> Unmoderated</a>
+        <a id="unmoderated" class="btn nav-link  <% if params[:type] == "unmoderated" %>  active <% else %> text-secondary <% end %>"> <i class="fa fa-check-square-o <% if params[:type] == "unmoderated" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all flag Nodes which are unmoderated"></i> Unmoderated</a>
       </li>
       <li class="nav-item">
-        <a id="page" class="btn nav-link font-weight-bold<% if params[:type] == "page" %>  active <% else %> text-secondary <% end %>"> <i class="fa fa-file-text-o <% if params[:type] == "page" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all Wikis which are flagged"></i> Page</a>
+        <a id="page" class="btn nav-link <% if params[:type] == "page" %>  active <% else %> text-secondary <% end %>"> <i class="fa fa-file-text-o <% if params[:type] == "page" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all Wikis which are flagged"></i> Page</a>
       </li>
       <li class="nav-item">
-        <a id="note" class="btn nav-link font-weight-bold <% if params[:type] == "note" %>  active <% else %> text-secondary <% end %>"> <i class="fa fa-file-o <% if params[:type] == "note" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all Notes which are flagged"></i> Notes</a>
+        <a id="note" class="btn nav-link <% if params[:type] == "note" %>  active <% else %> text-secondary <% end %>"> <i class="fa fa-file-o <% if params[:type] == "note" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all Notes which are flagged"></i> Notes</a>
       </li>
     </ul>
   </div>
@@ -88,7 +88,7 @@ $(document).ready(function () {
             <td>
               <i class="fa fa-flag text-<% if flag.flag > 10%>danger<% else%>secondary<%end%>"></i> 
               <a href="javascript:void(0);" class="text-dark font-weight-bold" id="node-hover" data-toggle="modal" data-target="#ninfo<%= flag.id %>"><%= flag.title.truncate(15) %></a><br />
-              <span class="text-secondary small"><%= flag.type.capitalize %>( <%= time_ago_in_words(flag.created_at) %> ago)</span>
+              <span class="text-secondary small"><%= flag.type.capitalize %> | <%= time_ago_in_words(flag.created_at) %> ago</span>
             </td>
             <td>  
               <a href="/profile/<%= flag.author&.name %>" class="text-info"><%= flag.author&.name %> <%= flag.author&.new_contributor%></a><br>
diff --git a/app/views/spam2/_nodes.html.erb b/app/views/spam2/_nodes.html.erb
index 64aa5376f7c..3cf9e8a68c8 100644
--- a/app/views/spam2/_nodes.html.erb
+++ b/app/views/spam2/_nodes.html.erb
@@ -42,31 +42,32 @@ $(document).ready(function () {
 	});
 });
 </script>
-
 <div class="card" id="table-card">
   <div class="bg-light navbar navbar-expand">
     <ul class="nav navbar-expand navbar-nav-scroll">
       <li class="nav-item">
-        <a class="btn nav-link text-secondary font-weight-bold" data-toggle="tooltip" data-placement="top" title="Selected per page"> Selected <span id="select-count" class="badge badge-dark">0</span></a>
+        <a class="btn nav-link text-secondary" data-toggle="tooltip" data-placement="top" title="Selected per page"> Selected <span id="select-count" class="badge badge-dark">0</span></a>
       </li>
-      <% if params[:type] != "wiki" %>
       <li class="nav-item">
-        <a id="reset_all" class="btn nav-link font-weight-bold <% if params[:type] == "all" %> active<% else %> text-secondary<% end %>"><i class="fa fa-arrow-circle-o-up <% if params[:type] == "all" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Latest updated Nodes"></i> New Activity</a>
+        <a id="reset_all" class="btn nav-link  <% if params[:type] == "all" %> active<% else %> text-secondary<% end %>"><i class="fa fa-arrow-circle-o-up <% if params[:type] == "all" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Latest updated Nodes"></i> New Activity </a>
       </li>
+      <% if params[:type] != "wiki" %>
       <li class="nav-item">
-        <a id="created" class="btn nav-link font-weight-bold <% if params[:type] == "created" %> active <% else %> text-secondary <% end %>"><i class="fa fa-list-ol <% if params[:type] == "created" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Order as per their creation time "></i> Recent </a>
+        <a id="created" class="btn nav-link  <% if params[:type] == "created" %> active <% else %> text-secondary <% end %>"><i class="fa fa-list-ol <% if params[:type] == "created" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Order as per their creation time "></i> Recent </a>
       </li>
       <li class="nav-item">
-        <a id="spammed" class="btn nav-link font-weight-bold <% if params[:type] == "spammed" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-ban <% if params[:type] == "spammed" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all Spammed Nodes "></i> Spammed </a>
+        <a id="spammed" class="btn nav-link  <% if params[:type] == "spammed" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-ban <% if params[:type] == "spammed" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all Spammed Nodes "></i> Spammed <span class="badge badge-dark"><%= Node.where(status: 0).length %></span></a> 
       </li>
       <li class="nav-item">
-        <a id="unmoderated" class="btn nav-link font-weight-bold <% if params[:type] == "unmoderated" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-check-square-o <% if params[:type] == "unmoderated" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all unmoderated Nodes"></i> Unmoderated</a>
+        <a id="unmoderated" class="btn nav-link  <% if params[:type] == "unmoderated" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-check-square-o <% if params[:type] == "unmoderated" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all unmoderated Nodes"></i> Unmoderated</a>
       </li>
       <% end %>
     </ul>
   </div>
   <div class="card-body" style="overflow-x:hidden;">
-    <div class="my-0 text-secondary small "><%= page_entries_info(@nodes) %></div>
+    <% unless @nodes.empty? %>
+    <div class="my-0 text-secondary small "><%= page_entries_info(@nodes) %>s</div>
+    <% end %>
     <table  id="node_table" class="nowrap table table-hover" style="width:100%; text-align:left">
       <thead style="text-align:left;">
         <tr>
@@ -74,7 +75,7 @@ $(document).ready(function () {
           <th>Title</th>
           <th>Author</th>
           <th>Status</th>
-          <th><% if params[:type] == "created" %>Created at <% else %> Updated at <% end %></th>
+          <th><% if params[:type] == "created"%>Created at <% else %> Updated at <% end %></th>
           <th>Action</th>                                
         </tr>       
       </thead>
@@ -85,7 +86,7 @@ $(document).ready(function () {
             <td>
               <i class="fa fa-file text-secondary"></i> 
               <a href="javascript:void(0);" class="text-dark font-weight-bold" id="node-hover" data-toggle="modal" data-target="#ninfo<%= node.id %>"><%= node.title.truncate(15) %></a><br />
-               <span class="text-secondary small"><%= node.type.capitalize %>(<% if params[:type] == "created"%><%= time_ago_in_words(node.updated_at) %><% else %><%= time_ago_in_words(node.created_at) %><% end %> ago)</span>
+               <span class="text-secondary small"><%= node.type.capitalize %> | <% if params[:type] == "created"%><%= time_ago_in_words(node.updated_at) %><% else %><%= time_ago_in_words(node.created_at) %><% end %> ago</span>
             </td>
             <td>  
               <a href="/profile/<%= node.author&.name %>" class="text-info"><%= node.author&.name.truncate(15) %> <%= node.author&.new_contributor%></a><br>
@@ -95,7 +96,7 @@ $(document).ready(function () {
               <% if node.status == 1 %><span class="badge badge-pill badge-success"><i class="fa fa-check-circle text-white"></i> Published</span><% elsif node.status == 0 %><span class="badge badge-pill badge-danger"><i class="fa fa-ban text-white"></i> Spammed</span><% elsif node.status == 4 %><span class="badge badge-pill badge-primary"><i class="fa fa-circle text-white"></i> Unmoderated</span><% end %>
             </td>
              <td>
-               <span class="text-dark"><% if params[:type] == "created"%><%= time_ago_in_words(node.created_at) %> <% else %><%= time_ago_in_words(node.updated_at) %> <% end %> ago</span>
+               <span class="text-dark"><% if params[:type] == "created" %><%= time_ago_in_words(node.created_at) %> <% else %><%= time_ago_in_words(node.updated_at) %> <% end %> ago</span>
             </td>
              <td>
                <a class="btn btn-xs font-weight-bold btn<% if node.status != 1 %>-success<% else %>-secondary disabled<% end %> publish" data-remote="true" href="/moderate/publish/<%= node.id %>" ><i class="fa fa-check-circle fa-white"></i> Publish post</a>
@@ -158,9 +159,9 @@ $(document).ready(function () {
 </div>
 <div class="page-table">
   <div class="float-right">
-    <%= will_paginate @nodes, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer unless @unpaginated || @nodes.empty?%>
+    <%= will_paginate @nodes, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer unless @unpaginated || @nodes.empty? %>
   </div>
-  <div class="float-left">
-    Page number <%= @nodes.current_page%> of <%= @nodes.total_pages %> total Pages
+  <div class="float-left text-secondary">
+    <% unless @nodes.empty? %> Page number <%= @nodes.current_page %> of <%= @nodes.total_pages %> total Pages <% end %>
   </div>
 </div>
diff --git a/app/views/spam2/_queue.html.erb b/app/views/spam2/_queue.html.erb
new file mode 100644
index 00000000000..2b2275e2429
--- /dev/null
+++ b/app/views/spam2/_queue.html.erb
@@ -0,0 +1,152 @@
+<script>
+$(document).ready(function () {
+	var table = table_main("#queue_table");
+	$("#all").click(function () { //select all button
+		$('.selectedId').prop('checked', !$('.selectedId').prop('checked'));
+		var check = ($('.selectedId').filter(":checked").length == $('.selectedId').length);
+		$('#select-count').text($('.selectedId').filter(":checked").length);
+		$('#selectall').prop("checked", check);
+		disable_buttons('#selectall');
+  });
+	$("#batch-spam").bind('click', function (e) { //batch spam
+		batch_nav("batch_spam");
+  });
+	$("#batch-publish").bind('click', function (e) { //batch publish
+		batch_nav("batch_publish");
+	});
+	$("#batch-ban").bind('click', function (e) { //batch ban
+		batch_nav("batch_ban");
+	});
+	$("#batch-unban").bind('click', function (e) { //batch unban
+		batch_nav("batch_unban");
+	});
+	$("#delete-batch").bind('click', function (e) { // batch delete
+		batch_nav("batch_delete");
+	});
+});
+</script>
+
+<div class="py-3 pl-3 w-100">
+  <% if @tags_followed.length == 20 %> <a class="fa fa-plus-circle text-info" href="/subscriptions"> </a> <% end %>
+  <% @tags_followed.limit(20).each do |tag| %>
+    <a class="btn btn-xs btn-<% if params[:tag] ==  tag.tagname %>info<%else%>light border<%end%> border-curve" href="/spam2/queue/filter/<%= tag.tagname %>"><%= tag.tagname %> <span class="badge badge-pill badge-<% if params[:tag] ==  tag.tagname %>light<%else%>info<%end%>" data-toggle="tooltip" data-placement="top" title="Filter Nodes by Tag"><%= Tag.followers(tag.tagname).where('rusers.role = ?', 'moderator').or(Tag.followers(tag.tagname).where('rusers.role = ?', 'admin')).size %></span></a> 
+  <% end %>
+  </div>
+<div class="card" id="table-card">
+  <div class="bg-light navbar navbar-expand">
+    <ul class="nav navbar-expand navbar-nav-scroll">
+      <li class="nav-item">
+        <a class="btn nav-link text-secondary" data-toggle="tooltip" data-placement="top" title="Selected per page"> Selected <span id="select-count" class="badge badge-dark">0</span></a>
+      </li>
+      <li class="nav-item">
+        <a href="/spam2/queue/filter/everything" class="btn nav-link  <% if params[:tag] == "everything" %> active<% else %> text-secondary<% end %>"><i class="fa fa-arrow-circle-o-up <% if params[:type] == "everything" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="All Nodes which you are following"></i> All Tags</a>
+      </li>
+    </ul>
+  </div>
+  <div class="card-body" style="overflow-x:hidden;">
+    <% unless @queue.empty? %>
+    <div class="my-0 text-secondary small "><%= page_entries_info(@queue) %>s</div>
+    <% end %>
+    <table  id="queue_table" class="nowrap table table-hover" style="width:100%; text-align:left">
+      <thead style="text-align:left;">
+        <tr>
+          <th><input type="checkbox"  id="selectall"/></th>
+          <th>Title</th>
+          <th>Author</th>
+          <th>Updated at</th>
+          <th>Action</th>                                
+        </tr>       
+      </thead>
+      <tbody> 
+        <% @queue.each do |node| %>
+          <tr id="n<%= node.id %>">
+            <td><input  class="selectedId" value="<%= node.nid %>" type="checkbox" /></td>
+            <td>
+              <% if node.status == 1 %><i class="fa fa-check text-success"></i> <% elsif node.status == 0 %><i class="fa fa-ban text-danger"></i> <% elsif node.status == 4 %><i class="fa fa-circle text-priamry"></i> <% end %> <% if params[:type] == 'flagged'%> <i class="fa fa-flag text-warning"><% end %>
+              <a href="javascript:void(0);" class="text-dark font-weight-bold" id="node-hover" data-toggle="modal" data-target="#ninfo<%= node.id %>"><%= node.title.truncate(25) %></a><br />
+               <span class="text-secondary small"><%= node.type.capitalize %> | <%= time_ago_in_words(node.created_at) %> ago</span>
+            </td>
+            <td>  
+              <a href="/profile/<%= node.author&.name %>" class="text-info"><%= node.author&.name.truncate(15) %> <%= node.author&.new_contributor%></a><br>
+               <span class="text-secondary small"><%= Node.where(uid: node.author&.id).count %> Nodes<span>
+             </td>
+             <td>
+               <span class="text-dark"><%= time_ago_in_words(node.updated_at) %> ago</span>
+            </td>
+             <td>
+               <a class="btn btn-xs font-weight-bold btn<% if node.status != 1 %>-success<% else %>-secondary disabled<% end %> publish" data-remote="true" href="/moderate/publish/<%= node.id %>" ><i class="fa fa-check-circle fa-white"></i> Publish post</a>
+               <a class="btn btn-xs font-weight-bold btn<% if node.status != 0 %>-danger<% else %>-secondary disabled<% end %> spam" data-remote="true" href="/moderate/spam/<%= node.id %>"><i class="fa fa-ban fa-white"></i> Spam post</a> 
+               <a class="btn btn-xs font-weight-bold btn-secondary ban a<%= node.author.id %>" <% if node.author.status == 0 %>style="display:none;"<% end %> data-remote="true" href="/ban/<%= node.author.id %>">Ban user</a>
+               <a class="btn btn-xs font-weight-bold btn-secondary unban a-unban<%= node.author.id %>" <% if node.author.status == 1 %>style="display:none;"<% end %> data-remote="true" href="/unban/<%= node.author.id %>">Unban user</a>
+               <a class="btn btn-xs font-weight-bold btn-warning unflag <% if node.flag == 0 %>disabled <% end %>" data-remote="true"href="/moderate/remove_flag_node/<%= node.id %>"> Unflag</a>
+               <%= link_to "/notes/delete/#{node.id}", data: { confirm: "Are you sure you want to delete #{node.path}?" }, :remote => true, :class => "btn border-curve btn-sm font-weight-bold btn-light delete" do %>
+                <i class="fa fa-trash text-dark"></i>
+               <% end %>
+               <script>
+                $('#n<%= node.id %> .delete').bind('ajax:success', function(e){
+                  $('#n<%= node.id %>').fadeOut()
+                  $('#deleted').fadeIn();
+                  $('#deleted').fadeOut(3000);
+                });
+                $('#n<%= node.id %> .publish').bind('ajax:success', function(e){
+                  $('#n<%= node.id %>').hide()
+                  $('#npublish').fadeIn(); // published!
+                  $('#npublish').fadeOut(3000);
+                });
+                $('#n<%= node.id %> .spam').bind('ajax:success', function(e){
+                  $('#n<%= node.id %>').hide()
+                  $('#nspam').fadeIn(); // spammed!
+                  $('#nspam').fadeOut(3000);
+                });  
+                $('.a<%= node.author.id %>.ban').bind('ajax:success', function(e){
+                  $('.a<%= node.author.id %>').hide()  // ban toggle
+                  $('.a-unban<%= node.author.id %>').show()
+                });
+                $('.a-unban<%= node.author.id %>.unban').bind('ajax:success', function(e){
+                  $('.a-unban<%= node.author.id %>').hide()
+                  $('.a<%= node.author.id %>').show()
+                });
+                $('#n<%= node.id %> .unflag').bind('ajax:success', function(e){
+                  $('#n<%= node.id %>').hide()
+                  $('#nunflag').fadeIn(); // unflag!
+                  $('#nunflag').fadeOut(3000);
+                });  
+                </script>
+              </td>
+            </tr>
+            <div class="modal fade" id="ninfo<%= node.id %>"> 
+              <div class="modal-dialog" >
+                <div class="modal-content">
+                  <div class="modal-header">
+                    <h5 class="modal-title"><a href="<%= node.path %>"><%= node.title %></a></h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                      <span>&times;</span>
+                    </button>
+                  </div>
+                  <div class="modal-body">
+                    <% node.tags.limit(4).each do |tag| %>
+                      <span ><a class="badge badge-primary" href="/questions/tag/<%= tag.name %>"> <%= tag.name %> </a></span>
+                    <% end %>
+                    <br>
+                    <%= node.body %>
+                  </div>
+                  <div class="modal-footer">
+                    <%= time_ago_in_words(node.created_at) %> ago
+                  </div>
+                </div>
+              </div>
+            </div>
+          <% end %>
+        </tbody>
+      </table>                       
+    </div>
+  </div>
+</div>
+<div class="page-table">
+  <div class="float-right">
+    <%= will_paginate @queue, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer unless @unpaginated || @queue.empty? %>
+  </div>
+  <div class="float-left text-secondary">
+    <% unless @queue.empty? %> Page number <%= @queue.current_page %> of <%= @queue.total_pages %> total Pages <% end %>
+  </div>
+</div>
diff --git a/app/views/spam2/_revisions.html.erb b/app/views/spam2/_revisions.html.erb
index 7d8875a72b3..66149205ae1 100644
--- a/app/views/spam2/_revisions.html.erb
+++ b/app/views/spam2/_revisions.html.erb
@@ -5,32 +5,39 @@ $(document).ready(function () {
 </script>
 
 <div class="card" id="table-card">
-  <div class="card-header">
+    <div class="bg-light navbar navbar-expand">
+      <ul class="nav navbar-expand navbar-nav-scroll">
+        <li class="nav-item">
+          <a class="btn nav-link text-secondary" data-toggle="tooltip" data-placement="top" title="Selected per page"> Selected <span id="select-count" class="badge badge-dark">0</span></a>
+        </li>
+      </ul>
   </div>
   <div class="card-body" style="overflow-x:hidden;">
+    <% unless @revisions.empty? %>
+      <div class="my-0 text-secondary small "><%= page_entries_info(@revisions) %>s</div>
+    <% end %>
     <table  id="revision_table" class="nowrap table table-hover" sstyle="width:100%; text-align:left">
       <thead style="text-align:left;">
         <tr>
           <th><input type="checkbox"  id="selectall" /></th>
           <th>Title</th>
           <th>Author</th>
-          <th>Time</th>
+          <th>Updated at</th>
           <th>Action</th>                                
         </tr>       
       </thead>
-
       <tbody> 
         <% @revisions.each do |revision| %>
           <tr id="n<%= revision.vid %>">
             <td><input  class="selectedId" value="<%= revision.vid %>" type="checkbox" /></td>
             <td>
-              <i class="fa fa-file"></i> <a class="text-primary" data-toggle="modal" data-target="#ninfo<%= revision.vid %>"><%= revision.title.truncate(20) %></a>
+              <i class="fa fa-file text-secondary"></i> <a class="text-dark font-weight-bold" data-toggle="modal" data-target="#ninfo<%= revision.vid %>" href="javascript:void(0);"> <%= revision.title.truncate(20) %></a><br />
             </td>
             <td>
-              <a href="/profile/<%= revision.author&.name %>"><%= revision.author&.name %></a> 
+              <a class="text-info" href="/profile/<%= revision.author&.name %>"><%= revision.author&.name %></a> 
             </td>
             <td>
-              <span style="color:grey;"><%= time_ago_in_words(revision.timestamp.seconds.ago) %> ago</span>
+              <span style="color:grey;"><%= time_ago_in_words(revision.updated_at) %> ago</span>
             </td>
             <td>
               <a class="badge badge-pill badge<% if revision.status == 0 %>-success<% else %>-secondary disabled<% end %> publish" data-remote="true" href="/moderate/revision/publish/<%= revision.vid %>"><i class="fa fa-check-circle fa-white"></i> Publish post</a>
@@ -65,7 +72,7 @@ $(document).ready(function () {
   <div class="float-right">
     <%= will_paginate @revisions, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer unless @unpaginated || @revisions.empty?%>
   </div>
-  <div class="float-left">
-    Batch  <%= @revisions.current_page%> of <%= @revisions.total_pages %> total Batches
+  <div class="float-left text-secondary">
+    Batch  <%= @revisions.current_page%> of <%= @revisions.total_pages %> total Pages
   </div>
 </div>
diff --git a/app/views/spam2/_spam.html.erb b/app/views/spam2/_spam.html.erb
index 55e03cfbbf7..31eb7ee837e 100644
--- a/app/views/spam2/_spam.html.erb
+++ b/app/views/spam2/_spam.html.erb
@@ -7,37 +7,40 @@
 <div style="display:none;" id="nspam" class="alert alert-danger alert-dismissible spam-alert" role="alert">
   Content spammed
 </div>
-<div style="display:none;" id="nunflag" class="alert alert-danger alert-dismissible spam-alert" role="alert">
+<div style="display:none;" id="nunflag" class="alert alert-success alert-dismissible spam-alert" role="alert">
   Content unflagged
 </div>
 
 <div class="nav_top flex d-inline">
-  <p class="text-secondary pt-2 float-left nav_title h4">
+  <p class="text-secondary pt-2 float-left nav_title ">
     <% if params[:type] == "wiki" %>
-      <a href="/spam2" class="text-dark"><i class=" pt-1 pr-2 fa fa-certificate text-success"></i> Spam2 / </a><b> Wiki   
+      <a href="/spam2" class="text-dark h4"><i class=" pt-1 pr-2 fa fa-certificate text-success"></i> Spam2 / </a><b> <span class="h2">Wiki</span>
+    <% elsif params[:action] == "_spam_queue"%>
+      <a href="/spam2" class="text-dark h4"><i class=" pt-1 pr-2 fa fa-clock text-success"></i> Spam2 / </a><b> <span class="h2">Queue</span>
     <% elsif params[:action] == "_spam_revisions"%>
-      <a href="/spam2" class="text-dark"><i class=" pt-1 pr-2 fa fa-file text-secondary"></i> Spam2 / </a><b> Revisions
+      <a href="/spam2" class="text-dark h4"><i class=" pt-1 pr-2 fa fa-file text-primary"></i> Spam2 / </a><b> <span class="h2">Revisions</span>
     <% elsif params[:action] == "_spam_comments"%>
-      <a href="/spam2" class="text-dark"><i class=" pt-1 pr-2 fa fa-comments text-info"></i> Spam2 / </a><b> Comments
+      <a href="/spam2" class="text-dark h4"><i class=" pt-1 pr-2 fa fa-comments text-info"></i> Spam2 / </a><b> <span class="h3">Comments</span>
     <% elsif params[:action] == "_spam_flags"%>
-      <a href="/spam2" class="text-dark"><i class=" pt-1 pr-2 fa fa-flag text-primary"></i> Spam2 / </a><b> Flags
+      <a href="/spam2" class="text-dark h4"><i class=" pt-1 pr-2 fa fa-flag text-warning"></i> Spam2 / </a><b> <span class="h2">Flags</span>
     <% elsif params[:action] == "_spam_users"%>
-      <a href="/spam2" class="text-dark"><i class=" pt-1 pr-2 fa fa-user text-info"></i> Spam2 / </a><b> Users
+      <a href="/spam2" class="text-dark h4"><i class=" pt-1 pr-2 fa fa-user text-info"></i> Spam2 / </a><b> <span class="h2">Users</span>
     <% else %>
-      <a href="/spam2" class="text-dark"><i class=" pt-1 pr-2 fa fa-check-circle text-success"></i> Spam2 / </a><b> Bulk Moderation 
+      <a href="/spam2" class="text-dark h4"><i class=" pt-1 pr-2 fa fa-check-circle text-success"></i> Spam2 / </a><b> <span class="h3">Moderation</span> 
     <% end %> </b>
   </p>
   <div class="dropdown float-right">
-    <a class="btn btn-light border border-curve" type="button" id="dropdownMenuLink" href="#" >
+    <a class="btn btn-light border border-curve mt-2" type="button" id="dropdownMenuLink" href="#" >
       Menu <i class="fa fa-align-left text-secondary" aria-hidden="true"></i>
     </a>
     <div class="dropdown-menu dropdown-menu-right">
-      <h6 class="dropdown-header">Menu</h6>
+      <h6 class="dropdown-header">Menu | <%= current_user.role%> </h6>
         <a class="dropdown-item" href="/dashboard"><i class="fa fa-list-alt text-primary"></i> Dashboard</a>
       <div class="dropdown-divider"></div>  
         <h6 class="dropdown-header">Spam Moderation</h6>
-        <a class="dropdown-item <% unless  params[:action] =="_spam_comments" || params[:action] =="_spam_revisions" || params[:action] =="_spam_flags" || params[:type] == "wiki" || params[:action] == "_spam_users"%> active <% end %>" href="/spam2/filter/all/30"><i class="drop fa fa-address-book text-primary"></i> Bulk Moderation</a>
-        <a class="dropdown-item <% if params[:type] == "wiki" %> active <% end %>" href="/spam2/filter/wiki/50" ><i class="drop fa fa-book text-primary"></i> Wiki</a>
+        <a class="dropdown-item <% unless  params[:action] =="_spam_comments" ||params[:action] =="_spam_queue" || params[:action] =="_spam_revisions" || params[:action] =="_spam_flags" || params[:type] == "wiki" || params[:action] == "_spam_users"%> active <% end %>" href="/spam2/filter/all/30"><i class="drop fa fa-address-book text-primary"></i> Moderation</a>
+        <a class="dropdown-item <% if params[:type] == "wiki" %> active <% end %>" id="wiki_drop" href="/spam2/filter/wiki/30" ><i class="drop fa fa-book text-primary"></i> Wiki</a>
+        <a class="dropdown-item <% if params[:action] == "_spam_queue" %> active <% end %>" href="/spam2/queue/filter/everything" ><i class="drop fa fa-clock text-primary"></i> Queue</a>
         <a class="dropdown-item <% if params[:action] == "_spam_revisions" %> active <% end %>" href="/spam2/revisions"><i class="drop fa fa-list text-primary"></i> Revision</a>
         <a class="dropdown-item <% if params[:action] == "_spam_comments" %> active <% end %>" href="/spam2/comments/filter/all/30" ><i class="drop fa fa-comment text-primary"></i> Comments</a>
         <a class="dropdown-item <% if params[:action] == "_spam_flags" %> active <% end %>"  href="/spam2/flags/filter/all/30" ><i class="drop fa fa-flag text-primary"></i> Flag </a>
@@ -45,22 +48,23 @@
       </div>
     </div>
 </div>
-
+<script>
+  $('#wiki_drop').on('click', function () { // Wiki filter
+    localStorage.setItem('page-select', "30");
+    localStorage.setItem('filter', 'wiki');
+  });
+</script>
 <div class="d-flex w-100 " style="overflow-x:auto !important;">
   <a class="btn btn-light border border-curve text-secondary mr-auto font-weight-bold" id="info-btn" data-toggle="collapse" href="#info-div" role="button" aria-expanded="false" aria-controls="info-div">
     Info <i class="fa fa-caret-down text-secondary"></i>
   </a>
   <% if params[:action] != "_spam_revisions" && params[:action] != "_spam_comments" && params[:action] != "_spam_flags" && params[:action] != "_spam_users"%>
-    <div class=" d-inline-flex"><i class="fa fa-sticky-note text-info mt-3 ml-5" data-toggle="tooltip" data-placement="left" title="Unmoderated Nodes"></i><a href="/spam2/filter/unmoderated/30"  class="badge badge-pill badge-light text-info mx-2 my-3"><%= @node_unmoderated_count %></a></div>
-    <div class=" d-inline-flex"><i class="fa fa-flag text-warning mt-3" data-toggle="tooltip" data-placement="left" title="Flagged Nodes"></i><a href="/spam2/flags/filter/all/30" class="badge badge-pill badge-light text-warning mx-2 my-3" ><%= @node_flag_count %></a></div>
+    <div class=" d-inline-flex"><a href="/spam2/filter/unmoderated/30"  class="badge badge-pill badge-light text-secondary mx-2 my-3"><%= Node.where(status: 4).length %> Unmoderated</a></div>
+    <div class=" d-inline-flex"><a href="/spam2/flags/filter/all/30" class="badge badge-pill badge-light text-secondary mx-2 my-3" ><%= Node.where('flag > ?', 0).length %> Flagged</a></div>
   <% end%>
   <% if params[:action] == "_spam_comments" %>
-    <div class=" d-inline-flex"><i class="fa fa-comment text-info ml-5 mt-3" data-toggle="tooltip" data-placement="left" title="Unmoderated Comments"></i><a href="/spam2/comment/filter/unmoderated/30" class="badge badge-pill badge-light text-info mx-2 my-3"><%= @comment_unmoderated_count %></a></div>
-    <div class=" d-inline-flex"><i class="fa fa-flag text-warning mt-3" data-toggle="tooltip" data-placement="left" title="Flagged Comments"></i><a href="/spam2/comments/filter/flagged/30"  class="badge badge-pill badge-light text-warning my-3 mx-2" ><%= @comment_flag_count %></a></div>
-  <% end %>
-  <% if params[:action] == "_spam_users" %>
-    <div class=" d-inline-flex"><i class="fa fa-user text-info ml-5 mt-3" data-toggle="tooltip" data-placement="left" title="Active Users"></i><a href="/spam2/flags/filter/all/30" class="badge badge-pill badge-light text-info mx-2 my-3"><%= @user_active_count %></a></div>
-    <div class=" d-inline-flex"><i class="fa fa-user text-danger  mt-3" data-toggle="tooltip" data-placement="left" title="Banned Users"></i><a href="/spam2/comments/filter/flagged/30"  class="badge badge-pill badge-light text-danger my-3 mx-2" ><%= @user_ban_count %></a></div>
+    <div class=" d-inline-flex"><a href="/spam2/comment/filter/unmoderated/30" class="badge badge-pill badge-light text-secondary mx-2 my-3"><%= Comment.where(status: 4).length %> Unmoderated</a></div>
+    <div class=" d-inline-flex"><a href="/spam2/comments/filter/flagged/30"  class="badge badge-pill badge-light text-secondary my-3 mx-2" ><%= Comment.where('flag > ?', 0).length %> Flagged</a> </div>
   <% end %>
 </div>
 
@@ -71,7 +75,7 @@
 <nav class="navbar navbar-expand " id="bulk-nav">
   <div class="navbar-expand navbar-nav-scroll d-inline">
     <ul class=" navbar-nav">
-      <% if params[:action] != "_spam_revisions" && params[:action] != "_spam_comments" && params[:action] != "_spam_users"%>
+      <% if params[:action] != "_spam_users" && params[:action] != "_spam_revisions"%>
         <li class="nav-item pr-4">
           <a class="nav-link btn btn-light border disabled text-dark d-inline-flex border-curve" id="batch-spam" ><i class=" pt-1 pr-2 fa fa-ban text-danger" data-toggle="tooltip" data-placement="top" title="Mark selected items as spam and ban users"></i>  Spam</a>
         </li>
@@ -81,26 +85,26 @@
         <li class="nav-item pr-4">
           <a class="nav-link btn btn-light border disabled text-dark d-inline-flex border-curve" id="delete-batch"><i class=" pt-1 pr-2 fa fa-trash text-danger" data-toggle="tooltip" data-placement="top" title="Delete Selected items"></i> Delete</a>
         </li>
-        <% end %>
-        <% if params[:action] != "_spam_revisions" && params[:action] != "_spam_comments" %>
         <li class="nav-item pr-4">
           <a class="nav-link btn btn-light border text-dark d-inline-flex border-curve"  id="all" ><i class=" pt-1 pr-2 fa fa-check text-primary" data-toggle="tooltip" data-placement="top" title="Select all in this page"></i> Select</a>
         </li>
+        <% end %>
+        <% if params[:action] != "_spam_revisions" && params[:action] != "_spam_comments" %>
         <li class="nav-item pr-4">
           <a class="nav-link btn btn-light border disabled text-dark d-inline-flex border-curve" id="batch-ban" ><i class=" pt-1 pr-2 fa fa-flag text-warning" data-toggle="tooltip" data-placement="top" title="Ban Users"></i> Ban</a>
         </li>
         <li class="nav-item pr-4">
-          <a class="nav-link btn btn-light border disabled text-dark d-inline-flex border-curve"  id="batch-unban" ><i class=" pt-1 pr-2 fa fa-flag text-success" data-toggle="tooltip" data-placement="top" title="Unban Users"></i> Unban</a>
+          <a class="nav-link btn btn-light border disabled text-dark d-inline-flex border-curve" id="batch-unban" ><i class=" pt-1 pr-2 fa fa-flag text-success" data-toggle="tooltip" data-placement="top" title="Unban Users"></i> Unban</a>
         </li>
+        <% end %>
         <li class="nav-item pr-4">
           <a class="nav-link btn btn-light border d-inline-flex border-curve" id="docs-btn" ><i class=" pt-1 pr-2 fa fa-info-circle text-info" data-toggle="tooltip"  data-placement="top" title="Wiki page for info will be added later"></i> Docs</a>
         </li>
-      <% end %>
     </ul>
   </div>
 </nav>
 
-<% if params[:type] != "wiki" %>
+<% if params[:action] != "_spam_revisions" && params[:action] != "_spam_queue"%>
 <div class="w-20 d-flex ml-1">
   <a class="btn nav-link text-secondary font-weight-bold">Nodes per page </a>
   <select name="Visible" id="pageselect" class="overflow-hiden mt-1 custom-select custom-select-sm form-control form-control-sm">
@@ -115,5 +119,6 @@
 <%= render partial: 'spam2/nodes' if @nodes %>
 <%= render partial: 'spam2/revisions' if @revisions %>
 <%= render partial: 'spam2/comments' if @comments %>
+<%= render partial: 'spam2/queue' if @queue %>
 <%= render partial: 'spam2/flags' if @flags %>
 <%= render partial: 'spam2/users' if @users %>
\ No newline at end of file
diff --git a/app/views/spam2/_users.html.erb b/app/views/spam2/_users.html.erb
index 0e62097ce7b..aac94fdc465 100644
--- a/app/views/spam2/_users.html.erb
+++ b/app/views/spam2/_users.html.erb
@@ -31,24 +31,23 @@ $(document).ready(function () {
 	});
 });
 </script>
-
 <div class="card" id="table-card">
   <div class="bg-light  navbar navbar-expand">
     <ul class="nav navbar-expand  navbar-nav-scroll">
       <li class="nav-item">
-        <a class="btn nav-link text-secondary font-weight-bold" data-toggle="tooltip" data-placement="top" title="Selected per page">Selected <span id="select-count" class="badge badge-dark">0</span></a>
+        <a class="btn nav-link text-secondary " data-toggle="tooltip" data-placement="top" title="Selected per page">Selected <span id="select-count" class="badge badge-dark">0</span></a>
       </li>
       <li class="nav-item">
-        <a id="reset" class="btn nav-link font-weight-bold <% if params[:type] == "all" %> active<% else %> text-secondary<% end %>"><i class="fa fa-arrow-circle-o-up <% if params[:type] == "all" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="All active Users"></i> Active Users</a>
+        <a id="reset" class="btn nav-link <% if params[:type] == "all" %> active<% else %> text-secondary<% end %>"><i class="fa fa-arrow-circle-o-up <% if params[:type] == "all" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="All active Users"></i> Active Users <span class="badge badge-dark"><%= User.where('rusers.status = 1').length %></span></a>
       </li>
       <li class="nav-item">
-        <a id="banned" class="btn nav-link font-weight-bold<% if params[:type] == "banned" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-ban <% if params[:type] == "banned" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all Banned Users"></i> Banned </a>
+        <a id="banned" class="btn nav-link <% if params[:type] == "banned" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-ban <% if params[:type] == "banned" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="Filter all Banned Users"></i> Banned <span class="badge badge-dark"><%= User.where('rusers.status = 0').length %></span></a>
       </li>
       <li class="nav-item">
-        <a id="moderator" class="btn nav-link font-weight-bold<% if params[:type] == "moderator" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-certificate <% if params[:type] == "moderator" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="All Moderators"></i> Moderators </a>
+        <a id="moderator" class="btn nav-link <% if params[:type] == "moderator" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-certificate <% if params[:type] == "moderator" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="All Moderators"></i> Moderators <span class="badge badge-dark"><%= User.where('rusers.role = ?', 'moderator').length %></span></a>
       </li>
       <li class="nav-item">
-        <a id="admin" class="btn nav-link font-weight-bold<% if params[:type] == "admin" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-asterisk <% if params[:type] == "admin" %> text-primary<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="All Admin"></i> Admin </a>
+        <a id="admin" class="btn nav-link <% if params[:type] == "admin" %> active <% else %> text-secondary <% end %>"> <i class="fa fa-asterisk <% if params[:type] == "admin" %> text-dark<% else %> text-secondary<% end %>" data-toggle="tooltip" data-placement="top" title="All Admin"></i> Admin <span class="badge badge-dark"><%= User.where('rusers.role = ?', 'admin').length %></span></a>
       </li>
     </ul>
   </div>
diff --git a/config/routes.rb b/config/routes.rb
index ba0242ab4c0..2d30f35d26c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -297,14 +297,16 @@
   get 'spam2/comments/filter/:type/:pagination' => 'spam2#_spam_comments'
   get 'spam2/users/filter/:type/:pagination' => 'spam2#_spam_users'
   get 'spam2/flags/filter/:type/:pagination' => 'spam2#_spam_flags'
+  get 'spam2/queue/filter/:tag' => 'spam2#_spam_queue'
   get 'spam2/filter/:type/:pagination' => 'spam2#_spam'
-  get 'spam2/batch_spam/:ids' => 'spam2#batch_spam'
-  get 'spam2/batch_publish/:ids' => 'spam2#batch_publish'
-  get 'spam2/batch_delete/:ids' => 'spam2#batch_delete'
-  get 'spam2/batch_ban/:ids' => 'spam2#batch_ban'
-  get 'spam2/batch_unban/:ids' => 'spam2#batch_unban'
-  get 'spam2/batch_ban_user/:ids' => 'spam2#batch_ban_user'
-  get 'spam2/batch_unban_user/:ids' => 'spam2#batch_unban_user'
+  get 'spam2/batch_spam/:ids' => 'batch#batch_spam'
+  get 'spam2/batch_publish/:ids' => 'batch#batch_publish'
+  get 'spam2/batch_delete/:ids' => 'batch#batch_delete'
+  get 'spam2/batch_ban/:ids' => 'batch#batch_ban'
+  get 'spam2/batch_unban/:ids' => 'batch#batch_unban'
+  get 'spam2/batch_ban_user/:ids' => 'batch#batch_ban_user'
+  get 'spam2/batch_unban_user/:ids' => 'batch#batch_unban_user'
+  get 'spam2/batch_comment/:type/:ids' => 'batch#batch_comment'
   get 'admin/users' => 'admin#users'
   get 'admin/queue' => 'admin#queue'
   get 'ban/:id' => 'admin#ban'
diff --git a/test/functional/batch_controller_test.rb b/test/functional/batch_controller_test.rb
new file mode 100644
index 00000000000..0fb803bcc2f
--- /dev/null
+++ b/test/functional/batch_controller_test.rb
@@ -0,0 +1,142 @@
+require 'test_helper'
+
+class BatchControllerTest < ActionController::TestCase
+
+    def setup
+        activate_authlogic
+        Timecop.freeze
+    end
+    
+    def teardown
+        UserSession.find.destroy if UserSession.find
+        Timecop.return
+    end    
+    # batch spam 
+    test 'User which are batch spammed are ban' do
+        UserSession.create(users(:moderator))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
+        get :batch_spam, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
+        assert_redirected_to "/spam2"
+        #  check if authors are banned
+        authors = spam_nodes.collect { |node| User.find(node.author.id) }
+        assert authors.all? { |spammer| spammer.status == 0 }
+    end
+    
+    test 'batch spam ban correct number of users and spam correct number of notes' do
+        UserSession.create(users(:admin))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
+        authors = spam_nodes.collect { |node| node.author }
+        get :batch_spam, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
+        assert_redirected_to "/spam2"
+        assert_equal spam_nodes.length.to_s + ' nodes spammed and ' + authors.uniq.length.to_s + ' users banned.', flash[:notice]
+    end
+      
+    test 'normal user should not be allowed to batch spam' do
+        UserSession.create(users(:bob))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
+        get :batch_spam, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
+        assert_equal "Only admins and moderators can mark a batch spam.", flash[:error]
+        assert_redirected_to "/dashboard"
+    end
+    # batch_publish
+    test 'User which are batch Publish are unbaned' do
+        UserSession.create(users(:moderator))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
+        get :batch_publish, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
+        assert_redirected_to "/spam2"
+        # check if users are unbanned
+        authors = spam_nodes.collect { |node| User.find(node.author.id) }
+        assert authors.all? { |spammer| spammer.status == 1 }
+    end
+
+    test 'batch Publish unban correct number of users and publish correct number of notes' do
+        UserSession.create(users(:admin))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
+        authors = spam_nodes.collect { |node| node.author }
+        get :batch_publish, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
+        #redirect to same path
+        assert_redirected_to '/spam2'
+        assert_equal spam_nodes.length.to_s + ' nodes published and ' + authors.uniq.length.to_s + ' users unbanned.', flash[:notice]
+    end
+
+    test 'normal user should not be allowed to batch publish' do
+        UserSession.create(users(:bob))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
+        get :batch_publish, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
+        assert_equal "Only admins and moderators can batch publish.", flash[:error]
+        assert_redirected_to "/dashboard"
+    end
+    # batch ban 
+    test 'User which are batch banned are ban' do
+        UserSession.create(users(:moderator))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
+        get :batch_ban, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
+        assert_redirected_to root_path
+        # check if they are banned
+        authors = spam_nodes.collect { |node| User.find(node.author.id) }
+        assert authors.all? { |spammer| spammer.status == 0 }
+    end
+
+    test 'batch ban, ban correct number of users' do
+        UserSession.create(users(:admin))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
+        authors = spam_nodes.collect { |node| node.author }
+        get :batch_ban, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
+        assert_redirected_to root_path
+        assert_equal authors.uniq.length.to_s + ' users banned.', flash[:notice]
+    end
+      
+    test 'normal user should not be allowed to batch ban' do
+        UserSession.create(users(:bob))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
+        authors = spam_nodes.collect { |node| node.author }
+        get :batch_ban, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",")}
+        assert_equal "Only admins and moderators can ban users.", flash[:error]
+        assert_redirected_to "/dashboard"
+    end
+    # batch unban 
+    test 'User which are batch unbanned are unban' do
+        UserSession.create(users(:moderator))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
+        get :batch_unban, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
+        assert_redirected_to root_path
+        # check if they are unbanned
+        authors = spam_nodes.collect { |node| User.find(node.author.id) }
+        assert authors.all? { |spammer| spammer.status == 1 }
+    end
+
+    test 'batch unban, unban correct number of users' do
+        UserSession.create(users(:admin))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
+        authors = spam_nodes.collect { |node| node.author }
+        get :batch_unban, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
+        assert_redirected_to root_path
+        assert_equal authors.uniq.length.to_s + ' users unbanned.', flash[:notice]
+    end
+      
+    test 'normal user should not be allowed to batch unban' do
+        UserSession.create(users(:bob))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
+        authors = spam_nodes.collect { |node| node.author }
+        get :batch_unban, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",")}
+        assert_equal "Only admins and moderators can unban users.", flash[:error]
+        assert_redirected_to "/dashboard"
+    end
+    #batch delete
+    test 'Notes which are batch deleted are deleted' do
+        UserSession.create(users(:moderator))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
+        get :batch_delete, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
+        assert_redirected_to root_path
+        # It checks that notes are deleted and number is correct
+        assert_equal spam_nodes.length.to_s + ' nodes deleted', flash[:notice]
+    end 
+    
+    test 'normal user should not be allowed to batch delete' do
+        UserSession.create(users(:bob))
+        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
+        get :batch_delete, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
+        assert_equal "Only admins and moderators can batch delete.", flash[:error]
+        assert_redirected_to "/dashboard"
+    end
+end
diff --git a/test/functional/spam2_controller_test.rb b/test/functional/spam2_controller_test.rb
index 9e92a1f378f..be18b77188a 100644
--- a/test/functional/spam2_controller_test.rb
+++ b/test/functional/spam2_controller_test.rb
@@ -95,160 +95,6 @@ def teardown
         assert_response :success
         assert_not_nil assigns(:flags)
     end
-    # batch spam 
-    test 'User which are batch spammed are ban' do
-        UserSession.create(users(:moderator))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
-        get :batch_spam, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
-        assert_redirected_to "/spam2"
-        #  check if authors are banned
-        authors = spam_nodes.collect { |node| User.find(node.author.id) }
-        assert authors.all? { |spammer| spammer.status == 0 }
-    end
-    
-    test "batched spammed notes are spammed and not present in spam2/wiki as a potential spam" do
-        UserSession.create(users(:admin))
-        spam_node = nodes(:about) 
-        get :_spam, params: { type: "wiki" }
-        # node should be present on spam suggestions because it is not yet spammed
-        assert_select "#n#{spam_node.nid}", 1
-        get :batch_spam, params: { ids: spam_node.nid }
-        # node is no longer on /spam/wiki because it is now already spammed
-        assert_select "#n#{spam_node.nid}", 0
-        # call the node from database to check if spammed
-        assert_equal 0, Node.find(spam_node.id).status
-    end
-    
-    test 'batch spam ban correct number of users and spam correct number of notes' do
-        UserSession.create(users(:admin))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
-        authors = spam_nodes.collect { |node| node.author }
-        get :batch_spam, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
-        assert_redirected_to "/spam2"
-        assert_equal spam_nodes.length.to_s + ' nodes spammed and ' + authors.uniq.length.to_s + ' users banned.', flash[:notice]
-    end
-      
-    test 'normal user should not be allowed to batch spam' do
-        UserSession.create(users(:bob))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
-        get :batch_spam, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
-        assert_equal "Only admins and moderators can mark a batch spam.", flash[:error]
-        assert_redirected_to "/dashboard"
-    end
-    # batch_publish
-    test 'User which are batch Publish are unbaned' do
-        UserSession.create(users(:moderator))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
-        get :batch_publish, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
-        assert_redirected_to "/spam2"
-        # check if users are unbanned
-        authors = spam_nodes.collect { |node| User.find(node.author.id) }
-        assert authors.all? { |spammer| spammer.status == 1 }
-    end
-
-    test "batch published notes are published and not present in spam2 as unmoderated note" do
-        UserSession.create(users(:admin))
-        spam_node = nodes(:spam)
-        get :_spam
-        # node is spammeed and now present in the /spam2 
-        assert_select "#n#{spam_node.nid}", 1
-        get :batch_publish, params: { ids: spam_node.nid }
-        # node is no longer present as it is published
-        assert_select "#n#{spam_node.nid}", 0
-        # call the node from database to check if published
-        assert_equal 1, Node.find(spam_node.id).status
-    end
-
-    test 'batch Publish unban correct number of users and publish correct number of notes' do
-        UserSession.create(users(:admin))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
-        authors = spam_nodes.collect { |node| node.author }
-        get :batch_publish, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
-        #redirect to same path
-        assert_redirected_to '/spam2'
-        assert_equal spam_nodes.length.to_s + ' nodes published and ' + authors.uniq.length.to_s + ' users unbanned.', flash[:notice]
-    end
-
-    test 'normal user should not be allowed to batch publish' do
-        UserSession.create(users(:bob))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
-        get :batch_publish, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
-        assert_equal "Only admins and moderators can batch publish.", flash[:error]
-        assert_redirected_to "/dashboard"
-    end
-    # batch ban 
-    test 'User which are batch banned are ban' do
-        UserSession.create(users(:moderator))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
-        get :batch_ban, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
-        assert_redirected_to root_path
-        # check if they are banned
-        authors = spam_nodes.collect { |node| User.find(node.author.id) }
-        assert authors.all? { |spammer| spammer.status == 0 }
-    end
-
-    test 'batch ban, ban correct number of users' do
-        UserSession.create(users(:admin))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
-        authors = spam_nodes.collect { |node| node.author }
-        get :batch_ban, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
-        assert_redirected_to root_path
-        assert_equal authors.uniq.length.to_s + ' users banned.', flash[:notice]
-    end
-      
-    test 'normal user should not be allowed to batch ban' do
-        UserSession.create(users(:bob))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
-        authors = spam_nodes.collect { |node| node.author }
-        get :batch_ban, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",")}
-        assert_equal "Only admins and moderators can ban users.", flash[:error]
-        assert_redirected_to "/dashboard"
-    end
-    # batch unban 
-    test 'User which are batch unbanned are unban' do
-        UserSession.create(users(:moderator))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
-        get :batch_unban, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
-        assert_redirected_to root_path
-        # check if they are unbanned
-        authors = spam_nodes.collect { |node| User.find(node.author.id) }
-        assert authors.all? { |spammer| spammer.status == 1 }
-    end
-
-    test 'batch unban, unban correct number of users' do
-        UserSession.create(users(:admin))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
-        authors = spam_nodes.collect { |node| node.author }
-        get :batch_unban, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
-        assert_redirected_to root_path
-        assert_equal authors.uniq.length.to_s + ' users unbanned.', flash[:notice]
-    end
-      
-    test 'normal user should not be allowed to batch unban' do
-        UserSession.create(users(:bob))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
-        authors = spam_nodes.collect { |node| node.author }
-        get :batch_unban, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",")}
-        assert_equal "Only admins and moderators can unban users.", flash[:error]
-        assert_redirected_to "/dashboard"
-    end
-    #batch delete
-    test 'Notes which are batch deleted are deleted' do
-        UserSession.create(users(:moderator))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:question)]
-        get :batch_delete, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
-        assert_redirected_to root_path
-        # It checks that notes are deleted and number is correct
-        assert_equal spam_nodes.length.to_s + ' nodes deleted', flash[:notice]
-    end 
-    
-    test 'normal user should not be allowed to batch delete' do
-        UserSession.create(users(:bob))
-        spam_nodes = [nodes(:spam_targeted_page), nodes(:spam)]
-        get :batch_delete, params: { ids: spam_nodes.collect { |node| node["nid"] }.join(",") }
-        assert_equal "Only admins and moderators can batch delete.", flash[:error]
-        assert_redirected_to "/dashboard"
-    end
     #flag Nodes
     test 'Anyone should be able to flag a node' do
         UserSession.create(users(:bob))