diff --git a/.arcconfig b/.arcconfig
new file mode 100644
index 0000000..fea6e62
--- /dev/null
+++ b/.arcconfig
@@ -0,0 +1,3 @@
+{
+  "phabricator.uri" : "https://repo.grnet.gr"
+}
diff --git a/app/views/shared/_nav.html.erb b/app/views/shared/_nav.html.erb
index 922f606..e05d35d 100644
--- a/app/views/shared/_nav.html.erb
+++ b/app/views/shared/_nav.html.erb
@@ -1,57 +1,57 @@
 <!-- Fixed navbar -->
 <nav class="navbar navbar-inverse navbar-fixed-top">
   <div class="container">
     <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>
       <a class="navbar-brand" href="/">WebDNS</a>
     </div>
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="active"><a href="/domains">Domains</a></li>
         <form class="navbar-form navbar-left" role="search" action="/records/search" method="get">
           <div class="form-group">
             <input type="text" name="q" id="q" class="form-control" placeholder="Records" value="<%= params[:q] %>">
           </div>
           <button type="submit" class="btn btn-default">Search</button>
         </form>
+       </ul>
 
+       <ul class="nav navbar-nav navbar-right">
         <% if admin? %>
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">
 	      Admin<span class="caret"></span>
             </a>
             <ul class="dropdown-menu">
               <li><a href="/admin/groups/">Groups</a></li>
               <li><a href="/admin/jobs/">Jobs</a></li>
               <li><a href="/admin/users/orphans/">Orphans</a></li>
             </ul>
           </li>
         <% end %>
 
         <% if user_signed_in? %>
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">
               <%= current_user.try(:email) %>
               <span class="caret"></span>
             </a>
             <ul class="dropdown-menu">
-              <li><%= link_to('Logout', destroy_user_session_path, method: :delete) %></li>
-              <li class="divider"></li>
-              <li class="dropdown-header">Profile</li>
               <% if current_user.can_change_password? %>
                 <li><%= link_to('Change Password', edit_user_registration_path) %></li>
               <% end %>
               <li><%= link_to('API Token', token_user_path(current_user)) %></li>
+              <li><%= link_to('Logout', destroy_user_session_path, method: :delete) %></li>
             </ul>
           </li>
         <% end %>
 
       </ul>
     </div><!--/.nav-collapse -->
   </div>
 </nav>