diff --git a/blender-bfct/application/static/assets_shared b/blender-bfct/application/static/assets_shared
index 7b3d854..03df3b9 160000
--- a/blender-bfct/application/static/assets_shared
+++ b/blender-bfct/application/static/assets_shared
@@ -1 +1 @@
-Subproject commit 7b3d854c59a2b274db30417081293ec9bb296004
+Subproject commit 03df3b93360546259dde9952e7cdd2f98db7f282
diff --git a/blender-bfct/application/templates/layout.html b/blender-bfct/application/templates/layout.html
index 2110884..317f7aa 100644
--- a/blender-bfct/application/templates/layout.html
+++ b/blender-bfct/application/templates/layout.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>{% block page_title %}Homepage{% endblock %} - Blender Foundation Certified Trainer - blender.org</title>
+    <title>{% block page_title %}Home{% endblock %} - Blender Foundation Certified Trainer - blender.org</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
@@ -33,52 +33,30 @@
   <body>
     {% block modal %}
     {% endblock %}
+    <a name="hop"></a>
 
-    <header class="navbar navbar-default navbar-fixed-top" role="navigation">
+    <header class="navbar navbar-default navbar-fixed-top bright" role="navigation">
       <div class="container">
-        <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-menu">
             <span class="sr-only">Toggle navigation</span>
             <i class="fa fa-bars"></i>
           </button>
-          <a class="navbar-brand" href="{{ url_for('homepage') }}">
-            <i class="bf-blender"></i> <span class="hidden-xs">Blender</span>
-          </a>
-          <ul class="nav navbar-nav">
-            <li><a href="http://blendernetwork.org/BFCT">Certified Trainers</a></li>
-            <li><a href="http://www.blender.org/certification/become-a-trainer/">Become a Trainer</a></li>
-            {% if current_user.has_role('admin') %}
-            <li><a href="{{url_for('applications.index')}}">Review Applications</a></li>
-            {% endif %}
-          </ul>
+          <a class="logo" href="http://local.blender.org"></a>
         </div>
 
-        <!-- Collect the nav links, forms, and other content for toggling -->
-        <nav class="collapse navbar-collapse" id="navbar-collapse-1">
-          <ul class="nav navbar-nav navbar-right">
-            {% if current_user.is_authenticated() %}
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{current_user.email}} <b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li {% if title == 'home': %} class="active"{% endif %}>
-                  <a href="{{ url_for('homepage') }}">Home</a>
-                </li>
-                {% if not current_user.has_role('bfct') %}
-                <li><a href="{{url_for('apply')}}">Apply/View application</a></li>
-                {% endif %}
-                <li class="divider"></li>
-                <li><a href="{{url_for_security('logout')}}">Log out</a></li>
-              </ul>
-            </li>
-            {% else %}
-            <li><a href="{{url_for_security('login')}}">Log in</a></li>
-            {% endif %}
-          </ul>
-        </nav><!-- /.navbar-collapse -->
+        <nav class="collapse navbar-collapse" id="navbar-collapse-menu">
+            <ul class="nav navbar-nav navbar-right">
+                <li><a href="http://local.blender.org/features/">Features</a></li>
+                <li><a href="http://local.blender.org/download/">Download</a></li>
+                <li><a href="http://local.blender.org/support/">Support</a></li>
+                <li><a href="http://local.blender.org/get-involved/">Get Involved</a></li>
+                <li><a href="http://local.blender.org/about/">About</a></li>
+                <li><a href="http://www.blender3d.org/e-shop/">Store</a></li>
+            </ul>
+        </nav>
       </div>
     </header>
-    <a name="hop"></a>
 
     {% for message in get_flashed_messages() %}
     <div class="alert alert-warning">
@@ -98,6 +76,35 @@
       </div>
     </div>
 
+    <header class="navbar navbar-default navbar-secondlevel navbar-static-top bright" role="navigation">
+      <div class="container">
+        <ul class="nav navbar-nav navbar-left">
+          <li {% if title == 'home': %} class="active"{% endif %}>
+            <a href="{{ url_for('homepage') }}">Home</a>
+          </li>
+          <li><a href="http://www.blender.org/certification/become-a-trainer/">Become a Trainer</a></li>
+          {% if current_user.has_role('admin') %}
+          <li><a href="{{url_for('applications.index')}}">Review Applications</a></li>
+          {% endif %}
+
+          {% if current_user.is_authenticated() %}
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{current_user.email}} <b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              {% if not current_user.has_role('bfct') %}
+              <li><a href="{{url_for('apply')}}"><i class="fa fa-edit"></i> Apply / View</a></li>
+              {% endif %}
+              <li class="divider"></li>
+              <li><a href="{{url_for_security('logout')}}"><i class="fa fa-power-off"></i> Log out</a></li>
+            </ul>
+          </li>
+          {% else %}
+          <li><a href="{{url_for_security('login')}}">Log in</a></li>
+          {% endif %}
+        </ul>
+      </div>
+    </header> <!-- // second level-->
+
     <div class="container">
       <div class="row">
         <div class="col-md-12">
