diff --git a/templates/web/en/home.tt2.html b/templates/web/en/home.tt2.html
index 1c873db3321a20d2fa76048a21ac5ca2d4ab8561..bfe337f85dcfa3926de0c38540cfaa5495e2d602 100644
--- a/templates/web/en/home.tt2.html
+++ b/templates/web/en/home.tt2.html
@@ -1,19 +1,13 @@
-
-<div class="row">
 <h2>[% app.name %]?</h2>
 <p>[% app.name %] allows administrators of a Service
 Provider (SP) registered in <a href="http://www.geant.net/service/eduGAIN/Pages/home.aspx">eduGAIN</a> to create test
 accounts with different profiles to validate the behaviour and test
-federated login. The test accounts can only be used to access own services. <a href="presentation.html">Learn more about this service...</a>
-</p>
-<h3>Start testing your eduGAIN service</h3>
+federated login. The test accounts can only be used to access own services. <a href="presentation.html">Learn more about this service...</a></p>
+
+<h2>Start testing your eduGAIN service</h2>
 <p>To start testing your own eduGAIN service, start by selecting the Service
 Provider you are administrator for.</p>
 <p class="text-center"><a href="?action=select_sp" class="button">Go on testing the service</a></p>
 
-<h3>[% app.name %] basics</h3>
-<p>
-<br/><img alt="[% app.name %] Basics" src="images/edugain_test_idp_basics.png"/>
-</p>
-
-</div>
+<h2>[% app.name %] basics</h2>
+<img alt="[% app.name %] Basics" src="images/edugain_test_idp_basics.png"/>
diff --git a/templates/web/fr/home.tt2.html b/templates/web/fr/home.tt2.html
index 5c17a0fdafb3bd363db2d1c232a912cb199d9ff4..64ad7b521e80f1ec0341820cfa8e22a1fcb455c4 100644
--- a/templates/web/fr/home.tt2.html
+++ b/templates/web/fr/home.tt2.html
@@ -1,17 +1,12 @@
-<div class="row">
 <h2>[% app.name %]?</h2>
 <p>[% app.name %] allows administrators of a Service
 Provider (SP) registered in <a href="http://www.geant.net/service/eduGAIN/Pages/home.aspx">eduGAIN</a> to create test
 accounts with different profiles to validate the behaviour and test
-federated login. The test accounts can only be used to access own services. <a href="presentation.html">Learn more about this service...</a>
-</p>
-<h3>Start testing your eduGAIN service</h3>
+federated login. The test accounts can only be used to access own services. <a href="presentation.html">Learn more about this service...</a></p>
+
+<h2>Start testing your eduGAIN service</h2>
 <p>To start testing your own eduGAIN service, start by selecting the Service Provider you are administrator for.</p>
 <p class="text-center"><a href="?action=select_sp" class="button">Go on testing the service</a></p>
 
-<h3>[% app.name %] basics</h3>
-<p>
-<br/><img alt="[% app.name %] Basics" src="images/edugain_test_idp_basics.png"/>
-</p>
-
-</div>
+<h2>[% app.name %] basics</h2>
+<img alt="[% app.name %] Basics" src="images/edugain_test_idp_basics.png"/>