diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 8b23d5c..227d4a1 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,44 +1,46 @@
 class Admin::UsersController < Admin::BaseController
   # GET /admin/users
   def index
     @baculized_host_names = Hash.new { |h, k| h[k] = [] }
     @non_baculized_host_names = Hash.new { |h, k| h[k] = [] }
     @unverified_host_names = Hash.new { |h, k| h[k] = [] }
 
     @users = User.all.includes(:hosts)
+    @users = @users.admin if params[:type] == 'admin'
+    @users = @users.vima if params[:type] == 'vima'
     @users.each do |user|
       user.hosts.each do |host|
         if host.deployed? || host.updated? || host.dispatched? || host.for_removal?
           @baculized_host_names[user.id] << host.name
         else
           @non_baculized_host_names[user.id] << host.name
           @unverified_host_names[user.id] << host.name if !host.verified?
         end
       end
     end
   end
 
   # PATCH /admin/users/1/ban
   def ban
     @user = User.find(params[:id])
     if @user.ban
       flash[:success] = 'User banned'
     else
       flash[:error] = 'User NOT banned'
     end
 
     redirect_to admin_users_path
   end
 
   # PATCH /admin/users/1/unban
   def unban
     @user = User.find(params[:id])
     if @user.unban
       flash[:success] = 'User enabled'
     else
       flash[:error] = 'User NOT enabled'
     end
 
     redirect_to admin_users_path
   end
 end
diff --git a/app/views/shared/_nav.html.erb b/app/views/shared/_nav.html.erb
index dd0e7e5..ca41736 100644
--- a/app/views/shared/_nav.html.erb
+++ b/app/views/shared/_nav.html.erb
@@ -1,58 +1,73 @@
 <!-- Fixed navbar -->
 <nav class="navbar navbar-default navbar-fixed-top">
   <div class="container-fluid">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar">
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
     </div>
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="logo">
           <%= link_to root_path do %>
             <p><b>GRNET NOC</b></p>
             <p>Archiving</p>
           <% end %>
         </li>
         <% if current_user %>
           <%= content_tag(:li, active_class(clients_path, true)) do %>
             <%= link_to 'Clients', clients_path %>
           <% end %>
           <li><%= link_to current_user.username, '#' %></li>
         <% end %>
       </ul>
       <% if current_user %>
         <ul class="nav navbar-nav navbar-right">
           <li>
             <%= link_to logout_path do %>
               <label class="glyphicon glyphicon-log-out"></label>
               Logout
             <% end %>
           </li>
         </ul>
       <% end %>
       <% if current_user.try(:admin?) %>
         <ul class="nav navbar-nav navbar-right">
           <%= content_tag(:li, active_class(admin_path)) do %>
             <%= link_to 'Admin', admin_path %>
           <% end %>
           <%= content_tag(:li, active_class(admin_clients_path, true)) do %>
             <%= link_to 'Clients', admin_clients_path %>
           <% end %>
           <%= content_tag(:li, active_class(unverified_admin_hosts_path, true)) do %>
             <%= link_to 'Hosts', unverified_admin_hosts_path %>
           <% end %>
-          <%= content_tag(:li, active_class(admin_users_path)) do %>
-            <%= link_to 'Users', admin_users_path %>
+          <%= content_tag(:li, { class: "dropdown #{active_class(admin_users_path)[:class]}" }) do %>
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+              Users <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu">
+              <li>
+                <%= link_to 'All Users', admin_users_path %>
+              </li>
+              <li class="divider"></li>
+              <li>
+                <%= link_to 'ViMa Users', admin_users_path(type: :vima) %>
+              </li>
+              <li>
+                <%= link_to 'Admins', admin_users_path(type: :admin) %>
+              </li>
+              <li>
+            </ul>
           <% end %>
           <%= content_tag(:li, active_class(admin_settings_path)) do %>
             <%= link_to 'Settings', admin_settings_path %>
           <% end %>
         </ul>
       <% end %>
     </div><!--/.nav-collapse -->
   </div>
 </nav>