diff --git a/resources/css/style.css b/resources/css/style.css
index 2a448cfe70c1d932e62032722f89a26e780b7f8b..86c167b6495ba5567d8e1784522e8dd0f3301531 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -25,27 +25,6 @@ body {
 
 
 /* Header*/
-header {
-    width: 100%;
-    margin:0;
-    padding:0;
-}
-header ul {
-    width: 100%;
-    display:table;
-    table-layout:fixed;
-    margin:0;
-    padding:0.3rem 0.5rem;
-    box-sizing:border-box;
-}
-header ul li{
-    display:table-cell;
-    width:40%;
-}
-header ul li.logo{
-    width: 30%;
-}
-
 header .title {
     width: 100%;
     height: 4rem;
@@ -55,7 +34,6 @@ header .title {
     background-color: #FF8547;
     background-color: hsl(20,100%,64%);
 }
-
 header h1 {
     width: 100%;
     font-size: 1.6em;
@@ -67,7 +45,6 @@ header h1 {
     text-align: center;
 }
 
-
 /* Footer*/
 footer{
     width:100%;
diff --git a/templates/web/index.tt2.html b/templates/web/index.tt2.html
index 7e6a3d1970c034baaa57798082ae0972ec41fe84..2bc228f9d4126de5d03476abbf42d67ff82de233 100644
--- a/templates/web/index.tt2.html
+++ b/templates/web/index.tt2.html
@@ -27,11 +27,10 @@ html1/DTD/xhtml1-transitional.dtd">
 
     <body>
         <header>
-            <ul>
-                <li class="logo align-left"><a href="http://www.edugain.org" title="eduGAIN home page" target="_blank"><img alt="eduGAIN logo" width="200" src="images/edugain_logo.png "/></a></li>
-                <li>&nbsp;</li>
-                <li class="logo align-right"><a href="http://www.geant.net" title="Geant home page" target="_blank"><img alt="GEANT logo" width="100" src="images/geant_logo_rgb_300dpi.jpg"/></a></li>
-            </ul>
+            <div class="clearfix">
+                <a href="http://www.edugain.org" title="eduGAIN home page" target="_blank" class="left"><img alt="eduGAIN logo" width="200" src="images/edugain_logo.png"/></a>
+                <a href="http://www.geant.net" title="Geant home page" target="_blank" class="right"><img alt="GEANT logo" width="100" src="images/geant_logo_rgb_300dpi.jpg"/></a>
+            </div>
             <div class="title">
                 <h1>[% title %]</h1>
             </div>