diff --git a/app/views/shared/_admin.html.erb b/app/views/shared/_admin.html.erb
new file mode 100644
index 0000000..7ed7b91
--- /dev/null
+++ b/app/views/shared/_admin.html.erb
@@ -0,0 +1,39 @@
+<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, { 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 'Institutional Users', admin_users_path(type: :institutional) %>
+      </li>
+      <li>
+        <%= link_to 'Admins', admin_users_path(type: :admin) %>
+      </li>
+      <li>
+    </ul>
+  <% end %>
+  <%= content_tag(:li, active_class(admin_pools_path)) do %>
+    <%= link_to 'Pools', admin_pools_path %>
+  <% end %>
+  <%= content_tag(:li, active_class(admin_settings_path)) do %>
+    <%= link_to 'Settings', admin_settings_path %>
+  <% end %>
+</ul>
+
diff --git a/app/views/shared/_nav.html.erb b/app/views/shared/_nav.html.erb
index ae04748..1e24683 100644
--- a/app/views/shared/_nav.html.erb
+++ b/app/views/shared/_nav.html.erb
@@ -1,79 +1,40 @@
 <!-- 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, { 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 'Institutional Users', admin_users_path(type: :institutional) %>
-              </li>
-              <li>
-                <%= link_to 'Admins', admin_users_path(type: :admin) %>
-              </li>
-              <li>
-            </ul>
-          <% end %>
-          <%= content_tag(:li, active_class(admin_pools_path)) do %>
-            <%= link_to 'Pools', admin_pools_path %>
-          <% end %>
-          <%= content_tag(:li, active_class(admin_settings_path)) do %>
-            <%= link_to 'Settings', admin_settings_path %>
-          <% end %>
-        </ul>
-      <% end %>
+      <%= render partial: 'shared/admin' if current_user.try(:admin?) %>
     </div><!--/.nav-collapse -->
   </div>
 </nav>