diff --git a/datamodel/itop-config-mgmt-1.0.0/cis_menu.html b/datamodel/itop-config-mgmt-1.0.0/cis_menu.html
deleted file mode 100644
index d4389e952..000000000
--- a/datamodel/itop-config-mgmt-1.0.0/cis_menu.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<style>
-.main_container {
-	width: 100%;
-	border: 0;
-	overflow-y: hidden;
-	overflow-x: hidden;
-	margin-bottom: 5px;
-	margin-top: 5px;
-	border-bottom: #ccc 1px solid;
-	border-top: #ccc 1px solid;
-}
-.main_header {
-	width:100%;
-	height: 60px;
-	cursor: move;
-	background-color: #F1F1F6;
-}
-.main_header h1 {
-	color: #1C94C4;
-	margin-top:0;
-	margin-bottom:0;
-	padding-top: 10px;
-	padding-bottom: 10px;p
-	font-size: 16px;
-	line-height: 16px;
-}
-.main_header img {
-	margin-top: 10px;
-	margin-right: 10px;
-	float:left;
-}
-.item {
-	overflow-y: auto;
-	overflow-x: hidden;
-	background-color: #fff;
-	padding: 5px;
-	height: auto;
-}
-.main_menu {
-	overflow-y: auto;
-	overflow-x: hidden;
-	height: auto;
-	background-color: #eee;
-	width: 100%;
-}
-.element {
-	display: inline;
-	float: left;
-}
-.element a {
-	font-size: 10px;
-}
-.element a.actions {
-	font-size: 16px;
-	text-decoration: none;
-	background: transparent;
-	color: #666;
-}
-.element a img {
-	border: 0;
-}
-.summary-details {
-	float:right;
-	margin-top: 5px;
-}
-
-.summary-details td {
-	text-align: center;
-	background: transparent;
-	padding: 5px;
-}
-.summary-details th {
-	text-align: center;
-	background: #CCC;
-	padding: 5px;
-	color: #eee;
-}
-a.summary {
-	text-decoration: none;
-	background: transparent;
-	color: #666;
-}
-a.summary:hover {
-	text-decoration: underline;
-}
-</style>
-<div id="ci_menu" class="sortable persistent">
-
-<!-- ######################################### -->
-
-<div id="menu_1" class="main_container v-resizable">
-
-<div class="main_header drag_handle" id="config_devices">
-<img src="$MODULES_URL$itop-config-mgmt-1.0.0/images/server.png"/>
-<itopblock BlockClass="DisplayBlock" type="summary" asynchronous="false" encoding="text/oql" parameters="title[block]:Menu_ConfigManagement_Devices;context_filter:1;label[block]:Menu_ConfigManagement_AllDevices;status[block]:status;status_codes[block]:implementation,production,obsolete">SELECT Device</itopblock>
-</div><!-- Drag Handle -->
-
-<div class="item">
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Server</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT NetworkDevice</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT PC</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT MobilePhone</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Printer</itopblock>
-</div><!-- element -->
-
-</div><!-- item -->
-
-</div><!-- menu_1 -->
-
-<!-- ######################################### -->
-
-<div id="menu_2" class="main_container v-resizable">
-
-<div class="main_header drag_handle" id="config_applications">
-<img src="$MODULES_URL$itop-config-mgmt-1.0.0/images/application.png"/>
-<h1><itopstring>Menu:ConfigManagement:SWAndApps</itopstring></h1>
-</div><!-- Drag Handle -->
-
-<div class="item">
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT ApplicationInstance</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT DBServerInstance</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT DatabaseInstance</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Patch</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Licence</itopblock>
-</div><!-- element -->
-</div><!-- item -->
-
-</div><!-- menu_2 -->
-
-<!-- ######################################### -->
-
-<div id="menu_3" class="main_container v-resizable">
-
-<div class="main_header drag_handle" id="cfg_misc">
-<img src="$MODULES_URL$itop-config-mgmt-1.0.0/images/subnet.png"/>
-<h1><itopstring>Menu:ConfigManagement:Misc</itopstring></h1>
-</div><!-- drag handle -->
-
-<div class="item">
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT NetworkInterface</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Subnet</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT BusinessProcess</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT ApplicationSolution</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Group</itopblock>
-</div><!-- element -->
-
-</div><!-- item -->
-</div><!-- menu_3 -->
-
-<!-- ######################################### -->
-
-</div>
diff --git a/datamodel/itop-config-mgmt-1.0.0/cis_menu.xml b/datamodel/itop-config-mgmt-1.0.0/cis_menu.xml
new file mode 100644
index 000000000..44e81f5a6
--- /dev/null
+++ b/datamodel/itop-config-mgmt-1.0.0/cis_menu.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <layout>DashboardLayoutOneCol</layout>
+  <title></title>
+  <cells>
+    <cell>
+      <dashlet id="1" xsi:type="DashletHeaderDynamic">
+        <title>Menu_ConfigManagement_Devices</title>
+        <icon>itop-config-mgmt-1.0.0/images/server.png</icon>
+        <subtitle>Menu_ConfigManagement_AllDevices</subtitle>
+        <query>SELECT FunctionalCI</query>
+        <group_by>status</group_by>
+        <values>implementation,production,obsolete</values>
+      </dashlet>
+      <dashlet id="2" xsi:type="DashletBadge">
+        <class>Server</class>
+      </dashlet>
+      <dashlet id="3" xsi:type="DashletBadge">
+        <class>NetworkDevice</class>
+      </dashlet>
+      <dashlet id="5" xsi:type="DashletBadge">
+        <class>PC</class>
+      </dashlet>
+      <dashlet id="6" xsi:type="DashletBadge">
+        <class>MobilePhone</class>
+      </dashlet>
+      <dashlet id="7" xsi:type="DashletBadge">
+        <class>Printer</class>
+      </dashlet>
+    </cell>
+    <cell>
+      <dashlet id="8" xsi:type="DashletHeaderStatic">
+        <title>Menu:ConfigManagement:SWAndApps</title>
+        <icon>itop-config-mgmt-1.0.0/images/application.png</icon>
+      </dashlet>
+      <dashlet id="9" xsi:type="DashletBadge">
+        <class>ApplicationInstance</class>
+      </dashlet>
+      <dashlet id="10" xsi:type="DashletBadge">
+        <class>DBServerInstance</class>
+      </dashlet>
+      <dashlet id="11" xsi:type="DashletBadge">
+        <class>DatabaseInstance</class>
+      </dashlet>
+      <dashlet id="12" xsi:type="DashletBadge">
+        <class>Patch</class>
+      </dashlet>
+      <dashlet id="13" xsi:type="DashletBadge">
+        <class>Licence</class>
+      </dashlet>
+    </cell>
+    <cell>
+      <dashlet id="14" xsi:type="DashletHeaderStatic">
+        <title>Menu:ConfigManagement:Misc</title>
+        <icon>itop-config-mgmt-1.0.0/images/subnet.png</icon>
+      </dashlet>
+      <dashlet id="15" xsi:type="DashletBadge">
+        <class>NetworkInterface</class>
+      </dashlet>
+      <dashlet id="16" xsi:type="DashletBadge">
+        <class>Subnet</class>
+      </dashlet>
+      <dashlet id="17" xsi:type="DashletBadge">
+        <class>BusinessProcess</class>
+      </dashlet>
+      <dashlet id="18" xsi:type="DashletBadge">
+        <class>ApplicationSolution</class>
+      </dashlet>
+      <dashlet id="19" xsi:type="DashletBadge">
+        <class>Group</class>
+      </dashlet>
+    </cell>
+  </cells>
+</dashboard>
+
diff --git a/datamodel/itop-config-mgmt-1.0.0/contacts_menu.html b/datamodel/itop-config-mgmt-1.0.0/contacts_menu.html
deleted file mode 100644
index 8aac2473d..000000000
--- a/datamodel/itop-config-mgmt-1.0.0/contacts_menu.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<style>
-.main_container {
-	width: 100%;
-	border: 0;
-	overflow-y: hidden;
-	overflow-x: hidden;
-	margin-bottom: 5px;
-	margin-top: 5px;
-	border-bottom: #ccc 1px solid;
-	border-top: #ccc 1px solid;
-}
-.main_header {
-	width:100%;
-	height: 60px;
-	background-color: #F1F1F6;
-}
-.main_header h1 {
-	color: #1C94C4;
-	margin-top:0;
-	margin-bottom:0;
-	padding-top: 10px;
-	padding-bottom: 10px;p
-	font-size: 16px;
-	line-height: 16px;
-}
-.main_header img {
-	margin-top: 10px;
-	margin-right: 10px;
-	float:left;
-}
-.item {
-	overflow-y: auto;
-	overflow-x: hidden;
-	background-color: #fff;
-	padding: 5px;
-	height: auto;
-}
-.main_menu {
-	overflow-y: auto;
-	overflow-x: hidden;
-	height: auto;
-	background-color: #eee;
-	width: 100%;
-}
-.element {
-	display: inline-block;
-	height: auto;
-}
-.element a {
-	font-size: 10px;
-}
-.element a.actions {
-	font-size: 16px;
-	text-decoration: none;
-	background: transparent;
-	color: #666;
-}
-.element a img {
-	border: 0;
-}
-.summary-details {
-	float:right;
-	margin-top: 5px;
-}
-
-.summary-details td {
-	text-align: center;
-	background: transparent;
-	padding: 5px;
-}
-.summary-details th {
-	text-align: center;
-	background: #CCC;
-	padding: 5px;
-	color: #eee;
-}
-a.summary {
-	text-decoration: none;
-	background: transparent;
-	color: #666;
-}
-a.summary:hover {
-	text-decoration: underline;
-}
-</style>
-<div id="contacts_menu">
-
-<!-- ######################################### -->
-
-<div id="menu_1" class="main_container">
-
-<div class="main_header drag_handle" id="config_devices">
-<img src="$MODULES_URL$itop-config-mgmt-1.0.0/images/team.png"/>
-<itopblock BlockClass="DisplayBlock" type="summary" asynchronous="false" encoding="text/oql" parameters="title[block]:Menu_Contact;context_filter:1;label[block]:Menu_ConfigManagement_AllContacts;status[block]:status;status_codes[block]:active,inactive">SELECT Contact</itopblock>
-</div><!-- Drag Handle -->
-
-<div class="item">
-<table style="width:100%;text-align:center">
-<tr>
-<td style="width:50%">
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Team</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Person</itopblock>
-</div><!-- element -->
-
-</td>
-<td style="width:50%">
-<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;chart_title:UI-ContactsMenu-ContactsByLocation;group_by:location_name" asynchronous="false" encoding="text/oql">SELECT Contact</itopblock>
-</td>
-</tr></table>
-
-</div><!-- item -->
-
-</div><!-- menu_1 -->
-
-<!-- ######################################### -->
-
-</div>
diff --git a/datamodel/itop-config-mgmt-1.0.0/contacts_menu.xml b/datamodel/itop-config-mgmt-1.0.0/contacts_menu.xml
new file mode 100644
index 000000000..7a7db016f
--- /dev/null
+++ b/datamodel/itop-config-mgmt-1.0.0/contacts_menu.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <layout>DashboardLayoutOneCol</layout>
+  <title></title>
+  <cells>
+    <cell>
+      <dashlet id="1" xsi:type="DashletHeaderDynamic">
+        <title>Menu_Contact</title>
+        <icon>itop-config-mgmt-1.0.0/images/team.png</icon>
+        <subtitle>Contacts</subtitle>
+        <query>SELECT Contact</query>
+        <group_by>status</group_by>
+        <values>active,inactive</values>
+      </dashlet>
+      <dashlet id="2" xsi:type="DashletBadge">
+        <class>Team</class>
+      </dashlet>
+      <dashlet id="3" xsi:type="DashletBadge">
+        <class>Person</class>
+      </dashlet>
+    </cell>
+    <cell>
+      <dashlet id="4" xsi:type="DashletGroupByPie">
+        <title>UI-ContactsMenu-ContactsByLocation</title>
+        <query>SELECT Contact</query>
+        <group_by>location_name</group_by>
+        <style>pie</style>
+      </dashlet>
+    </cell>
+  </cells>
+</dashboard>
+
diff --git a/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml b/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml
index 4291546d6..c6faa79b2 100644
--- a/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml
+++ b/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml
@@ -4200,10 +4200,10 @@
       <parent>ConfigManagement</parent>
       <definition_file>config-dashboard.xml</definition_file>
     </menu>
-    <menu id="Contact" xsi:type="TemplateMenuNode" _delta="define">
+    <menu id="Contact" xsi:type="DashboardMenuNode" _delta="define">
       <rank>1</rank>
       <parent>ConfigManagement</parent>
-      <template_file>contacts_menu.html</template_file>
+      <template_file>contacts_menu.xml</template_file>
     </menu>
     <menu id="NewContact" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>
@@ -4233,10 +4233,10 @@
       <oql>SELECT Group</oql>
       <do_search>1</do_search>
     </menu>
-    <menu id="ConfigManagementCI" xsi:type="TemplateMenuNode" _delta="define">
+    <menu id="ConfigManagementCI" xsi:type="DashboardMenuNode" _delta="define">
       <rank>5</rank>
       <parent>ConfigManagement</parent>
-      <template_file>cis_menu.html</template_file>
+      <template_file>cis_menu.xml</template_file>
     </menu>
     <menu id="NewCI" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>0</rank>