diff --git a/app/views/shared/_nav.html.erb b/app/views/shared/_nav.html.erb
index 654d8cc..c644f91 100644
--- a/app/views/shared/_nav.html.erb
+++ b/app/views/shared/_nav.html.erb
@@ -1,35 +1,41 @@
 <!-- Fixed navbar -->
 <nav class="navbar navbar-inverse 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>
       <a class="navbar-brand" href="/">Baas</a>
     </div>
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
-        <li class="active"><a href="/clients">Clients</a></li>
+        <%= content_tag(:li, active_class(clients_path, true)) do %>
+          <%= link_to 'Clients', clients_path %>
+        <% end %>
         <li><a href="/contact">Contact</a></li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Profile <span class="caret"></span></a>
           <ul class="dropdown-menu">
             <li><a href="#">Logout</a></li>
             <li class="divider"></li>
             <li class="dropdown-header">Profile</li>
             <li><a href="#">Edit</a></li>
           </ul>
         </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <% if current_user.admin? %>
-          <li><%= link_to 'Admin', admin_path %></li>
-          <li><%= link_to 'Clients', admin_clients_path %></li>
+          <%= 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 %>
         <% end %>
       </ul>
     </div><!--/.nav-collapse -->
   </div>
 </nav>