diff --git a/src/fr/devinsy/statoolinfos/htmlize/ChartHtmlizer.java b/src/fr/devinsy/statoolinfos/htmlize/ChartHtmlizer.java
index 8483a1c..f4ab5c6 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ChartHtmlizer.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ChartHtmlizer.java
@@ -1075,6 +1075,28 @@ public class ChartHtmlizer
         return result;
     }
 
+    /**
+     * Htmlize organization type chart.
+     *
+     * @param organization
+     *            the organization
+     * @return the string
+     * @throws StatoolInfosException
+     *             the statool infos exception
+     */
+    public static String htmlizeOrganizationTypeChart(final Organization organization) throws StatoolInfosException
+    {
+        String result;
+
+        Organizations organizations = new Organizations();
+        organizations.add(organization);
+
+        result = htmlizeOrganizationTypeChart(organizations);
+
+        //
+        return result;
+    }
+
     /**
      * Htmlize organization type chart.
      *
diff --git a/src/fr/devinsy/statoolinfos/htmlize/OrganizationStatsPage.java b/src/fr/devinsy/statoolinfos/htmlize/OrganizationStatsPage.java
index 0d41277..48e0b4c 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/OrganizationStatsPage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/OrganizationStatsPage.java
@@ -67,12 +67,15 @@ public class OrganizationStatsPage
             data.setContent("turnoutChart", ChartHtmlizer.htmlizeOrganizationTurnoutChart(organization));
 
             Services services = organization.getActiveServices();
-            data.setContent("hostServerDistributionChart", ChartHtmlizer.htmlizeHostServerDistributionChart(services));
+            data.setContent("serviceCountYearChart", ChartHtmlizer.htmlizeServiceCountYearChart(organization));
             data.setContent("hostServerTypeChart", ChartHtmlizer.htmlizeHostServerTypeChart(services));
             data.setContent("hostProviderTypeChart", ChartHtmlizer.htmlizeHostProviderTypeChart(services));
             data.setContent("serviceCountryChart", ChartHtmlizer.htmlizeServiceCountryChart(services));
 
             data.setContent("hostNameChart", ChartHtmlizer.htmlizeHostNamePieChart(services));
+            data.setContent("hostProviderHypervisorChart", ChartHtmlizer.htmlizeHostProviderHypervisorChart(services));
+
+            data.setContent("hostServerDistributionChart", ChartHtmlizer.htmlizeHostServerDistributionChart(services));
             data.setContent("serviceInstallTypeChart", ChartHtmlizer.htmlizeServiceInstallTypeChart(services));
 
             {
@@ -86,7 +89,7 @@ public class OrganizationStatsPage
             }
 
             data.setContent("serviceDateStatusChart", ChartHtmlizer.htmlizeServiceDateStatusChart(services));
-            data.setContent("serviceCountYearChart", ChartHtmlizer.htmlizeServiceCountYearChart(organization));
+            data.setContent("organisationTypeChart", ChartHtmlizer.htmlizeOrganizationTypeChart(organization));
 
             //
             String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/organizationStatsPage.xhtml", data).toString();
diff --git a/src/fr/devinsy/statoolinfos/htmlize/organizationStatsPage.xhtml b/src/fr/devinsy/statoolinfos/htmlize/organizationStatsPage.xhtml
index 89b7790..45a51f9 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/organizationStatsPage.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/organizationStatsPage.xhtml
@@ -19,13 +19,17 @@
 				<div id="turnoutChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
 			</div>
 			<div>
-				<div id="hostServerDistributionChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
+				<div id="serviceCountYearChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
 				<div id="hostServerTypeChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
 				<div id="hostProviderTypeChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
 				<div id="serviceCountryChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
 			</div>
 			<div>
 				<div id="hostNameChart" class="chartborder" style="width: 500px; height: 250px; display: inline-block;"/>
+				<div id="hostProviderHypervisorChart" class="chartborder" style="width: 500px; height: 250px; display: inline-block;"/>
+			</div>
+			<div>
+				<div id="hostServerDistributionChart" class="chartborder" style="width: 500px; height: 250px; display: inline-block;"/>
 				<div id="serviceInstallTypeChart" class="chartborder" style="width: 500px; height: 250px; display: inline-block; vertical-align: top;"/>
 			</div>
 			<div class="row">
@@ -43,7 +47,7 @@
 			</div>
 			<div>
 				<div id="serviceDateStatusChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
-				<div id="serviceCountYearChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
+				<div id="organisationTypeChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
 			</div>
 		</div>
 	</div>