diff --git a/main/template/default/layout/show_footer.tpl b/main/template/default/layout/show_footer.tpl
index 6b60cca721..a68ccedd03 100755
--- a/main/template/default/layout/show_footer.tpl
+++ b/main/template/default/layout/show_footer.tpl
@@ -1,8 +1,16 @@
-    {% if show_footer == true %}
-            </div>
-        </section>
-        {% include 'layout/page_footer.tpl'|get_template %}
-    {% endif %}
     </div>
+    </section>
+    <!-- END CONTENT -->
+
+    <!-- START FOOTER -->
+    <footer class="footer">
+        {% if show_footer == true %}
+            {% include 'layout/page_footer.tpl'|get_template %}
+        {% endif %}
+    </footer>
+    <!-- END FOOTER -->
+
+    </main>
+    <!-- END MAIN -->
 </body>
-</html>
+</html>
\ 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 2d2aa97e7a..68128aafab 100755
--- a/main/template/default/layout/show_header.tpl
+++ b/main/template/default/layout/show_header.tpl
@@ -1,10 +1,7 @@
 <!DOCTYPE html>
-<!--[if lt IE 7]>
-<html lang="{{ document_language }}" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
-<!--[if IE 7]>
-<html lang="{{ document_language }}" class="no-js lt-ie9 lt-ie8"> <![endif]-->
-<!--[if IE 8]>
-<html lang="{{ document_language }}" class="no-js lt-ie9"> <![endif]-->
+<!--[if lt IE 7]> <html lang="{{ document_language }}" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]>    <html lang="{{ document_language }}" class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]>    <html lang="{{ document_language }}" class="no-js lt-ie9"> <![endif]-->
 <!--[if gt IE 8]><!-->
 <html lang="{{ document_language }}" class="no-js"> <!--<![endif]-->
 <head>
@@ -12,42 +9,52 @@
         {% include 'layout/head.tpl'|get_template %}
     {% endblock %}
 </head>
-<body dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}">
-<noscript>{{ "NoJavascript"|get_lang }}</noscript>
-{% if show_header == true %}
-    <div class="wrap">
-        {% if displayCookieUsageWarning == true %}
-            <!-- Display Cookies validation -->
-            <div class="toolbar-cookie alert-warning">
-                <form onSubmit="$(this).toggle('slow')" action="" method="post">
-                    <input value=1 type="hidden" name="acceptCookies"/>
-                    <div class="cookieUsageValidation">
-                        {{ "YouAcceptCookies" | get_lang }}
-                        <span style="margin-left:20px;" onclick="$(this).next().toggle('slow'); $(this).toggle('slow')">
-                        ({{ "More" | get_lang }})
-                    </span>
-                        <div style="display:none; margin:20px 0;">
-                            {{ "HelpCookieUsageValidation" | get_lang }}
-                        </div>
-                        <span style="margin-left:20px;" onclick="$(this).parent().parent().submit()">
-                        ({{ "Accept" | get_lang }})
-                    </span>
+<body>
+
+<!-- START MAIN -->
+<main id="main" dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}">
+    <noscript>{{ "NoJavascript"|get_lang }}</noscript>
+    {% if show_course_shortcut is not null %}
+        <!-- TOOLS SHOW COURSE -->
+        <div id="cm-tools" class="nav-tools">
+            {{ show_course_shortcut }}
+        </div>
+        <!-- END TOOLS SHOW COURSE -->
+    {% endif %}
+    {% if displayCookieUsageWarning == true %}
+        <!-- START DISPLAY COOKIES VALIDATION -->
+        <div class="toolbar-cookie alert-warning">
+            <form onSubmit="$(this).toggle('slow')" action="" method="post">
+                <input value=1 type="hidden" name="acceptCookies"/>
+                <div class="cookieUsageValidation">
+                    {{ "YouAcceptCookies" | get_lang }}
+                    <span style="margin-left:20px;" onclick="$(this).next().toggle('slow'); $(this).toggle('slow')">
+                                ({{"More" | get_lang }})
+                            </span>
+                    <div style="display:none; margin:20px 0;">
+                        {{ "HelpCookieUsageValidation" | get_lang}}
                     </div>
-                </form>
-            </div>
+                    <span style="margin-left:20px;" onclick="$(this).parent().parent().submit()">
+                                ({{"Accept" | get_lang }})
+                            </span>
+                </div>
+            </form>
+        </div>
+        <!-- END DISPLAY COOKIES VALIDATION -->
+    {% endif %}
+
+    <!-- START HEADER -->
+    <header id="cm-header">
+        {% if show_header == true %}
+            {% include 'layout/page_header.tpl'|get_template %}
         {% endif %}
-        {% include 'layout/page_header.tpl'|get_template %}
-        {% if show_course_shortcut is not null %}
-            <div class="nav-tools">
-                {{ show_course_shortcut }}
-            </div>
-        {% endif %}
-        <section id="content-section">
-            <div class="container">
-                {% block breadcrumb %}
-                    <div id="page-breadcrumb">
-                        {{ breadcrumb }}
-                    </div>
-                {% endblock %}
-                {{ flash_messages }}
-{% endif %}
\ No newline at end of file
+    </header>
+    <!-- END HEADER -->
+
+    <!-- START CONTENT -->
+    <section id="cm-content">
+        <div class="container">
+            {% block breadcrumb %}
+                {{ breadcrumb }}
+            {% endblock %}
+            {{ flash_messages }}
