diff --git a/src/fr/devinsy/statoolinfos/build/Builder.java b/src/fr/devinsy/statoolinfos/build/Builder.java
index 93b2fec..1b627a7 100644
--- a/src/fr/devinsy/statoolinfos/build/Builder.java
+++ b/src/fr/devinsy/statoolinfos/build/Builder.java
@@ -108,8 +108,8 @@ public class Builder
     /**
      * Clear.
      *
-     * @param configurationFile
-     *            the input
+     * @param configuration
+     *            the configuration
      * @throws StatoolInfosException
      *             the statool infos exception
      * @throws IOException
diff --git a/src/fr/devinsy/statoolinfos/crawl/Crawler.java b/src/fr/devinsy/statoolinfos/crawl/Crawler.java
index 1d65d8e..bba476a 100644
--- a/src/fr/devinsy/statoolinfos/crawl/Crawler.java
+++ b/src/fr/devinsy/statoolinfos/crawl/Crawler.java
@@ -72,6 +72,16 @@ public class Crawler
         }
     }
 
+    /**
+     * Crawl.
+     *
+     * @param configuration
+     *            the configuration
+     * @throws StatoolInfosException
+     *             the statool infos exception
+     * @throws IOException
+     *             Signals that an I/O exception has occurred.
+     */
     public static void crawl(final Configuration configuration) throws StatoolInfosException, IOException
     {
         logger.info("Crawl input setting: {}", configuration.getCrawlInputPath());
diff --git a/src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java b/src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java
index fefb946..cf3dba6 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java
@@ -72,9 +72,10 @@ public class OrganizationPage
             int index = 0;
             for (Service service : organization.getServices())
             {
-                data.setAttribute("serviceListLine", index, "serviceListLineLogo", "src", service.getTechnicalName() + "-logo.png");
-                data.setEscapedContent("serviceListLine", index, "serviceListLineNameLink", service.getName());
                 data.setAttribute("serviceListLine", index, "serviceListLineNameLink", "href", organization.getTechnicalName() + "-" + service.getTechnicalName() + ".xhtml");
+                data.setAttribute("serviceListLine", index, "serviceListLineLogo", "src", organization.getTechnicalName() + "-" + service.getTechnicalName() + "-logo.png");
+                data.setEscapedContent("serviceListLine", index, "serviceListLineNameValue", service.getName());
+                data.setEscapedContent("serviceListLine", index, "serviceListLineUrlLink", service.getWebsite());
                 data.setEscapedContent("serviceListLine", index, "serviceListLineWebsiteLink", service.getWebsite());
                 data.setAttribute("serviceListLine", index, "serviceListLineWebsiteLink", "href", service.getWebsite());
                 data.setEscapedContent("serviceListLine", index, "serviceListLineSoftware", service.getSoftware());
diff --git a/src/fr/devinsy/statoolinfos/htmlize/organization.xhtml b/src/fr/devinsy/statoolinfos/htmlize/organization.xhtml
index adec4d1..8de85ca 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/organization.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/organization.xhtml
@@ -30,7 +30,12 @@
 				<th class="">Logiciel</th>
 			</tr>
 			<tr id="serviceListLine">
-				<td id="serviceListLineName"><a href="#" id="serviceListLineNameLink">n/a</a></td>
+				<td id="serviceListLineName" style="padding-top: 0; padding-bottom: 0;">
+					<a href="#" id="serviceListLineNameLink">
+						<img id="serviceListLineLogo" src="" style="width: 26px; height: 26px; padding-top:0; padding-bottom: 0; vertical-align: middle;"/>
+						&#160;<span id="serviceListLineNameValue">n/a</span>
+					</a>
+				</td>
 				<td id="serviceListLineWebsite"><a href="#" id="serviceListLineWebsiteLink">n/a</a></td>
 				<td id="serviceListLineSoftware">n/a</td>
 			</tr>