diff --git a/main/template/default/layout/footer.tpl b/main/template/default/layout/footer.tpl
index 7e8a9ad6d0..67ed9d0439 100644
--- a/main/template/default/layout/footer.tpl
+++ b/main/template/default/layout/footer.tpl
@@ -9,8 +9,7 @@
 	    <div align="right">	    	
 	    	{"Platform"|get_lang} <a href="{$_p.web}" target="_blank">{$_s.software_name} {$_s.system_version}</a> &copy; {$smarty.now|date_format:"%Y"}	    	
 	    </div>    
-	</div>
-	
+	</div>	
 	<div class="footer_emails">		
 		{*  Plugins for footer section *}		
 		<div id="plugin-footer">
@@ -23,21 +22,7 @@
 {literal}
 <script type="text/javascript">
 $(document).ready( function() {
-    $(".chzn-select").chosen();
-    
-//highlighting rows
-      
-    /*$("form .data_table .row_even, form .data_table .row_odd").click(function(e) {
-        var $check = $(this).find("input:checkbox");        
-        if ($check.is(":checked")) {
-            $(this).removeClass("row_selected");
-            $check.removeAttr('checked', 'checked');
-        } else {
-            $(this).addClass("row_selected");
-            $check.attr('checked', 'checked');           
-        }    
-    });*/   
-    
+    $(".chzn-select").chosen();     
     $("form .data_table input:checkbox").click(function() {
         if ($(this).is(":checked")) {
             $(this).parentsUntil("tr").parent().addClass("row_selected");
diff --git a/main/template/default/layout/head.tpl b/main/template/default/layout/head.tpl
index 94b547d51e..d052de1cca 100644
--- a/main/template/default/layout/head.tpl
+++ b/main/template/default/layout/head.tpl
@@ -2,12 +2,13 @@
 <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" />
-<link rel="top"		href="{$_p.web_main}index.php" title="" />
+<!-- <link rel="top"		href="{$_p.web_main}index.php" title="" />
 <link rel="courses" href="{$_p.web_main}auth/courses.php" title="{"OtherCourses"|get_lang}"/>
-<link rel="profil"  href="{$_p.web_main}auth/profile.php" title="{"ModifyProfile"|get_lang}"/>
+<link rel="profil"  href="{$_p.web_main}auth/profile.php" title="{"ModifyProfile"|get_lang}"/> -->
 
-<meta http-equiv="Content-Type" content="text/html; charset={$system_charset}" />
 <meta name="Generator" content="{$_s.software_name} {$_s.system_version|substr:0:1}" />
+<meta charset="{$system_charset}" />
+<meta http-equiv="content-language" content="{$document_language}">
 		
 <title>{$title_string}</title>
 
@@ -103,6 +104,5 @@ $(document).ready(function() {
 	});
 });
 </script>
-
 {$header_extra_content}
 <!--  head end-->
\ No newline at end of file
diff --git a/main/template/default/layout/main.tpl b/main/template/default/layout/main.tpl
index 97bcba8a68..c2fa3d1d4a 100644
--- a/main/template/default/layout/main.tpl
+++ b/main/template/default/layout/main.tpl
@@ -1,13 +1,7 @@
 {* html -> skip *}
 {include file="default/layout/main_header.tpl"}
 
-{* wrapper -> submain *}
-{include file="default/layout/main_pre_content.tpl"}       
-
 {block name="body"}{/block}
 
-{* closing divs *}
-{include file="default/layout/main_post_content.tpl"}
-
 {* footer *}
 {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
index ae74886e1d..bc1f1e37f8 100644
--- a/main/template/default/layout/main_footer.tpl
+++ b/main/template/default/layout/main_footer.tpl
@@ -1,3 +1,9 @@
+<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>
diff --git a/main/template/default/layout/main_header.tpl b/main/template/default/layout/main_header.tpl
index c937dfb5b9..561d35ec99 100644
--- a/main/template/default/layout/main_header.tpl
+++ b/main/template/default/layout/main_header.tpl
@@ -1,11 +1,8 @@
-<!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}">
+<!DOCTYPE html>
+<html>    
 <head>
-{include file="default/layout/head.tpl"}
+    {include file="default/layout/head.tpl"}
 </head>
-
 <body dir="{$text_direction}" class="{$section_name}">
 
 <div class="skip">
@@ -13,4 +10,16 @@
 		<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
+</div>
+<div id="wrapper">
+    {* Bug and help notifications *}		
+    <ul id="navigation">
+        {$help_content}
+        {$bug_notification_link}
+    </ul>    
+    {include file="default/layout/header.tpl"}
+
+    <div id="main">
+        {* breadcrumb *}
+        {$header4}
+        <div id="submain">	    
\ 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
deleted file mode 100644
index df3a7c7ad1..0000000000
--- a/main/template/default/layout/main_post_content.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index f3acf970e9..0000000000
--- a/main/template/default/layout/main_pre_content.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="wrapper">
-    {* Bug and help notifications *}		
-    <ul id="navigation">
-        {$help_content}
-        {$bug_notification_link}
-    </ul>    
-    {include file="default/layout/header.tpl"}
-
-    <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
index 14cd020a0b..ee1017a2f6 100644
--- a/main/template/default/layout/show_footer.tpl
+++ b/main/template/default/layout/show_footer.tpl
@@ -1,3 +1 @@
-{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
index d2f9f80d7b..50f67d828e 100644
--- a/main/template/default/layout/show_header.tpl
+++ b/main/template/default/layout/show_header.tpl
@@ -1,3 +1 @@
-{include file="default/layout/main_header.tpl"}
-
-{include file="default/layout/main_pre_content.tpl"}       
+{include file="default/layout/main_header.tpl"}
\ No newline at end of file