diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico
new file mode 100644
index 00000000..861f34a3
Binary files /dev/null and b/app/assets/images/favicon.ico differ
diff --git a/app/assets/stylesheets/tracks.css.scss b/app/assets/stylesheets/tracks.css.scss
index 102d6645..d95c7e58 100644
--- a/app/assets/stylesheets/tracks.css.scss
+++ b/app/assets/stylesheets/tracks.css.scss
@@ -2,17 +2,31 @@
  * Tracks CSS
 */
 
-.navbar-inner {
-	background-color: #000;
-	background-image: none;
-}
-
 footer {
 	text-align: center;
 	background-color: #000;
 	background-image: linear-gradient(to bottom, #FFFFFF, #F2F2F2);
 }
 
+.navbar-inner {
+	border-radius: none;
+}
+
+div#tracks-login-navbar {
+	.navbar-inner {
+		background-color: #000;
+		background-image: none;
+	}
+}
+
 div#tracks-login-form {
 	margin: 0 0 100px 0;
+}
+
+span.badge_count {
+	color: #FFF;
+	background-color: #F00;
+	text-shadow: none;
+	padding: 5px 5px 5px 5px;
+	border-radius: 2px 2px 2px 2px;
 }
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index ad7daf2a..43376196 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -36,53 +36,24 @@
   </head>
   <body>
 
-    <div class="navbar navbar-fluid-top">
-      <div class="navbar-inner">
-        <div class="container-fluid">
-          <a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </a>
-          <a class="brand" href="#">Tracksapp</a>
-          <div class="container-fluid nav-collapse">
-            <ul class="nav">
-              <li><%= link_to "Link1", "/path1"  %></li>
-              <li><%= link_to "Link2", "/path2"  %></li>
-              <li><%= link_to "Link3", "/path3"  %></li>
-            </ul>
-          </div><!--/.nav-collapse -->
-        </div>
-      </div>
-    </div>
+    <%= render partial: "shared/navbar" %>
 
     <div class="container-fluid">
       <div class="row-fluid">
-        <div class="span3">
-          <div class="well sidebar-nav">
-            <ul class="nav nav-list">
-              <li class="nav-header">Sidebar</li>
-              <li><%= link_to "Link1", "/path1"  %></li>
-              <li><%= link_to "Link2", "/path2"  %></li>
-              <li><%= link_to "Link3", "/path3"  %></li>
-            </ul>
-          </div><!--/.well -->
-        </div><!--/span-->
-        <div class="span9">
+        <div class="span6 offset 3">
           <%= bootstrap_flash %>
           <%= yield %>
         </div>
-      </div><!--/row-->
+      </div>
+    </div> 
 
-      <footer>
-        <p>&copy; Company 2013</p>
-      </footer>
+    <%= render partial: "shared/footer" %>
 
-    </div> <!-- /container -->
-
-    <!-- Javascripts
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
+    <%
+      # Javascripts
+      # ================================================== 
+      # Placed at the end of the document so the pages load faster
+    -%>
     <%= javascript_include_tag "application" %>
 
   </body>
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 0a04e3c6..db0b0b84 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -36,7 +36,7 @@
   </head>
   <body>
 
-    <div class="navbar navbar-fluid-top">
+    <div id="tracks-login-navbar" class="navbar navbar-fluid-top navbar-inverse">
       <div class="navbar-inner">
         <div class="container-fluid">
           <a class="brand" href="#"><%= image_tag "tracks-logo-dark.png"%></a>
diff --git a/app/views/login/login.html.erb b/app/views/login/login.html.erb
index 290593eb..73802d33 100644
--- a/app/views/login/login.html.erb
+++ b/app/views/login/login.html.erb
@@ -5,7 +5,6 @@
         <h3><%= t('login.please_login') %></h3>
       </div>
     </div>
-
     <div class="control-group">
       <label class="control-label" for="user_login"><%= User.human_attribute_name('login') %></label>
       <div class="controls">
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
new file mode 100644
index 00000000..457589b0
--- /dev/null
+++ b/app/views/shared/_navbar.html.erb
@@ -0,0 +1,72 @@
+<div class="navbar navbar-fluid-top navbar-inverse">
+  <div class="navbar-inner">
+    <div class="container-fluid">
+
+      <a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
+        <span class="icon-bar">A</span>
+        <span class="icon-bar">B</span>
+        <span class="icon-bar">C</span>
+      </a>
+
+      <a class="brand" href="#"><span id="badge_count" class="badge_count"><%= @badge_count || @count %></span></a>
+
+      <div class="container-fluid nav-collapse">
+        <ul class="nav">
+          <li><%= navigation_link(t('layouts.navigation.home'), root_path, {:accesskey => "t", :title => t('layouts.navigation.home_title')} ) %></li>
+          <li><%= navigation_link(t('layouts.navigation.starred'), tag_path("starred"), :title => t('layouts.navigation.starred_title')) %></li>
+          <li><%= navigation_link(t('common.projects'), projects_path, {:accesskey=>"p", :title=>t('layouts.navigation.projects_title')} ) %></li>
+          <li><%= navigation_link(t('layouts.navigation.tickler'), tickler_path, {:accesskey =>"k", :title => t('layouts.navigation.tickler_title')} ) %></li>
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('layouts.navigation.organize') %><b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              <li><%= navigation_link( t('common.contexts'), contexts_path, {:accesskey=>"c", :title=>t('layouts.navigation.contexts_title')} ) %></li>
+              <li><%= navigation_link( t('common.notes'), notes_path, {:accesskey => "o", :title => t('layouts.navigation.notes_title')} ) %></li>
+              <li><%= navigation_link( t('common.review'), review_path, {:accesskey => "r", :title => t('layouts.navigation.review_title')} ) %></li>
+              <li><%= navigation_link( t('layouts.navigation.recurring_todos'), {:controller => "recurring_todos", :action => "index"}, :title => t('layouts.navigation.recurring_todos_title')) %></li>
+            </ul>
+          </li>
+          <li class="dropdown" id="menu_view">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="menu_view_link"><%= t('layouts.navigation.view') %><b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              <li><%= navigation_link( t('layouts.navigation.calendar'), calendar_path, :title => t('layouts.navigation.calendar_title')) %></li>
+              <li><%= navigation_link( t('layouts.navigation.completed_tasks'), done_overview_path, {:accesskey=>"d", :title=>t('layouts.navigation.completed_tasks_title')} ) %></li>
+              <li><%= navigation_link( t('layouts.navigation.feeds'), feeds_path, :title => t('layouts.navigation.feeds_title')) %></li>
+              <li><%= navigation_link( t('layouts.navigation.stats'), stats_path, :title => t('layouts.navigation.stats_title')) %></li>
+              <li class="divider"></li>
+              <li id="menu_view_toggle_contexts"><%= link_to(t('layouts.toggle_contexts'), "#", {:title => t('layouts.toggle_contexts_title'), :id => "toggle-contexts-nav"}) %></li>
+              <li><%= link_to(t('layouts.toggle_notes'), "#", {:accesskey => "S", :title => t('layouts.toggle_notes_title'), :id => "toggle-notes-nav"}) %></li>
+              <%= group_view_by_menu_entry %>
+            </ul>
+          </li>
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('layouts.navigation.admin') %><b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              <li><%= navigation_link( t('layouts.navigation.preferences'), preferences_path, {:accesskey => "u", :title => t('layouts.navigation.preferences_title')} ) %></li>
+              <li><%= navigation_link( t('layouts.navigation.export'), data_path, {:accesskey => "i", :title => t('layouts.navigation.export_title')} ) %></li>
+              <% if current_user.is_admin? -%>
+                <li><%= navigation_link(t('layouts.navigation.manage_users'), users_path, {:accesskey => "a", :title => t('layouts.navigation.manage_users_title')} ) %></li>
+              <% end -%>
+            </ul>
+          </li>
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('layouts.navigation.help') %><b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              <li><%= link_to t('layouts.navigation.integrations_'), integrations_path %></li>
+              <li><%= link_to t('layouts.navigation.api_docs'), rest_api_docs_path %></li>
+            </ul>
+          </li>          
+        </ul>
+
+        <ul class="nav pull-right">
+          <li>
+            <form class="navbar-search pull-right">
+              <input type="text" class="search-query" placeholder="Search">
+            </form>
+          </li>
+          <li><%= link_to("#{t('common.logout')} (#{current_user.display_name}) &raquo;".html_safe, logout_path) %>
+        </ul>
+
+      </div>
+    </div>
+  </div>
+</div>
