diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 4afcdd5..e3a8d05 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1,51 +1,67 @@
 /*
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.
  *
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
  * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
  * compiled file so the styles you add here take precedence over styles defined in any styles
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
  *= require bootstrap.min
  *= require_tree .
  *= require_self
  */
 
 /* Make sure navbar does not overlay body */
 body {
   padding-top: 70px;
 }
 
 .right {
   text-align: right;
   margin-right: 0px;
   float: right;
 }
 
 .graybox {
   max-width: 500px;
   margin-right: 0;
   margin-left: 0;
   background-color: #F7F7F9;
   margin-bottom: 30px;
 }
 
 .graybox form {
   padding-top: 30px;
 }
 
 #_days_back {
   margin: auto 10px;
 }
 
 tr.fatal > td {
   background-color: #EA7272;
 }
 
 tr.fatal > td {
   background-color: #EA7272;
 }
+
+li.logo {
+}
+
+li.logo > a {
+  padding-left: 60px;
+  background: url('/images/logo.png') no-repeat scroll 4px 5px;
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+
+li.logo > a > p {
+  font-size: 13px;
+  margin-bottom: 0;
+  color: #333333px;
+}
diff --git a/app/views/shared/_nav.html.erb b/app/views/shared/_nav.html.erb
index 1129172..ecaf656 100644
--- a/app/views/shared/_nav.html.erb
+++ b/app/views/shared/_nav.html.erb
@@ -1,53 +1,58 @@
 <!-- Fixed navbar -->
-<nav class="navbar navbar-inverse navbar-fixed-top">
+<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>
-      <a class="navbar-brand" href="/">Baas</a>
     </div>
-    <% if current_user %>
-      <div id="navbar" class="navbar-collapse collapse">
-        <ul class="nav navbar-nav">
+    <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><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>
           <% if current_user %>
             <li><%= link_to current_user.username, '#' %></li>
           <% end %>
           <li><%= link_to 'logout', logout_path %></li>
-        </ul>
+        <% end %>
+      </ul>
+      <% if current_user.try(:admin?) %>
         <ul class="nav navbar-nav navbar-right">
-          <% if current_user.admin? %>
-            <%= 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_settings_path)) do %>
-              <%= link_to 'Settings', admin_settings_path %>
-            <% end %>
+          <%= 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_settings_path)) do %>
+            <%= link_to 'Settings', admin_settings_path %>
           <% end %>
         </ul>
-      </div><!--/.nav-collapse -->
-    <% end %>
+      <% end %>
+    </div><!--/.nav-collapse -->
   </div>
 </nav>
diff --git a/public/images/logo.png b/public/images/logo.png
new file mode 100644
index 0000000..2dae847
Binary files /dev/null and b/public/images/logo.png differ