diff --git a/app/views/shared/_nav.html.erb b/app/views/shared/_nav.html.erb
index c71a7d3..51dd235 100644
--- a/app/views/shared/_nav.html.erb
+++ b/app/views/shared/_nav.html.erb
@@ -1,43 +1,58 @@
 <!-- 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 %>
         <%= content_tag(:li, active_class(faq_path)) do %>
           <%= link_to 'FAQ', faq_path %>
         <% 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
+            <%= link_to '#', class: 'dropdown-toggle', 'data-toggle' => 'dropdown' do %>
+              <label class="glyphicon glyphicon-user"></label>
+              <%= current_user.username %><span class="caret"></span>
             <% end %>
+            <ul class="dropdown-menu">
+              <li>
+                <%= link_to user_path(current_user) do %>
+                  <label class="glyphicon glyphicon-wrench"></label>
+                  Info
+                <% end %>
+              </li>
+              <li>
+                <%= link_to logout_path do %>
+                  <label class="glyphicon glyphicon-log-out"></label>
+                  Logout
+                <% end %>
+              </li>
+            </ul>
           </li>
         </ul>
       <% end %>
+
       <%= render partial: 'shared/admin' if current_user.try(:admin?) %>
     </div><!--/.nav-collapse -->
   </div>
 </nav>