diff --git a/maintenance.xml b/maintenance.xml
index ceacd64..ae2a74f 100644
--- a/maintenance.xml
+++ b/maintenance.xml
@@ -187,26 +187,26 @@
             <field name="name">calibration_total_form</field>
         </record>
 
-	<record model="ir.ui.view" id="maintenance_service_view_calendar">
-            <field name="model">optical_equipment_maintenance.service</field>
+	<record model="ir.ui.view" id="maintenance_diary_view_calendar">
+            <field name="model">optical_equipment_maintenance.diary</field>
             <field name="type">calendar</field>
             <field name="name">maintenance_calendar</field>
         </record>
-	<record model="ir.action.act_window" id="act_maintenance_service_calendar">
+	<record model="ir.action.act_window" id="act_maintenance_diary_calendar">
             <field name="name">Calendar</field>
-            <field name="res_model">optical_equipment_maintenance.service</field>
+            <field name="res_model">optical_equipment_maintenance.diary</field>
         </record>
         <record model="ir.action.act_window.view"
             id="act_maintenance_calendar_view1">
             <field name="sequence" eval="10"/>
-            <field name="view" ref="maintenance_service_view_calendar"/>
-            <field name="act_window" ref="act_maintenance_service_calendar"/>
+            <field name="view" ref="maintenance_diary_view_calendar"/>
+            <field name="act_window" ref="act_maintenance_diary_calendar"/>
         </record>
 	<record model="ir.action.act_window.view"
             id="act_maintenance_calendar_view2">
             <field name="sequence" eval="20"/>
-            <field name="view" ref="maintenance_service_view_form"/>
-            <field name="act_window" ref="act_maintenance_service_calendar"/>
+            <field name="view" ref="optical_equipment.agended_list_view_form"/>
+            <field name="act_window" ref="act_maintenance_diary_calendar"/>
         </record>
 	<record model="ir.ui.view" id="assing_agended_view_form">
 	    <field name="model">optical_equipment_maintenance.agended</field>
@@ -242,7 +242,7 @@
 	    <field name="action" ref="maintenance_create_contract"/>
 	</record>
 	<menuitem parent="menu_diary"
-		  action="act_maintenance_service_calendar"
+		  action="act_maintenance_diary_calendar"
 		  sequence="10"
 		  id="menu_agenda_form"/>
 	<menuitem parent="menu_equipment"
diff --git a/view/maintenance_calendar.xml b/view/maintenance_calendar.xml
index 2308197..cb46322 100644
--- a/view/maintenance_calendar.xml
+++ b/view/maintenance_calendar.xml
@@ -2,6 +2,6 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <calendar
-    dtstart="estimated_agended"
-    dtend="estimated_agended">
+    dtstart="date_expected"
+    dtend="date_expected">
 </calendar>
diff --git a/view/maintenance_form.xml b/view/maintenance_form.xml
index 409a6ec..58f523a 100644
--- a/view/maintenance_form.xml
+++ b/view/maintenance_form.xml
@@ -17,16 +17,6 @@
     <label name="service_maintenance"/>
     <field name="service_maintenance"/>
     <notebook colspan="6">
-	<!--
-	<page string="Agended" id="agended">
-	    <label name="estimated_agended"/>
-	    <field name="estimated_agended"/>
-	    <label name="technical"/>
-	    <field name="technical"/>
-	    <label name="state_agended"/>
-	    <field name="state_agended"/>
-	    </page>
-	-->
 	<page string="Preventive" id="preventive">
 	    <label name="initial_operation"/>
 	    <field name="initial_operation"/>
@@ -42,18 +32,13 @@
 	    <field name="optical"/>
 	    <label name="check_calibration"/>
 	    <field name="check_calibration"/>
-	    <newline/>
-	    <!--
-		<label name="check_calibration"/>
-		<field name="check_calibration"/>
-	    -->
 	</page>
 	<page string="Corrective" id="corrective">
 	    <label name="maintenance_lines"/>
 	    <field name="maintenance_lines"/>
 	    <field name="maintenance_lines"/>
 	</page>
-	<page string="Calibration" colspan="6" id="calibration">
+	<page string="Calibration" id="calibration">
 	    <label name="patterns_equipments"/>
 	    <field name="patterns_equipments"/>
 	    <newline/>