diff --git a/main/inc/banner.inc.php b/main/inc/banner.inc.php
index 3d41ac64c8..ee9511b59c 100644
--- a/main/inc/banner.inc.php
+++ b/main/inc/banner.inc.php
@@ -45,18 +45,11 @@ show_header_1($language_file, $nameTools);
 show_header_2();
 
 echo '<div id="header3">';
+echo '<div id="subnav">';
 echo show_header_3();
 echo '</div>';
+echo '</div>';
     
-if (isset($database_connection)) {
-    // connect to the main database.
-    // if single database, don't pefix table names with the main database name in SQL queries
-    // (ex. SELECT * FROM table)
-    // if multiple database, prefix table names with the course database name in SQL queries (or no prefix if the table is in
-    // the main database)
-    // (ex. SELECT * FROM table_from_main_db  -  SELECT * FROM courseDB.table_from_course_db)
-    Database::select_db($_configuration['main_database'], $database_connection);
-}
 
 echo '</div>'; // <!-- end of the whole #header section -->
   
diff --git a/main/inc/footer.inc.php b/main/inc/footer.inc.php
index e33b3181bd..cd073a6e91 100644
--- a/main/inc/footer.inc.php
+++ b/main/inc/footer.inc.php
@@ -1,193 +1,4 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *	This script displays the footer that is below (almost)
- *	every Chamilo web page.
- *
- *	@package chamilo.include
- */
-
-// Display of tool_navigation_menu according to admin setting.
-if (api_get_setting('show_navigation_menu') != 'false') {
-   $course_id = api_get_course_id();
-   if (!empty($course_id) && ($course_id != -1)) {
-   		if (api_get_setting('show_navigation_menu') != 'icons') {
-	    	echo '</div> <!-- end #center -->';
-    		echo '</div> <!-- end #centerwrap -->';
-		}
-      	require_once api_get_path(INCLUDE_PATH).'tool_navigation_menu.inc.php';
-      	show_navigation_menu();
-   }
-}
-
-?>
-<div class="clear">&nbsp;</div> <!-- 'clearing' div to make sure that footer stays below the main and right column sections -->
-</div> <!-- end of #main" started at the end of banner.inc.php -->
-</div> <!-- end of #main" started at the end of banner.inc.php -->
-
-<div class="push"></div>
-</div> <!-- end of #wrapper section -->
-<?php 
-/*
-global $used_lang_vars;
-if (!empty($used_lang_vars)) {
-	echo '<div style="float:left"><ul>';
-	foreach ($used_lang_vars as $var => $value) {
-		echo '<li><b>'.$var.'</b>: '.$value.'</li>';
-	}
-	echo '</ul></div>';
-} else {
-	echo '<p>No translated strings on this page?!</p>';
-}*/
-
-?>
-<div id="footer"> <!-- start of #footer section -->
-<div id="bottom_corner"></div>
-<?php
-global $_configuration;
-
-echo '<div class="copyright">';
-	if (api_get_setting('show_administrator_data') == 'true') {
-		// Platform manager
-		echo '<div align="right">', get_lang('Manager'), ' : ', Display::encrypted_mailto_link(api_get_setting('emailAdministrator'), api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))).'</div>';
-	}
-	echo '<div align="right">'.get_lang('Platform').' <a href="', $_configuration['software_url'], '" target="_blank">', $_configuration['software_name'], ' ', $_configuration['system_version'], '</a>';
-	echo ' &copy; ', date('Y');
-	echo '</div>';
-	
-echo '</div>'; //copyright div
-
-echo '<div class="footer_emails">';
-
-/*	Plugins for footer section */
-
-echo '<div id="plugin-footer">';
-api_plugin('footer');
-echo '</div>';
-
-if (api_get_setting('show_tutor_data') == 'true') {
-	// Course manager
-	$id_course = api_get_course_id();
-	$id_session = api_get_session_id();
-	if (isset($id_course) && $id_course != -1) {
-		echo '<div id="platformmanager">';
-		if ($id_session != 0){
-			$coachs_email = CourseManager::get_email_of_tutor_to_session($id_session, $id_course);
-			$email_link = array();
-			foreach ($coachs_email as $coach_email) {
-				foreach ($coach_email as $email => $username) {
-					$email_link[] = Display::encrypted_mailto_link($email, $username);
-				}
-			}
-			if (count($coachs_email) > 1) {
-				$bar = '<br />';
-				echo get_lang('Coachs').' : <ul>';
-				echo '<li>'.implode("<li>", $email_link);
-				echo '</ul>';
-			} elseif (count($coachs_email) == 1) {
-				echo get_lang('Coach').' : ';
-				echo implode("&nbps;", $email_link);
-			} elseif (count($coachs_email) == 0) {
-				echo '';
-			}
-		}
-		echo '</div>';
-	}
-	echo '<br>';
-}
-
-echo '<div style="clear:both"></div>';
-$class = '';
-
-if (api_get_setting('show_teacher_data') == 'true') {
-	if (api_get_setting('show_tutor_data') == 'false') {
-		$class = 'platformmanager';
-	} else {
-		$class = 'coursemanager';
-	}
-	// course manager
-	$id_course = api_get_course_id();
-	if (isset($id_course) && $id_course != -1) {
-		echo '<div id="'.$class.'">';
-		$mail = CourseManager::get_emails_of_tutors_to_course($id_course);
-		if (!empty($mail)) {
-			if (count($mail) > 1) {
-				echo get_lang('Teachers').' : <ul>';
-				foreach ($mail as $value => $key) {
-					foreach ($key as $email => $name) {
-						echo '<li>'.Display::encrypted_mailto_link($email, $name).'</li>';
-					}
-				}
-				echo '</ul>';
-			} else {
-				echo get_lang('Teacher').' : ';
-				foreach ($mail as $value => $key) {
-					foreach ($key as $email => $name) {
-						echo Display::encrypted_mailto_link($email, $name).'<br />';
-					}
-				}
-			}
-		}
-		echo '</div>';
-	}
-}
-echo '</div>';
-
-
-echo '</div> <!-- end of #footer -->';
-
-if (!api_is_platform_admin()) {
-        $extra_footer = trim(api_get_setting('footer_extra_content'));
-        if (!empty($extra_footer)) {
-                echo $extra_footer;
-        }
-}
-
-/*
-// Test server mode indicator and information for testing purposes.
-if (api_is_platform_admin()) {
-	if (api_get_setting('server_type') == 'test') {
-
-		echo '<br /><a href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Platform#server_type">';
-		echo '<span style="background-color: white; color: red; border: 1px solid red;">&nbsp;'.get_lang('TestServerMode').'&nbsp;</span></a>';
-
-		// @todo page execution time
-		$mtime = microtime();
-		$mtime = explode(" ",$mtime);
-		$mtime = $mtime[1] + $mtime[0];
-		$endtime = $mtime;
-		$starttime = $_SESSION['page_start_time_execution']; 
-		$totaltime = ($endtime - $starttime);
-
-		$starttime = null;
-		unset($_SESSION['page_start_time_execution']);
-
-		$totaltime = number_format(($totaltime), 4, '.', '');
-	    echo '<h2>'.get_lang('PageExecutionTimeWas').' '.$totaltime.' '.get_lang('Seconds').'</h2>';
-	    unset($_SESSION['page_start_time_execution']);
-
-
-	    // Memory usage
-	    echo get_lang('MemoryUsage').': '.number_format((memory_get_usage()/1048576), 3, '.', '') .' Mb' ;
-		echo '<br />';
-		echo get_lang('MemoryUsagePeak').': '.number_format((memory_get_peak_usage()/1048576), 3, '.', '').' Mb';
-	}
-}*/
-?>
-<script>
-$(document).ready( function() {
-	$(".chzn-select").chosen();	
-	//highlighting rows	
-	$("form .data_table input:checkbox").click(function() {
-        if ($(this).is(":checked")) {
-            $(this).parentsUntil("tr").parent().addClass("row_selected");
-            
-        } else {
-        $(this).parentsUntil("tr").parent().removeClass("row_selected");
-        }    
-    });
-});
-</script>
-</body>
-</html>
\ No newline at end of file
+echo $global_tpl->show_footer();
\ No newline at end of file
diff --git a/main/inc/header.inc.php b/main/inc/header.inc.php
index a204a2775f..b5fbd49a14 100644
--- a/main/inc/header.inc.php
+++ b/main/inc/header.inc.php
@@ -6,219 +6,3 @@
  *  @package chamilo.include
  */
 
-/*  HEADERS SECTION */
-
-header('Content-Type: text/html; charset='.api_get_system_encoding());
-//show the X-Powered-By header so that parsers can find it
-global $_configuration, $this_section;
-header('X-Powered-By: '.$_configuration['software_name'].' '.substr($_configuration['system_version'],0,1));
-
-$navigator_info = api_get_navigator();
-//ie6 fix
-if ($navigator_info['name'] == 'Internet Explorer' &&  $navigator_info['version'] == '6') {
-    $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/iepngfix/iepngfix_tilebg.js" type="text/javascript" language="javascript"></script>';
-}
-
-// Include here the script ASCIIMathML.js if you want to show mathematical formulas and graphics
-// not only in the "Documents" tool, but elsewhere in the system. This setting is related to the
-// online editor's plugins 'asciimath' and 'asciisvg'.
-if (api_get_setting('include_asciimathml_script') == 'true') {
-    $htmlHeadXtra[] = api_get_js('asciimath/ASCIIMathML.js');
-}
-
-if (isset($httpHeadXtra) && $httpHeadXtra) {
-    foreach ($httpHeadXtra as & $thisHttpHead) {
-        header($thisHttpHead);
-    }
-}
-
-// Get language iso-code for this page - ignore errors
-$document_language = api_get_language_isocode();
-
-$course_title = $_course['name'];
-$title_list[] = api_get_setting('Institution');
-$title_list[] = api_get_setting('siteName');
-if (!empty($course_title)) {
-    $title_list[] = $course_title;
-}
-
-if ($nameTools != '') {
-    $title_list[] = $nameTools;
-}
-
-$title_string = '';
-for($i=0; $i<count($title_list);$i++) {
-    $title_string .=$title_list[$i];
-    if (isset($title_list[$i+1])) {
-        $item = trim($title_list[$i+1]);
-        if (!empty($item))
-            $title_string .=' - ';
-    }    
-}
-
-/*
- * HTML HEADER
- */
-?>
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $document_language; ?>" lang="<?php echo $document_language; ?>">
-<head>
-<title>
-<?php
-echo Security::remove_XSS($title_string);
-?>
-</title>
-<style type="text/css" media="screen, projection">
-/*<![CDATA[*/
-<?php
-
-$platform_theme = api_get_setting('stylesheets');
-$my_style = api_get_visual_theme();
-
-global $show_learn_path;
-
-if ($show_learn_path) {
-    $htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_CSS_PATH).$my_style.'/learnpath.css"/>';
-}
-$htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/dtree/dtree.css" />'; //will be moved
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/dtree/dtree.js" type="text/javascript"></script>'; //will be moved
-
-//Base CSS
-echo '@import "'.api_get_path(WEB_CSS_PATH).'base.css";';
-//Default CSS
-echo '@import "'.api_get_path(WEB_CSS_PATH).$my_style.'/default.css";';
-//Course CSS
-echo '@import "'.api_get_path(WEB_CSS_PATH).$my_style.'/course.css";';
-
-// enabling page to load extra css from correct theme 
-if (isset($htmlCSSXtra) && $htmlCSSXtra) {
-	foreach ($htmlCSSXtra as & $css) 
-		echo '@import "'.api_get_path(WEB_CSS_PATH).$my_style.'/'.$css.'";'."\n";
-	
-}
-
-if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
-    echo 'img, div { behavior: url('.api_get_path(WEB_LIBRARY_PATH).'javascript/iepngfix/iepngfix.htc) } ';
-}
-
-?>
-/*]]>*/
-</style>
-<style type="text/css" media="print">
-/*<![CDATA[*/
-<?php
-  echo '@import "'.api_get_path(WEB_CSS_PATH).$my_style.'/print.css";';
-?>
-/*]]>*/
-</style>
-
-<script src="<?php echo api_get_path(WEB_LIBRARY_PATH);?>javascript/jquery.min.js" type="text/javascript" ></script>
-<script src="<?php echo api_get_path(WEB_LIBRARY_PATH);?>javascript/chosen/chosen.jquery.min.js" type="text/javascript" ></script>
-
-<script src="<?php echo api_get_path(WEB_LIBRARY_PATH);?>javascript/thickbox.js" type="text/javascript" ></script>
-<link rel="stylesheet" href="<?php echo api_get_path(WEB_LIBRARY_PATH);?>javascript/thickbox.css" type="text/css" media="projection, screen" />
-<link rel="stylesheet" href="<?php echo api_get_path(WEB_LIBRARY_PATH);?>javascript/chosen/chosen.css" type="text/css" media="projection, screen" />
-
-<link rel="top" href="<?php echo api_get_path(WEB_PATH); ?>index.php" title="" />
-<link rel="courses" href="<?php echo api_get_path(WEB_CODE_PATH); ?>auth/courses.php" title="<?php echo api_htmlentities(get_lang('OtherCourses'), ENT_QUOTES); ?>" />
-<link rel="profil" href="<?php echo api_get_path(WEB_CODE_PATH); ?>auth/profile.php" title="<?php echo api_htmlentities(get_lang('ModifyProfile'), ENT_QUOTES); ?>" />
-<link href="http://www.chamilo.org/documentation.php" rel="Help" />
-<link href="http://www.chamilo.org/team.php" rel="Author" />
-<link href="http://www.chamilo.org" rel="Copyright" />
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo api_get_system_encoding(); ?>" />
-<meta name="Generator" content="<?php echo $_configuration['software_name'].' '.substr($_configuration['system_version'],0,1);?>" />
-<script src= "<?php echo api_get_path(WEB_LIBRARY_PATH);?>javascript/jquery.menu.js" type="text/javascript"></script>
-
-<?php if ( api_get_setting('allow_global_chat') == 'true' && !api_is_anonymous() ) { ?>
-	<script src="<?php echo api_get_path(WEB_LIBRARY_PATH);?>javascript/chat/js/chat.js" type="text/javascript" ></script>
-	<link rel="stylesheet" href="<?php echo api_get_path(WEB_LIBRARY_PATH);?>javascript/chat/css/chat.css" type="text/css" media="projection, screen" />
-	<link rel="stylesheet" href="<?php echo api_get_path(WEB_LIBRARY_PATH);?>javascript/chat/css/screen.css" type="text/css" media="projection, screen" />
-<?php } ?>
-
-<script type="text/javascript">
-//<![CDATA[
-// This is a patch for the "__flash__removeCallback" bug, see FS#4378.
-if ( ( navigator.userAgent.toLowerCase().indexOf('msie') != -1 ) && ( navigator.userAgent.toLowerCase().indexOf( 'opera' ) == -1 ) ) {
-    window.attachEvent( 'onunload', function() {
-            window['__flash__removeCallback'] = function ( instance, name ) {
-                try {
-                    if ( instance ) {
-                        instance[name] = null ;
-                    }
-                } catch ( flashEx ) {
-                }
-            } ;
-	});
-}
-
-/* Global chat variables */
-var ajax_url = '<?php echo api_get_path(WEB_AJAX_PATH).'chat.ajax.php'; ?>';
-var online_button = '<?php  echo Security::remove_XSS(Display::return_icon('online.png')); ?>';
-var offline_button = '<?php echo Security::remove_XSS(Display::return_icon('offline.png')); ?>';
-
-var	connect_lang = '<?php echo get_lang('ChatConnected');?>';
-var	disconnect_lang = '<?php echo get_lang('ChatDisconnected');?>';
-
-
-//]]>
-</script>
-<?php
-if (api_get_setting('accessibility_font_resize') == 'true') {
-    echo '<script src= "'.api_get_path(WEB_LIBRARY_PATH).'javascript/fontresize.js" type="text/javascript"></script>';
-}
-
-if (isset($htmlHeadXtra) && $htmlHeadXtra) {
-    foreach ($htmlHeadXtra as & $this_html_head) {
-        echo $this_html_head;
-    }
-}
-if (isset($htmlIncHeadXtra) && $htmlIncHeadXtra) {
-    foreach ($htmlIncHeadXtra as & $this_html_head) {
-        include($this_html_head);
-    }
-}
-// The following include might be subject to a setting proper to the course or platform.
-include api_get_path(LIBRARY_PATH).'javascript/email_links.lib.js.php';
-
-$favico = '<link rel="shortcut icon" href="'.api_get_path(WEB_PATH).'favicon.ico" type="image/x-icon" />';
-if (isset($_configuration['multiple_access_urls']) && $_configuration['multiple_access_urls']) {
-    $access_url_id = api_get_current_access_url_id();
-    if ($access_url_id != -1) {
-        $url_info = api_get_access_url($access_url_id);
-        $url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
-        $clean_url = replace_dangerous_char($url);
-        $clean_url = str_replace('/', '-', $clean_url);
-        $clean_url .= '/';
-        $homep            = api_get_path(REL_PATH).'home/'.$clean_url; //homep for Home Path               
-        //we create the new dir for the new sites
-        if (is_file($homep.'favicon.ico')) {
-            $favico = '<link rel="shortcut icon" href="'.$homep.'favicon.ico" type="image/x-icon" />';
-        }
-    }
-}
-echo $favico;
-if (!api_is_platform_admin()) {
-	$extra_header = trim(api_get_setting('header_extra_content'));
-	if (!empty($extra_header)) {
-		echo $extra_header;
-	}		
-}
-?>
-</head>
-<body dir="<?php echo api_get_text_direction(); ?>" <?php
-if (defined('CHAMILO_HOMEPAGE') && CHAMILO_HOMEPAGE) {
-  echo 'onload="javascript: if(document.formLogin) { document.formLogin.login.focus(); }"';
-}
-echo 'class="'.(!empty($this_section)?$this_section:'').'"';?>>
-<div class="skip">
-<ul>
-<li><a href="#menu"><?php echo get_lang('WCAGGoMenu'); ?></a></li>
-<li><a href="#content" accesskey="2"><?php echo get_lang('WCAGGoContent'); ?></a></li>
-</ul>
-</div>
-<?php
-
-// Banner
-require_once api_get_path(INCLUDE_PATH).'banner.inc.php';
diff --git a/main/inc/lib/banner.lib.php b/main/inc/lib/banner.lib.php
index 22c419fca5..35f5d456c6 100644
--- a/main/inc/lib/banner.lib.php
+++ b/main/inc/lib/banner.lib.php
@@ -455,14 +455,14 @@ function show_header_3() {
             }
             
             //start user section line with name, my course, my profile, scorm info, etc            
-            $header3 .= '<ul id="logout">';
+            $header3 .= '<ul class="nav secondary-nav">';
                 //echo '<li><span>'.get_lang('LoggedInAsX').' '.$login.'</span></li>';
                 //echo '<li><a href="'.api_get_path(WEB_PATH).'main/auth/profile.php" target="_top"><span>'.get_lang('Profile').'</span></a></li>';
                 $header3 .= '<li><a href="'.api_get_path(WEB_PATH).'index.php?logout=logout&uid='.api_get_user_id().'" target="_top"><span>'.get_lang('Logout').' ('.$login.')</span></a></li>';
             $header3 .= '</ul>';    
         }   
         if (!empty($lis)) {
-            $header3 .= '<ul>';
+            $header3 .= '<ul class="nav nav-pills">';
             $header3 .= $lis;
             $header3 .= '</ul>';
         }
diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index b949315bbd..1fb3c6e2f0 100644
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -26,6 +26,7 @@ define('MAX_LENGTH_BREADCRUMB', 100);
  */
 
 class Display {
+    static $global_template;
 
     private function __construct() {
 
@@ -73,86 +74,6 @@ class Display {
         }
     }
 
-    /**
-     *	Display simple html header of table.
-     *  @deprecated use the HTML_table class
-     */
-    /*public static function display_table_header() {
-        $bgcolor = 'bgcolor="white"';
-        echo '<table border="0" cellspacing="0" cellpadding="4" width="85%"><tbody>';
-        return $bgcolor;
-    }*/
-
-    /**
-     *	Display html header of table with several options.
-     *
-     *	@param $properties, array with elements, all of which have defaults
-     *	"width" - the table width, e.g. "100%", default is 85%
-     *	"class"	 - the class to use for the table, e.g. "class=\"data_table\""
-     *   "cellpadding"  - the extra border in each cell, e.g. "8",default is 4
-     *   "cellspacing"  - the extra space between cells, default = 0
-     *	@param column_header, array with the header elements.
-     *	@author Roan Embrechts
-     *	@version 1.01
-     *  @todo remove this function, is only use in user.php
-     *  @deprecated use the HTML_table class
-     *	@return return type string, bgcolor
-     *//*
-    public static function display_complex_table_header($properties, $column_header) {
-        $width = $properties['width'];
-        if (!isset($width)) {
-            $width = '85%';
-        }
-        $class = $properties['class'];
-        if (!isset($class)) {
-            $class = 'class="data_table"';
-        }
-        $cellpadding = $properties['cellpadding'];
-        if (!isset($cellpadding)) {
-            $cellpadding = '4';
-        }
-        $cellspacing = $properties['cellspacing'];
-        if (!isset ($cellspacing)) {
-            $cellspacing = '0';
-        }
-        //... add more properties as you see fit
-        //api_display_debug_info("Light grey is " . DOKEOSLIGHTGREY);
-        $bgcolor = 'bgcolor="'.DOKEOSLIGHTGREY.'"';
-        echo '<table '.$class.' border="0" cellspacing="$cellspacing" cellpadding="'.$cellpadding.'" width="'.$width.'">'."\n";
-        echo '<thead><tr '.$bgcolor.'>';
-        foreach ($column_header as & $table_element) {
-            echo '<th>'.$table_element.'</th>';
-        }
-        echo "</tr></thead>\n";
-        echo "<tbody>\n";
-        $bgcolor = 'bgcolor="'.HTML_WHITE.'"';
-        return $bgcolor;
-    }*/
-
-    /**
-     *	Displays a table row.
-     *
-     *	@param $bgcolor the background colour for the table
-     *	@param $table_row an array with the row elements
-     *	@param $is_alternating true: the row colours alternate, false otherwise
-     *  @todo remove this function, is only use in user.php
-     */
-    /*public static function display_table_row($bgcolor, $table_row, $is_alternating = true) {
-        echo '<tr '.$bgcolor.'>';
-        foreach ($table_row as & $table_element) {
-            echo '<td>'.$table_element.'</td>';
-        }
-        echo "</tr>\n";
-        if ($is_alternating) {
-            if ($bgcolor == 'bgcolor="'.HTML_WHITE.'"') {
-                $bgcolor = 'bgcolor="'.DOKEOSLIGHTGREY.'"';
-            } elseif ($bgcolor == 'bgcolor="'.DOKEOSLIGHTGREY.'"') {
-                $bgcolor = 'bgcolor="'.HTML_WHITE.'"';
-            }
-        }
-        return $bgcolor;
-    }*/
-
     /**
      * Displays a table
      * @param array $header Titles for the table header
@@ -465,7 +386,10 @@ class Display {
         global $httpHeadXtra, $htmlHeadXtra, $htmlIncHeadXtra, $_course, $_user, $text_dir, $plugins, $_user, $_cid, $interbreadcrumb, $charset, $language_file, $noPHP_SELF;
         global $menu_navigation;        
 		global $htmlCSSXtra;
-        require api_get_path(INCLUDE_PATH).'header.inc.php';
+        require_once api_get_path(LIBRARY_PATH).'template.lib.php';
+        self::$global_template = new Template($tool_name);
+        echo self::$global_template ->show_header();
+
     }
 
     /**
@@ -475,15 +399,18 @@ class Display {
         global $_plugins, $lp_theme_css, $mycoursetheme, $user_theme, $platform_theme;
         global $httpHeadXtra, $htmlHeadXtra, $htmlIncHeadXtra, $_course, $_user, $text_dir, $plugins, $_user, $_cid, $interbreadcrumb, $charset, $language_file, $noPHP_SELF, $language_interface;
         global $menu_navigation;
-        require api_get_path(INCLUDE_PATH).'reduced_header.inc.php';
+        //require api_get_path(INCLUDE_PATH).'reduced_header.inc.php';
+        self::$global_template = new Template($tool_name);
+        self::$global_template->show_header = false;
+        echo self::$global_template ->show_header();        
     }
 
     /**
      * Display the page footer
      */
     public static function display_footer () {
-        global $_plugins;
-        require api_get_path(INCLUDE_PATH).'footer.inc.php';
+        global $_plugins, $global_tpl;
+        echo self::$global_template ->show_footer();        
     }
 
     /**
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index 852fdf092c..483eae28c5 100644
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -446,4 +446,14 @@ class Template extends Smarty {
 	
 		$this->assign('execution_stats', $stats);		
 	}
+    
+    function show_header() {        
+		$tpl = $this->get_template('layout/show_header.tpl');
+		$this->display($tpl);	
+    }
+    
+    function show_footer() {
+        $tpl = $this->get_template('layout/show_footer.tpl');
+		$this->display($tpl);	
+    }
 }
diff --git a/main/template/default/layout/head.tpl b/main/template/default/layout/head.tpl
index 3d15a88a5e..4daa13d1e0 100644
--- a/main/template/default/layout/head.tpl
+++ b/main/template/default/layout/head.tpl
@@ -54,7 +54,26 @@ var	disconnect_lang = '{"ChatDisconnected"|get_lang}';
 {$favico}
 
 <script type="text/javascript">
+
+$(document).scroll(function() {
+    // If has not activated (has no attribute "data-top"
+    if (!$('.subnav').attr('data-top')) {
+        // If already fixed, then do nothing
+        if ($('.subnav').hasClass('subnav-fixed')) return;
+        // Remember top position
+        var offset = $('.subnav').offset()
+        $('.subnav').attr('data-top', offset.top);
+    }
+
+    if ($('.subnav').attr('data-top') - $('.subnav').outerHeight() <= $(this).scrollTop())
+        $('.subnav').addClass('subnav-fixed');
+    else
+        $('.subnav').removeClass('subnav-fixed');
+});
+
+
 $(document).ready(function(){
+   
 	$('.topbar').dropdown();
 
 	$('.ajax').live('click', function() {
diff --git a/main/template/default/layout/header.tpl b/main/template/default/layout/header.tpl
index 7c96a8cbf9..8d8fc59ff5 100644
--- a/main/template/default/layout/header.tpl
+++ b/main/template/default/layout/header.tpl
@@ -81,6 +81,8 @@
 
 {if $header3}
 <div id="header3">
+    <div class="subnav">
     {$header3}
+    </div>
 </div>
 {/if}
diff --git a/main/template/default/layout/main.tpl b/main/template/default/layout/main.tpl
index 70197a4a07..f2ede6446d 100644
--- a/main/template/default/layout/main.tpl
+++ b/main/template/default/layout/main.tpl
@@ -1,37 +1,9 @@
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$document_language}" lang="{$document_language}">
-<head>
-{include file="default/layout/head.tpl"}
-</head>
+{include file="default/layout/main_header.tpl"}
 
-<body dir="{$text_direction}" class="{$section_name}">
+{include file="default/layout/main_pre_content.tpl"}       
 
-<div class="skip">
-	<ul>
-		<li><a href="#menu">{"WCAGGoMenu"|get_lang}</a></li>
-		<li><a href="#content" accesskey="2">{"WCAGGoContent"|get_lang}</a></li>
-	</ul>
-</div>
+{block name="body"}{/block}			
 
-<div id="wrapper">
-	{* Bug and help notifications *}		
-	<ul id="navigation">
-		{$help_content}
-		{$bug_notification_link}
-	</ul>	
-	{block name="header"}{/block}
-	<div id="main">
-	    {* breadcrumb *}
-        {$header4}
-		<div id="submain">			
-			{block name="body"}{/block}
-			<div class="clear">&nbsp;</div> <!-- 'clearing' div to make sure that footer stays below the main and right column sections -->
-		</div> <!-- end of #main" started at the end of banner.inc.php -->
-	</div> <!-- end of #main" started at the end of banner.inc.php -->
-	<div class="push"></div>
-</div> <!-- end of #wrapper section -->
-{block name="footer"}{/block}
-</body>
-</html>
+{include file="default/layout/main_post_content.tpl"}
+
+{include file="default/layout/main_footer.tpl"}
diff --git a/main/template/default/layout/main_footer.tpl b/main/template/default/layout/main_footer.tpl
new file mode 100644
index 0000000000..ae74886e1d
--- /dev/null
+++ b/main/template/default/layout/main_footer.tpl
@@ -0,0 +1,3 @@
+{block name="footer"}{/block}
+</body>
+</html>
diff --git a/main/template/default/layout/main_header.tpl b/main/template/default/layout/main_header.tpl
new file mode 100644
index 0000000000..c937dfb5b9
--- /dev/null
+++ b/main/template/default/layout/main_header.tpl
@@ -0,0 +1,16 @@
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$document_language}" lang="{$document_language}">
+<head>
+{include file="default/layout/head.tpl"}
+</head>
+
+<body dir="{$text_direction}" class="{$section_name}">
+
+<div class="skip">
+	<ul>
+		<li><a href="#menu">{"WCAGGoMenu"|get_lang}</a></li>
+		<li><a href="#content" accesskey="2">{"WCAGGoContent"|get_lang}</a></li>
+	</ul>
+</div>
\ No newline at end of file
diff --git a/main/template/default/layout/main_post_content.tpl b/main/template/default/layout/main_post_content.tpl
new file mode 100644
index 0000000000..df3a7c7ad1
--- /dev/null
+++ b/main/template/default/layout/main_post_content.tpl
@@ -0,0 +1,6 @@
+<div class="clear">&nbsp;</div> <!-- 'clearing' div to make sure that footer stays below the main and right column sections -->
+        </div> <!-- end of #main" started at the end of banner.inc.php -->
+
+    </div> <!-- end of #main" started at the end of banner.inc.php -->
+    <div class="push"></div>
+</div> <!-- end of #wrapper section -->
\ No newline at end of file
diff --git a/main/template/default/layout/main_pre_content.tpl b/main/template/default/layout/main_pre_content.tpl
new file mode 100644
index 0000000000..6d04355a0a
--- /dev/null
+++ b/main/template/default/layout/main_pre_content.tpl
@@ -0,0 +1,12 @@
+<div id="wrapper">
+    {* Bug and help notifications *}		
+    <ul id="navigation">
+        {$help_content}
+        {$bug_notification_link}
+    </ul>	
+    {block name="header"}{/block}
+
+    <div id="main">
+        {* breadcrumb *}
+        {$header4}
+        <div id="submain">	
\ No newline at end of file
diff --git a/main/template/default/layout/show_footer.tpl b/main/template/default/layout/show_footer.tpl
new file mode 100644
index 0000000000..14cd020a0b
--- /dev/null
+++ b/main/template/default/layout/show_footer.tpl
@@ -0,0 +1,3 @@
+{include file="default/layout/main_post_content.tpl"}
+
+{include file="default/layout/main_footer.tpl"}
\ No newline at end of file
diff --git a/main/template/default/layout/show_header.tpl b/main/template/default/layout/show_header.tpl
new file mode 100644
index 0000000000..d2f9f80d7b
--- /dev/null
+++ b/main/template/default/layout/show_header.tpl
@@ -0,0 +1,3 @@
+{include file="default/layout/main_header.tpl"}
+
+{include file="default/layout/main_pre_content.tpl"}