diff --git a/main/css/base.css b/main/css/base.css
index 83f3b813bc..ff5356ef3e 100644
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -31,6 +31,13 @@ legend {
     padding:40px 0px 0px 0px;
 }
 
+.subnav .brand {
+    display:none;
+}
+
+.subnav .navbar-inner {
+    box-shadow : none;
+}
 /* menu dropdown fixes */
 .subnav .nav .open > .dropdown-toggle, .subnav .nav .active > .dropdown-toggle, .subnav .nav .open.active > .dropdown-toggle {
     background-color: transparent;
@@ -3542,8 +3549,6 @@ a.forum_group_link {
 
 /* Subnav */
 .subnav {
-    height: 36px;
-
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
@@ -3559,6 +3564,7 @@ a.forum_group_link {
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
     background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */
     border: 1px solid #e5e5e5;
+    margin-bottom: 0px;
     /* end default subnav background colors */
 }
 
@@ -3567,15 +3573,8 @@ a.forum_group_link {
     border-color: transparent;
 }
 
-/* Fixes the view as student/teacher button */
-.subnav .nav {
-    margin-bottom: 0;
-}
-
 .subnav .nav > li > a {
-    margin: 0;
-    padding-top:    11px;
-    padding-bottom: 11px;
+    margin: 0;    
     border-left: 1px solid #f5f5f5;
     border-right: 1px solid #e5e5e5;
     -webkit-border-radius: 0;
@@ -3620,7 +3619,7 @@ a.forum_group_link {
     border-radius: 0;
 }
 .subnav .nav > li > a:hover {
-    text-decoration: none;
+    text-decoration: none;    
 }
 
 .new_actions {
diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css
index da7441596d..aee1f9abc2 100644
--- a/main/css/chamilo/default.css
+++ b/main/css/chamilo/default.css
@@ -22,7 +22,7 @@ a:active {
     color : #3757f7;
 }
 
-.subnav {
+.subnav .navbar-inner {
     background-color: #00AAE3; /* Old browsers */
     background-repeat: repeat-x; /* Repeat the gradient */
     background-image: -moz-linear-gradient(top, #028DC2 0%, #00AAE3 100%); /* FF3.6+ */  
@@ -31,13 +31,13 @@ a:active {
     background-image: -ms-linear-gradient(top, #028DC2 0%,#00AAE3 100%); /* IE10+ */
     background-image: -o-linear-gradient(top, #028DC2 0%,#00AAE3 100%); /* Opera 11.10+ */
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#028DC2', endColorstr='#00AAE3',GradientType=0 ); /* IE6-9 */
-    background-image: linear-gradient(top, #028DC2 0%,#00AAE3 100%); /* W3C */
-    border: 1px solid #028DC2;
+    background-image: linear-gradient(top, #028DC2 0%,#00AAE3 100%); /* W3C */    
 }
 
 .subnav .nav > li > a {
     border-left: 1px solid #0EA0D4;
     border-right: 1px solid #0EA0D4;
+    color: white;
 }
 
 .subnav .nav > #current > a,
diff --git a/main/css/responsive.css b/main/css/responsive.css
index a98d0fb891..2f099d68e4 100644
--- a/main/css/responsive.css
+++ b/main/css/responsive.css
@@ -13,6 +13,10 @@
         display:none;
     }
     
+    .subnav .nav > li > a, .navbar .dropdown-menu a {        
+        color: white;        
+    }
+    
     header #header_center, header #header_right {
         display:none;
     }    
@@ -73,6 +77,10 @@
         text-align: center !important;
     }    
     
+    .subnav .nav > li > a, .navbar .dropdown-menu a {        
+        color: white;        
+    }
+    
     footer .container .row {
         padding-top: 15px;        
     }
@@ -171,6 +179,14 @@
     .subnav .dropdown-toggle {
         display:none;
     }    
+    
+    .subnav .nav > li > a, .navbar .dropdown-menu a {      
+        color: #ccc;        
+    }
+    
+   .subnav .nav > li > a:hover,
+   .subnav .dropdown-menu a:hover {
+    }
 }
 
 @media (max-width: 979px) {
diff --git a/main/inc/lib/banner.lib.php b/main/inc/lib/banner.lib.php
index b0c0738d50..ea3c54f07f 100644
--- a/main/inc/lib/banner.lib.php
+++ b/main/inc/lib/banner.lib.php
@@ -386,12 +386,12 @@ function return_menu() {
         $pre_lis = '';
         foreach ($navigation as $section => $navigation_info) {
             if (isset($GLOBALS['this_section'])) {
-                $current = $section == $GLOBALS['this_section'] ? ' id="current"' : '';
+                $current = $section == $GLOBALS['this_section'] ? ' id="current" class="active" ' : '';
             } else {
                 $current = '';
             }
             if (!empty($navigation_info['title'])) {
-                $pre_lis .= '<li'.$current.'><a  href="'.$navigation_info['url'].'" target="_top">'.$navigation_info['title'].'</a></li>';
+                $pre_lis .= '<li'.$current.' ><a  href="'.$navigation_info['url'].'" target="_top">'.$navigation_info['title'].'</a></li>';
             }
         }
         $lis = $pre_lis.$lis;        
diff --git a/main/template/default/layout/footer.tpl b/main/template/default/layout/footer.tpl
index 203dbfd481..c45acf9a39 100644
--- a/main/template/default/layout/footer.tpl
+++ b/main/template/default/layout/footer.tpl
@@ -4,20 +4,20 @@
             <div id="footer_left" class="span4">                
                 {% if session_teachers is not null %}
                     <div id="session_teachers">
-                        {{session_teachers}}           
+                        {{ session_teachers }}           
                     </div>
                 {% endif %}
 
                 {% if teachers is not null %}
                     <div id="teachers">
-                        {{teachers}}            
+                        {{ teachers }}            
                     </div>
                 {% endif %}
                 
                 {#  Plugins for footer section #}                                             
                 {% if plugin_footer_left is not null %}
                     <div id="plugin_footer_left">
-                        {{plugin_footer_left}}               
+                        {{ plugin_footer_left }}               
                     </div>                
                 {% endif %}
                  &nbsp;
@@ -27,28 +27,27 @@
                 {#   Plugins for footer section  #}		
                 {% if plugin_footer_center is not null %}
                     <div id="plugin_footer_center">
-                        {{plugin_footer_center}}                
+                        {{ plugin_footer_center }}                
                     </div>
                 {% endif %}
                  &nbsp;
             </div>
             
-            <div id="footer_right" class="span4">        
-                
+            <div id="footer_right" class="span4">                
                 {% if administrator_name is not null %}
                     <div id="admin_name">
-                        {{administrator_name}}          
+                        {{ administrator_name }}          
                     </div>
                 {% endif %}
                 
                 <div id="software_name">	    	
-                    {{"Platform"|get_lang}} <a href="{{_p.web}}" target="_blank">{{_s.software_name}} {{_s.system_version}}</a>
+                    {{ "Platform" | get_lang }} <a href="{{_p.web}}" target="_blank">{{_s.software_name}} {{_s.system_version}}</a>
                     &copy; {{ "now"|date("Y") }}   	
                 </div>
                 {#   Plugins for footer section  #}		
                 {% if plugin_footer_right is not null %}                                
                     <div id="plugin_footer_right">
-                        {{plugin_footer_right}}                
+                        {{ plugin_footer_right }}                
                     </div>                
                 {% endif %}
                 &nbsp;
@@ -57,7 +56,7 @@
     </div><!-- end of #container -->
 </footer>
 
-{{footer_extra_content}}
+{{ footer_extra_content }}
 
 {% raw %}
 <script>
@@ -74,11 +73,10 @@ $(document).ready( function() {
     });
 
     var tip_options = {
-            placement : 'right'
+        placement : 'right'
     }
-
     $('.boot-tooltip').tooltip(tip_options);
 });
 </script>
 {% endraw %}
-{{execution_stats}}
\ No newline at end of file
+{{ execution_stats }}
\ No newline at end of file
diff --git a/main/template/default/layout/head.tpl b/main/template/default/layout/head.tpl
index dda13f6064..34c2aaa83e 100644
--- a/main/template/default/layout/head.tpl
+++ b/main/template/default/layout/head.tpl
@@ -68,10 +68,25 @@ function get_url_params(q, attribute) {
     }
 }
 
+function check_brand() {
+    if ($('.subnav').length) {     
+        if ($(window).width() > 959) {
+            $('.subnav .brand').hide();
+        } else {
+            $('.subnav .brand').show();
+        }
+    }
+}
+
+
+$(window).resize(function() {
+    check_brand();
+});
+
 $(document).scroll(function() {
 
     // Top bar scroll effect
-    if ($('body').width() > 959) {
+    if ($('body').width() > 959) {     
         if ($('.subnav').length) {
             if (!$('.subnav').attr('data-top')) {
                 // If already fixed, then do nothing
@@ -86,7 +101,10 @@ $(document).scroll(function() {
             } else {
                 $('.subnav').removeClass('subnav-fixed');
             }
+            //$('.subnav .brand').show();
         }
+    } else {
+        //$('.subnav .brand').hide();
     }
 
     //Admin -> Settings toolbar
@@ -102,7 +120,6 @@ $(document).scroll(function() {
             if ($('.subnav').hasClass('new_actions-fixed')) {
                 more_top = 50;
             }
-
             $('.new_actions').attr('data-top', offset.top + more_top);
         }
 
@@ -115,7 +132,6 @@ $(document).scroll(function() {
 
     //Bottom actions
     if ($('.bottom_actions').length) {
-
         if (!$('.bottom_actions').attr('data-top')) {
             // If already fixed, then do nothing
             if ($('.bottom_actions').hasClass('bottom_actions_fixed')) return;
@@ -157,6 +173,8 @@ function isScrolledIntoView(elem) {
 
 
 $(function() {
+    
+    check_brand();
 
     //Removes the yellow input in Chrome
     if (navigator.userAgent.toLowerCase().indexOf("chrome") >= 0) {
@@ -230,6 +248,7 @@ $(function() {
     $('#navigation a').stop().animate({
         'marginLeft':'50px'
     },1000);
+    
     $('#navigation > li').hover(
         function () {
             $('a',$(this)).stop().animate({
diff --git a/main/template/default/layout/menu.tpl b/main/template/default/layout/menu.tpl
index 516aa7abb7..1db6211ec8 100644
--- a/main/template/default/layout/menu.tpl
+++ b/main/template/default/layout/menu.tpl
@@ -1,31 +1,44 @@
 {% if menu is not null %}
-    <div class="subnav">
-        {% if _u.logged == 1 %}
-        <ul class="nav nav-pills pull-right">
-            <li class="dropdown">
-                <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                    <img src="{{ _u.avatar_small }}"/>
-                    {{ _u.complete_name }}
+    
+<div class="navbar subnav">
+    <div class="navbar-inner">
+        <div class="container">            
+            <a data-toggle="collapse" data-target=".nav-collapse" class="btn btn-navbar">                
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <a class="brand" href="{{ _p.web }}">{{ "Institution" | get_setting }}</a>
+            <div class="nav-collapse">
+                <ul class="nav">
+                    {{ menu }}
+                </ul>
+
+                {% if _u.logged == 1 %}
+                <ul class="nav pull-right">
+                    <li class="dropdown">
+                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                            <img src="{{ _u.avatar_small }}"/>
+                            {{ _u.complete_name }}
+
+                            <b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li>
+                                {{ profile_link }}
+                                {{ message_link }}
+                            </li>
+                        </ul>
 
-                    <b class="caret"></b>
-                </a>
-                <ul class="dropdown-menu">
                     <li>
-                        {{ profile_link }}
-                        {{ message_link }}
-                    </li>
+                        <a class="logout" title="{{ "Logout" | get_lang }}" href="{{ logout_link }}" >
+                            <img src="{{ "exit.png" | icon(22) }}">
+                        </a>
+                    </li>            
                 </ul>
-            
-            <li>
-                <a class="logout" title="{{ "Logout" | get_lang }}" href="{{ logout_link }}" >
-                    <img src="{{ "exit.png" | icon(22) }}">
-                </a>
-            </li>            
-        </ul>
-        {% endif %}
-         
-        <ul class="nav nav-pills">
-            {{ menu }}
-        </ul>
+                {% endif %}
+            </div>
+        </div>
     </div>
+</div>
 {% endif %}
\ No newline at end of file
diff --git a/main/template/default/layout/topbar.tpl b/main/template/default/layout/topbar.tpl
index 628365ffd6..24c533ac0f 100644
--- a/main/template/default/layout/topbar.tpl
+++ b/main/template/default/layout/topbar.tpl
@@ -8,54 +8,55 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </a>
-                <a class="brand" href="{{ _p.web }}">{{"siteName"|get_setting }}</a>
+                <a class="brand" href="{{ _p.web }}">
+                    {{ "siteName" | get_setting }}
+                </a>
 
                 {% if _u.logged %}
-                    <div class="nav-collapse">
-                        
+                    <div class="nav-collapse">                        
                         <ul class="nav">
                             <li class="active"><a href="{{ _p.web }}user_portal.php"> {{ "MyCourses"|get_lang }}</a></li>
                             {#
                             <li class="dropdown">
                                 <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{'Teaching'|get_lang }}<b class="caret"></b></a>
                                 <ul class="dropdown-menu">
-                                    <li><a href="{{ _p.web_main }}create_course/add_course.php">{{"AddCourse"|get_lang }}</a></li>
-                                    <li><a href="{{ _p.web_main }}auth/courses.php">{{"Catalog"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}create_course/add_course.php">{{ "AddCourse"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}auth/courses.php">{{ "Catalog"|get_lang }}</a></li>
                                 </ul>
                             </li>
                             #}
                             <li class="dropdown">
                                 <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{'Tracking'|get_lang }}<b class="caret"></b></a>
                                 <ul class="dropdown-menu">
-                                    <li><a href="{{ _p.web_main }}mySpace/">{{"CoursesReporting"|get_lang }}</a></li>
-                                    <li><a href="{{ _p.web_main }}mySpace/index.php?view=admin">{{"AdminReports"|get_lang }}</a></li>
-                                    <li><a href="{{ _p.web_main }}tracking/exams.php">{{"ExamsReporting"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}mySpace/">{{ "CoursesReporting" | get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}mySpace/index.php?view=admin">{{ "AdminReports"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}tracking/exams.php">{{ "ExamsReporting" | get_lang }}</a></li>
                                     <li class="divider"></li>
-                                    <li><a href="{{ _p.web_main }}dashboard/">{{"Dashboard"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}dashboard/">{{ "Dashboard"|get_lang }}</a></li>
                                 </ul>
                             </li>
                             {% if _u.is_admin == 1 %}
                             <li class="dropdown">
                                 <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{'Administration'|get_lang }}<b class="caret"></b></a>
                                 <ul class="dropdown-menu">
-                                    <li><a href="{{ _p.web_main }}admin/">{{"Home"|get_lang }}</a></li>
-                                    <li><a href="{{ _p.web_main }}admin/user_list.php">{{"UserList"|get_lang }}</a></li>
-                                    <li><a href="{{ _p.web_main }}admin/course_list.php">{{"CourseList"|get_lang }}</a></li>
-                                    <li><a href="{{ _p.web_main }}admin/session_list.php">{{"SessionList"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}admin/">{{ "Home"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}admin/user_list.php">{{ "UserList"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}admin/course_list.php">{{ "CourseList"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}admin/session_list.php">{{ "SessionList"|get_lang }}</a></li>
                                     <li class="divider"></li>
-                                    <li><a href="{{ _p.web_main }}admin/settings.php">{{"Settings"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}admin/settings.php">{{ "Settings"|get_lang }}</a></li>
                                     <li class="divider"></li>
-                                    <li><a href="{{ _p.web_main }}admin/settings.php?category=Plugins">{{"Plugins"|get_lang }}</a></li>
-                                    <li><a href="{{ _p.web_main }}admin/settings.php?category=Regions">{{"Regions"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}admin/settings.php?category=Plugins">{{ "Plugins"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}admin/settings.php?category=Regions">{{ "Regions"|get_lang }}</a></li>
                                 </ul>
                             </li>
 
                             <li class="dropdown">
                                 <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ 'Add' | get_lang }}<b class="caret"></b></a>
                                 <ul class="dropdown-menu">
-                                    <li><a href="{{ _p.web_main }}admin/user_add.php">{{"User"|get_lang }}</a></li>
-                                    <li><a href="{{ _p.web_main }}admin/course_add.php">{{"Course"|get_lang }}</a></li>
-                                    <li><a href="{{ _p.web_main }}admin/session_add.php">{{"Session"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}admin/user_add.php">{{ "User"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}admin/course_add.php">{{ "Course"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}admin/session_add.php">{{ "Session"|get_lang }}</a></li>
                                 </ul>
                             </li>
                             {% endif %}
@@ -73,12 +74,12 @@
                             <li class="dropdown">
                                 <a class="dropdown-toggle" data-toggle="dropdown"  href="#">{{ _u.complete_name }}<b class="caret"></b></a>
                                 <ul class="dropdown-menu">
-                                    <li><a href="{{ _p.web_main }}social/home.php">{{"Profile"|get_lang }}</a></li>
-                                    <li><a href="{{ _p.web_main }}calendar/agenda_js.php?type=personal">{{"MyAgenda"|get_lang }}</a></li>
-                                    <li><a href="{{ _p.web_main }}messages/inbox.php">{{"Messages"|get_lang }}</a></li>
-                                    <li><a href="{{ _p.web_main }}auth/my_progress.php">{{"MyReporting"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}social/home.php">{{ "Profile"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}calendar/agenda_js.php?type=personal">{{ "MyAgenda"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}messages/inbox.php">{{ "Inbox"|get_lang }}</a></li>
+                                    <li><a href="{{ _p.web_main }}auth/my_progress.php">{{ "MyReporting"|get_lang }}</a></li>
                                     <!--<li class="divider"></li>
-                                    <li><a href="{{ _p.web_main }}social/invitations.php">{{"PendingInvitations"|get_lang }}</a></li> -->
+                                    <li><a href="{{ _p.web_main }}social/invitations.php">{{ "PendingInvitations"|get_lang }}</a></li> -->
                                 </ul>
                             </li>
                             <li><a href="{{  _p.web }}index.php?logout=logout">{{ "Logout" | get_lang }}</a></li>