diff --git a/app/controllers/internal/users_controller.rb b/app/controllers/internal/users_controller.rb
index 605cde6c9..c738319f0 100644
--- a/app/controllers/internal/users_controller.rb
+++ b/app/controllers/internal/users_controller.rb
@@ -4,12 +4,21 @@ class Internal::UsersController < Internal::ApplicationController
   def index
     @users = case params[:state]
              when "mentors"
-               User.where(offering_mentorship: true).page(params[:page]).per(20)
+               User.where(offering_mentorship: true).page(params[:page]).per(50)
              when "mentees"
-               User.where(seeking_mentorship: true).page(params[:page]).per(20)
+               User.where(seeking_mentorship: true).page(params[:page]).per(50)
+             when /role\-/
+               User.with_role(params[:state].split("-")[1], :any).page(params[:page]).per(50)
              else
-               User.order("created_at DESC").page(params[:page]).per(20)
+               User.order("created_at DESC").page(params[:page]).per(50)
              end
+    if params[:search].present?
+      @users = @users.where('users.name ILIKE :search OR
+        users.username ILIKE :search OR
+        users.github_username ILIKE :search OR
+        users.email ILIKE :search OR
+        users.twitter_username ILIKE :search', search: "%#{params[:search].strip}%")
+    end
   end
 
   def edit
diff --git a/app/views/internal/users/index.html.erb b/app/views/internal/users/index.html.erb
index ec81053fc..cd54c6a2f 100644
--- a/app/views/internal/users/index.html.erb
+++ b/app/views/internal/users/index.html.erb
@@ -3,23 +3,29 @@
     border: 2px red solid;
   }
 </style>
-<h3 class="top-nav">
-  <a href="/internal/users">All Users</a> ||
-  <a href="/internal/users?state=mentors">Mentors Only </a>||
-  <a href="/internal/users?state=mentees">Mentees Only</a>
+<h3 class="top-nav" style="font-weight:400;font-size:0.9em;">
+  <a href="/internal/users" style="<%= "font-weight:bold" if params[:state].blank? %>">All</a> |
+  <a href="/internal/users?state=mentors" style="<%= "font-weight:bold" if params[:state] == "mentors" %>">Mentors </a> |
+  <a href="/internal/users?state=mentees" style="<%= "font-weight:bold" if params[:state] == "mentees" %>">Mentees</a> |
+  <a href="/internal/users?state=role-admin" style="<%= "font-weight:bold" if params[:state] == "role-admin" %>">Admins</a> |
+  <a href="/internal/users?state=role-super_admin" style="<%= "font-weight:bold" if params[:state] == "role-super_admin" %>">Super Admins</a> |
+  <a href="/internal/users?state=role-trusted" style="<%= "font-weight:bold" if params[:state] == "role-trusted" %>">Trusted</a> |
+  <a href="/internal/users?state=role-tag_moderator" style="<%= "font-weight:bold" if params[:state] == "role-tag_moderator" %>">Tag Mods</a>
 </h3>
-<% if params[:state] == "mentors" %>
-  <h1>Mentors</h1>
-<% elsif params[:state] == "mentees" %>
-  <h1>Mentees</h1>
-<% else %>
-  <h1>All Users</h1>
+<%= form_tag("/internal/users", method: "get") do %>
+  <%= label_tag(:search, "Find by:") %>
+  <%= text_field_tag(:search, params[:search]) %>
+  <% if params[:state].present? %>
+  <%= hidden_field_tag(:state, params[:state]) %>
+  <% end %>
+  <%= submit_tag("Search") %>
+  <em style="font-size:0.78em;">(<b>fields:</b> name, username, twitter_username, github_username, email)</em>
 <% end %>
 <%= paginate @users %>
 <% @users.each do |user| %>
   <div class="row">
-    <h2><%= user.name%></h2>
-    <h3><a href="/internal/users/<%= user.id %>" target="_blank">@<%= user.username%></a></h3>
+    <h2><%= user.name %></h2>
+    <h3><a href="/internal/users/<%= user.id %>" target="_blank">@<%= user.username %></a></h3>
   </div>
 <% end %>
-<%= paginate @users %>
\ No newline at end of file
+<%= paginate @users %>